diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java
index ff2c569ce..2605fda13 100644
--- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java
+++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java
@@ -18,18 +18,19 @@
  */
 package org.apache.openjpa.example.gallery.constraint;
 
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.apache.openjpa.example.gallery.ImageType.GIF;
+import static org.apache.openjpa.example.gallery.ImageType.JPEG;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
 import org.apache.openjpa.example.gallery.ImageType;
-import static org.apache.openjpa.example.gallery.ImageType.GIF;
-import static org.apache.openjpa.example.gallery.ImageType.JPEG;
 
 /**
  * Type-level annotation used to specify an image constraint.  Uses
diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java
index ee9153d07..fb663a981 100644
--- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java
+++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java
@@ -18,19 +18,20 @@
  */
 package org.apache.openjpa.example.gallery.constraint;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.apache.openjpa.example.gallery.ImageType.GIF;
+import static org.apache.openjpa.example.gallery.ImageType.JPEG;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
 import org.apache.openjpa.example.gallery.ImageType;
-import static org.apache.openjpa.example.gallery.ImageType.GIF;
-import static org.apache.openjpa.example.gallery.ImageType.JPEG;
 
 /**
  * Attribute-level annotation used to specify an image content constraint.  Uses
diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java
index b07ac3ed1..16eabc558 100644
--- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java
+++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java
@@ -37,6 +37,7 @@ public class ImageContentValidator implements ConstraintValidator<ImageContent,
      * types it should support.
      * @param constraint the constraint definition
      */
+    @Override
     public void initialize(ImageContent constraint) {
         allowedTypes = Arrays.asList(constraint.value());
     }
@@ -44,6 +45,7 @@ public class ImageContentValidator implements ConstraintValidator<ImageContent,
     /**
      * Validate a specified value.
      */
+    @Override
     public boolean isValid(byte[] value, ConstraintValidatorContext context) {
         if (value == null) {
             return false;
diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java
index 031ec63cb..7424dddd5 100644
--- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java
+++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java
@@ -38,6 +38,7 @@ public class ImageValidator implements ConstraintValidator<ImageConstraint, Imag
      * types it should support.
      * @param constraint the constraint definition
      */
+    @Override
     public void initialize(ImageConstraint constraint) {
         allowedTypes = Arrays.asList(constraint.value());
     }
@@ -45,6 +46,7 @@ public class ImageValidator implements ConstraintValidator<ImageConstraint, Imag
     /**
      * Validate a specified value.
      */
+    @Override
     public boolean isValid(Image value, ConstraintValidatorContext context) {
         // JSR-303 best practice.  Promotes the use of @NotNull to perform
         // null checking.
diff --git a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java
index 020dc0349..89e977e70 100644
--- a/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java
+++ b/openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java
@@ -23,8 +23,8 @@ import java.util.List;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.OneToMany;
 import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
 import javax.validation.constraints.NotNull;
 
 /**
diff --git a/openjpa-examples/jest/src/main/java/demo/SimpleApp.java b/openjpa-examples/jest/src/main/java/demo/SimpleApp.java
index c2538103b..2d9f3de59 100644
--- a/openjpa-examples/jest/src/main/java/demo/SimpleApp.java
+++ b/openjpa-examples/jest/src/main/java/demo/SimpleApp.java
@@ -46,8 +46,8 @@ import javax.servlet.http.HttpServletResponse;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class SimpleApp extends HttpServlet {
+    private static final long serialVersionUID = 1L;
     EntityManagerFactory _emf;
     private static String UNIT_NAME = "jestdemo";
 
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java
index 859c49b3c..3fd5bf400 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java
@@ -23,6 +23,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 
 /**
  * Displays color codes of each attribute type.
@@ -30,8 +31,8 @@ import javax.swing.JPanel;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class AttributeLegendView extends JPanel {
+    private static final long serialVersionUID = 1L;
 
     public AttributeLegendView() {
         super(true);
@@ -51,7 +52,7 @@ public class AttributeLegendView extends JPanel {
         for (int i = 0; i < width; i++)
             for (int j = 0; j < height; j++)
                 bimage.setRGB(i, j, c.getRGB());
-        JLabel label = new JLabel(text, new ImageIcon(bimage), JLabel.LEADING);
+        JLabel label = new JLabel(text, new ImageIcon(bimage), SwingConstants.LEADING);
         return label;
     }
 
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java
index d29bc1274..8c131f7b9 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java
@@ -24,8 +24,8 @@ import javax.swing.JLabel;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class AttributeView extends JLabel {
+    private static final long serialVersionUID = 1L;
     private final Attribute<?,?> _attr;
 
     public AttributeView(Attribute<?,?> attr) {
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ConfigurationViewer.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ConfigurationViewer.java
index 52c7accbf..c4c18428c 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ConfigurationViewer.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ConfigurationViewer.java
@@ -28,14 +28,14 @@ import javax.swing.JTextPane;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class ConfigurationViewer extends JTextPane {
+    private static final long serialVersionUID = 1L;
     private static final char SPACE = ' ';
 
     public ConfigurationViewer(String title, Map<String, Object> config) {
         super();
         setBorder(BorderFactory.createTitledBorder(title));
-        TreeSet<String> sortedKeys = new TreeSet<String>(config.keySet());
+        TreeSet<String> sortedKeys = new TreeSet<>(config.keySet());
         int L = getMaxLength(sortedKeys);
         for (String key : sortedKeys) {
             setCaretPosition(getDocument().getLength());
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java
index f712c00a8..927b85cbb 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java
@@ -39,8 +39,8 @@ import javax.swing.table.TableModel;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class EntityDataModel<T> extends AbstractTableModel implements TableModel, Iterable<T> {
+    private static final long serialVersionUID = 1L;
     /**
      * Constant designates to include non-relation fields.
      */
@@ -84,10 +84,10 @@ public class EntityDataModel<T> extends AbstractTableModel implements TableModel
         this.data = data;
         EntityType<T> entityType = meta.entity(cls);
 
-        columnNames   = new ArrayList<String>();
-        columnClasses = new ArrayList<Class<?>>();
-        attributes    = new ArrayList<Attribute<? super T,?>>();
-        methods       = new ArrayList<Method>();
+        columnNames   = new ArrayList<>();
+        columnClasses = new ArrayList<>();
+        attributes    = new ArrayList<>();
+        methods       = new ArrayList<>();
 
         showsRowCount     = (styleBits & ROW_COUNT) != 0;
         showsBasicAttr    = (styleBits & BASIC_ATTR) != 0;
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java
index 48a520c2f..3434ce431 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java
@@ -23,9 +23,9 @@ import javax.persistence.PersistenceUnitUtil;
 import javax.persistence.metamodel.Attribute;
 import javax.swing.DefaultCellEditor;
 import javax.swing.JComboBox;
-import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
@@ -48,8 +48,8 @@ import org.apache.openjpa.enhance.StateManager;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class EntityTable<T> extends JTable {
+    private static final long serialVersionUID = 1L;
     private InstanceCellRenderer instanceCellRenderer;
     private CollectionCellRenderer collectionCellRenderer;
 
@@ -59,7 +59,7 @@ public class EntityTable<T> extends JTable {
         collectionCellRenderer = new CollectionCellRenderer();
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
-        setModel(new EntityDataModel<T>(cls, data,  unit.getMetamodel(), styleBits));
+        setModel(new EntityDataModel<>(cls, data,  unit.getMetamodel(), styleBits));
         getModel().addTableModelListener(this);
         initColumnSizes();
         setFillsViewportHeight(true);
@@ -74,6 +74,7 @@ public class EntityTable<T> extends JTable {
      * Gets the special renderer for single- and multi-valued association.
      * Otherwise uses the super classes' renderer defined by the field type.
      */
+    @Override
     public TableCellRenderer getCellRenderer(int row, int column) {
         Attribute<?,?> attr = ((EntityDataModel)getModel()).getAttribute(column);
         TableCellRenderer renderer = null;
@@ -87,12 +88,13 @@ public class EntityTable<T> extends JTable {
             renderer = super.getCellRenderer(row, column);
         }
         if (renderer instanceof DefaultTableCellRenderer) {
-            ((DefaultTableCellRenderer)renderer).setHorizontalAlignment(JLabel.CENTER);
+            ((DefaultTableCellRenderer)renderer).setHorizontalAlignment(SwingConstants.CENTER);
         }
 
         return renderer;
     }
 
+    @Override
     public TableCellEditor getCellEditor(int row, int column) {
         Attribute<?,?> attr = ((EntityDataModel)getModel()).getAttribute(column);
         if (attr == null)
@@ -145,6 +147,8 @@ public class EntityTable<T> extends JTable {
      *
      */
     public class InstanceCellRenderer extends DefaultTableCellRenderer {
+        
+        private static final long serialVersionUID = 1L;
         private final PersistenceUnitUtil util;
 
         public InstanceCellRenderer(PersistenceUnitUtil util) {
@@ -171,6 +175,7 @@ public class EntityTable<T> extends JTable {
             return id == null ? "null" : id.toString();
         }
 
+        @Override
         public void setValue(Object instance) {
             setForeground(Color.BLUE);
             setText(renderAsString(instance));
@@ -186,6 +191,8 @@ public class EntityTable<T> extends JTable {
      *
      */
     public class CollectionCellRenderer extends DefaultTableCellRenderer {
+        
+        private static final long serialVersionUID = 1L;
         public CollectionCellRenderer() {
             setPreferredSize(new Dimension(10,20));
         }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java
index 0f0dac207..3f499ab90 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java
@@ -28,6 +28,7 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.ListSelectionModel;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.ListSelectionEvent;
@@ -42,18 +43,18 @@ import jpa.tools.swing.EntityTable.InstanceCellRenderer;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class EntityTableView<T> extends JPanel implements ListSelectionListener {
+    private static final long serialVersionUID = 1L;
     private EntityTable<T> _table;
     private JTextArea _details;
 
     public EntityTableView(Class<T> cls, int styleBits, EntityManagerFactory unit) {
-        this(cls, (List<T>)Collections.EMPTY_LIST, styleBits, unit);
+        this(cls, Collections.emptyList(), styleBits, unit);
     }
 
     public EntityTableView(Class<T> cls, List<T> data, int styleBits, EntityManagerFactory unit) {
         super(true);
-        _table   = new EntityTable<T>(cls, data, styleBits, unit);
+        _table   = new EntityTable<>(cls, data, styleBits, unit);
         _table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
         if ((styleBits & EntityDataModel.PLURAL_ATTR) != 0) {
@@ -68,8 +69,8 @@ public class EntityTableView<T> extends JPanel implements ListSelectionListener
 
         setLayout(new BoxLayout(this,BoxLayout.Y_AXIS));
         add(new JScrollPane(_table,
-                JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
-                JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS));
+                ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS,
+                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS));
         if (_details != null)
             add(_details);
     }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java
index 54c8b4098..14ff81e7a 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java
@@ -31,8 +31,8 @@ import javax.swing.JPanel;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class EntityTypeView<T> extends JPanel {
+    private static final long serialVersionUID = 1L;
     final EntityType<T> type;
     final int hgap = 4;
     final int vgap = 4;
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ErrorDialog.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ErrorDialog.java
index ed8fad3dc..cf87c540c 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ErrorDialog.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ErrorDialog.java
@@ -32,6 +32,8 @@ import javax.swing.JEditorPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextPane;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.WindowConstants;
 
 /**
  * A dialog to display runtime error.
@@ -39,8 +41,8 @@ import javax.swing.JTextPane;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class ErrorDialog extends JDialog {
+    private static final long serialVersionUID = 1L;
     private static List<String> filters = Arrays.asList(
             "java.awt.",
             "javax.swing.",
@@ -87,7 +89,7 @@ public class ErrorDialog extends JDialog {
         setModal(true);
         if (icon != null && icon instanceof ImageIcon)
             setIconImage(((ImageIcon)icon).getImage());
-        setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
         _error = t;
         _message = createErrorMessage(_error);
         _main    = createContent();
@@ -106,6 +108,7 @@ public class ErrorDialog extends JDialog {
     JComponent createContent() {
         final JButton showDetails = new JButton("Show Details >>");
         showDetails.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 if (_showingDetails) {
                      _main.remove(_details);
@@ -133,6 +136,7 @@ public class ErrorDialog extends JDialog {
         final JCheckBox filter = new JCheckBox("Filter stack traces");
         filter.setSelected(_isFiltering);
         filter.addActionListener(new ActionListener(){
+            @Override
             public void actionPerformed(ActionEvent e) {
                 _isFiltering = filter.isSelected();
                 StringBuilder buffer = new StringBuilder();
@@ -178,8 +182,8 @@ public class ErrorDialog extends JDialog {
         _stacktrace = new JTextPane();
         _stacktrace.setEditable(false);
         JScrollPane pane = new JScrollPane(_stacktrace,
-                JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-                JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+                ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
+                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 
         return pane;
     }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/FileScanner.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/FileScanner.java
index 911c813e3..1f84436f9 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/FileScanner.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/FileScanner.java
@@ -36,7 +36,7 @@ public class FileScanner {
      * Scans the given
      */
     public List<File> scan(File dir) {
-        List<File> bag = new ArrayList<File>();
+        List<File> bag = new ArrayList<>();
         scan(dir, bag);
         return bag;
     }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/Finder.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/Finder.java
index 4e7461097..a87ef0804 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/Finder.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/Finder.java
@@ -79,6 +79,7 @@ public class Finder {
 
     private void scan(File dir, String cls) throws IOException {
         File[] classes = dir.listFiles(new FileFilter() {
+            @Override
             public boolean accept(File path) {
                 return path.getName().endsWith(CLASS_SUFFIX);
             }
@@ -91,6 +92,7 @@ public class Finder {
         }
 
         File[] jars = dir.listFiles(new FileFilter() {
+            @Override
             public boolean accept(File path) {
                 return path.getName().endsWith(JAR_SUFFIX);
             }
@@ -102,6 +104,7 @@ public class Finder {
         }
 
         File[] dirs = dir.listFiles(new FileFilter() {
+            @Override
             public boolean accept(File path) {
                 return path.isDirectory();
             }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/GraphicOutputStream.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/GraphicOutputStream.java
index e83cc30cf..39613e6ec 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/GraphicOutputStream.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/GraphicOutputStream.java
@@ -32,7 +32,7 @@ public class GraphicOutputStream extends OutputStream {
     ScrollingTextPane _sink;
     private char[] buffer = new char[1024];
     private int count;
-    private Map<String, AttributeSet> _styles = new HashMap<String, AttributeSet>();
+    private Map<String, AttributeSet> _styles = new HashMap<>();
     private static AttributeSet _defaultStyle = StyleContext.getDefaultStyleContext()
                                                             .getStyle(StyleContext.DEFAULT_STYLE);
 
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/IndexedMap.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/IndexedMap.java
index d2babd7ab..96867bcd9 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/IndexedMap.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/IndexedMap.java
@@ -39,21 +39,24 @@ import java.util.Set;
  * @param <V>
  */
 public class IndexedMap<K,V> implements Map<K, V> {
-    private final List<K> _keys = new ArrayList<K>();
-    private final List<V> _values = new ArrayList<V>();
-    private final Set<K> _nulls = new HashSet<K>();
+    private final List<K> _keys = new ArrayList<>();
+    private final List<V> _values = new ArrayList<>();
+    private final Set<K> _nulls = new HashSet<>();
 
+    @Override
     public void clear() {
         _keys.clear();
         _values.clear();
     }
 
 
+    @Override
     public boolean containsKey(Object key) {
         return _keys.contains(key) && !_nulls.contains(key);
     }
 
 
+    @Override
     public boolean containsValue(Object value) {
         return _values.contains(value);
     }
@@ -61,26 +64,31 @@ public class IndexedMap<K,V> implements Map<K, V> {
     /**
      * Not supported.
      */
+    @Override
     public Set<java.util.Map.Entry<K, V>> entrySet() {
         throw new UnsupportedOperationException();
     }
 
 
+    @Override
     public V get(Object key) {
         int i = indexOf(key);
         return i == -1 ? null : _values.get(i);
     }
 
+    @Override
     public boolean isEmpty() {
         return (_keys.size() - _nulls.size()) == 0;
     }
 
+    @Override
     public Set<K> keySet() {
-        Set<K> result = new HashSet<K>(_keys);
+        Set<K> result = new HashSet<>(_keys);
         result.removeAll(_nulls);
         return result;
     }
 
+    @Override
     public V put(K key, V value) {
         int i = _keys.indexOf(key);
         if (i == -1) {
@@ -93,12 +101,14 @@ public class IndexedMap<K,V> implements Map<K, V> {
         }
     }
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> m) {
         for (K k : m.keySet()) {
             this.put(k, m.get(k));
         }
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public V remove(Object key) {
         V v = get(key);
@@ -106,12 +116,14 @@ public class IndexedMap<K,V> implements Map<K, V> {
         return v;
     }
 
+    @Override
     public int size() {
         return _keys.size() - _nulls.size();
     }
 
+    @Override
     public Collection<V> values() {
-        Collection<V> result = new ArrayList<V>();
+        Collection<V> result = new ArrayList<>();
         for (int i = 0; i < _values.size(); i++) {
             if (!_nulls.contains(_keys.get(i)))
                 result.add(_values.get(i));
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java
index 143433ca3..62005bc11 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java
@@ -19,8 +19,8 @@ import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.EntityType;
 import javax.swing.table.AbstractTableModel;
 
-@SuppressWarnings("serial")
 public class InstanceDataModel<T> extends AbstractTableModel {
+    private static final long serialVersionUID = 1L;
     List<Attribute<? super T, ?>> attributes;
     private T _instance;
 
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java
index 6aa907113..906e4dd87 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java
@@ -16,10 +16,11 @@ package jpa.tools.swing;
 import javax.persistence.metamodel.EntityType;
 import javax.swing.JTable;
 
-@SuppressWarnings("serial")
 public class InstanceView<T> extends JTable {
+    private static final long serialVersionUID = 1L;
+
     public InstanceView(EntityType<T> type, T instance) {
-        super(new InstanceDataModel<T>(type, instance));
+        super(new InstanceDataModel<>(type, instance));
         setShowHorizontalLines(false);
         setShowVerticalLines(false);
     }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java
index 35639054e..39b401665 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java
@@ -88,7 +88,7 @@ public class MetamodelHelper {
 
 
     public static <T> List<Attribute<? super T,?>> getAttributes(EntityType<T> type) {
-        List<Attribute<? super T,?>> list = new ArrayList<Attribute<? super T,?>>(type.getAttributes());
+        List<Attribute<? super T,?>> list = new ArrayList<>(type.getAttributes());
         Collections.sort(list, new AttributeComparator());
         return list;
     }
@@ -110,7 +110,7 @@ public class MetamodelHelper {
 
     public static <T> Set<SingularAttribute<? super T, ?>> getIdAttributes(EntityType<T> type) {
         Set<SingularAttribute<? super T,?>> attrs = type.getSingularAttributes();
-        Set<SingularAttribute<? super T,?>> idAttrs = new HashSet<SingularAttribute<? super T,?>>();
+        Set<SingularAttribute<? super T,?>> idAttrs = new HashSet<>();
         for (SingularAttribute<? super T,?> attr : attrs) {
             if (attr.isId()) {
                 idAttrs.add(attr);
@@ -192,7 +192,7 @@ public class MetamodelHelper {
       default: return 5;
       }
     }
-    private static Map<Attribute<?,?>, Method> members = new HashMap<Attribute<?,?>, Method>();
+    private static Map<Attribute<?,?>, Method> members = new HashMap<>();
     private static Object[] EMPTY_ARGS = null;
     private static Class<?>[] EMPTY_CLASSES = null;
     /**
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java
index 2fa09d620..f29576b0b 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java
@@ -43,9 +43,8 @@ import javax.swing.JPanel;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class MetamodelView extends JPanel implements Maze {
-
+    private static final long serialVersionUID = 1L;
     private static final int GRID = 8;
     int hgap = 40;
     int vgap = 40;
@@ -63,7 +62,7 @@ public class MetamodelView extends JPanel implements Maze {
         layout.setVgap(80);
 //        getInsets(new Insets(100,100,100,100));
         Set<EntityType<?>> types = model.getEntities();
-        List<EntityType<?>> sorted = new ArrayList<EntityType<?>>(types);
+        List<EntityType<?>> sorted = new ArrayList<>(types);
         Collections.sort(sorted, new MetamodelHelper.EntityComparator());
         for (EntityType type : sorted) {
             EntityTypeView view = new EntityTypeView(type);
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PathFinder.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PathFinder.java
index a70543586..e81c21004 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PathFinder.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PathFinder.java
@@ -58,8 +58,8 @@ public class PathFinder {
         Node source = new Node(null, x1, y1);
         Node target = new Node(null, x2, y2);
         int maxCost = distance(source, target)*2;
-        LinkedList<Node> openList = new LinkedList<Node>();
-        List<Node> closedList = new ArrayList<Node>();
+        LinkedList<Node> openList = new LinkedList<>();
+        List<Node> closedList = new ArrayList<>();
         openList.add(source);
         do {
             Node current = openList.remove(0);
@@ -119,7 +119,7 @@ public class PathFinder {
     }
 
     List<Point> traceBackPath(Node target) {
-        LinkedList<Point> path = new LinkedList<Point>();
+        LinkedList<Point> path = new LinkedList<>();
         path.add(new Point(target.x, target.y));
         Node next = target.parent;
         while (next != null) {
@@ -132,7 +132,7 @@ public class PathFinder {
     List<Point> straighten(List<Point> path) {
         if (path.size() < 3)
             return path;
-        List<Point> mids = new ArrayList<Point>();
+        List<Point> mids = new ArrayList<>();
         Point prev = path.get(0);
         Point mid  = path.get(1);
         for (int i = 2; i < path.size(); i++) {
@@ -158,6 +158,7 @@ public class PathFinder {
             this.y = y;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (this == o) return true;
             if (o instanceof Node) {
@@ -173,6 +174,7 @@ public class PathFinder {
             return f > o.f ? 1 : -1;
         }
 
+        @Override
         public String toString() {
             return "(" + x + "," + y + ":" + g + ")";
         }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java
index 49415dff2..efa6fdcaa 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java
@@ -40,9 +40,9 @@ import openbook.client.Images;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class PowerPointViewer extends JPanel {
-    private List<WeakReference<ImageIcon>> _slides = new ArrayList<WeakReference<ImageIcon>>();
+    private static final long serialVersionUID = 1L;
+    private List<WeakReference<ImageIcon>> _slides = new ArrayList<>();
     private int _total;      // Total number of slides in the deck.
     private String _dir;
     private List<URL> _slideURLs;
@@ -89,6 +89,7 @@ public class PowerPointViewer extends JPanel {
         _prev = new RoundButton(Images.BACK);
         buttons.add(_prev);
         _prev.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 prevPage();
             }
@@ -101,6 +102,7 @@ public class PowerPointViewer extends JPanel {
                 buttons.add(gotoLabel);
                 buttons.add(_goto);
                 _goto.addChangeListener(new ChangeListener() {
+                    @Override
                     public void stateChanged(ChangeEvent e) {
                         Integer page = (Integer)_goto.getValue();
                         showPage(page-1);
@@ -112,6 +114,7 @@ public class PowerPointViewer extends JPanel {
             buttons.add(_navButtons[i]);
             _navButtons[i].putClientProperty(SLIDE_INDEX, i+1);
             _navButtons[i].addActionListener(new ActionListener() {
+                @Override
                 public void actionPerformed(ActionEvent e) {
                     JButton button = (JButton)e.getSource();
                     int index = (Integer)button.getClientProperty(SLIDE_INDEX);
@@ -123,6 +126,7 @@ public class PowerPointViewer extends JPanel {
         buttons.add(Box.createHorizontalGlue());
         buttons.add(_next);
         _next.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 nextPage();
             }
@@ -198,12 +202,12 @@ public class PowerPointViewer extends JPanel {
     ImageIcon loadSlide(int index) {
         URL imgURL = _slideURLs.get(index);
         ImageIcon icon = new ImageIcon(imgURL);
-        _slides.add(index, new WeakReference<ImageIcon>(icon));
+        _slides.add(index, new WeakReference<>(icon));
         return icon;
     }
 
     List<URL> validateSlides(String dir, List<String> slides) {
-        List<URL> valid = new ArrayList<URL>();
+        List<URL> valid = new ArrayList<>();
         for (String slide : slides) {
             URL url = findResource(dir + slide);
             if (url != null) {
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PreparedQueryViewer.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PreparedQueryViewer.java
index 9b62c28f3..fdedec9b9 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PreparedQueryViewer.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PreparedQueryViewer.java
@@ -15,7 +15,6 @@ package jpa.tools.swing;
 
 import javax.swing.JTable;
 
-
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 
@@ -25,8 +24,8 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class PreparedQueryViewer extends JTable {
+    private static final long serialVersionUID = 1L;
 
     public PreparedQueryViewer(OpenJPAEntityManagerFactory emf) {
         super(new QueryStatisticsModel(((OpenJPAEntityManagerFactorySPI)emf).getConfiguration()
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryStatisticsModel.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryStatisticsModel.java
index 65e22997a..f4b04f164 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryStatisticsModel.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryStatisticsModel.java
@@ -21,10 +21,10 @@ import javax.swing.table.AbstractTableModel;
 
 import org.apache.openjpa.kernel.QueryStatistics;
 
-@SuppressWarnings("serial")
 class QueryStatisticsModel extends AbstractTableModel {
+    private static final long serialVersionUID = 1L;
     QueryStatistics<String> _stats;
-    private List<String> _keys = new ArrayList<String>();
+    private List<String> _keys = new ArrayList<>();
 
     QueryStatisticsModel(QueryStatistics<String> stats) {
         _stats = stats;
@@ -65,7 +65,7 @@ class QueryStatisticsModel extends AbstractTableModel {
 
     void sortKeys(QueryStatistics<String> stats) {
         if (_stats.keys().size() != _keys.size()) {
-            _keys = new ArrayList<String>(_stats.keys());
+            _keys = new ArrayList<>(_stats.keys());
             if (_keys.size() > 1) {
                 Collections.sort(_keys);
             }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/RoundButton.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/RoundButton.java
index 004ef25f5..4d4e4d28c 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/RoundButton.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/RoundButton.java
@@ -34,8 +34,8 @@ import javax.swing.JButton;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class RoundButton extends JButton {
+    private static final long serialVersionUID = 1L;
     protected Shape shape, base;
 
     public RoundButton() {
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java
index d4ab5ef57..2ab82efef 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java
@@ -32,8 +32,8 @@ import javax.swing.text.Document;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class ScrollingTextPane extends JTextPane {
+    private static final long serialVersionUID = 1L;
 
     public void appendText(String text) {
         if (text == null)
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java
index 6a7c8f972..48b156a11 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java
@@ -28,6 +28,7 @@ import javax.swing.JEditorPane;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneConstants;
 
 
 /**
@@ -39,12 +40,12 @@ import javax.swing.JScrollPane;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class SourceCodeViewer extends JPanel {
+    private static final long serialVersionUID = 1L;
     private final JEditorPane _editor;
     private final JComboBox   _bookmarks;
-    private IndexedMap<String, URI> _anchors = new IndexedMap<String, URI>();
-    private LinkedList<String> _visited = new LinkedList<String>();
+    private IndexedMap<String, URI> _anchors = new IndexedMap<>();
+    private LinkedList<String> _visited = new LinkedList<>();
 
     /**
      * Create a Source Code Browser.
@@ -62,6 +63,7 @@ public class SourceCodeViewer extends JPanel {
         _bookmarks.setEditable(false);
 
         _bookmarks.addActionListener(new ActionListener(){
+            @Override
             public void actionPerformed(ActionEvent e) {
                 showAnchor((String)_bookmarks.getSelectedItem());
             }
@@ -75,8 +77,8 @@ public class SourceCodeViewer extends JPanel {
 
 
         add(new JScrollPane(_editor,
-                JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
-                JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS),
+                ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS,
+                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS),
                 BorderLayout.CENTER);
         add(topPanel, BorderLayout.NORTH);
     }
diff --git a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/StatusBar.java b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/StatusBar.java
index fcdc406e4..3be13b9ad 100644
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/StatusBar.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/StatusBar.java
@@ -28,8 +28,8 @@ import javax.swing.JProgressBar;
 import javax.swing.SwingWorker;
 import javax.swing.Timer;
 
-@SuppressWarnings("serial")
 public class StatusBar extends JPanel implements PropertyChangeListener {
+    private static final long serialVersionUID = 1L;
     private JProgressBar progressBar;
     private JProgressBar memoryBar;
     private JLabel messageText;
@@ -76,6 +76,7 @@ public class StatusBar extends JPanel implements PropertyChangeListener {
     /**
      * Invoked when task's progress property changes.
      */
+    @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if ("progress".equals(evt.getPropertyName())) {
             progressBar.setValue((Integer)evt.getNewValue());
@@ -138,7 +139,7 @@ public class StatusBar extends JPanel implements PropertyChangeListener {
             long usedMemory = totalMemory-jvm.freeMemory();
             int usedPct = (int)((100*usedMemory)/totalMemory);
             bar.setForeground(getColor(usedPct));
-            bar.setValue((int)usedPct);
+            bar.setValue(usedPct);
             bar.setString(usedPct + "% (" + mb(usedMemory) + "/" + mb(totalMemory) + "MB) ");
         }
 
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java b/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java
index 93985ef20..e868840d8 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java
@@ -37,6 +37,8 @@ import javax.swing.SwingWorker;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import org.apache.openjpa.lib.jdbc.SQLFormatter;
+
 import jpa.tools.swing.EntityDataModel;
 import jpa.tools.swing.EntityTable;
 import jpa.tools.swing.EntityTableView;
@@ -50,8 +52,6 @@ import openbook.domain.ShoppingCart;
 import openbook.server.OpenBookService;
 import openbook.server.QueryDecorator;
 
-import org.apache.openjpa.lib.jdbc.SQLFormatter;
-
 /**
  * A visual page coordinates the following functions of {@link OpenBookService} :
  * <li>query for books
@@ -71,8 +71,8 @@ import org.apache.openjpa.lib.jdbc.SQLFormatter;
  *
  * @author Pinaki Poddar
  */
-@SuppressWarnings("serial")
 public final class BuyBookPage extends JPanel {
+    private static final long serialVersionUID = 1L;
     private final OpenBookService   _service;
     private final Customer          _customer;
     private final SearchPanel       _searchPanel;
@@ -124,6 +124,8 @@ public final class BuyBookPage extends JPanel {
      *
      */
     class SearchPanel extends JPanel implements ActionListener {
+        
+        private static final long serialVersionUID = 1L;
         private final JTextField _title       = new JTextField("", 20);
         private final JTextField _author      = new JTextField("", 20);
         private final JTextField _maxPrice    = new JTextField("", 6);
@@ -208,6 +210,7 @@ public final class BuyBookPage extends JPanel {
          *
          * The query is executed in a background, non-AWT thread.
          */
+        @Override
         public void actionPerformed(ActionEvent e) {
             new SwingWorker<List<Book>, Void>() {
                 private String queryString;
@@ -260,6 +263,8 @@ public final class BuyBookPage extends JPanel {
      *
      */
     class SelectBookPanel extends JPanel {
+        
+        private static final long serialVersionUID = 1L;
         private final JLabel _bookCount;
         private final EntityTableView<Book> _selectedBooks;
 
@@ -267,7 +272,7 @@ public final class BuyBookPage extends JPanel {
             setLayout(new BorderLayout());
             setBorder(BorderFactory.createTitledBorder(title));
 
-            _selectedBooks = new EntityTableView<Book>(Book.class,
+            _selectedBooks = new EntityTableView<>(Book.class,
                     EntityDataModel.BASIC_ATTR | EntityDataModel.ROW_COUNT,
                     _service.getUnit());
             _bookCount = new JLabel();
@@ -290,6 +295,8 @@ public final class BuyBookPage extends JPanel {
      *
      */
     class BuyPanel extends JPanel implements ListSelectionListener {
+        
+        private static final long serialVersionUID = 1L;
         JLabel _bookTitle;
         JLabel _bookAuthors;
         JLabel _bookPrice;
@@ -385,6 +392,8 @@ public final class BuyBookPage extends JPanel {
      *
      */
     class ShoppingCartPanel extends JPanel implements ActionListener {
+        
+        private static final long serialVersionUID = 1L;
         private static final int MAX_ITEMS = 10;
         private final ShoppingCart _cart;
         private final JButton _placeOrder;
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/DeliveryPage.java b/openjpa-examples/openbooks/src/main/java/openbook/client/DeliveryPage.java
index 50a069f51..304ee47be 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/DeliveryPage.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/DeliveryPage.java
@@ -40,8 +40,8 @@ import openbook.server.OpenBookService;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class DeliveryPage extends JPanel {
+    private static final long serialVersionUID = 1L;
     private final JButton _deliver;
     private EntityTableView<PurchaseOrder> _orders;
     private final OpenBookService _service;
@@ -55,7 +55,7 @@ public class DeliveryPage extends JPanel {
 
         _service = service;
 
-        _orders = new EntityTableView<PurchaseOrder>(PurchaseOrder.class, getOrders(PurchaseOrder.Status.PENDING),
+        _orders = new EntityTableView<>(PurchaseOrder.class, getOrders(PurchaseOrder.Status.PENDING),
                 EntityDataModel.ALL_ATTR, service.getUnit());
 
         _title = new JLabel(_orders.getDataModel().getRowCount() + " " + PurchaseOrder.Status.PENDING
@@ -116,7 +116,7 @@ public class DeliveryPage extends JPanel {
                 new SwingWorker<List<PurchaseOrder>, Void>() {
                     @Override
                     protected List<PurchaseOrder> doInBackground() throws Exception {
-                        List<PurchaseOrder> updated = new ArrayList<PurchaseOrder>();
+                        List<PurchaseOrder> updated = new ArrayList<>();
                         EntityDataModel<PurchaseOrder> orders = _orders.getDataModel();
                         int n = orders.getRowCount();
                         for (int i = 0; i < n; i++) {
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java b/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java
index 0a5badee9..3a6486c1f 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/Demo.java
@@ -52,6 +52,10 @@ import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
+import org.apache.openjpa.conf.OpenJPAVersion;
+import org.apache.openjpa.lib.jdbc.JDBCListener;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+
 import jpa.tools.swing.AttributeLegendView;
 import jpa.tools.swing.ConfigurationViewer;
 import jpa.tools.swing.ErrorDialog;
@@ -67,18 +71,14 @@ import openbook.server.OpenBookService;
 import openbook.server.ServiceFactory;
 import openbook.util.PropertyHelper;
 
-import org.apache.openjpa.conf.OpenJPAVersion;
-import org.apache.openjpa.lib.jdbc.JDBCListener;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-
 /**
  * A graphical user interface based client of OpenBooks for demonstration.
  *
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class Demo extends JFrame {
+    private static final long serialVersionUID = 1L;
     private static Dimension TAB_VIEW = new Dimension(800,600);
     private static Dimension OUT_VIEW = new Dimension(800,200);
     private static Dimension NAV_VIEW = new Dimension(400,800);
@@ -124,6 +124,7 @@ public class Demo extends JFrame {
         SwingHelper.setLookAndFeel(14);
         adjustWidgetSize();
         SwingUtilities.invokeLater(new Runnable() {
+            @Override
             public void run() {
                 Demo demo = Demo.getInstance();
                 demo.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -207,7 +208,7 @@ public class Demo extends JFrame {
             SwingWorker<OpenBookService, Void> getService = new SwingWorker<OpenBookService, Void> () {
                 @Override
                 protected OpenBookService doInBackground() throws Exception {
-                    Map<String, Object> runtimeConfig = new HashMap<String, Object>();
+                    Map<String, Object> runtimeConfig = new HashMap<>();
                     runtimeConfig.put("openjpa.jdbc.JDBCListeners", new JDBCListener[]{_sqlListener});
                     OpenBookService service = ServiceFactory.getService(unitName, runtimeConfig);
                     service.initialize(null);
@@ -302,6 +303,9 @@ public class Demo extends JFrame {
      *
      */
     public abstract class OpenBookAction extends AbstractAction {
+        
+        private static final long serialVersionUID = 1L;
+
         public OpenBookAction(String name, Icon icon, String tooltip) {
             putValue(Action.NAME, name);
             putValue(Action.SHORT_DESCRIPTION, tooltip);
@@ -310,11 +314,14 @@ public class Demo extends JFrame {
     }
 
     public class BuyBookAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         BuyBookPage         _buyBookPage;
         public BuyBookAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (_buyBookPage == null) {
                 _buyBookPage = new BuyBookPage(getService(), getCustomer());
@@ -325,10 +332,13 @@ public class Demo extends JFrame {
 
     }
     public class DeliveryAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         DeliveryPage        _deliveryPage;
         public DeliveryAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (_deliveryPage == null) {
                 _deliveryPage = new DeliveryPage(getService());
@@ -340,10 +350,13 @@ public class Demo extends JFrame {
     }
 
     public class SupplyAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         SupplyPage          _supplyPage;
         public SupplyAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (_supplyPage == null) {
                 _supplyPage = new SupplyPage(getService());
@@ -355,10 +368,13 @@ public class Demo extends JFrame {
     }
 
     public class ViewConfigAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         ConfigurationViewer _configView;
         public ViewConfigAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (_configView == null) {
                 _configView = new ConfigurationViewer("Unit Configuration", getService().getUnit().getProperties());
@@ -371,11 +387,14 @@ public class Demo extends JFrame {
     }
 
     public class ViewDomainAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         MetamodelView       _domainView;
         AttributeLegendView _legends;
         public ViewDomainAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (_domainView == null) {
                 _domainView = new MetamodelView(getService().getUnit().getMetamodel());
@@ -388,9 +407,12 @@ public class Demo extends JFrame {
     }
 
     public class ViewDataAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         public ViewDataAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             showTab(_tabbedPane, "Buy Books", null);
         }
@@ -398,10 +420,13 @@ public class Demo extends JFrame {
     }
 
     public class ViewQueryCacheAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         PreparedQueryViewer _queryView;
         public ViewQueryCacheAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (_queryView == null) {
                 _queryView = new PreparedQueryViewer(OpenJPAPersistence.cast(getService().getUnit()));
@@ -413,10 +438,14 @@ public class Demo extends JFrame {
     }
 
     public class ViewSourceAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
+
         public ViewSourceAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             getSourceCodeBrowser();
         }
@@ -427,6 +456,8 @@ public class Demo extends JFrame {
      *
      */
     public class ShowCodeAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         private String _key;
         private String _page;
 
@@ -439,6 +470,7 @@ public class Demo extends JFrame {
             _page = page;
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
            getSourceCodeBrowser().showPage(_key, _page);
         }
@@ -451,6 +483,8 @@ public class Demo extends JFrame {
      *
      */
     public class WelcomeAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         PowerPointViewer    _powerpoint;
         JLabel              _logoLabel = new JLabel(Images.LOGO_OPENBOOKS);
         boolean _showPresentation = true;
@@ -459,6 +493,7 @@ public class Demo extends JFrame {
             super(name, icon, tooltip);
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (_powerpoint == null && _showPresentation) {
                 String dir = getConfiguration("openbook.slides.dir", "slides/");
@@ -493,12 +528,15 @@ public class Demo extends JFrame {
     }
 
     public class AboutAction extends OpenBookAction {
+        
+        private static final long serialVersionUID = 1L;
         AboutDialog _dialog;
 
         public AboutAction(String name, Icon icon, String tooltip) {
             super(name, icon, tooltip);
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (_dialog == null) {
                 _dialog = new AboutDialog(Images.LOGO_OPENBOOKS);
@@ -605,6 +643,7 @@ public class Demo extends JFrame {
         tree.setShowsRootHandles(true);
 
         tree.addTreeSelectionListener(new TreeSelectionListener() {
+            @Override
             public void valueChanged(TreeSelectionEvent e) {
                 Object treeNode = _navigator.getLastSelectedPathComponent();
                 if (treeNode instanceof ActionTreeNode) {
@@ -628,11 +667,14 @@ public class Demo extends JFrame {
      *
      */
     public static class ActionTreeNode extends DefaultMutableTreeNode {
+        
+        private static final long serialVersionUID = 1L;
         private final Action _action;
         public ActionTreeNode(Action action) {
             _action = action;
         }
 
+        @Override
         public String toString() {
             return _action.getValue(Action.SHORT_DESCRIPTION).toString();
         }
@@ -640,6 +682,9 @@ public class Demo extends JFrame {
     }
 
     public class TypedTreeCellRenderer extends DefaultTreeCellRenderer {
+        
+        private static final long serialVersionUID = 1L;
+
         @Override
         public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded,
                 boolean leaf, int row, boolean hasFocus) {
@@ -648,6 +693,9 @@ public class Demo extends JFrame {
     }
 
     public static class AboutDialog extends JDialog {
+        
+        private static final long serialVersionUID = 1L;
+
         public AboutDialog(Icon logo) {
             setModal(true);
             setLayout(new BorderLayout());
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/ErrorHandler.java b/openjpa-examples/openbooks/src/main/java/openbook/client/ErrorHandler.java
index 542ed3770..8aebb6776 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/ErrorHandler.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/ErrorHandler.java
@@ -38,6 +38,7 @@ public class ErrorHandler implements Thread.UncaughtExceptionHandler{
         uncaughtException(Thread.currentThread(), e);
     }
 
+    @Override
     public void uncaughtException(Thread t, Throwable e) {
         if (SwingUtilities.isEventDispatchThread()) {
             new ErrorDialog(null, Images.ERROR, e).setVisible(true);
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java b/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java
index 0c1c1c508..69d43d98d 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java
@@ -30,7 +30,7 @@ import javax.swing.ImageIcon;
  */
 public class Images {
 
-    private static Map<String, Icon> images = new HashMap<String, Icon>();
+    private static Map<String, Icon> images = new HashMap<>();
 
     public static Icon NEXT    = getIcon("images/arrow_right.jpg", 24, -1);
     public static Icon BACK    = getIcon("images/arrow_left.jpg",  24, -1);
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/SQLLogger.java b/openjpa-examples/openbooks/src/main/java/openbook/client/SQLLogger.java
index 834da3718..c801141c9 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/SQLLogger.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/SQLLogger.java
@@ -22,13 +22,11 @@ import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
 
-import jpa.tools.swing.GraphicOutputStream;
-
-
-
 import org.apache.openjpa.lib.jdbc.AbstractJDBCListener;
 import org.apache.openjpa.lib.jdbc.JDBCEvent;
 
+import jpa.tools.swing.GraphicOutputStream;
+
 /**
  * Logs SQL statement to a graphic console.
  *
@@ -59,6 +57,7 @@ public class SQLLogger extends AbstractJDBCListener {
         if (out == null)
             return;
         SwingUtilities.invokeLater(new Runnable() {
+            @Override
             public void run() {
                 out.println(event.getSQL());
             }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/client/SupplyPage.java b/openjpa-examples/openbooks/src/main/java/openbook/client/SupplyPage.java
index 9eed4fa25..4fe1a7f80 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/SupplyPage.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/SupplyPage.java
@@ -39,8 +39,9 @@ import openbook.server.OpenBookService;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class SupplyPage extends JPanel  {
+    private static final long serialVersionUID = 1L;
+
     private final OpenBookService _service;
 
     private final EntityTableView<Inventory> _lowInventories;
@@ -62,7 +63,7 @@ public class SupplyPage extends JPanel  {
         _supply = new JButton("Supply " + REORDER_QUANTITY + " to each item");
 
         List<Inventory> orders = getInventory(REORDER_LIMIT);
-        _lowInventories = new EntityTableView<Inventory>(Inventory.class,
+        _lowInventories = new EntityTableView<>(Inventory.class,
                 orders,
                 EntityDataModel.BASIC_ATTR | EntityDataModel.ASSOCIATION_ATTR,
                 service.getUnit());
@@ -76,6 +77,7 @@ public class SupplyPage extends JPanel  {
 
 
         _view.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 _lowInventories.getDataModel().updateData(getInventory(REORDER_LIMIT));
             }
@@ -91,7 +93,7 @@ public class SupplyPage extends JPanel  {
                     @Override
                     protected List<Inventory> doInBackground() throws Exception {
                         EntityDataModel<Inventory> invs = _lowInventories.getDataModel();
-                        List<Inventory> updated = new ArrayList<Inventory>();
+                        List<Inventory> updated = new ArrayList<>();
                         for (Inventory inv : invs) {
                             Book supplied = _service.supply(inv.getBook(), REORDER_QUANTITY);
                             updated.add(supplied.getInventory());
@@ -99,6 +101,7 @@ public class SupplyPage extends JPanel  {
                         return updated;
                     }
 
+                    @Override
                     public void done() {
                         try {
                             _lowInventories.getDataModel().updateData(get(1, TimeUnit.SECONDS));
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java
index bcd9b7b13..b685c07dd 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java
@@ -67,7 +67,7 @@ public class Author {
 
     public void addBook(Book book) {
         if (books == null)
-            books = new HashSet<Book>();
+            books = new HashSet<>();
         books.add(book);
     }
 
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java
index 3c8a1833a..78c653140 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java
@@ -44,9 +44,10 @@ import javax.persistence.Version;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class Book implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @Id
     private String ISBN;
 
@@ -108,7 +109,7 @@ public class Book implements Serializable {
 
     public void addAuthor(Author...authors) {
         if (this.authors == null)
-            this.authors = new ArrayList<Author>();
+            this.authors = new ArrayList<>();
         for (Author a : authors) {
             if (!this.authors.contains(a))
                 this.authors.add(a);
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java
index 94c0f43fe..2e24083dd 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java
@@ -32,9 +32,9 @@ import javax.persistence.Version;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class Customer implements Serializable {
+    private static final long serialVersionUID = 1L;
     @Id
     @GeneratedValue
     private long id;
@@ -71,6 +71,7 @@ public class Customer implements Serializable {
         return new ShoppingCart(this);
     }
 
+    @Override
     public String toString() {
         return name;
     }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java
index a321bcb82..f60149693 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java
@@ -28,9 +28,10 @@ import javax.persistence.Version;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class Inventory implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @Id
     @OneToOne(fetch=FetchType.EAGER, optional=false)
     private Book book;
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java
index a72b8d601..7dd791c80 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java
@@ -32,10 +32,11 @@ import javax.persistence.OrderColumn;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 @IdClass(LineItem.LineItemId.class)
 public class LineItem implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     /**
      * <A name="order">
      * An example of a compound derived identity.
@@ -122,6 +123,8 @@ public class LineItem implements Serializable {
      *
      */
     public static class LineItemId implements Serializable {
+        
+        private static final long serialVersionUID = 1L;
         long order;
         int index;
 
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
index 477ca8020..3c59f784c 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
@@ -54,9 +54,10 @@ import javax.persistence.TemporalType;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class PurchaseOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     /**
      * Enumerates the status of a Purchase Order.
      *
@@ -195,7 +196,7 @@ public class PurchaseOrder implements Serializable {
             throw new IllegalArgumentException("Can not add Line Item to Purchase Order for negative (=" +
                     quantity + ") number of Book " + book);
         if (items == null)
-            items = new ArrayList<LineItem>();
+            items = new ArrayList<>();
         items.add(new LineItem(this, items.size()+1, book, quantity));
         total += (book.getPrice() * quantity);
     }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/domain/ShoppingCart.java b/openjpa-examples/openbooks/src/main/java/openbook/domain/ShoppingCart.java
index 4cd303fff..396c4b913 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/domain/ShoppingCart.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/domain/ShoppingCart.java
@@ -27,8 +27,9 @@ import java.util.Map;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class ShoppingCart implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     /**
      * The owner of this cart.
      */
@@ -47,7 +48,7 @@ public class ShoppingCart implements Serializable {
      */
     ShoppingCart(Customer c) {
         customer = c;
-        items = new HashMap<Book, Integer>();
+        items = new HashMap<>();
     }
 
     /**
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java
index 936bf9ca6..06d9a8f5a 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java
@@ -33,7 +33,7 @@ import openbook.domain.ShoppingCart;
  *
  */
 public interface OpenBookService {
-    public static final String DEFAULT_UNIT_NAME = "OpenBooks";
+    String DEFAULT_UNIT_NAME = "OpenBooks";
 
     /**
      * Starts a session for the given named Customer.
@@ -43,7 +43,7 @@ public interface OpenBookService {
      *
      * @return a Customer
      */
-    public Customer login(String name);
+    Customer login(String name);
 
     /**
      * Selects a list of Books matching the given conditions.
@@ -56,7 +56,7 @@ public interface OpenBookService {
      * @param author name of author
      * @param decorators to modify the executable query such as its range.
      */
-    public List<Book> select(String title,
+    List<Book> select(String title,
             Double min, Double max,
             String author,
             QueryDecorator...decorators);
@@ -71,7 +71,7 @@ public interface OpenBookService {
      * @param author name of author
      * @param decorators to modify the executable query such as its range.
      */
-    public String getQuery(String title,
+    String getQuery(String title,
             Double min, Double max,
             String author);
 
@@ -92,7 +92,7 @@ public interface OpenBookService {
      * @param cart a non-empty cart.
      * @return a PurchaseOrder for the content of the cart.
      */
-    public PurchaseOrder placeOrder(ShoppingCart cart);
+    PurchaseOrder placeOrder(ShoppingCart cart);
 
     /**
      * Delivers the given order. Delivery changes the status of the order, decrements
@@ -102,7 +102,7 @@ public interface OpenBookService {
      * @return the PurchaseOrder after delivery.
      *
      */
-    public PurchaseOrder deliver(PurchaseOrder order);
+    PurchaseOrder deliver(PurchaseOrder order);
 
     /**
      * Add inventory of the given Book by the given quantity.
@@ -112,7 +112,7 @@ public interface OpenBookService {
      *
      * @return the Book after incrementing its inventory.
      */
-    public Book supply(Book b, int quantity);
+    Book supply(Book b, int quantity);
 
     /**
      * Gets the list of orders of given status.
@@ -121,7 +121,7 @@ public interface OpenBookService {
      *
      * @return list of orders sorted by their placement dates.
      */
-    public List<PurchaseOrder> getOrders(PurchaseOrder.Status status, Customer customer);
+    List<PurchaseOrder> getOrders(PurchaseOrder.Status status, Customer customer);
 
 
     /**
@@ -131,7 +131,7 @@ public interface OpenBookService {
      *
      * @return list of Books with inventory lower than the given limit.
      */
-    public List<Inventory> getReorderableBooks(int limit);
+    List<Inventory> getReorderableBooks(int limit);
 
     /**
      * Count the number of instances of the given persistent type.
@@ -139,7 +139,7 @@ public interface OpenBookService {
      * @param cls a persistent type.
      * @return number of persistent entity of the given type.
      */
-    public long count(Class<?> cls);
+    long count(Class<?> cls);
 
     /**
      * Populates the underlying data repository with sample values, only if
@@ -150,31 +150,31 @@ public interface OpenBookService {
      *
      * @return true if the repository is initialized by this invocation.
      */
-    public boolean initialize(Map<String,Object> loadParameters);
+    boolean initialize(Map<String,Object> loadParameters);
 
     /**
      * Cleans everything. Be careful.
      */
-    public void clean();
+    void clean();
 
 
     /**
      * Gets the underlying persistence unit.
      *
      */
-    public EntityManagerFactory getUnit();
+    EntityManagerFactory getUnit();
 
     /**
      * Gets the name of the underlying persistence unit.
      *
      */
-    public String getUnitName();
+    String getUnitName();
 
     /**
      * Affirms if the transaction on this persistence unit is managed by a container.
      *
      */
-    public boolean isManaged();
+    boolean isManaged();
 
 
 }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java
index c3039c4ac..75c42656b 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java
@@ -31,6 +31,8 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.persistence.metamodel.EntityType;
 
+import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;
+
 import openbook.domain.Author;
 import openbook.domain.Author_;
 import openbook.domain.Book;
@@ -47,8 +49,6 @@ import openbook.domain.ShoppingCart;
 import openbook.util.PropertyHelper;
 import openbook.util.Randomizer;
 
-import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;
-
 /**
  * A demonstrative example of a transaction service with persistent entity using Java Persistence API.
  * <br>
@@ -67,9 +67,8 @@ import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 class OpenBookServiceImpl extends PersistenceService implements OpenBookService {
-
+    private static final long serialVersionUID = 1L;
     public static final int   CUSTOMER_COUNT     = 10;
     public static final int   BOOK_COUNT         = 100;
     public static final int   AUTHOR_COUNT       = 40;
@@ -78,8 +77,8 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
     /**
      * Range of number of queries executed for a {@linkplain #shop() shopping} trip.
      */
-    public static final Range<Double> PRICE_RANGE  = new Range<Double>(4.99, 120.99);
-    public static final Range<Integer> STOCK_RANGE = new Range<Integer>(5, 50);
+    public static final Range<Double> PRICE_RANGE  = new Range<>(4.99, 120.99);
+    public static final Range<Integer> STOCK_RANGE = new Range<>(5, 50);
     public static final int REORDER_LEVEL          = 10;
 
     OpenBookServiceImpl(String unit, EntityManagerFactory emf, boolean managed,
@@ -93,6 +92,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
      *
      * @return true if new inventory is created. false otherwise.
      */
+    @Override
     public boolean initialize(Map<String,Object> config) {
         if (isInitialized()) {
             return false;
@@ -119,7 +119,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
             em.persist(customer);
         }
 
-        List<Author> allAuthors = new ArrayList<Author>();
+        List<Author> allAuthors = new ArrayList<>();
         System.err.println("Creating " + nAuthor + " new Authors");
         for (int i = 1; i <= nAuthor; i++) {
             Author author = new Author();
@@ -164,6 +164,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
      *
      * @return a Customer
      */
+    @Override
     public Customer login(String name) {
         EntityManager em = begin();
 
@@ -191,6 +192,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
     /**
      * Find books that match title and price range.
      */
+    @Override
     public List<Book> select(String title, Double minPrice, Double maxPrice, String author,
             QueryDecorator...decorators) {
         CriteriaQuery<Book> q = buildQuery(title, minPrice, maxPrice, author);
@@ -208,6 +210,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
      * But OpenJPA produces a readable form that is quite <em>similar</em> to
      * equivalent JPQL.
      */
+    @Override
     public String getQuery(String title, Double minPrice, Double maxPrice, String author) {
         CriteriaQuery<Book> q = buildQuery(title, minPrice, maxPrice, author);
         return q.toString();
@@ -238,7 +241,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
         q.select(book);
 
         // Builds the predicates conditionally for the filled-in input fields
-        List<Predicate> predicates = new ArrayList<Predicate>();
+        List<Predicate> predicates = new ArrayList<>();
         if (!isEmpty(title)) {
             Predicate matchTitle = cb.like(book.get(Book_.title), title);
             predicates.add(matchTitle);
@@ -280,6 +283,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
      * The transactions may fail because of either insufficient inventory or
      * concurrent modification of the same inventory by {@link #supply(Book, int) the supplier}.
      */
+    @Override
     public PurchaseOrder deliver(PurchaseOrder o) {
         if (o.isDelivered())
             return o;
@@ -293,13 +297,14 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
         return o;
     }
 
+    @Override
     public List<PurchaseOrder> getOrders(PurchaseOrder.Status status, Customer customer) {
         EntityManager em = begin();
         CriteriaBuilder cb = em.getCriteriaBuilder();
         CriteriaQuery<PurchaseOrder> q = cb.createQuery(PurchaseOrder.class);
         Root<PurchaseOrder> order = q.from(PurchaseOrder.class);
         q.select(order);
-        List<Predicate> predicates = new ArrayList<Predicate>();
+        List<Predicate> predicates = new ArrayList<>();
         if (status != null) {
             predicates.add(cb.equal(order.get(PurchaseOrder_.status), status));
         }
@@ -326,6 +331,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
      *
      * @param cart a non-null Shopping cart.
      */
+    @Override
     public PurchaseOrder placeOrder(ShoppingCart cart) {
         EntityManager em = begin();
         PurchaseOrder order = new PurchaseOrder(cart);
@@ -342,6 +348,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
      * transaction. Some of the transactions may fail due to concurrent modification on
      * the {@linkplain Inventory} by the {@linkplain #deliver() delivery} process.
      */
+    @Override
     public Book supply(Book b, int quantity) {
         EntityManager em = begin();
         b = em.merge(b);
@@ -350,6 +357,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
         return b;
     }
 
+    @Override
     public List<Inventory> getReorderableBooks(int limit) {
         EntityManager em = begin();
         CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -368,6 +376,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
         return result;
     }
 
+    @Override
     public long count(Class<?> cls) {
         EntityManager em = getEntityManager();
         CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -391,6 +400,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
         return result;
     }
 
+    @Override
     public <T> List<T> getExtent(Class<T> entityClass) {
         EntityManager em = begin();
         CriteriaQuery<T> c = em.getCriteriaBuilder().createQuery(entityClass);
@@ -400,6 +410,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
         return result;
     }
 
+    @Override
     public <T> List<T> query(String jpql, Class<T> resultClass, QueryDecorator... decorators) {
         EntityManager em = begin();
         TypedQuery<T> query = em.createQuery(jpql, resultClass);
@@ -413,6 +424,7 @@ class OpenBookServiceImpl extends PersistenceService implements OpenBookService
         return result;
     }
 
+    @Override
     public void clean() {
         EntityManager em = begin();
         Set<EntityType<?>> entities = em.getMetamodel().getEntities();
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java b/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java
index b055c7af1..6317b099f 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java
@@ -32,14 +32,14 @@ import javax.persistence.PersistenceContextType;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 abstract class PersistenceService implements Serializable {
+    private static final long serialVersionUID = 1L;
     private final EntityManagerFactory emf;
     private final String unitName;
     private final boolean isManaged;
     private final PersistenceContextType scope;
 
-    private ThreadLocal<EntityManager> thread = new ThreadLocal<EntityManager>();
+    private ThreadLocal<EntityManager> thread = new ThreadLocal<>();
     private ReentrantLock lock = new ReentrantLock();
 
     protected PersistenceService(String unit, EntityManagerFactory emf, boolean managed,
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java b/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java
index 3c241c886..6000b8260 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java
@@ -28,7 +28,7 @@ import javax.persistence.PersistenceContextType;
  *
  */
 public class ServiceFactory {
-    private static final Map<String, OpenBookService> _services = new HashMap<String, OpenBookService>();
+    private static final Map<String, OpenBookService> _services = new HashMap<>();
 
     public synchronized static OpenBookService getService(String unit) {
         return getService(unit, null);
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/CommandProcessor.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/CommandProcessor.java
index 52e5388de..f89200e26 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/CommandProcessor.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/CommandProcessor.java
@@ -36,8 +36,8 @@ import java.util.Set;
  *
  */
 public class CommandProcessor {
-    private final Map<Option, String> registeredOptions = new HashMap<Option,String>();
-    private final Set<Option> unregisteredOptions = new HashSet<Option>();
+    private final Map<Option, String> registeredOptions = new HashMap<>();
+    private final Set<Option> unregisteredOptions = new HashSet<>();
     private boolean allowsUnregisteredOption = true;
 
     /**
@@ -348,6 +348,7 @@ public class CommandProcessor {
             return defValue;
         }
 
+        @Override
         public String toString() {
             return getName();
         }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/ant/Java2HTMLConverterTask.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/ant/Java2HTMLConverterTask.java
index 02e75a09e..47fb2cf82 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/ant/Java2HTMLConverterTask.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/ant/Java2HTMLConverterTask.java
@@ -22,12 +22,12 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import openbook.tools.converter.Java2HTMLConverter;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.taskdefs.MatchingTask;
 
+import openbook.tools.converter.Java2HTMLConverter;
+
 /**
  * An ant task to run {@linkplain Java2HTMLConverter Java2HTML Converter}.
  *
@@ -46,7 +46,7 @@ public class Java2HTMLConverterTask extends MatchingTask {
     private String lineNumberFormat  = "%04d";
     private boolean verbose          = false;
 
-    private List<Arg> _args = new ArrayList<Arg>();
+    private List<Arg> _args = new ArrayList<>();
 
     public String getSourcepath() {
         return sourcepath;
@@ -59,7 +59,7 @@ public class Java2HTMLConverterTask extends MatchingTask {
     @Override
     public void execute() throws BuildException {
         List<String> files = getFiles();
-        List<String> args  = new ArrayList<String>();
+        List<String> args  = new ArrayList<>();
         args.add("-sourcepath");       args.add(sourcepath);
         args.add("-d");                args.add(destDir);
         args.add("-extension");        args.add(extension);
@@ -87,7 +87,7 @@ public class Java2HTMLConverterTask extends MatchingTask {
     }
 
     List<String> getFiles() {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         DirectoryScanner scanner = getDirectoryScanner(new File(getSourcepath()));
         String[] files = scanner.getIncludedFiles();
         for (String file : files) {
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/HTMLTokenRenderer.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/HTMLTokenRenderer.java
index 72035352c..481c3bb6f 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/HTMLTokenRenderer.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/HTMLTokenRenderer.java
@@ -21,11 +21,11 @@ package openbook.tools.converter;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.antlr.runtime.Token;
+
 import openbook.tools.parser.JavaParser;
 import openbook.tools.util.TextProcessingUtility;
 
-import org.antlr.runtime.Token;
-
 /**
  * Renders Java source tokens as HTML tags.
  * This renderer renders the parsed Java tokens with HTML styles.
@@ -81,7 +81,7 @@ public class HTMLTokenRenderer implements TokenRenderer {
     public static final String CSS_DECIMAL     = "decimal";
     public static final String CSS_LINE_NO     = "lineno";
 
-    private Set<String> customIdentifiers = new HashSet<String>();
+    private Set<String> customIdentifiers = new HashSet<>();
 
     public static final String NEW_LINE = "\r\n";
     public static final String HTML_BR_TAG = "<br>";
@@ -90,6 +90,7 @@ public class HTMLTokenRenderer implements TokenRenderer {
     /**
      * Gets a end-of-line string: a HTML &lt;br&gt; tag followed by carriage return and line feed.
      */
+    @Override
     public String endLine(int line) {
         return  addLineBreak ?  HTML_BR_TAG + NEW_LINE : NEW_LINE;
     }
@@ -97,6 +98,7 @@ public class HTMLTokenRenderer implements TokenRenderer {
     /**
      * Gets a string for beginning of a new line.
      */
+    @Override
     public String newLine(int line) {
         String result = "";
         if (showLineNumber) {
@@ -187,6 +189,7 @@ public class HTMLTokenRenderer implements TokenRenderer {
     /**
      * Gets the opening &lt;BODY&gt; and &lt;HTML&gt; tags and the &lt;link type="stylesheet"&gt; clause.
      */
+    @Override
     public String getPrologue() {
         return insertLines(
                 "<HTML>",
@@ -199,6 +202,7 @@ public class HTMLTokenRenderer implements TokenRenderer {
     /**
      * Gets the closing &lt;BODY&gt; and &lt;HTML&gt; tags
      */
+    @Override
     public String getEpilogue() {
         return insertLines(" ", "</BODY>", "</HTML>");
     }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/ParseTokenListener.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/ParseTokenListener.java
index e03b748f2..52f5bb76b 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/ParseTokenListener.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/ParseTokenListener.java
@@ -21,12 +21,12 @@ package openbook.tools.converter;
 import java.io.PrintStream;
 import java.util.StringTokenizer;
 
-import openbook.tools.parser.JavaParser;
-
 import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.Token;
 import org.antlr.runtime.debug.BlankDebugEventListener;
 
+import openbook.tools.parser.JavaParser;
+
 /**
  * A token processor to render the ANTLR tokens.
  *
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/PlainTokenRenderer.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/PlainTokenRenderer.java
index 6ee361640..5328fd2d4 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/PlainTokenRenderer.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/PlainTokenRenderer.java
@@ -31,22 +31,27 @@ public class PlainTokenRenderer implements TokenRenderer {
     private boolean showLineNumber = true;
     private String lineNumberFormat  = "%04d";
 
+    @Override
     public String endLine(int line) {
         return EMPTY;
     }
 
+    @Override
     public String newLine(int line) {
         return showLineNumber ? String.format(lineNumberFormat, line) : EMPTY;
     }
 
+    @Override
     public String render(int decision, Token token) {
         return token.getText();
     }
 
+    @Override
     public String getEpilogue() {
         return EMPTY;
     }
 
+    @Override
     public String getPrologue() {
         return EMPTY;
     }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/SourceRenderer.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/SourceRenderer.java
index 967d882a1..c17decc99 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/SourceRenderer.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/SourceRenderer.java
@@ -24,14 +24,14 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.PrintStream;
 
-import openbook.tools.CommandProcessor;
-import openbook.tools.parser.JavaLexer;
-import openbook.tools.parser.JavaParser;
-
 import org.antlr.runtime.ANTLRInputStream;
 import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.debug.DebugEventListener;
 
+import openbook.tools.CommandProcessor;
+import openbook.tools.parser.JavaLexer;
+import openbook.tools.parser.JavaParser;
+
 /**
  * Renders Java Source Code.
  *
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/TokenRenderer.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/TokenRenderer.java
index 5ae1d30ec..ce5bebfd8 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/TokenRenderer.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/converter/TokenRenderer.java
@@ -56,14 +56,14 @@ public interface TokenRenderer {
      * A HTML render using a Cascaded Style Sheet may additionally specify
      * the <HEAD> tag to include the style sheet.
      */
-    public String getPrologue();
+    String getPrologue();
 
     /**
      * Gets a string to be added after token processing ends.
      * For example, a HTML renderer may return the closing HTML and BODY tags.
      *
      */
-    public String getEpilogue();
+    String getEpilogue();
 
     /**
      * Produce a string representation of the given token.
@@ -76,7 +76,7 @@ public interface TokenRenderer {
      *
      * @return a string representation of the given token.
      */
-    public String render(int decision, Token token);
+    String render(int decision, Token token);
 
     /**
      * Produce a string to signal beginning of a line.
@@ -87,7 +87,7 @@ public interface TokenRenderer {
      *
      * @return a String can be a blank
      */
-    public String newLine(int line);
+    String newLine(int line);
 
 
     /**
@@ -99,5 +99,5 @@ public interface TokenRenderer {
      *
      * @return a String can be a blank
      */
-    public String endLine(int line);
+    String endLine(int line);
 }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaLexer.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaLexer.java
index 6efb35464..ac9cc21d2 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaLexer.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaLexer.java
@@ -19,7 +19,15 @@
 package openbook.tools.parser;
 // $ANTLR 3.2 Sep 23, 2009 12:02:23 Java.g 2010-05-15 01:06:38
 
-import org.antlr.runtime.*;
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.Lexer;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RecognizerSharedState;
 
 public class JavaLexer extends Lexer {
     public static final int T__29=29;
@@ -149,6 +157,7 @@ public class JavaLexer extends Lexer {
         super(input,state);
 
     }
+    @Override
     public String getGrammarFileName() { return "Java.g"; }
 
     // $ANTLR start "T__25"
@@ -3337,6 +3346,7 @@ public class JavaLexer extends Lexer {
     }
     // $ANTLR end "LINE_COMMENT"
 
+    @Override
     public void mTokens() throws RecognitionException {
         // Java.g:1:8: ( T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | HexLiteral | DecimalLiteral | OctalLiteral | FloatingPointLiteral | CharacterLiteral | StringLiteral | ENUM | ASSERT | Identifier | WS | COMMENT | LINE_COMMENT )
         int alt29=101;
@@ -4108,6 +4118,7 @@ public class JavaLexer extends Lexer {
             this.special = DFA18_special;
             this.transition = DFA18_transition;
         }
+        @Override
         public String getDescription() {
             return "921:1: FloatingPointLiteral : ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( Exponent )? ( FloatTypeSuffix )? | '.' ( '0' .. '9' )+ ( Exponent )? ( FloatTypeSuffix )? | ( '0' .. '9' )+ Exponent ( FloatTypeSuffix )? | ( '0' .. '9' )+ FloatTypeSuffix );";
         }
@@ -4756,6 +4767,7 @@ public class JavaLexer extends Lexer {
             this.special = DFA29_special;
             this.transition = DFA29_transition;
         }
+        @Override
         public String getDescription() {
             return "1:1: Tokens : ( T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | HexLiteral | DecimalLiteral | OctalLiteral | FloatingPointLiteral | CharacterLiteral | StringLiteral | ENUM | ASSERT | Identifier | WS | COMMENT | LINE_COMMENT );";
         }
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaParser.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaParser.java
index c4a50defd..ca78e7d39 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaParser.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaParser.java
@@ -19,10 +19,24 @@
 package openbook.tools.parser;
 // $ANTLR 3.2 Sep 23, 2009 12:02:23 Java.g 2010-05-15 01:06:37
 
-import org.antlr.runtime.*;
-import java.util.HashMap;
-import org.antlr.runtime.debug.*;
 import java.io.IOException;
+import java.util.HashMap;
+
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RecognizerSharedState;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.debug.DebugEventListener;
+import org.antlr.runtime.debug.DebugEventSocketProxy;
+import org.antlr.runtime.debug.DebugParser;
 
 /** A Java 1.5 grammar for ANTLR v3 derived from the spec
  *
@@ -422,7 +436,9 @@ public class JavaParser extends DebugParser {
     }
 
 
+    @Override
     public String[] getTokenNames() { return JavaParser.tokenNames; }
+    @Override
     public String getGrammarFileName() { return "Java.g"; }
 
 
@@ -16773,12 +16789,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA8_special;
             this.transition = DFA8_transition;
         }
+        @Override
         public String getDescription() {
             return "177:1: compilationUnit : ( annotations ( packageDeclaration ( importDeclaration )* ( typeDeclaration )* | classOrInterfaceDeclaration ( typeDeclaration )* ) | ( packageDeclaration )? ( importDeclaration )* ( typeDeclaration )* );";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -16901,12 +16920,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA81_special;
             this.transition = DFA81_transition;
         }
+        @Override
         public String getDescription() {
             return "492:13: ( explicitConstructorInvocation )?";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -17174,12 +17196,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA85_special;
             this.transition = DFA85_transition;
         }
+        @Override
         public String getDescription() {
             return "495:1: explicitConstructorInvocation : ( ( nonWildcardTypeArguments )? ( 'this' | 'super' ) arguments ';' | primary '.' ( nonWildcardTypeArguments )? 'super' arguments ';' );";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -17315,12 +17340,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA106_special;
             this.transition = DFA106_transition;
         }
+        @Override
         public String getDescription() {
             return "600:1: blockStatement : ( localVariableDeclarationStatement | classOrInterfaceDeclaration | statement );";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -17461,9 +17489,11 @@ public class JavaParser extends DebugParser {
             this.special = DFA114_special;
             this.transition = DFA114_transition;
         }
+        @Override
         public String getDescription() {
             return "618:1: statement : ( block | ASSERT expression ( ':' expression )? ';' | 'if' parExpression statement ( options {k=1; } : 'else' statement )? | 'for' '(' forControl ')' statement | 'while' parExpression statement | 'do' statement 'while' parExpression ';' | 'try' block ( catches 'finally' block | catches | 'finally' block ) | 'switch' parExpression '{' switchBlockStatementGroups '}' | 'synchronized' parExpression block | 'return' ( expression )? ';' | 'throw' expression ';' | 'break' ( Identifier )? ';' | 'continue' ( Identifier )? ';' | ';' | statementExpression ';' | Identifier ':' statement );";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
@@ -17659,12 +17689,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA123_special;
             this.transition = DFA123_transition;
         }
+        @Override
         public String getDescription() {
             return "671:1: forControl options {k=3; } : ( enhancedForControl | ( forInit )? ';' ( expression )? ';' ( forUpdate )? );";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -18089,12 +18122,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA124_special;
             this.transition = DFA124_transition;
         }
+        @Override
         public String getDescription() {
             return "677:1: forInit : ( localVariableDeclaration | expressionList );";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -18197,12 +18233,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA126_special;
             this.transition = DFA126_transition;
         }
+        @Override
         public String getDescription() {
             return "709:31: ( assignmentOperator expression )?";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -18441,12 +18480,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA127_special;
             this.transition = DFA127_transition;
         }
+        @Override
         public String getDescription() {
             return "712:1: assignmentOperator : ( '=' | '+=' | '-=' | '*=' | '/=' | '&=' | '|=' | '^=' | '%=' | ( '<' '<' '=' )=>t1= '<' t2= '<' t3= '=' {...}? | ( '>' '>' '>' '=' )=>t1= '>' t2= '>' t3= '>' t4= '=' {...}? | ( '>' '>' '=' )=>t1= '>' t2= '>' t3= '=' {...}?);";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -18577,12 +18619,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA139_special;
             this.transition = DFA139_transition;
         }
+        @Override
         public String getDescription() {
             return "792:1: shiftOp : ( ( '<' '<' )=>t1= '<' t2= '<' {...}? | ( '>' '>' '>' )=>t1= '>' t2= '>' t3= '>' {...}? | ( '>' '>' )=>t1= '>' t2= '>' {...}?);";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -18723,12 +18768,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA145_special;
             this.transition = DFA145_transition;
         }
+        @Override
         public String getDescription() {
             return "823:1: unaryExpressionNotPlusMinus : ( '~' unaryExpression | '!' unaryExpression | castExpression | primary ( selector )* ( '++' | '--' )? );";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -18808,12 +18856,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA146_special;
             this.transition = DFA146_transition;
         }
+        @Override
         public String getDescription() {
             return "832:12: ( type | expression )";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -18920,12 +18971,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA149_special;
             this.transition = DFA149_transition;
         }
+        @Override
         public String getDescription() {
             return "837:34: ( identifierSuffix )?";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -19047,12 +19101,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA151_special;
             this.transition = DFA151_transition;
         }
+        @Override
         public String getDescription() {
             return "841:38: ( identifierSuffix )?";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -19151,9 +19208,11 @@ public class JavaParser extends DebugParser {
             this.special = DFA156_special;
             this.transition = DFA156_transition;
         }
+        @Override
         public String getDescription() {
             return "846:1: identifierSuffix : ( ( '[' ']' )+ '.' 'class' | ( '[' expression ']' )+ | arguments | '.' 'class' | '.' explicitGenericInvocation | '.' 'this' | '.' 'super' arguments | '.' 'new' innerCreator );";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
@@ -19237,12 +19296,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA155_special;
             this.transition = DFA155_transition;
         }
+        @Override
         public String getDescription() {
             return "()+ loopback of 848:9: ( '[' expression ']' )+";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
@@ -19349,12 +19411,15 @@ public class JavaParser extends DebugParser {
             this.special = DFA162_special;
             this.transition = DFA162_transition;
         }
+        @Override
         public String getDescription() {
             return "()* loopback of 874:28: ( '[' expression ']' )*";
         }
+        @Override
         public void error(NoViableAltException nvae) {
             dbg.recognitionException(nvae);
         }
+        @Override
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             TokenStream input = (TokenStream)_input;
         	int _s = s;
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/tools/util/URIUtils.java b/openjpa-examples/openbooks/src/main/java/openbook/tools/util/URIUtils.java
index 95855cbb2..83c57f337 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/util/URIUtils.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/util/URIUtils.java
@@ -70,7 +70,7 @@ public class URIUtils {
             return uri;
         }
         String[] inputSegments = path.split("/");
-        Stack<String> outputSegments = new Stack<String>();
+        Stack<String> outputSegments = new Stack<>();
         for (int i = 0; i < inputSegments.length; i++) {
             if ((inputSegments[i].length() == 0) || (".".equals(inputSegments[i]))) {
                 // Do nothing
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/util/PropertyHelper.java b/openjpa-examples/openbooks/src/main/java/openbook/util/PropertyHelper.java
index acd8b4ec7..e37ac707b 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/util/PropertyHelper.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/util/PropertyHelper.java
@@ -46,7 +46,7 @@ public class PropertyHelper {
      */
     public static Map<String,Object> filter(Map<String,Object> props, String name, boolean prefix,
             boolean includeArrays) {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = new HashMap<>();
         for (String key : props.keySet()) {
             if (key == null)
                 continue;
@@ -82,14 +82,14 @@ public class PropertyHelper {
      * @return key-value pairs that match.
      */
     public static Map<String,List<Object>> filterArrayKeys(Map<String,Object> props, String name, boolean prefix) {
-        Map<String, List<Object>> result = new HashMap<String, List<Object>>();
+        Map<String, List<Object>> result = new HashMap<>();
         for (String key : props.keySet()) {
             boolean match = prefix ? key.startsWith(name) : (key.indexOf(name) != -1);
             if (match && isArray(key)) {
                 String realKey = removeArray(key);
                 List<Object> values = result.get(realKey);
                 if (values == null) {
-                    values = new ArrayList<Object>();
+                    values = new ArrayList<>();
                     result.put(realKey, values);
                 }
                 values.add(props.get(key));
@@ -137,7 +137,7 @@ public class PropertyHelper {
     }
 
     public static Map<String, Object> toMap(Properties p) {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = new HashMap<>();
         for (Object k : p.keySet()) {
             result.put(k.toString(), p.get(k));
         }
@@ -210,7 +210,7 @@ public class PropertyHelper {
         List<String> pairs = getStringList(props, key);
         if (pairs == null || pairs.isEmpty())
             return def;
-        Map<String,String> result = new LinkedHashMap<String, String>();
+        Map<String,String> result = new LinkedHashMap<>();
         for (String pair : pairs) {
             int index = pair.indexOf("->");
             if (index != -1) {
@@ -250,7 +250,7 @@ public class PropertyHelper {
 
     public static Set<String> getSubsectionKeys(Set<String> keys, String section) {
         String prefix = asPrefix(section);
-        Set<String> subsections = new HashSet<String>();
+        Set<String> subsections = new HashSet<>();
         for (String key : keys) {
             if (key.startsWith(prefix)) {
                 subsections.add(prefix + getPrefix(key.substring(prefix.length())));
@@ -292,7 +292,7 @@ public class PropertyHelper {
      * @return the map with only the keys that starts with the given section.
      */
     public static Map<String,Object> getSection(Map<String,Object> props, String section, boolean retain) {
-        Map<String,Object> result = new HashMap<String, Object>(props);
+        Map<String,Object> result = new HashMap<>(props);
         Set<String> keys = props.keySet();
         String prefix = asPrefix(section);
         for (String key : keys) {
diff --git a/openjpa-examples/openbooks/src/main/java/openbook/util/Randomizer.java b/openjpa-examples/openbooks/src/main/java/openbook/util/Randomizer.java
index 84f874601..5e8bba344 100644
--- a/openjpa-examples/openbooks/src/main/java/openbook/util/Randomizer.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/util/Randomizer.java
@@ -92,8 +92,8 @@ public class Randomizer {
     public static <T> List<T> selectRandom(List<T> list, int n) {
         if (list == null || list.isEmpty())
             return Collections.emptyList();
-        Set<Integer> indices = new HashSet<Integer>();
-        List<T> selected = new ArrayList<T>();
+        Set<Integer> indices = new HashSet<>();
+        List<T> selected = new ArrayList<>();
         int m = list.size();
         if (n >= m) {
             selected.addAll(list);
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java
index 1d8c9a654..eab8c6264 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java
@@ -31,9 +31,9 @@ import javax.persistence.ManyToOne;
  *
  */
 
-@SuppressWarnings("serial")
 @Entity
 public class Ask  extends Tradable {
+    private static final long serialVersionUID = 1L;
     /**
      * The trader who has made the offer.
      * Must never be null.
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java
index 9660e2250..752b85039 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java
@@ -30,9 +30,9 @@ import javax.persistence.ManyToOne;
  *
  */
 
-@SuppressWarnings("serial")
 @Entity
 public class Bid extends Tradable {
+    private static final long serialVersionUID = 1L;
     /**
      * The trader who has made the offer.
      * Must never be null.
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/LogStatement.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/LogStatement.java
index 916f36ed9..e34a69023 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/LogStatement.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/LogStatement.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.trader.domain;
 
 import java.io.Serializable;
 
-@SuppressWarnings("serial")
 public class LogStatement implements Serializable {
+    private static final long serialVersionUID = 1L;
     private String level;
     private String context;
     private String thread;
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Match.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Match.java
index 043b5c1c8..5cc26dd0f 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Match.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Match.java
@@ -28,8 +28,8 @@ import java.io.Serializable;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class Match implements Serializable {
+    private static final long serialVersionUID = 1L;
     private Ask ask;
     private Bid bid;
 
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java
index 667224382..efe67d83d 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java
@@ -31,9 +31,9 @@ import javax.persistence.Id;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class Stock implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * The primary identity of a Stock.
      * The uniqueness of the primary keys are often warranted by the persistence provider.
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java
index 7ff773d79..b9c10692a 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java
@@ -37,9 +37,9 @@ import javax.persistence.Version;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @MappedSuperclass
 public abstract class Tradable implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * Primary identity of a traded entity.
      * Its value is generated by the persistence provider.
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java
index 8db4b9558..0a2e10a8e 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java
@@ -27,9 +27,9 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 
-@SuppressWarnings("serial")
 @Entity
 public class Trade implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * Primary identity of a committed trade.
      * Its value is generated by the persistence provider.
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java
index 006e94a7e..a2aad6b0c 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java
@@ -26,12 +26,12 @@ import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 
-@SuppressWarnings("serial")
 @Entity
 @Table(name="TRADER",
        uniqueConstraints= @UniqueConstraint(columnNames={"NAME"}))
 
 public class Trader implements Serializable {
+    private static final long serialVersionUID = 1L;
     @Id
     private String name;
 
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/server/TradingServiceAdapterImpl.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/server/TradingServiceAdapterImpl.java
index 92c0c70f4..621ebb6a1 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/server/TradingServiceAdapterImpl.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/server/TradingServiceAdapterImpl.java
@@ -55,8 +55,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet;
  *
  * @author Pinaki Poddar
  */
-@SuppressWarnings("serial")
 public class TradingServiceAdapterImpl extends RemoteServiceServlet implements TradingServiceAdapter {
+    private static final long serialVersionUID = 1L;
 
     private TradingService _del;
     private ExceptionAdapter _translator = new ExceptionAdapter();
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java
index dc79cbe58..5ea3cde59 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java
@@ -40,8 +40,8 @@ import org.apache.openjpa.trader.domain.Tradable;
 import org.apache.openjpa.trader.domain.Trade;
 import org.apache.openjpa.trader.domain.Trader;
 
-@SuppressWarnings("serial")
 public class Exchange extends PersistenceService implements TradingService {
+    private static final long serialVersionUID = 1L;
     private BufferedLog log;
 
     public Exchange(String unit) {
diff --git a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java
index 46e93fed6..5f44e3447 100644
--- a/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java
+++ b/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java
@@ -43,8 +43,8 @@ import org.apache.openjpa.persistence.OpenJPAPersistence;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public abstract class PersistenceService extends Observable implements Serializable {
+    private static final long serialVersionUID = 1L;
     private final OpenJPAEntityManagerFactory emf;
     private final String unitName;
     private final boolean isManaged;
diff --git a/openjpa-examples/simple/src/main/java/embeddables/Address.java b/openjpa-examples/simple/src/main/java/embeddables/Address.java
index 83345ccce..230ce7b1b 100644
--- a/openjpa-examples/simple/src/main/java/embeddables/Address.java
+++ b/openjpa-examples/simple/src/main/java/embeddables/Address.java
@@ -50,6 +50,7 @@ public class Address {
         coordinates = c;
     }
 
+    @Override
     public String toString() {
         return street + " " + city + ", " + state + " " + zip;
     }
diff --git a/openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java b/openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java
index 60ec93a06..f49f78ec7 100644
--- a/openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java
+++ b/openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java
@@ -39,6 +39,7 @@ public class ContactInfo {
     @Embedded
     Phone homePhone;
 
+    @Override
     public String toString() {
         return homeAddress.toString() + " " + homePhone.toString();
     }
diff --git a/openjpa-examples/simple/src/main/java/embeddables/Phone.java b/openjpa-examples/simple/src/main/java/embeddables/Phone.java
index 88a62bd51..b64a1b1b9 100644
--- a/openjpa-examples/simple/src/main/java/embeddables/Phone.java
+++ b/openjpa-examples/simple/src/main/java/embeddables/Phone.java
@@ -37,6 +37,7 @@ public class Phone {
     @Basic
     private String type;
 
+    @Override
     public String toString() {
         return "type: " + type + " number:" + number;
     }
diff --git a/openjpa-examples/simple/src/main/java/embeddables/User.java b/openjpa-examples/simple/src/main/java/embeddables/User.java
index 09e6d5d57..f752a75ec 100644
--- a/openjpa-examples/simple/src/main/java/embeddables/User.java
+++ b/openjpa-examples/simple/src/main/java/embeddables/User.java
@@ -44,7 +44,7 @@ public class User {
     // Collection of embeddables
     @ElementCollection
     @CollectionTable(name = "user_addresses")
-    private Set<Address> addresses = new HashSet<Address>();
+    private Set<Address> addresses = new HashSet<>();
     @Basic
     private String user_name;
 
@@ -65,6 +65,7 @@ public class User {
         addresses.add(a);
     }
 
+    @Override
     public String toString() {
         String res = user_name + " " + user + " " + contactInfo;
 
diff --git a/openjpa-examples/simple/src/main/java/hellojpa/Main.java b/openjpa-examples/simple/src/main/java/hellojpa/Main.java
index 09e3ebe96..15161eb58 100644
--- a/openjpa-examples/simple/src/main/java/hellojpa/Main.java
+++ b/openjpa-examples/simple/src/main/java/hellojpa/Main.java
@@ -18,8 +18,12 @@
  */
 package hellojpa;
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
 
 
 /**
diff --git a/openjpa-examples/simple/src/main/java/hellojpa/Message.java b/openjpa-examples/simple/src/main/java/hellojpa/Message.java
index 41f80d5b3..bb3d4af79 100644
--- a/openjpa-examples/simple/src/main/java/hellojpa/Message.java
+++ b/openjpa-examples/simple/src/main/java/hellojpa/Message.java
@@ -18,8 +18,11 @@
  */
 package hellojpa;
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
 
 /**
diff --git a/openjpa-examples/simple/src/main/java/relations/Deity.java b/openjpa-examples/simple/src/main/java/relations/Deity.java
index 8d8faaece..721243d09 100644
--- a/openjpa-examples/simple/src/main/java/relations/Deity.java
+++ b/openjpa-examples/simple/src/main/java/relations/Deity.java
@@ -25,11 +25,11 @@ import java.util.Set;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.Enumerated;
 import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.Id;
-import javax.persistence.NamedQuery;
 import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 
@@ -75,6 +75,9 @@ import javax.persistence.OneToOne;
         + "and cousin2 = ?1 and cousin1 <> ?1")
     })
 public class Deity implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     // the Id is the name, which is generally a bad idea, but we are
     // confident that diety names will be unique
     @Id
@@ -130,13 +133,13 @@ public class Deity implements Serializable {
 
         // add the child to this member's children
         if (children == null)
-            children = new HashSet<Deity>();
+            children = new HashSet<>();
         children.add(child);
 
         if (childFather != null) {
             child.father = childFather;
             if (childFather.children == null)
-                childFather.children = new HashSet<Deity>();
+                childFather.children = new HashSet<>();
             childFather.children.add(child);
         }
 
diff --git a/openjpa-examples/simple/src/main/java/relations/Main.java b/openjpa-examples/simple/src/main/java/relations/Main.java
index 9463ed7f9..fec2df094 100644
--- a/openjpa-examples/simple/src/main/java/relations/Main.java
+++ b/openjpa-examples/simple/src/main/java/relations/Main.java
@@ -18,11 +18,16 @@
  */
 package relations;
 
-import java.util.*;
-import javax.persistence.*;
-
 // import the enums for MALE and FEMALE
-import static relations.Deity.Gender.*;
+import static relations.Deity.Gender.FEMALE;
+import static relations.Deity.Gender.MALE;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
 
 
 /**
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java
index 5bf4ddefa..a5dfedf6f 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java
@@ -159,6 +159,7 @@ public class AccountDataBean implements Serializable {
         );
     }
 
+    @Override
     public String toString() {
         return "\n\tAccount Data for account: " + getAccountID()
                 + "\n\t\t   loginCount:" + getLoginCount()
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java
index e1be98b5b..e7cc8dd94 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java
@@ -97,6 +97,7 @@ public class AccountProfileDataBean implements java.io.Serializable {
         );
     }
 
+    @Override
     public String toString() {
         return "\n\tAccount Profile Data for userID:" + getUserID()
                 + "\n\t\t   passwd:" + getPassword()
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java
index a5beacf7e..a1a39f6a7 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java
@@ -127,6 +127,7 @@ public class HoldingDataBean implements Serializable {
         );
     }
 
+    @Override
     public String toString() {
         return "\n\tHolding Data for holding: " + getHoldingID()
                 + "\n\t\t      quantity:" + getQuantity()
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/MarketSummaryDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/MarketSummaryDataBean.java
index f5c0fda5e..9be4433d6 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/MarketSummaryDataBean.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/MarketSummaryDataBean.java
@@ -82,7 +82,8 @@ public class MarketSummaryDataBean implements Serializable
 		);
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
 		String ret = "\n\tMarket Summary at: " + getSummaryDate()
 			+ "\n\t\t        TSIA:" + getTSIA()
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java
index dbebcb8b4..27c8d621c 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java
@@ -179,6 +179,7 @@ public class OrderDataBean implements Serializable
         );
     }
 
+    @Override
     public String toString()
     {
         return "Order " + getOrderID()
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java
index efcb2fe0e..b29eea1b5 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java
@@ -124,6 +124,7 @@ public class QuoteDataBean implements Serializable {
         setSymbol(symbol);
     }
 
+    @Override
     public String toString() {
         return "\n\tQuote Data for: " + getSymbol()
                 + "\n\t\t companyName: " + getCompanyName()
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java
index 99a223d3b..71c9a539b 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java
@@ -47,7 +47,7 @@ public class TestDaytrader extends AbstractPersistenceTestCase {
         // Mimic EM pooling
         boolean poolEm = true;
 
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true,"
             + "SchemaAction='add,deleteTableContents')");
         emf = createEmf("daytrader", map);
@@ -105,7 +105,7 @@ public class TestDaytrader extends AbstractPersistenceTestCase {
     private EntityManagerFactory createEmf(final String pu, Object... props) {
         Map<String, Object> map = getPropertiesMap(props);
         EntityManagerFactory emf = null;
-        Map<Object, Object> config = new HashMap<Object, Object>(System.getProperties());
+        Map<Object, Object> config = new HashMap<>(System.getProperties());
         config.putAll(map);
         emf = Persistence.createEntityManagerFactory(pu, config);
         if (emf == null) {
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java
index 38d44c070..b20aa00b2 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java
@@ -17,10 +17,10 @@
 package org.apache.openjpa.integration.daytrader;
 
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.ArrayList;
-import java.math.BigDecimal;
 
 import javax.persistence.EntityManagerFactory;
 
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java
index ac5fc6824..65a4ab0af 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java
@@ -93,8 +93,8 @@ public class TradeJPADirect {
 
     // constructor for OpenJPA junit tests
     public TradeJPADirect(Log log, EntityManagerFactory emf, boolean poolEm) {
-        this.log = log;
-        this.emf = emf;
+        TradeJPADirect.log = log;
+        TradeJPADirect.emf = emf;
         _poolEm = poolEm;
         if (initialized == false)
             init();
@@ -140,9 +140,9 @@ public class TradeJPADirect {
             quotes = query.getResultList();
 
             QuoteDataBean[] quoteArray = (QuoteDataBean[]) quotes.toArray(new QuoteDataBean[quotes.size()]);
-            ArrayList<QuoteDataBean> topGainers = new ArrayList<QuoteDataBean>(
+            ArrayList<QuoteDataBean> topGainers = new ArrayList<>(
                                                                               5);
-            ArrayList<QuoteDataBean> topLosers = new ArrayList<QuoteDataBean>(5);
+            ArrayList<QuoteDataBean> topLosers = new ArrayList<>(5);
             // BigDecimal TSIA = FinancialUtils.ZERO;
             BigDecimal TSIA = (new BigDecimal(0.00)).setScale(2);
             // BigDecimal openTSIA = FinancialUtils.ZERO;
@@ -963,6 +963,7 @@ public class TradeJPADirect {
     }
 
     class quotePriceComparator implements java.util.Comparator {
+        @Override
         public int compare(Object quote1, Object quote2) {
             double change1 = ((QuoteDataBean) quote1).getChange();
             double change2 = ((QuoteDataBean) quote2).getChange();
diff --git a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeScenario.java b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeScenario.java
index 29ccd1276..1666ed809 100644
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeScenario.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeScenario.java
@@ -16,9 +16,9 @@
  */
 package org.apache.openjpa.integration.daytrader;
 
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
-import java.io.IOException;
 
 /**
  * TradeScenarioServlet emulates a population of web users by generating a specific Trade operation
@@ -203,15 +203,15 @@ public class TradeScenario {
 							}
 						}
 						if (foundHoldingToSell) break;
-						tAction.log.warn("TradeScenario: No holdings sold for userID=" + userID +
+						TradeJPADirect.log.warn("TradeScenario: No holdings sold for userID=" + userID +
 						    ", holdings=" + numHoldings);
 					} else {
-                        tAction.log.warn("TradeScenario: No holdings to sell for userID=" + userID);
+                        TradeJPADirect.log.warn("TradeScenario: No holdings to sell for userID=" + userID);
 					}
 					// At this point: A TradeScenario Sell was requested with No Stocks in Portfolio
 					// This can happen when a new registered user happens to request a sell before a buy
 					// In this case, fall through and perform a buy instead
-                    tAction.log.warn("TradeScenario: No holdings sold - switching to buy -- userID=" + userID);
+                    TradeJPADirect.log.warn("TradeScenario: No holdings sold - switching to buy -- userID=" + userID);
 
 					/* Trade 2.037: Added sell_deficit counter to maintain correct buy/sell mix.
 					 * When a users portfolio is reduced to 0 holdings, a buy is requested instead of a sell.
@@ -236,14 +236,14 @@ public class TradeScenario {
 	}
 
     private void log(StringBuilder sb, String msg) {
-        if (tAction.log != null && tAction.log.isTraceEnabled()) {
+        if (TradeJPADirect.log != null && TradeJPADirect.log.isTraceEnabled()) {
             sb.append(msg);
             sb.append(System.getProperty("line.separator"));
         }
     }
 
     private void log(StringBuilder sb, String msg, Object obj) {
-        if (tAction.log != null && tAction.log.isTraceEnabled()) {
+        if (TradeJPADirect.log != null && TradeJPADirect.log.isTraceEnabled()) {
             sb.append(msg);
             sb.append(" = ");
             sb.append(obj);
diff --git a/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java b/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java
index b07068c8c..512120210 100644
--- a/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java
+++ b/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java
@@ -252,6 +252,7 @@ public class TestJMXPlatformMBeans extends AbstractPersistenceTestCase {
 
     public class DCMBeanCallable implements Callable<Boolean> {
 
+        @Override
         public Boolean call() {
             MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
             assertNotNull(mbs);
@@ -314,6 +315,7 @@ public class TestJMXPlatformMBeans extends AbstractPersistenceTestCase {
             setQueryMethod(queryMethod);
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public Boolean call() {
             MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
diff --git a/openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java b/openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java
index b2c5824c0..fb817ceec 100644
--- a/openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java
+++ b/openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestLogFactory extends SingleEMFTestCase {
     String systemPropLog = null;
 
+    @Override
     public void setUp() throws Exception {
         // Maven users may disable logging via a global system prop - which breaks this testcase.
         systemPropLog = System.getProperty("openjpa.Log");
@@ -37,6 +38,7 @@ public class TestLogFactory extends SingleEMFTestCase {
         super.setUp();
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         if(systemPropLog != null) {
@@ -61,6 +63,7 @@ public class TestLogFactory extends SingleEMFTestCase {
         }
     }
 
+    @Override
     public String getPersistenceUnitName() {
         // override puName instead of creating our own EMF.
         // getLog uses the SingleEMFTestCase's emf.
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java
index 441e892ce..9c291a638 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java
@@ -26,9 +26,11 @@ import javax.persistence.spi.PersistenceProviderResolver;
 public class DummyPersistenceProviderResolver implements
     PersistenceProviderResolver {
 
+    @Override
     public void clearCachedProviders() {
     }
 
+    @Override
     public List<PersistenceProvider> getPersistenceProviders() {
         return null;
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java
index d77c81645..03b073b59 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java
@@ -27,6 +27,7 @@ import javax.persistence.spi.ProviderUtil;
 
 public class DummyProvider1 implements PersistenceProvider {
 
+    @Override
     public EntityManagerFactory createContainerEntityManagerFactory(
         PersistenceUnitInfo persistenceunitinfo, Map map) {
         return null;
@@ -42,10 +43,12 @@ public class DummyProvider1 implements PersistenceProvider {
         return false;
     }
 
+    @Override
     public EntityManagerFactory createEntityManagerFactory(String s, Map map) {
         return null;
     }
 
+    @Override
     public ProviderUtil getProviderUtil() {
         return null;
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java
index 16e6150b6..5a9bbde2b 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java
@@ -27,6 +27,7 @@ import javax.persistence.spi.ProviderUtil;
 
 public class DummyProvider2 implements PersistenceProvider {
 
+    @Override
     public EntityManagerFactory createContainerEntityManagerFactory(
         PersistenceUnitInfo persistenceunitinfo, Map map) {
         return null;
@@ -42,10 +43,12 @@ public class DummyProvider2 implements PersistenceProvider {
         return false;
     }
 
+    @Override
     public EntityManagerFactory createEntityManagerFactory(String s, Map map) {
         return null;
     }
 
+    @Override
     public ProviderUtil getProviderUtil() {
         return null;
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java
index 6367f3c5b..b24251605 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java
@@ -56,6 +56,7 @@ public class TestPersistenceProviderResolver extends TestCase {
     ClassLoader originalLoader = null;
     TempUrlLoader tempLoader = null;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
 
@@ -77,6 +78,7 @@ public class TestPersistenceProviderResolver extends TestCase {
         originalLoader = (URLClassLoader)Thread.currentThread().getContextClassLoader();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         // Restore the original classloader, in case there was an exception
@@ -84,7 +86,7 @@ public class TestPersistenceProviderResolver extends TestCase {
     }
 
     public void testDefault() {
-        List<String> providerNames = new LinkedList<String>();
+        List<String> providerNames = new LinkedList<>();
         providerNames.add(openjpaProvider);
         checkProviders(providerNames);
     }
@@ -99,7 +101,7 @@ public class TestPersistenceProviderResolver extends TestCase {
         AccessController.doPrivileged(J2DoPrivHelper
             .setContextClassLoaderAction(tempLoader));
 
-        List<String> providerNames = new LinkedList<String>();
+        List<String> providerNames = new LinkedList<>();
         providerNames.add(openjpaProvider);
         providerNames.add(dummyProvider1);
         checkProviders(providerNames);
@@ -118,7 +120,7 @@ public class TestPersistenceProviderResolver extends TestCase {
         AccessController.doPrivileged(J2DoPrivHelper
             .setContextClassLoaderAction(tempLoader));
 
-        List<String> providerNames = new LinkedList<String>();
+        List<String> providerNames = new LinkedList<>();
         providerNames.add(openjpaProvider);
         providerNames.add(dummyProvider1);
         providerNames.add(dummyProvider2);
@@ -136,7 +138,7 @@ public class TestPersistenceProviderResolver extends TestCase {
         assertNotNull(providers);
         resolver.clearCachedProviders();
 
-        List<String> providerNames = new LinkedList<String>();
+        List<String> providerNames = new LinkedList<>();
         providerNames.add(openjpaProvider);
         checkProviders(providerNames);
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java
index fe324fc2d..05a824812 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java
@@ -66,42 +66,52 @@ public class Address implements IAddress, Serializable {
     private String phoneNumber;
 
 
+    @Override
     public void setStreetAddress(String streetAddress) {
         this.streetAddress = streetAddress;
     }
 
+    @Override
     public String getStreetAddress() {
         return this.streetAddress;
     }
 
+    @Override
     public void setCity(String city) {
         this.city = city;
     }
 
+    @Override
     public String getCity() {
         return this.city;
     }
 
+    @Override
     public void setState(String state) {
         this.state = state;
     }
 
+    @Override
     public String getState() {
         return this.state;
     }
 
+    @Override
     public void setPostalCode(String postalCode) {
         this.postalCode = postalCode;
     }
 
+    @Override
     public String getPostalCode() {
         return this.postalCode;
     }
 
+    @Override
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
 
+    @Override
     public String getPhoneNumber() {
         return this.phoneNumber;
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java
index fd29ff242..b844b87bf 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.integration.validation;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNull.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNull.java
index 5e02f1da7..5cf483773 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNull.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintNull.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.integration.validation;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintSize.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintSize.java
index 6c7bb524a..bfc939673 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintSize.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintSize.java
@@ -110,7 +110,7 @@ public class ConstraintSize implements Serializable {
 
 
     private void setInvalidMap() {
-        Map<String,String> m = new HashMap<String,String>();
+        Map<String,String> m = new HashMap<>();
         m.put("a", "a value");
         m.put("b", "b value");
         m.put("c", "c value");
@@ -118,7 +118,7 @@ public class ConstraintSize implements Serializable {
     }
 
     private void setValidMap() {
-        Map<String,String> m = new HashMap<String,String>();
+        Map<String,String> m = new HashMap<>();
         m.put("a", "a value");
         setMyMap(m);
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Customer.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Customer.java
index 7f1bc4652..4095486eb 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Customer.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Customer.java
@@ -37,19 +37,23 @@ public class Customer extends Person implements ICustomer, Serializable {
     private Address billingAddress;
 
 
+    @Override
     public void setShippingAddress(IAddress shippingAddress) {
         this.shippingAddress = (Address) shippingAddress;
     }
 
+    @Override
     public IAddress getShippingAddress() {
         return this.shippingAddress;
     }
 
 
+    @Override
     public void setBillingAddress(IAddress billingAddress) {
         this.billingAddress = (Address) billingAddress;
     }
 
+    @Override
     public IAddress getBillingAddress() {
         return this.billingAddress;
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IAddress.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IAddress.java
index 2a3c2b879..fbd8f44a5 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IAddress.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IAddress.java
@@ -22,22 +22,18 @@ import javax.validation.constraints.NotNull;
 
 public interface IAddress {
 
-    @NotNull
-    public String getStreetAddress();
-    public void setStreetAddress(String streetAddress);
+    @NotNull String getStreetAddress();
+    void setStreetAddress(String streetAddress);
 
-    @NotNull
-    public String getCity();
-    public void setCity(String city);
+    @NotNull String getCity();
+    void setCity(String city);
 
-    @NotNull
-    public String getState();
-    public void setState(String state);
+    @NotNull String getState();
+    void setState(String state);
 
-    @NotNull
-    public String getPostalCode();
-    public void setPostalCode(String postalCode);
+    @NotNull String getPostalCode();
+    void setPostalCode(String postalCode);
 
-    public String getPhoneNumber();
-    public void setPhoneNumber(String phoneNumber);
+    String getPhoneNumber();
+    void setPhoneNumber(String phoneNumber);
 }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ICustomer.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ICustomer.java
index f7987ded1..cf8e73352 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ICustomer.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ICustomer.java
@@ -20,9 +20,9 @@ package org.apache.openjpa.integration.validation;
 
 public interface ICustomer extends IPerson {
 
-    public void setShippingAddress(IAddress shippingAddress);
-    public IAddress getShippingAddress();
+    void setShippingAddress(IAddress shippingAddress);
+    IAddress getShippingAddress();
 
-    public void setBillingAddress(IAddress billingAddress);
-    public IAddress getBillingAddress();
+    void setBillingAddress(IAddress billingAddress);
+    IAddress getBillingAddress();
 }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IPerson.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IPerson.java
index 57d948330..8ce3d137b 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IPerson.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/IPerson.java
@@ -22,15 +22,12 @@ import javax.validation.constraints.NotNull;
 
 public interface IPerson {
 
-    @NotNull
-    public String getFirstName();
-    public void setFirstName(String firstName);
+    @NotNull String getFirstName();
+    void setFirstName(String firstName);
 
-    @NotNull
-    public String getLastName();
-    public void setLastName(String lastName);
+    @NotNull String getLastName();
+    void setLastName(String lastName);
 
-    @NotNull
-    public IAddress getHomeAddress();
-    public void setHomeAddress(IAddress homeAddress);
+    @NotNull IAddress getHomeAddress();
+    void setHomeAddress(IAddress homeAddress);
 }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Image.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Image.java
index 9d1d3137a..c5441ef44 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Image.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Image.java
@@ -62,6 +62,7 @@ public class Image {
         this.location = location;
     }
 
+    @Override
     public String toString() {
         return "[Image:id=" + id + ",filename=" + fileName + "," + location + ']';
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Location.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Location.java
index 84068409e..db1c4dd6c 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Location.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Location.java
@@ -89,6 +89,7 @@ public class Location {
         return zipCode;
     }
 
+    @Override
     public String toString() {
         return "[Location:city=" + city + ",street=" + street + ",state=" + state + ",country=" + country + ",zipCode="
                 + zipCode + ']';
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/NonDefGrpEntity.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/NonDefGrpEntity.java
index 4cc961963..31d47f73c 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/NonDefGrpEntity.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/NonDefGrpEntity.java
@@ -22,7 +22,6 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.validation.constraints.NotNull;
-import org.apache.openjpa.integration.validation.ValGroup1;
 
 @Entity
 public class NonDefGrpEntity {
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Person.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Person.java
index 807af9049..f594127ef 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Person.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Person.java
@@ -58,28 +58,34 @@ public class Person implements IPerson, Serializable {
     private Address homeAddress;
 
 
+    @Override
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
+    @Override
     public String getFirstName() {
         return this.firstName;
     }
 
 
+    @Override
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
+    @Override
     public String getLastName() {
         return this.lastName;
     }
 
 
+    @Override
     public void setHomeAddress(IAddress homeAddress) {
         this.homeAddress = (Address) homeAddress;
     }
 
+    @Override
     public IAddress getHomeAddress() {
         return this.homeAddress;
     }
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/SimpleEntity.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/SimpleEntity.java
index f78287b07..91a556b1b 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/SimpleEntity.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/SimpleEntity.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.integration.validation;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -54,6 +55,7 @@ import javax.persistence.Table;
 @Entity(name = "simple")
 @Table(name = "SIMPLE_ENTITY")
 public class SimpleEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @Id
     @GeneratedValue
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraintViolation.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraintViolation.java
index f8d298644..3542f719b 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraintViolation.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestConstraintViolation.java
@@ -37,8 +37,9 @@ public class TestConstraintViolation extends AbstractPersistenceTestCase {
     EntityManagerFactory emf2 = null;
     Log log = null;
 
+    @Override
     public void setUp() {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("javax.persistence.validation.group.pre-remove", "javax.validation.groups.Default");
 
         // This test case uses a different persistence xml file because validation require 2.0 xsd.
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestEagerInit.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestEagerInit.java
index 0221603ae..ae9d02d57 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestEagerInit.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestEagerInit.java
@@ -31,7 +31,7 @@ public class TestEagerInit extends AbstractPersistenceTestCase {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.InitializeEagerly", "true");
         _emf =
             (OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.createEntityManagerFactory("simple-callback-mode",
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java
index 05fb39e57..fde01fe00 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java
@@ -28,7 +28,6 @@ import javax.validation.ConstraintViolationException;
 import javax.validation.Path;
 import javax.validation.TraversableResolver;
 
-import junit.framework.TestCase;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
@@ -39,6 +38,8 @@ import org.apache.openjpa.persistence.validation.TraversableResolverImpl;
 // import org.hibernate.validator.engine.PathImpl;
 // import com.agimatec.validation.jsr303.util.PathImpl;
 
+import junit.framework.TestCase;
+
 /**
  * Test the TraversableResolver methods
  *
@@ -71,7 +72,7 @@ public class TestTraversableResolver extends TestCase {
     }
 
     private void createEMF(String pu, String schemaAction) {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true,"
             + schemaAction);
         emf = (OpenJPAEntityManagerFactorySPI)OpenJPAPersistence.createEntityManagerFactory(
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java
index 15e950f9a..d883499ca 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java
@@ -27,7 +27,6 @@ import javax.validation.Validation;
 import javax.validation.ValidatorFactory;
 
 import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.integration.validation.SimpleEntity;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
@@ -149,7 +148,7 @@ public class TestValidatingLEM extends SingleEMFTestCase {
         getLog().trace("testValidatingLEM3() - CALLBACK");
         // create the Map to test overrides
         //   Just use current class object, as we have no provider to test with
-        Map<String,Object> props = new HashMap<String,Object>();
+        Map<String,Object> props = new HashMap<>();
         props.put("javax.persistence.validation.mode",
             String.valueOf(ValidationMode.CALLBACK));
         // create our EMF w/ props
@@ -198,7 +197,7 @@ public class TestValidatingLEM extends SingleEMFTestCase {
         }
         assertNotNull(factory);
         // create the Map to test overrides
-        Map<String,Object> props = new HashMap<String,Object>();
+        Map<String,Object> props = new HashMap<>();
         props.put("javax.persistence.validation.factory", factory);
         // create our EMF w/ props
         OpenJPAEntityManagerFactorySPI emf = (OpenJPAEntityManagerFactorySPI)
diff --git a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java
index a083953c0..f4994418f 100644
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidationGroups.java
@@ -323,7 +323,7 @@ public class TestValidationGroups extends AbstractPersistenceTestCase {
     public void testMultipleValidationGroups() {
 
         // Configure persistence properties via map
-        Map<String, Object> propMap = new HashMap<String, Object>();
+        Map<String, Object> propMap = new HashMap<>();
         propMap.put("javax.persistence.validation.group.pre-persist",
             "org.apache.openjpa.integration.validation.ValGroup1," +
             "org.apache.openjpa.integration.validation.ValGroup2");
@@ -441,7 +441,7 @@ public class TestValidationGroups extends AbstractPersistenceTestCase {
     public void testNoValidationGroups() {
 
         // Configure persistence properties via map
-        Map<String, Object> propMap = new HashMap<String, Object>();
+        Map<String, Object> propMap = new HashMap<>();
         propMap.put("javax.persistence.validation.group.pre-persist","");
 
         propMap.put("javax.persistence.validation.group.pre-update","");
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java
index 59af52dd8..38e7c2f0d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java
@@ -20,8 +20,6 @@ package org.apache.openjpa.jdbc.ant;
 
 import java.security.AccessController;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.meta.MappingTool;
@@ -32,6 +30,8 @@ import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.MultiLoaderClassResolver;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
  * Executes the {@link MappingTool} on the specified files.
@@ -194,10 +194,12 @@ public class MappingToolTask
         flags.meta = meta;
     }
 
+    @Override
     protected ConfigurationImpl newConfiguration() {
         return new JDBCConfigurationImpl();
     }
 
+    @Override
     protected void executeOn(String[] files)
         throws Exception {
         if (MappingTool.ACTION_IMPORT.equals(flags.action))
@@ -235,6 +237,7 @@ public class MappingToolTask
     public static class Action
         extends EnumeratedAttribute {
 
+        @Override
         public String[] getValues() {
             return MappingTool.ACTIONS;
         }
@@ -243,6 +246,7 @@ public class MappingToolTask
     public static class SchemaAction
         extends EnumeratedAttribute {
 
+        @Override
         public String[] getValues() {
             String[] actions = new String[SchemaTool.ACTIONS.length + 1];
             System.arraycopy(SchemaTool.ACTIONS, 0, actions, 0,
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java
index 34ed0be06..8b6ca55fd 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java
@@ -25,7 +25,6 @@ import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.util.Properties;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.meta.PropertiesReverseCustomizer;
@@ -37,6 +36,7 @@ import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.lib.util.CodeFormat;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
@@ -255,10 +255,12 @@ public class ReverseMappingToolTask
         return flags.format;
     }
 
+    @Override
     protected ConfigurationImpl newConfiguration() {
         return new JDBCConfigurationImpl();
     }
 
+    @Override
     protected void executeOn(String[] files)
         throws Exception {
         ClassLoader loader = getClassLoader();
@@ -298,6 +300,7 @@ public class ReverseMappingToolTask
     public static class Level
         extends EnumeratedAttribute {
 
+        @Override
         public String[] getValues() {
             return new String[]{
                 "package",
@@ -310,6 +313,7 @@ public class ReverseMappingToolTask
     public static class AccessType
         extends EnumeratedAttribute {
 
+        @Override
         public String[] getValues() {
             return new String[]{
                 "field",
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/SchemaToolTask.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/SchemaToolTask.java
index 56af7308c..b508ccd82 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/SchemaToolTask.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/SchemaToolTask.java
@@ -18,8 +18,6 @@
  */
 package org.apache.openjpa.jdbc.ant;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.schema.SchemaTool;
@@ -27,6 +25,8 @@ import org.apache.openjpa.lib.ant.AbstractTask;
 import org.apache.openjpa.lib.conf.ConfigurationImpl;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
  * Executes the {@link SchemaTool} on the specified XML schema definition
@@ -131,10 +131,12 @@ public class SchemaToolTask
         this.file = file;
     }
 
+    @Override
     protected ConfigurationImpl newConfiguration() {
         return new JDBCConfigurationImpl();
     }
 
+    @Override
     protected void executeOn(String[] files)
         throws Exception {
         if (SchemaTool.ACTION_IMPORT.equals(flags.action))
@@ -151,6 +153,7 @@ public class SchemaToolTask
     public static class Action
         extends EnumeratedAttribute {
 
+        @Override
         public String[] getValues() {
             return SchemaTool.ACTIONS;
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfiguration.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfiguration.java
index 04ee41d32..34ee5ebf2 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfiguration.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfiguration.java
@@ -51,55 +51,55 @@ public interface JDBCConfiguration
      * Name of the logger for SQL execution messages:
      * <code>openjpa.jdbc.SQL</code>.
      */
-    public static final String LOG_SQL = "openjpa.jdbc.SQL";
+    String LOG_SQL = "openjpa.jdbc.SQL";
 
     /**
      * Name of the logger for additional jdbc messages:
      * <code>openjpa.jdbc.DIAG</code>.
      */
-    public static final String LOG_DIAG = "openjpa.jdbc.SQLDiag";
+    String LOG_DIAG = "openjpa.jdbc.SQLDiag";
 
     /**
      * Name of the logger for JDBC-related messages:
      * <code>openjpa.jdbc.JDBC</code>.
      */
-    public static final String LOG_JDBC = "openjpa.jdbc.JDBC";
+    String LOG_JDBC = "openjpa.jdbc.JDBC";
 
     /**
      * Name of the logger for schema-related messages:
      * <code>openjpa.jdbc.Schema</code>.
      */
-    public static final String LOG_SCHEMA = "openjpa.jdbc.Schema";
+    String LOG_SCHEMA = "openjpa.jdbc.Schema";
 
     /**
      * Default schema for unqualified tables.
      */
-    public String getSchema();
+    String getSchema();
 
     /**
      * Default schema for unqualified tables.
      */
-    public void setSchema(String schema);
+    void setSchema(String schema);
 
     /**
      * Comma-separated list of modifiable schemas for persistent instances.
      */
-    public String getSchemas();
+    String getSchemas();
 
     /**
      * Comma-separated list of modifiable schemas for persistent instances.
      */
-    public void setSchemas(String schemas);
+    void setSchemas(String schemas);
 
     /**
      * Modificable schema components.
      */
-    public String[] getSchemasList();
+    String[] getSchemasList();
 
     /**
      * Modifiable schema components.
      */
-    public void setSchemas(String[] schemas);
+    void setSchemas(String[] schemas);
 
     /**
      * The transaction isolation level to use at the database level.
@@ -118,7 +118,7 @@ public interface JDBCConfiguration
      * {@link java.sql.Connection#TRANSACTION_SERIALIZABLE} level.</li>
      * </ul>
      */
-    public String getTransactionIsolation();
+    String getTransactionIsolation();
 
     /**
      * The transaction isolation level to use at the database level.
@@ -137,19 +137,19 @@ public interface JDBCConfiguration
      * {@link java.sql.Connection#TRANSACTION_SERIALIZABLE} level.</li>
      * </ul>
      */
-    public void setTransactionIsolation(String level);
+    void setTransactionIsolation(String level);
 
     /**
      * Return the proper transaction isolation level constant from
      * {@link java.sql.Connection}, or -1 for the default level.
      */
-    public int getTransactionIsolationConstant();
+    int getTransactionIsolationConstant();
 
     /**
      * Set the proper transaction isolation level constant from
      * {@link java.sql.Connection}, or -1 for the default level.
      */
-    public void setTransactionIsolation(int level);
+    void setTransactionIsolation(int level);
 
     /**
      * The JDBC result set type. Defaults to <code>forward-only</code>.
@@ -162,12 +162,12 @@ public interface JDBCConfiguration
      * {@link java.sql.ResultSet#TYPE_SCROLL_INSENSITIVE} type.</li>
      * </ul>
      */
-    public String getResultSetType();
+    String getResultSetType();
 
     /**
      * Return the result set constant for the result set type.
      */
-    public int getResultSetTypeConstant();
+    int getResultSetTypeConstant();
 
     /**
      * The JDBC result set type. Defaults to <code>forward-only</code>.
@@ -180,12 +180,12 @@ public interface JDBCConfiguration
      * {@link java.sql.ResultSet#TYPE_SCROLL_INSENSITIVE} type.</li>
      * </ul>
      */
-    public void setResultSetType(String type);
+    void setResultSetType(String type);
 
     /**
      * Set the result set constant type.
      */
-    public void setResultSetType(int type);
+    void setResultSetType(int type);
 
     /**
      * The JDBC fetch direction. Defaults to <code>forward</code>.
@@ -198,12 +198,12 @@ public interface JDBCConfiguration
      * {@link java.sql.ResultSet#FETCH_UNKNOWN} direction.</li>
      * </ul>
      */
-    public String getFetchDirection();
+    String getFetchDirection();
 
     /**
      * Return the result set constant for the fetch direction.
      */
-    public int getFetchDirectionConstant();
+    int getFetchDirectionConstant();
 
     /**
      * The JDBC fetch direction. Defaults to <code>forward</code>.
@@ -216,12 +216,12 @@ public interface JDBCConfiguration
      * {@link java.sql.ResultSet#FETCH_UNKNOWN} direction.</li>
      * </ul>
      */
-    public void setFetchDirection(String direction);
+    void setFetchDirection(String direction);
 
     /**
      * Set the result set fetch direction constant.
      */
-    public void setFetchDirection(int direction);
+    void setFetchDirection(int direction);
 
     /**
      * Specifies the default eager fetch mode to use. Defaults to
@@ -239,7 +239,7 @@ public interface JDBCConfiguration
      *
      * @since 0.3.0
      */
-    public String getEagerFetchMode();
+    String getEagerFetchMode();
 
     /**
      * Specifies the default eager fetch mode to use. Defaults to
@@ -254,7 +254,7 @@ public interface JDBCConfiguration
      * selects.</li>
      * </ul>
      */
-    public void setEagerFetchMode(String mode);
+    void setEagerFetchMode(String mode);
 
     /**
      * Return the eager fetch mode as one of the following symbolic constants:
@@ -266,7 +266,7 @@ public interface JDBCConfiguration
      *
      * @since 0.3.0
      */
-    public int getEagerFetchModeConstant();
+    int getEagerFetchModeConstant();
 
     /**
      * Set the eager fetch mode as one of the following symbolic constants:
@@ -278,7 +278,7 @@ public interface JDBCConfiguration
      *
      * @since 0.3.0
      */
-    public void setEagerFetchMode(int eagerFetchMode);
+    void setEagerFetchMode(int eagerFetchMode);
 
     /**
      * Specifies the default subclass fetch mode to use. Defaults to
@@ -293,7 +293,7 @@ public interface JDBCConfiguration
      *
      * @since 0.3.2
      */
-    public String getSubclassFetchMode();
+    String getSubclassFetchMode();
 
     /**
      * Specifies the default subclass fetch mode to use. Defaults to
@@ -308,7 +308,7 @@ public interface JDBCConfiguration
      *
      * @since 0.3.2
      */
-    public void setSubclassFetchMode(String mode);
+    void setSubclassFetchMode(String mode);
 
     /**
      * Return the subclass fetch mode as one of the following symbolic
@@ -321,7 +321,7 @@ public interface JDBCConfiguration
      *
      * @since 0.3.2
      */
-    public int getSubclassFetchModeConstant();
+    int getSubclassFetchModeConstant();
 
     /**
      * Set the subclass fetch mode as one of the following symbolic constants:
@@ -333,7 +333,7 @@ public interface JDBCConfiguration
      *
      * @since 0.3.2
      */
-    public void setSubclassFetchMode(int subclassFetchMode);
+    void setSubclassFetchMode(int subclassFetchMode);
 
     /**
      * How to obtain the size of large result sets. Defaults to
@@ -347,13 +347,13 @@ public interface JDBCConfiguration
      * size of the results.</li>
      * </ul>
      */
-    public String getLRSSize();
+    String getLRSSize();
 
     /**
      * Return the {@link LRSSizes} constant for the large result set size
      * setting.
      */
-    public int getLRSSizeConstant();
+    int getLRSSizeConstant();
 
     /**
      * How to obtain the size of large result sets. Defaults to
@@ -367,220 +367,220 @@ public interface JDBCConfiguration
      * size of the results.</li>
      * </ul>
      */
-    public void setLRSSize(String lrsSize);
+    void setLRSSize(String lrsSize);
 
     /**
      * Set the fetch configuration large result set size constant.
      */
-    public void setLRSSize(int size);
+    void setLRSSize(int size);
 
     /**
      * Whether OpenJPA should try to automatically refresh O/R mapping
      * information and the database schema.
      */
-    public String getSynchronizeMappings();
+    String getSynchronizeMappings();
 
     /**
      * Whether OpenJPA should try to automatically refresh O/R mapping
      * information and the database schema.
      */
-    public void setSynchronizeMappings(String synchronizeMappings);
+    void setSynchronizeMappings(String synchronizeMappings);
 
     /**
      * A comma-separated list of the {@link JDBCListener} plugins for
      * listening to {@link JDBCEvent}s.
      */
-    public String getJDBCListeners();
+    String getJDBCListeners();
 
     /**
      * A comma-separated list of the {@link JDBCListener} plugins for
      * listening to {@link JDBCEvent}s.
      */
-    public void setJDBCListeners(String jdbcListeners);
+    void setJDBCListeners(String jdbcListeners);
 
     /**
      * The {@link JDBCListener}s to use.
      */
-    public JDBCListener[] getJDBCListenerInstances();
+    JDBCListener[] getJDBCListenerInstances();
 
     /**
      * The {@link JDBCListener}s to use.
      */
-    public void setJDBCListeners(JDBCListener[] jdbcListeners);
+    void setJDBCListeners(JDBCListener[] jdbcListeners);
 
     /**
      * A comma-separated list of the {@link ConnectionDecorator} for adding
      * functionality to JDBC connections.
      */
-    public String getConnectionDecorators();
+    String getConnectionDecorators();
 
     /**
      * A comma-separated list of the {@link ConnectionDecorator} for
      * adding functionality to JDBC connections.
      */
-    public void setConnectionDecorators(String decorators);
+    void setConnectionDecorators(String decorators);
 
     /**
      * The {@link ConnectionDecorator}s to use.
      */
-    public ConnectionDecorator[] getConnectionDecoratorInstances();
+    ConnectionDecorator[] getConnectionDecoratorInstances();
 
     /**
      * The {@link ConnectionDecorator}s to use.
      */
-    public void setConnectionDecorators(ConnectionDecorator[] decorators);
+    void setConnectionDecorators(ConnectionDecorator[] decorators);
 
     /**
      * The {@link DBDictionary} to use to define the RDBMS SQL information.
      */
-    public String getDBDictionary();
+    String getDBDictionary();
 
     /**
      * The {@link DBDictionary} to use to define the RDBMS SQL information.
      */
-    public void setDBDictionary(String dbdictionary);
+    void setDBDictionary(String dbdictionary);
 
     /**
      * The {@link DBDictionary} to use.
      */
-    public DBDictionary getDBDictionaryInstance();
+    DBDictionary getDBDictionaryInstance();
 
     /**
      * The {@link DBDictionary} to use.
      */
-    public void setDBDictionary(DBDictionary dbdictionary);
+    void setDBDictionary(DBDictionary dbdictionary);
 
     /**
      * The {@link UpdateManager} to use for managing SQL updates.
      */
-    public String getUpdateManager();
+    String getUpdateManager();
 
     /**
      * The {@link UpdateManager} to use for managing SQL updates.
      */
-    public void setUpdateManager(String updateManager);
+    void setUpdateManager(String updateManager);
 
     /**
      * The {@link UpdateManager} for runtime data store interaction.
      */
-    public UpdateManager getUpdateManagerInstance();
+    UpdateManager getUpdateManagerInstance();
 
     /**
      * The {@link UpdateManager} for runtime data store interaction.
      */
-    public void setUpdateManager(UpdateManager updateManager);
+    void setUpdateManager(UpdateManager updateManager);
 
     /**
      * The {@link DriverDataSource} to use for creating a {@link DataSource}
      * from a JDBC {@link Driver}.
      */
-    public String getDriverDataSource();
+    String getDriverDataSource();
 
     /**
      * The {@link DriverDataSource} to use for creating a {@link DataSource}
      * from a JDBC {@link Driver}.
      */
-    public void setDriverDataSource(String driverDataSource);
+    void setDriverDataSource(String driverDataSource);
 
     /**
      * Create an instance of the {@link DriverDataSource} to use
      * for creating a {@link DataSource} from a JDBC {@link Driver}.
      */
-    public DriverDataSource newDriverDataSourceInstance();
+    DriverDataSource newDriverDataSourceInstance();
 
     /**
      * The plugin string for the {@link SchemaFactory} to use to provide
      * schema information during system initialization.
      */
-    public String getSchemaFactory();
+    String getSchemaFactory();
 
     /**
      * The plugin string for the {@link SchemaFactory} to use to provide
      * schema information during system initialization.
      */
-    public void setSchemaFactory(String schemaFactory);
+    void setSchemaFactory(String schemaFactory);
 
     /**
      * The {@link SchemaFactory} to use for schema information.
      */
-    public SchemaFactory getSchemaFactoryInstance();
+    SchemaFactory getSchemaFactoryInstance();
 
     /**
      * The {@link SchemaFactory} to use for schema information.
      */
-    public void setSchemaFactory(SchemaFactory schemaFactory);
+    void setSchemaFactory(SchemaFactory schemaFactory);
 
     /**
      * The SQL factory to use for SQL constructs.
      */
-    public String getSQLFactory();
+    String getSQLFactory();
 
     /**
      * The SQL factory to use for SQL constructs.
      */
-    public SQLFactory getSQLFactoryInstance();
+    SQLFactory getSQLFactoryInstance();
 
     /**
      * The SQL factory to use for SQL constructs.
      */
-    public void setSQLFactory(String sqlFactory);
+    void setSQLFactory(String sqlFactory);
 
     /**
      * The SQL factory to use for SQL constructs.
      */
-    public void setSQLFactory(SQLFactory sqlFactory);
+    void setSQLFactory(SQLFactory sqlFactory);
 
     /**
      * A plugin string describing the {@link MetaDataFactory} to use for
      * loading and storing object-relational mapping data.
      */
-    public String getMappingFactory();
+    String getMappingFactory();
 
     /**
      * A plugin string describing the {@link MetaDataFactory} to use for
      * loading and storing object-relational mapping data.
      */
-    public void setMappingFactory(String mappingFactory);
+    void setMappingFactory(String mappingFactory);
 
     /**
      * A plugin string describing the {@link MappingDefaults} to use.
      *
      * @since 0.4.0
      */
-    public String getMappingDefaults();
+    String getMappingDefaults();
 
     /**
      * A plugin string describing the {@link MappingDefaults} to use.
      *
      * @since 0.4.0
      */
-    public void setMappingDefaults(String map);
+    void setMappingDefaults(String map);
 
     /**
      * The {@link MappingDefaults} to use with a repository.
      *
      * @since 0.4.0
      */
-    public MappingDefaults getMappingDefaultsInstance();
+    MappingDefaults getMappingDefaultsInstance();
 
     /**
      * The {@link MappingDefaults} to use with a repository.
      *
      * @since 0.4.0
      */
-    public void setMappingDefaults(MappingDefaults map);
+    void setMappingDefaults(MappingDefaults map);
 
     /**
      * Return the mapping repository. Convenience method to cast from
      * the internal metadata repository.
      */
-    public MappingRepository getMappingRepositoryInstance();
+    MappingRepository getMappingRepositoryInstance();
 
     /**
      * Return a new empty mapping repository of the configured type.
      * Convenience method to cast from metadata repository.
      */
-    public MappingRepository newMappingRepositoryInstance();
+    MappingRepository newMappingRepositoryInstance();
 
     /**
      * Return the primary data source to use. The data source will
@@ -594,7 +594,7 @@ public interface JDBCConfiguration
      * {@link OpenJPAConfiguration#getConnectionFactory}, and avoids having to
      * pass in the user name and password to obtain connections.
      */
-    public DataSource getDataSource(StoreContext ctx);
+    DataSource getDataSource(StoreContext ctx);
 
     /**
      * Return the non-enlisted data source to use. If there is a valid
@@ -609,24 +609,24 @@ public interface JDBCConfiguration
      *
      * @see #getDataSource
      */
-    public DataSource getDataSource2(StoreContext ctx);
+    DataSource getDataSource2(StoreContext ctx);
 
     /**
      * Gets the String constant that matches the {@link IdentifierUtil}
      * @return String-based name of the {@link IdentifierUtil}
      */
-    public String getIdentifierUtil();
+    String getIdentifierUtil();
 
     /**
      * Gets the {@link DBIdentifierUtil}
      * @return DBIdentifierUtil
      */
-    public DBIdentifierUtil getIdentifierUtilInstance();
+    DBIdentifierUtil getIdentifierUtilInstance();
 
     /**
      * Sets the {@link DBIdentifierUtil}
      * @param util instance of the identifier utility
      */
-    public void setIdentifierUtil(DBIdentifierUtil util);
+    void setIdentifierUtil(DBIdentifierUtil util);
 
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
index c27e48529..178c680a6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
@@ -21,9 +21,9 @@ package org.apache.openjpa.jdbc.conf;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.util.Locale;
+
 import javax.sql.DataSource;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.jdbc.identifier.DBIdentifierUtil;
 import org.apache.openjpa.jdbc.kernel.BatchingConstraintUpdateManager;
@@ -55,6 +55,7 @@ import org.apache.openjpa.lib.jdbc.DecoratingDataSource;
 import org.apache.openjpa.lib.jdbc.JDBCListener;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.MetaDataFactory;
 import org.apache.openjpa.util.UserException;
 
@@ -384,164 +385,204 @@ public class JDBCConfigurationImpl
             fromProperties(conf.toProperties(false));
     }
 
+    @Override
     public void setSchema(String schema) {
         this.schema.setString(schema);
     }
 
+    @Override
     public String getSchema() {
         return schema.getString();
     }
 
+    @Override
     public void setSchemas(String schemas) {
         this.schemas.setString(schemas);
     }
 
+    @Override
     public String getSchemas() {
         return schemas.getString();
     }
 
+    @Override
     public void setSchemas(String[] schemas) {
         this.schemas.set(schemas);
     }
 
+    @Override
     public String[] getSchemasList() {
         return schemas.get();
     }
 
+    @Override
     public void setTransactionIsolation(String transactionIsolation) {
         this.transactionIsolation.setString(transactionIsolation);
     }
 
+    @Override
     public String getTransactionIsolation() {
         return transactionIsolation.getString();
     }
 
+    @Override
     public void setTransactionIsolation(int transactionIsolation) {
         this.transactionIsolation.set(transactionIsolation);
     }
 
+    @Override
     public int getTransactionIsolationConstant() {
         return transactionIsolation.get();
     }
 
+    @Override
     public void setResultSetType(String resultSetType) {
         this.resultSetType.setString(resultSetType);
     }
 
+    @Override
     public String getResultSetType() {
         return resultSetType.getString();
     }
 
+    @Override
     public void setResultSetType(int resultSetType) {
         this.resultSetType.set(resultSetType);
     }
 
+    @Override
     public int getResultSetTypeConstant() {
         return resultSetType.get();
     }
 
+    @Override
     public void setFetchDirection(String fetchDirection) {
         this.fetchDirection.setString(fetchDirection);
     }
 
+    @Override
     public String getFetchDirection() {
         return fetchDirection.getString();
     }
 
+    @Override
     public void setFetchDirection(int fetchDirection) {
         this.fetchDirection.set(fetchDirection);
     }
 
+    @Override
     public int getFetchDirectionConstant() {
         return fetchDirection.get();
     }
 
+    @Override
     public void setEagerFetchMode(String eagerFetchMode) {
         this.eagerFetchMode.setString(eagerFetchMode);
     }
 
+    @Override
     public String getEagerFetchMode() {
         return eagerFetchMode.getString();
     }
 
+    @Override
     public void setEagerFetchMode(int eagerFetchMode) {
         this.eagerFetchMode.set(eagerFetchMode);
     }
 
+    @Override
     public int getEagerFetchModeConstant() {
         return eagerFetchMode.get();
     }
 
+    @Override
     public void setSubclassFetchMode(String subclassFetchMode) {
         this.subclassFetchMode.setString(subclassFetchMode);
     }
 
+    @Override
     public String getSubclassFetchMode() {
         return subclassFetchMode.getString();
     }
 
+    @Override
     public void setSubclassFetchMode(int subclassFetchMode) {
         this.subclassFetchMode.set(subclassFetchMode);
     }
 
+    @Override
     public int getSubclassFetchModeConstant() {
         return subclassFetchMode.get();
     }
 
+    @Override
     public void setLRSSize(String lrsSize) {
         this.lrsSize.setString(lrsSize);
     }
 
+    @Override
     public String getLRSSize() {
         return lrsSize.getString();
     }
 
+    @Override
     public void setLRSSize(int lrsSize) {
         this.lrsSize.set(lrsSize);
     }
 
+    @Override
     public int getLRSSizeConstant() {
         return lrsSize.get();
     }
 
+    @Override
     public void setSynchronizeMappings(String synchronizeMappings) {
         this.synchronizeMappings.set(synchronizeMappings);
     }
 
+    @Override
     public String getSynchronizeMappings() {
         return synchronizeMappings.get();
     }
 
+    @Override
     public void setJDBCListeners(String jdbcListeners) {
         jdbcListenerPlugins.setString(jdbcListeners);
     }
 
+    @Override
     public String getJDBCListeners() {
         return jdbcListenerPlugins.getString();
     }
 
+    @Override
     public void setJDBCListeners(JDBCListener[] listeners) {
         jdbcListenerPlugins.set(listeners);
     }
 
+    @Override
     public JDBCListener[] getJDBCListenerInstances() {
         if (jdbcListenerPlugins.get() == null)
             jdbcListenerPlugins.instantiate(JDBCListener.class, this);
         return (JDBCListener[]) jdbcListenerPlugins.get();
     }
 
+    @Override
     public void setConnectionDecorators(String connectionDecorators) {
         connectionDecoratorPlugins.setString(connectionDecorators);
     }
 
+    @Override
     public String getConnectionDecorators() {
         return connectionDecoratorPlugins.getString();
     }
 
+    @Override
     public void setConnectionDecorators(ConnectionDecorator[] decorators) {
         connectionDecoratorPlugins.set(decorators);
     }
 
+    @Override
     public ConnectionDecorator[] getConnectionDecoratorInstances() {
         if (connectionDecoratorPlugins.get() == null) {
             connectionDecoratorPlugins.instantiate
@@ -550,14 +591,17 @@ public class JDBCConfigurationImpl
         return (ConnectionDecorator[]) connectionDecoratorPlugins.get();
     }
 
+    @Override
     public void setDBDictionary(String dbdictionary) {
         dbdictionaryPlugin.setString(dbdictionary);
     }
 
+    @Override
     public String getDBDictionary() {
         return dbdictionaryPlugin.getString();
     }
 
+    @Override
     public void setDBDictionary(DBDictionary dbdictionary) {
         // we can't allow the dictionary to be set after the connection
         // factory, due to initialization issues
@@ -568,6 +612,7 @@ public class JDBCConfigurationImpl
         dbdictionaryPlugin.set(dbdictionary);
     }
 
+    @Override
     public DBDictionary getDBDictionaryInstance() {
         // lock on connection factory name, since getting the connection
         // factory and getting the dictionary have to use the same locks to
@@ -610,112 +655,137 @@ public class JDBCConfigurationImpl
         return dbdictionary;
     }
 
+    @Override
     public void setUpdateManager(String updateManager) {
         updateManagerPlugin.setString(updateManager);
     }
 
+    @Override
     public String getUpdateManager() {
         return updateManagerPlugin.getString();
     }
 
+    @Override
     public void setUpdateManager(UpdateManager updateManager) {
         updateManagerPlugin.set(updateManager);
     }
 
+    @Override
     public UpdateManager getUpdateManagerInstance() {
         if (updateManagerPlugin.get() == null)
             updateManagerPlugin.instantiate(UpdateManager.class, this);
         return (UpdateManager) updateManagerPlugin.get();
     }
 
+    @Override
     public void setDriverDataSource(String driverDataSource) {
         driverDataSourcePlugin.setString(driverDataSource);
     }
 
+    @Override
     public String getDriverDataSource() {
         return driverDataSourcePlugin.getString();
     }
 
+    @Override
     public DriverDataSource newDriverDataSourceInstance() {
         return (DriverDataSource) driverDataSourcePlugin.
             instantiate(DriverDataSource.class, this);
     }
 
+    @Override
     public void setSchemaFactory(String schemaFactory) {
         schemaFactoryPlugin.setString(schemaFactory);
     }
 
+    @Override
     public String getSchemaFactory() {
         return schemaFactoryPlugin.getString();
     }
 
+    @Override
     public void setSchemaFactory(SchemaFactory schemaFactory) {
         schemaFactoryPlugin.set(schemaFactory);
     }
 
+    @Override
     public SchemaFactory getSchemaFactoryInstance() {
         if (schemaFactoryPlugin.get() == null)
             schemaFactoryPlugin.instantiate(SchemaFactory.class, this);
         return (SchemaFactory) schemaFactoryPlugin.get();
     }
 
+    @Override
     public void setSQLFactory(String sqlFactory) {
         sqlFactoryPlugin.setString(sqlFactory);
     }
 
+    @Override
     public String getSQLFactory() {
         return sqlFactoryPlugin.getString();
     }
 
+    @Override
     public void setSQLFactory(SQLFactory sqlFactory) {
         sqlFactoryPlugin.set(sqlFactory);
     }
 
+    @Override
     public SQLFactory getSQLFactoryInstance() {
         if (sqlFactoryPlugin.get() == null)
             sqlFactoryPlugin.instantiate(SQLFactory.class, this);
         return (SQLFactory) sqlFactoryPlugin.get();
     }
 
+    @Override
     public String getMappingFactory() {
         return mappingFactoryPlugin.getString();
     }
 
+    @Override
     public void setMappingFactory(String mapping) {
         mappingFactoryPlugin.setString(mapping);
     }
 
+    @Override
     public MetaDataFactory newMetaDataFactoryInstance() {
         return mappingFactoryPlugin.instantiateMetaDataFactory(this,
             metaFactoryPlugin, getMapping());
     }
 
+    @Override
     public void setMappingDefaults(String mapping) {
         this.mappingDefaultsPlugin.setString(mapping);
     }
 
+    @Override
     public String getMappingDefaults() {
         return mappingDefaultsPlugin.getString();
     }
 
+    @Override
     public void setMappingDefaults(MappingDefaults mapping) {
         mappingDefaultsPlugin.set(mapping);
     }
 
+    @Override
     public MappingDefaults getMappingDefaultsInstance() {
         if (mappingDefaultsPlugin.get() == null)
             mappingDefaultsPlugin.instantiate(MappingDefaults.class, this);
         return (MappingDefaults) mappingDefaultsPlugin.get();
     }
 
+    @Override
     public MappingRepository getMappingRepositoryInstance() {
         return (MappingRepository) getMetaDataRepositoryInstance();
     }
 
+    @Override
     public MappingRepository newMappingRepositoryInstance() {
         return (MappingRepository) newMetaDataRepositoryInstance();
     }
 
+    @Override
     public BrokerImpl newBrokerInstance(String user, String pass) {
         BrokerImpl broker = super.newBrokerInstance(user, pass);
 
@@ -727,6 +797,7 @@ public class JDBCConfigurationImpl
         return broker;
     }
 
+    @Override
     public Object getConnectionFactory() {
         // override to configure data source
         if (dataSource == null) {
@@ -737,6 +808,7 @@ public class JDBCConfigurationImpl
         return dataSource;
     }
 
+    @Override
     public void setConnectionFactory(Object factory) {
         // there's a lot of one-time initialization involved for
         // connection factories, so ignore resets
@@ -776,6 +848,7 @@ public class JDBCConfigurationImpl
         return dds;
     }
 
+    @Override
     public Object getConnectionFactory2() {
         // override to configure data source
         if (dataSource2 == null) {
@@ -812,6 +885,7 @@ public class JDBCConfigurationImpl
         return dataSource2;
     }
 
+    @Override
     public void setConnectionFactory2(Object factory) {
         if (factory == connectionFactory2.get())
             return;
@@ -856,6 +930,7 @@ public class JDBCConfigurationImpl
         return setupConnectionFactory(ds, false);
     }
 
+    @Override
     public DataSource getDataSource(StoreContext ctx) {
         Log log = getLog(LOG_RUNTIME);
         DataSource ds = null;
@@ -884,6 +959,7 @@ public class JDBCConfigurationImpl
         }
     }
 
+    @Override
     public DataSource getDataSource2(StoreContext ctx) {
         Log log = getLog(LOG_RUNTIME);
         DataSource ds = null;
@@ -965,6 +1041,7 @@ public class JDBCConfigurationImpl
     /**
      * Free the data sources.
      */
+    @Override
     protected void preClose() {
         if (dataSource != null) {
             getDBDictionaryInstance().closeDataSource(dataSource);
@@ -977,6 +1054,7 @@ public class JDBCConfigurationImpl
         super.preClose();
     }
 
+    @Override
     protected boolean isInvalidProperty(String propName) {
         if (super.isInvalidProperty(propName))
             return true;
@@ -990,16 +1068,19 @@ public class JDBCConfigurationImpl
         return false;
     }
 
+    @Override
     public String getIdentifierUtil() {
         return identifierUtilPlugin.getString();
     }
 
+    @Override
     public DBIdentifierUtil getIdentifierUtilInstance() {
         if (identifierUtilPlugin.get() == null)
             identifierUtilPlugin.instantiate(DBIdentifierUtil.class, this);
         return (DBIdentifierUtil) identifierUtilPlugin.get();
     }
 
+    @Override
     public void setIdentifierUtil(DBIdentifierUtil util) {
         identifierUtilPlugin.set(util);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCProductDerivation.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCProductDerivation.java
index 0a135fe78..6c0bc80a5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCProductDerivation.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCProductDerivation.java
@@ -40,14 +40,17 @@ public class JDBCProductDerivation extends AbstractProductDerivation
 
     public static final String PREFIX = "openjpa.jdbc";
 
+    @Override
     public void putBrokerFactoryAliases(Map<String,String> m) {
         m.put("jdbc", JDBCBrokerFactory.class.getName());
     }
 
+    @Override
     public int getType() {
         return TYPE_STORE;
     }
 
+    @Override
     public boolean beforeConfigurationConstruct(ConfigurationProvider cp) {
         // default to JDBC when no broker factory set
         if (BrokerFactoryValue.get(cp) == null) {
@@ -61,7 +64,7 @@ public class JDBCProductDerivation extends AbstractProductDerivation
      * Hint keys correspond to some (not all) bean-style mutable property name in JDBCFetchConfiguration.
      * The fully qualified key is prefixed with <code>openjpa.jdbc</code>.
      */
-    private static Set<String> _hints = new HashSet<String>();
+    private static Set<String> _hints = new HashSet<>();
     static {
         _hints.add(PREFIX + ".EagerFetchMode");
         _hints.add(PREFIX + ".FetchDirection");
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java
index e638b4dd5..07000f307 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingFactoryValue.java
@@ -18,7 +18,6 @@
  */
 package org.apache.openjpa.jdbc.conf;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.meta.MetaDataPlusMappingFactory;
 import org.apache.openjpa.lib.conf.Configuration;
@@ -26,6 +25,7 @@ import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.lib.conf.PluginValue;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.MetaDataFactory;
 
 /**
@@ -146,7 +146,7 @@ public class MappingFactoryValue
         Configurations.configureInstance(meta, conf, metaProps,
             (fatal) ? metaPlugin.getProperty() : null);
 
-        Log log = conf.getLog(JDBCConfiguration.LOG_METADATA);
+        Log log = conf.getLog(OpenJPAConfiguration.LOG_METADATA);
         if (log.isTraceEnabled()) {
             log.trace(_loc.get("meta-factory", meta));
             if (map != null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java
index e1dd327ec..67f2b7ded 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java
@@ -40,6 +40,7 @@ public class MappingRepositoryValue
         super(prop, true);
     }
 
+    @Override
     public Object newInstance(String clsName, Class type,
         Configuration conf, boolean fatal) {
         // since the MappingRepository takes a JDBConfiguration constructor,
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifier.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifier.java
index bdb83471e..b2688abf2 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifier.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifier.java
@@ -20,9 +20,9 @@ package org.apache.openjpa.jdbc.identifier;
 
 import java.io.Serializable;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.identifier.Identifier;
 import org.apache.openjpa.lib.identifier.IdentifierImpl;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Encapsulates a database identifier.  With a few exceptions, this class is
@@ -30,6 +30,9 @@ import org.apache.openjpa.lib.identifier.IdentifierImpl;
  */
 public class DBIdentifier extends IdentifierImpl implements Cloneable, Identifier, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Database identifier types.
      */
@@ -110,6 +113,7 @@ public class DBIdentifier extends IdentifierImpl implements Cloneable, Identifie
     /**
      * Set the name of the identifier.
      */
+    @Override
     public void setName(String name) {
         setName(name, false);
     }
@@ -315,6 +319,7 @@ public class DBIdentifier extends IdentifierImpl implements Cloneable, Identifie
     /**
      * Clones an identifier using deep copy.
      */
+    @Override
     public DBIdentifier clone() {
         DBIdentifier sName = new DBIdentifier();
         sName.setNameInternal(getNameInternal());
@@ -358,6 +363,7 @@ public class DBIdentifier extends IdentifierImpl implements Cloneable, Identifie
      * Equality operation for identifiers.  Supports comparison with strings
      * and objects of this type.
      */
+    @Override
     public boolean equals(Object obj) {
         if (obj == null) {
             return false;
@@ -384,6 +390,7 @@ public class DBIdentifier extends IdentifierImpl implements Cloneable, Identifie
     /**
      * Comparison operator for identifiers.
      */
+    @Override
     public int compareTo(Identifier o) {
         if (o instanceof DBIdentifier) {
             if (this == DBIdentifier.NULL && (o == null || o == DBIdentifier.NULL)) {
@@ -885,6 +892,7 @@ public class DBIdentifier extends IdentifierImpl implements Cloneable, Identifie
     /**
      * The length of the name, including delimiting characters.
      */
+    @Override
     public int length() {
         if (DBIdentifier.isNull(this)) {
             return 0;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtil.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtil.java
index 05ed8dfe7..7d8725cb0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtil.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtil.java
@@ -18,14 +18,13 @@
  */
 package org.apache.openjpa.jdbc.identifier;
 
+import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.NameSet;
 import org.apache.openjpa.jdbc.schema.Schema;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.lib.identifier.IdentifierUtil;
 
-import static org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
-
 /**
  * An interface for DB identifier utility-style operations.  This interface
  * extends the basic operations provided by IdentifierUtil with additional
@@ -34,10 +33,10 @@ import static org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 public interface DBIdentifierUtil extends IdentifierUtil {
 
     // Legacy values for naming operations
-    public static final int ANY = 0;
-    public static final int TABLE = 1;
-    public static final int SEQUENCE = 2;
-    public static final int COLUMN = 3;
+    int ANY = 0;
+    int TABLE = 1;
+    int SEQUENCE = 2;
+    int COLUMN = 3;
 
     /**
      * Shortens the given name to the given maximum length, then checks that
@@ -51,7 +50,7 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * Note: If the name is delimited, make sure the ending delimiter is
      * not stripped off.
      */
-    public DBIdentifier makeIdentifierValid(DBIdentifier sname, NameSet set, int maxLen,
+    DBIdentifier makeIdentifierValid(DBIdentifier sname, NameSet set, int maxLen,
         boolean checkForUniqueness);
 
     /**
@@ -66,7 +65,7 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * Note: If the name is delimited, make sure the ending delimiter is
      * not stripped off.
      */
-    public DBIdentifier makeNameValid(String name, NameSet set, int maxLen,
+    DBIdentifier makeNameValid(String name, NameSet set, int maxLen,
         int nameType, boolean checkForUniqueness);
 
     /**
@@ -77,7 +76,7 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * @param maxLen
      * @param checkForUniqueness
      */
-    public DBIdentifier getValidColumnIdentifier(DBIdentifier name, Table table, int maxLen,
+    DBIdentifier getValidColumnIdentifier(DBIdentifier name, Table table, int maxLen,
         boolean checkForUniqueness);
 
     /**
@@ -88,7 +87,7 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * @param maxLen
      * @param checkForUniqueness
      */
-    public DBIdentifier getValidIndexIdentifier(DBIdentifier name, Table table, int maxLen);
+    DBIdentifier getValidIndexIdentifier(DBIdentifier name, Table table, int maxLen);
 
     /**
      * Returns a valid index identifier, based upon the configuration and
@@ -98,7 +97,7 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * @param maxLen
      * @param checkForUniqueness
      */
-    public DBIdentifier getValidSequenceIdentifier(DBIdentifier name, Schema schema, int maxLen);
+    DBIdentifier getValidSequenceIdentifier(DBIdentifier name, Schema schema, int maxLen);
 
     /**
      * Returns a valid table identifier, based upon the configuration and provided
@@ -107,7 +106,7 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * @param schema
      * @param maxLen
      */
-    public DBIdentifier getValidTableIdentifier(DBIdentifier name, Schema schema, int maxLen);
+    DBIdentifier getValidTableIdentifier(DBIdentifier name, Schema schema, int maxLen);
 
     /**
      * Returns a valid unique constraint identifier, based upon the configuration and
@@ -116,7 +115,7 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * @param table
      * @param maxLen
      */
-    public DBIdentifier getValidUniqueIdentifier(DBIdentifier name, Table table, int maxLen);
+    DBIdentifier getValidUniqueIdentifier(DBIdentifier name, Table table, int maxLen);
 
     /**
      * Returns a valid foreign key identifier, based upon the configuration and
@@ -126,13 +125,13 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * @param toTable
      * @param maxLen
      */
-    public DBIdentifier getValidForeignKeyIdentifier(DBIdentifier name, Table table, Table toTable, int maxLen);
+    DBIdentifier getValidForeignKeyIdentifier(DBIdentifier name, Table table, Table toTable, int maxLen);
 
     /**
      * Converts the specified identifier to a format required by the database.
      * @param name
      */
-    public String toDBName(DBIdentifier name);
+    String toDBName(DBIdentifier name);
 
     /**
      * Converts the specified identifier to a format required by the database,
@@ -140,58 +139,58 @@ public interface DBIdentifierUtil extends IdentifierUtil {
      * @param name
      * @param delimit
      */
-    public String toDBName(DBIdentifier name, boolean delimit);
+    String toDBName(DBIdentifier name, boolean delimit);
 
     /**
      * Converts the specified string to a format required by the database.
      * @param name
      */
-    public String toDBName(String name);
+    String toDBName(String name);
 
     /**
      * Converts the specified string to a format required by the database,
      * optionally delimiting the name.
      * @param name
      */
-    public String toDBName(String name, boolean delimit);
+    String toDBName(String name, boolean delimit);
 
     /**
      * Converts the name returned by the database to an identifier of the
      * specified type.
      * @param name
      */
-    public DBIdentifier fromDBName(String name, DBIdentifierType id);
+    DBIdentifier fromDBName(String name, DBIdentifierType id);
 
     /**
      * Appends multiple columns names together into comma delimited string.
      * @param columns
      */
-    public String appendColumns(Column[] columns);
+    String appendColumns(Column[] columns);
 
     /**
      * Converts the name of the specified delimiter to the appropriate
      * case as defined by the configuration.
      * @param columns
      */
-    public DBIdentifier convertSchemaCase(DBIdentifier schema);
+    DBIdentifier convertSchemaCase(DBIdentifier schema);
 
     /**
      * Appends multiple names together using the appropriate name delimiter.
      * @param resultId
      * @param names
      */
-    public DBIdentifier append(DBIdentifierType resultId, DBIdentifier...names);
+    DBIdentifier append(DBIdentifierType resultId, DBIdentifier...names);
 
     /**
      * Returns a generated key sequence identifier for the column.
      * @param col
      * @param maxLen
      */
-    public DBIdentifier getGeneratedKeySequenceName(Column col, int maxLen);
+    DBIdentifier getGeneratedKeySequenceName(Column col, int maxLen);
 
     /**
      * Converts a provided alias to a format specified in the configuration.
      * @param alias
      */
-    public String convertAlias(String alias);
+    String convertAlias(String alias);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtilImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtilImpl.java
index c1d57ac3f..b84d58ffb 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtilImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DBIdentifierUtilImpl.java
@@ -18,7 +18,6 @@
  */
 package org.apache.openjpa.jdbc.identifier;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -33,6 +32,7 @@ import org.apache.openjpa.lib.identifier.IdentifierConfiguration;
 import org.apache.openjpa.lib.identifier.IdentifierRule;
 import org.apache.openjpa.lib.identifier.IdentifierUtil;
 import org.apache.openjpa.lib.identifier.IdentifierUtilImpl;
+import org.apache.openjpa.lib.util.StringUtil;
 
 public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdentifierUtil,
     Configurable {
@@ -46,6 +46,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
         super(config);
     }
 
+    @Override
     public DBIdentifier getValidColumnIdentifier(DBIdentifier name, Table table,
         int maxLen, boolean checkForUniqueness) {
         if (DBIdentifier.isNull(name)) {
@@ -58,6 +59,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
         return makeIdentifierValid(sName, table, maxLen, checkForUniqueness);
     }
 
+    @Override
     public DBIdentifier getValidForeignKeyIdentifier(DBIdentifier name, Table table, Table toTable, int maxLen) {
         if (DBIdentifier.isNull(name)) {
             return name;
@@ -71,6 +73,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
     }
 
 
+    @Override
     public DBIdentifier getValidUniqueIdentifier(DBIdentifier name, Table table, int maxLen) {
         if (DBIdentifier.isNull(name)) {
             return name;
@@ -83,6 +86,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
             maxLen, true);
     }
 
+    @Override
     public DBIdentifier getValidIndexIdentifier(DBIdentifier name, Table table, int maxLen) {
         if (DBIdentifier.isNull(name)) {
             return name;
@@ -95,6 +99,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
             maxLen, true);
     }
 
+    @Override
     public DBIdentifier getValidSequenceIdentifier(DBIdentifier name, Schema schema, int maxLen) {
         if (DBIdentifier.isNull(name)) {
             return name;
@@ -106,6 +111,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
         return makeIdentifierValid(sName, schema.getSchemaGroup(), maxLen, true);
     }
 
+    @Override
     public DBIdentifier getValidTableIdentifier(DBIdentifier name, Schema schema, int maxLen) {
         if (DBIdentifier.isNull(name)) {
             return name;
@@ -119,6 +125,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
             maxLen, true);
     }
 
+    @Override
     public DBIdentifier makeNameValid(String name, NameSet set, int maxLen,
         int nameType, boolean checkForUniqueness) {
         DBIdentifierType id = DBIdentifierType.DEFAULT;
@@ -136,6 +143,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
         return makeIdentifierValid(DBIdentifier.newIdentifier(name, id), set, maxLen, checkForUniqueness);
     }
 
+    @Override
     public DBIdentifier makeIdentifierValid(DBIdentifier sname, NameSet set, int maxLen,
         boolean checkForUniqueness) {
         DBIdentifier validName = sname;
@@ -206,6 +214,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
      *  the appropriate delimiters and separators.
      *  @parm name a DBIdentifier
      */
+    @Override
     public String toDBName(DBIdentifier name) {
         return toDBName(name, true);
     }
@@ -217,6 +226,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
      *  @param delimit If true, allows the name to be delimited, if necessary.
      *  Otherwise, the identifier is not delimited.
      */
+    @Override
     public String toDBName(DBIdentifier name, boolean delimit) {
         if (DBIdentifier.isNull(name)) {
             return null;
@@ -237,6 +247,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
      * Converts the identifier to a format appropriate for the configuration.
      * Delimits if necessary
      */
+    @Override
     public String toDBName(String name) {
         return toDBName(name, true);
     }
@@ -246,6 +257,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
      * the default naming rule.
      * @param delimit If false, do not delimit.  Otherwise, delimit if necessary.
      */
+    @Override
     public String toDBName(String name, boolean delimit) {
         return toDBName(getIdentifierConfiguration().getDefaultIdentifierRule().getName(), name, delimit);
     }
@@ -270,6 +282,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
      * Creates a new identifier of a given type based upon the name returned
      * from the database.
      */
+    @Override
     public DBIdentifier fromDBName(String name, DBIdentifierType id) {
         if (name == null) {
             return DBIdentifier.NULL;
@@ -311,6 +324,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
             !delimCase.equals(CASE_PRESERVE));
     }
 
+    @Override
     public DBIdentifier append(DBIdentifierType resultId, DBIdentifier...names) {
         if (names == null || names.length == 0) {
             return DBIdentifier.NULL;
@@ -322,6 +336,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
         return sName;
     }
 
+    @Override
     public String appendColumns(Column[] columns) {
         if (columns == null || columns.length == 0) {
             return "";
@@ -369,6 +384,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
         return DBDictionary.shorten(name, targetLength);
     }
 
+    @Override
     public DBIdentifier getGeneratedKeySequenceName(Column col, int maxLen) {
         DBIdentifier tname = col.getTableIdentifier();
         DBIdentifier cname = col.getIdentifier();
@@ -387,6 +403,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
      * Convert the specified schema name to a name that the database will
      * be able to understand in metadata operations.
      */
+    @Override
     public DBIdentifier convertSchemaCase(DBIdentifier name) {
         if (DBIdentifier.isNull(name))
             return DBIdentifier.NULL;
@@ -419,6 +436,7 @@ public class DBIdentifierUtilImpl extends IdentifierUtilImpl implements DBIdenti
     /**
      * Converts a column alias to use the appropriate delimiters
      */
+    @Override
     public String convertAlias(String alias) {
         if (!needsConversion(getIdentifierConfiguration())) {
             return alias;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DefaultIdentifierConfiguration.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DefaultIdentifierConfiguration.java
index 720c36f89..f13c96fa5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DefaultIdentifierConfiguration.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/DefaultIdentifierConfiguration.java
@@ -28,58 +28,70 @@ import org.apache.openjpa.lib.identifier.IdentifierUtil;
 public class DefaultIdentifierConfiguration implements IdentifierConfiguration {
 
     private DBIdentifierRule normalizingRule = new DBIdentifierRule();
-    private Map<String, IdentifierRule> normalizingRules = new HashMap<String, IdentifierRule>();
+    private Map<String, IdentifierRule> normalizingRules = new HashMap<>();
     private final String conversionKey = getLeadingDelimiter() + getIdentifierDelimiter() + getTrailingDelimiter();
 
     public DefaultIdentifierConfiguration() {
         normalizingRules.put(IdentifierRule.DEFAULT_RULE, normalizingRule);
     }
 
+    @Override
     public boolean delimitAll() {
         return false;
     }
 
+    @Override
     public IdentifierRule getDefaultIdentifierRule() {
         return normalizingRule;
     }
 
+    @Override
     public String getDelimitedCase() {
         return IdentifierUtil.CASE_PRESERVE;
     }
 
+    @Override
     public String getSchemaCase() {
         return IdentifierUtil.CASE_PRESERVE;
     }
 
+    @Override
     public String getLeadingDelimiter() {
         return IdentifierUtil.DOUBLE_QUOTE;
     }
 
+    @Override
     public String getIdentifierDelimiter() {
         return IdentifierUtil.DOT;
     }
 
+    @Override
     public String getIdentifierConcatenator() {
         return IdentifierUtil.UNDERSCORE;
     }
 
+    @Override
     public <T> IdentifierRule getIdentifierRule(T t) {
         return normalizingRule;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public Map<String, IdentifierRule> getIdentifierRules() {
         return normalizingRules;
     }
 
+    @Override
     public String getTrailingDelimiter() {
         return IdentifierUtil.DOUBLE_QUOTE;
     }
 
+    @Override
     public boolean getSupportsDelimitedIdentifiers() {
         return true;
     }
 
+    @Override
     public String getConversionKey() {
         return conversionKey;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java
index 1f0adc20e..cce440d1e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java
@@ -20,10 +20,10 @@ package org.apache.openjpa.jdbc.identifier;
 
 import java.util.Objects;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.identifier.IdentifierConfiguration;
 import org.apache.openjpa.lib.identifier.IdentifierRule;
 import org.apache.openjpa.lib.identifier.IdentifierUtil;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Static utility class used for operating on string based identifiers.
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/QualifiedDBIdentifier.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/QualifiedDBIdentifier.java
index 1834059f0..deee7976d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/QualifiedDBIdentifier.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/QualifiedDBIdentifier.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.lib.identifier.Identifier;
  */
 public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, Cloneable, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private DBIdentifier _schemaName = DBIdentifier.NULL;  // The schema name
     // The table name if the object (column, constraint) is qualified by a table name
     private DBIdentifier _objectTableName = DBIdentifier.NULL;
@@ -102,7 +104,7 @@ public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, C
     public static DBIdentifier[] splitPath(DBIdentifier sName) {
         if (sName instanceof QualifiedDBIdentifier && sName.getType() != DBIdentifierType.SCHEMA) {
             QualifiedDBIdentifier path = (QualifiedDBIdentifier)sName;
-            List<DBIdentifier> names = new ArrayList<DBIdentifier>();
+            List<DBIdentifier> names = new ArrayList<>();
 
             if (!DBIdentifier.isNull(path.getSchemaName())) {
                 names.add(path.getSchemaName().clone());
@@ -181,6 +183,7 @@ public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, C
     /**
      * Equality operator.
      */
+    @Override
     public boolean equals(Object obj) {
         if (obj == null) {
             return false;
@@ -229,6 +232,7 @@ public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, C
     /**
      * Returns a fully qualified name as a string.
      */
+    @Override
     public String toString() {
         return getName();
     }
@@ -236,6 +240,7 @@ public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, C
     /**
      * Returns the fully qualified name as a string
      */
+    @Override
     public String getName() {
         // If no schema or object or table qualifier, return the base name
         if (DBIdentifier.isEmpty(_schemaName) && DBIdentifier.isEmpty(_objectTableName)) {
@@ -264,6 +269,7 @@ public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, C
      * Set the name of this qualified identifier.  Splits the string into
      * multiple components.  This method assumes the type does not change.
      */
+    @Override
     public void setName(String name) {
         // Split apart name into components
         DBIdentifier[] sNames = DBIdentifier.split(getType(), name);
@@ -282,6 +288,7 @@ public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, C
      * Returns the length of the qualified identifier, including delimiters
      * and name separators.
      */
+    @Override
     public int length() {
         String name = getName();
         if (name == null) {
@@ -293,6 +300,7 @@ public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, C
     /**
      * Compares this identifier with another identifier.
      */
+    @Override
     public int compareTo(Identifier o) {
         if (o instanceof DBIdentifier) {
             if (o == null || o == DBIdentifier.NULL)
@@ -338,6 +346,7 @@ public class QualifiedDBIdentifier extends DBIdentifier implements Identifier, C
     /**
      * Creates a clone of this identifier.
      */
+    @Override
     public QualifiedDBIdentifier clone() {
         QualifiedDBIdentifier sPath = new QualifiedDBIdentifier();
         sPath.setObjectTableName(getObjectTableName().clone());
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSavepointManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSavepointManager.java
index 05dc4648a..a08e1e616 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSavepointManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSavepointManager.java
@@ -46,14 +46,17 @@ public abstract class AbstractJDBCSavepointManager
 
     private boolean _restore = false;
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _restore = ((OpenJPAConfiguration) conf).getRestoreStateConstant()
             != RestoreState.RESTORE_NONE;
     }
 
+    @Override
     public void endConfiguration() {
     }
 
@@ -73,6 +76,7 @@ public abstract class AbstractJDBCSavepointManager
         _restore = restore;
     }
 
+    @Override
     public OpenJPASavepoint newSavepoint(String name, Broker broker) {
         // flush after creating savepoint b/c flush may add/change states
         OpenJPASavepoint save = new ConnectionSavepoint(broker, name, _restore);
@@ -80,6 +84,7 @@ public abstract class AbstractJDBCSavepointManager
         return save;
     }
 
+    @Override
     public boolean supportsIncrementalFlush() {
         return true;
     }
@@ -100,6 +105,8 @@ public abstract class AbstractJDBCSavepointManager
      */
     protected class ConnectionSavepoint extends OpenJPASavepoint {
 
+        
+        private static final long serialVersionUID = 1L;
         private Object _savepoint;
 
         public ConnectionSavepoint(Broker broker, String name, boolean copy) {
@@ -128,11 +135,13 @@ public abstract class AbstractJDBCSavepointManager
                 getInnermostDelegate()).getConnection();
         }
 
+        @Override
         public Collection rollback(Collection previous) {
             AbstractJDBCSavepointManager.this.rollbackDataStore(this);
             return super.rollback(previous);
         }
 
+        @Override
         public void save(Collection states) {
             AbstractJDBCSavepointManager.this.setDataStore(this);
             super.save(states);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
index 0be426547..ef364a409 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.jdbc.kernel;
 
 import java.sql.Connection;
 import java.sql.SQLException;
+
 import javax.sql.DataSource;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
@@ -27,6 +28,7 @@ import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.schema.SchemaGroup;
 import org.apache.openjpa.jdbc.sql.SQLExceptions;
 import org.apache.openjpa.kernel.StoreContext;
+import org.apache.openjpa.kernel.StoreManager;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.StoreException;
@@ -47,10 +49,12 @@ public abstract class AbstractJDBCSeq
     /**
      * Records the sequence type.
      */
+    @Override
     public void setType(int type) {
         this.type = type;
     }
 
+    @Override
     public Object next(StoreContext ctx, ClassMetaData meta) {
         JDBCStore store = getStore(ctx);
         try {
@@ -66,6 +70,7 @@ public abstract class AbstractJDBCSeq
         }
     }
 
+    @Override
     public Object current(StoreContext ctx, ClassMetaData meta) {
         JDBCStore store = getStore(ctx);
         try {
@@ -79,6 +84,7 @@ public abstract class AbstractJDBCSeq
         }
     }
 
+    @Override
     public void allocate(int additional, StoreContext ctx, ClassMetaData meta) {
         JDBCStore store = getStore(ctx);
         try {
@@ -95,12 +101,14 @@ public abstract class AbstractJDBCSeq
     /**
      * No-op.
      */
+    @Override
     public void addSchema(ClassMapping mapping, SchemaGroup group) {
     }
 
     /**
      * No-op.
      */
+    @Override
     public void close() {
     }
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
index 508b8a57c..244efde6a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
@@ -58,17 +58,21 @@ public abstract class AbstractUpdateManager
     protected JDBCConfiguration conf = null;
     protected DBDictionary dict = null;
 
+    @Override
     public void setConfiguration(Configuration conf) {
         this.conf = (JDBCConfiguration) conf;
         dict = this.conf.getDBDictionaryInstance();
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public Collection flush(Collection states, JDBCStore store) {
         Connection conn = store.getConnection();
         try {
@@ -249,7 +253,7 @@ public abstract class AbstractUpdateManager
     }
 
     private FieldMapping[] reorderFields(FieldMapping[] fields) {
-        List<FieldMapping> pkFmds = new ArrayList<FieldMapping>();
+        List<FieldMapping> pkFmds = new ArrayList<>();
         FieldMapping[] ret = new FieldMapping[fields.length];
         int j = 0;
         for (int i = 0; i < fields.length; i++) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java
index 569abad81..f3b76caf0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java
@@ -43,6 +43,7 @@ import org.apache.openjpa.util.OpenJPAException;
 
 public class BatchingConstraintUpdateManager extends ConstraintUpdateManager {
 
+    @Override
     protected PreparedStatementManager newPreparedStatementManager(
         JDBCStore store, Connection conn) {
         int batchLimit = dict.getBatchLimit();
@@ -54,6 +55,7 @@ public class BatchingConstraintUpdateManager extends ConstraintUpdateManager {
      * Override this method to flush any remaining batched row in the
      * PreparedStatementManager.
      */
+    @Override
     protected Collection flush(RowManager rowMgr,
         PreparedStatementManager psMgr, Collection exceps) {
         exceps = super.flush(rowMgr, psMgr, exceps);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java
index 3a5e50d48..6d93c18d9 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingOperationOrderUpdateManager.java
@@ -45,6 +45,7 @@ import org.apache.openjpa.util.OpenJPAException;
 public class BatchingOperationOrderUpdateManager extends
     OperationOrderUpdateManager {
 
+    @Override
     protected PreparedStatementManager newPreparedStatementManager(
         JDBCStore store, Connection conn) {
         int batchLimit = dict.getBatchLimit();
@@ -56,6 +57,7 @@ public class BatchingOperationOrderUpdateManager extends
      * Override this method to flush any remaining batched row in the
      * PreparedStatementManager.
      */
+    @Override
     protected Collection flush(RowManager rowMgr,
         PreparedStatementManager psMgr, Collection exceps) {
         exceps = super.flush(rowMgr, psMgr, exceps);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java
index 939170023..73f5440a8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.jdbc.kernel;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.Statement;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -51,7 +51,7 @@ public class BatchingPreparedStatementManagerImpl extends
             .forPackage(BatchingPreparedStatementManagerImpl.class);
 
     private String _batchedSql = null;
-    private List<RowImpl> _batchedRows = new ArrayList<RowImpl>();
+    private List<RowImpl> _batchedRows = new ArrayList<>();
     private int _batchLimit;
     private boolean _disableBatch = false;
 
@@ -69,6 +69,7 @@ public class BatchingPreparedStatementManagerImpl extends
     /**
      * Flush the given row immediately or deferred the flush in batch.
      */
+    @Override
     protected void flushAndUpdate(RowImpl row) throws SQLException {
         if (isBatchDisabled(row)) {
             // if there were some statements batched before, then
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java
index 638c3e216..2c9f584a3 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java
@@ -50,7 +50,7 @@ public class ClassTableJDBCSeq
     private static final Localizer _loc = Localizer.forPackage
         (ClassTableJDBCSeq.class);
 
-    private final Map<String, Status> _stats = new HashMap<String, Status>();
+    private final Map<String, Status> _stats = new HashMap<>();
     private boolean _ignore = false;
     private boolean _aliases = false;
 
@@ -78,6 +78,7 @@ public class ClassTableJDBCSeq
      * @deprecated Use {@link #setIgnoreUnmapped}. Retained for
      * backwards-compatibility for auto-configuration.
      */
+    @Deprecated
     public void setIgnoreVirtual(boolean ignore) {
         setIgnoreUnmapped(ignore);
     }
@@ -98,6 +99,7 @@ public class ClassTableJDBCSeq
         _aliases = aliases;
     }
 
+    @Override
     protected synchronized Status getStatus(ClassMapping mapping) {
         if (mapping == null)
             return null;
@@ -110,6 +112,7 @@ public class ClassTableJDBCSeq
         return stat;
     }
 
+    @Override
     protected Column addPrimaryKeyColumn(Table table) {
         DBDictionary dict = getConfiguration().getDBDictionaryInstance();
         Column pkColumn = table.addColumn(dict.getValidColumnName(
@@ -120,6 +123,7 @@ public class ClassTableJDBCSeq
         return pkColumn;
     }
 
+    @Override
     protected Object getPrimaryKey(ClassMapping mapping) {
         if (mapping == null)
             return null;
@@ -171,6 +175,7 @@ public class ClassTableJDBCSeq
         final String[] arguments = opts.setFromCmdLine(args);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws Exception {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
                 try {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java
index fbb2deca3..ee928d071 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java
@@ -57,19 +57,23 @@ public class ConstraintUpdateManager
     private static final Localizer _loc = Localizer.forPackage
         (ConstraintUpdateManager.class);
 
+    @Override
     public boolean orderDirty() {
         return true;
     }
 
+    @Override
     protected PreparedStatementManager newPreparedStatementManager
         (JDBCStore store, Connection conn) {
         return new PreparedStatementManagerImpl(store, conn);
     }
 
+    @Override
     protected RowManager newRowManager() {
         return new RowManagerImpl(false);
     }
 
+    @Override
     protected Collection flush(RowManager rowMgr,
         PreparedStatementManager psMgr, Collection exceps) {
         RowManagerImpl rmimpl = (RowManagerImpl) rowMgr;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/DelegatingJDBCFetchConfiguration.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/DelegatingJDBCFetchConfiguration.java
index 3b5ec0c42..8bf385abe 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/DelegatingJDBCFetchConfiguration.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/DelegatingJDBCFetchConfiguration.java
@@ -42,6 +42,9 @@ public class DelegatingJDBCFetchConfiguration
     extends DelegatingFetchConfiguration
     implements JDBCFetchConfiguration {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor; supply delegate.
      */
@@ -64,6 +67,7 @@ public class DelegatingJDBCFetchConfiguration
         return (JDBCFetchConfiguration) getDelegate();
     }
 
+    @Override
     public int getEagerFetchMode() {
         try {
             return getJDBCDelegate().getEagerFetchMode();
@@ -72,6 +76,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration setEagerFetchMode(int mode) {
         try {
             getJDBCDelegate().setEagerFetchMode(mode);
@@ -81,6 +86,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public int getSubclassFetchMode() {
         try {
             return getJDBCDelegate().getSubclassFetchMode();
@@ -89,6 +95,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public int getSubclassFetchMode(ClassMapping cls) {
         try {
             return getJDBCDelegate().getSubclassFetchMode(cls);
@@ -97,6 +104,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration setSubclassFetchMode(int mode) {
         try {
             getJDBCDelegate().setSubclassFetchMode(mode);
@@ -106,6 +114,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public int getResultSetType() {
         try {
             return getJDBCDelegate().getResultSetType();
@@ -114,6 +123,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration setResultSetType(int type) {
         try {
             getJDBCDelegate().setResultSetType(type);
@@ -123,6 +133,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public int getFetchDirection() {
         try {
             return getJDBCDelegate().getFetchDirection();
@@ -131,6 +142,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration setFetchDirection(int direction) {
         try {
             getJDBCDelegate().setFetchDirection(direction);
@@ -140,6 +152,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public int getLRSSize() {
         try {
             return getJDBCDelegate().getLRSSize();
@@ -148,6 +161,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration setLRSSize(int lrsSize) {
         try {
             getJDBCDelegate().setLRSSize(lrsSize);
@@ -157,6 +171,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public int getJoinSyntax() {
         try {
             return getJDBCDelegate().getJoinSyntax();
@@ -165,6 +180,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration setJoinSyntax(int syntax) {
         try {
             getJDBCDelegate().setJoinSyntax(syntax);
@@ -174,6 +190,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public Set getJoins() {
         try {
             return getJDBCDelegate().getJoins();
@@ -182,6 +199,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public boolean hasJoin(String field) {
         try {
             return getJDBCDelegate().hasJoin(field);
@@ -190,6 +208,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration addJoin(String field) {
         try {
             getJDBCDelegate().addJoin(field);
@@ -199,6 +218,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration addJoins(Collection fields) {
         try {
             getJDBCDelegate().addJoins(fields);
@@ -208,6 +228,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration removeJoin(String field) {
         try {
             getJDBCDelegate().removeJoin(field);
@@ -217,6 +238,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration removeJoins(Collection fields) {
         try {
             getJDBCDelegate().removeJoins(fields);
@@ -226,6 +248,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration clearJoins() {
         try {
             getJDBCDelegate().clearJoins();
@@ -235,6 +258,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public int getIsolation() {
         try {
             return getJDBCDelegate().getIsolation();
@@ -243,6 +267,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration setIsolation(int level) {
         try {
             getJDBCDelegate().setIsolation(level);
@@ -252,6 +277,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration traverseJDBC(FieldMetaData fm) {
         try {
             return getJDBCDelegate().traverseJDBC(fm);
@@ -260,6 +286,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public Set getFetchInnerJoins() {
         try {
             return getJDBCDelegate().getFetchInnerJoins();
@@ -268,6 +295,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public boolean hasFetchInnerJoin(String field) {
         try {
             return getJDBCDelegate().hasFetchInnerJoin(field);
@@ -276,6 +304,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration addFetchInnerJoin(String field) {
         try {
             getJDBCDelegate().addFetchInnerJoin(field);
@@ -285,6 +314,7 @@ public class DelegatingJDBCFetchConfiguration
         }
     }
 
+    @Override
     public JDBCFetchConfiguration addFetchInnerJoins(Collection fields) {
         try {
             getJDBCDelegate().addFetchInnerJoins(fields);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/EagerFetchModes.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/EagerFetchModes.java
index 7af22385f..c62f90272 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/EagerFetchModes.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/EagerFetchModes.java
@@ -29,17 +29,17 @@ public interface EagerFetchModes {
      * Constant indicating not to try to load subclass data and related
      * objects when querying for an object.
      */
-    public static final int EAGER_NONE = 0;
+    int EAGER_NONE = 0;
 
     /**
      * Constant indicating to load relations and subclass data if possible
      * without separate queries.
      */
-    public static final int EAGER_JOIN = 1;
+    int EAGER_JOIN = 1;
 
     /**
      * Constant indicating to load relations and subclass data if possible
      * using either joins or parallel queries.
      */
-    public static final int EAGER_PARALLEL = 2;
+    int EAGER_PARALLEL = 2;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java
index 2415ffd5e..2bb7f459e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java
@@ -28,7 +28,6 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.sql.Result;
 import org.apache.openjpa.jdbc.sql.SelectExecutor;
@@ -38,6 +37,7 @@ import org.apache.openjpa.kernel.FinderQuery;
 import org.apache.openjpa.kernel.QueryHints;
 import org.apache.openjpa.kernel.QueryStatistics;
 import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Implementation of FinderCache for JDBC.
@@ -61,9 +61,9 @@ public class FinderCacheImpl
     private boolean _enableStats = false;
 
     public FinderCacheImpl() {
-        _delegate = new HashMap<ClassMapping, FinderQuery<ClassMapping, SelectExecutor, Result>>();
-        _uncachables = new HashMap<String, String>();
-        _stats = new QueryStatistics.None<ClassMapping>();
+        _delegate = new HashMap<>();
+        _uncachables = new HashMap<>();
+        _stats = new QueryStatistics.None<>();
     }
 
     /**
@@ -71,10 +71,11 @@ public class FinderCacheImpl
      *
      * @return a map of the query string with class names as key.
      */
+    @Override
     public Map<String, String> getMapView() {
         lock();
         try {
-            Map<String, String> view = new TreeMap<String, String>();
+            Map<String, String> view = new TreeMap<>();
             for (ClassMapping mapping : _delegate.keySet()) {
                 view.put(mapping.getDescribedType().getName(),
                     _delegate.get(mapping).getQueryString());
@@ -88,6 +89,7 @@ public class FinderCacheImpl
     /**
      * Gets basic statistics of execution and hit count of finder queries.
      */
+    @Override
     public QueryStatistics<ClassMapping> getStatistics() {
         return _stats;
     }
@@ -102,6 +104,7 @@ public class FinderCacheImpl
      * null.
      *
      */
+    @Override
     public FinderQuery<ClassMapping,SelectExecutor,Result>
         get(ClassMapping mapping, FetchConfiguration fetch) {
         if (fetch.getReadLockLevel() != 0) {
@@ -142,6 +145,7 @@ public class FinderCacheImpl
      * @param select the finder query
      * @param fetch may contain hints to control cache operation
      */
+    @Override
     public FinderQuery<ClassMapping, SelectExecutor, Result> cache
        (ClassMapping mapping, SelectExecutor select, FetchConfiguration fetch) {
         lock();
@@ -187,6 +191,7 @@ public class FinderCacheImpl
     /**
      * Affirms if the given mapping is excluded from being cached.
      */
+    @Override
     public boolean isExcluded(ClassMapping mapping) {
         return mapping != null && isExcluded(mapping.getDescribedType().getName());
     }
@@ -205,11 +210,12 @@ public class FinderCacheImpl
      * Adds a pattern for exclusion. Any cached finder whose class name
      * matches the given pattern will be marked invalidated as a side-effect.
      */
+    @Override
     public void addExclusionPattern(String pattern) {
         lock();
         try {
             if (_exclusionPatterns == null)
-                _exclusionPatterns = new ArrayList<String>();
+                _exclusionPatterns = new ArrayList<>();
             _exclusionPatterns.add(pattern);
             Collection<ClassMapping> invalidMappings = getMatchedKeys(pattern,
                     _delegate.keySet());
@@ -224,6 +230,7 @@ public class FinderCacheImpl
      * cachable due to the given pattern will now be removed from the list of
      * uncachables as a side-effect.
      */
+    @Override
     public void removeExclusionPattern(String pattern) {
         lock();
         try {
@@ -255,7 +262,7 @@ public class FinderCacheImpl
      * Gets the elements of the given set that match the given pattern.
      */
     private Collection<ClassMapping> getMatchedKeys(String pattern, Set<ClassMapping> set) {
-        List<ClassMapping> result = new ArrayList<ClassMapping>();
+        List<ClassMapping> result = new ArrayList<>();
         for (ClassMapping entry : set) {
             if (matches(pattern, entry)) {
                 result.add(entry);
@@ -268,7 +275,7 @@ public class FinderCacheImpl
      * Gets the elements of the given list which match the given pattern.
      */
     private Collection<String> getMatchedKeys(String pattern, Collection<String> coll) {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         for (String key : coll) {
             if (matches(pattern, key)) {
                 result.add(key);
@@ -286,6 +293,7 @@ public class FinderCacheImpl
           || target.matches(pattern));
     }
 
+    @Override
     public boolean invalidate(ClassMapping mapping) {
         lock();
         try {
@@ -295,6 +303,7 @@ public class FinderCacheImpl
         }
     }
 
+    @Override
     public FinderQuery<ClassMapping, SelectExecutor, Result> markUncachable(ClassMapping mapping) {
         return markUncachable(mapping.getDescribedType().getName());
     }
@@ -342,7 +351,7 @@ public class FinderCacheImpl
             if (StringUtil.isEmpty(excludes))
                 return;
             if (_exclusionPatterns == null)
-                _exclusionPatterns = new ArrayList<String>();
+                _exclusionPatterns = new ArrayList<>();
             String[] patterns = excludes.split(PATTERN_SEPARATOR);
             for (String pattern : patterns)
                 addExclusionPattern(pattern);
@@ -351,6 +360,7 @@ public class FinderCacheImpl
         }
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public List<String> getExcludes() {
         return (List<String>)_exclusionPatterns == null
@@ -378,7 +388,7 @@ public class FinderCacheImpl
     public void setEnableStats(boolean b) {
         _enableStats = b;
         if (_enableStats) {
-            _stats = new QueryStatistics.Default<ClassMapping>();
+            _stats = new QueryStatistics.Default<>();
         }
     }
 
@@ -388,12 +398,15 @@ public class FinderCacheImpl
     // ----------------------------------------------------
     //  Configuration contract
     // ----------------------------------------------------
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
     }
 
+    @Override
     public void endConfiguration() {
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java
index f9e143df4..636567c0e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java
@@ -37,6 +37,7 @@ import org.apache.openjpa.kernel.FetchConfiguration;
 import org.apache.openjpa.kernel.FinderQuery;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StoreManager;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.util.ApplicationIds;
 import org.apache.openjpa.util.Id;
@@ -106,14 +107,17 @@ public class FinderQueryImpl
 
     }
 
+    @Override
     public ClassMapping getIdentifier() {
         return _mapping;
     }
 
+    @Override
     public SelectExecutor getDelegate() {
         return _select;
     }
 
+    @Override
     public String getQueryString() {
         return _sql;
     }
@@ -125,7 +129,7 @@ public class FinderQueryImpl
     private Object[] getPKValues(OpenJPAStateManager sm, JDBCStore store) {
         Object[] pks = null;
         Object oid = sm.getObjectId();
-        if (_mapping.getIdentityType() == ClassMapping.ID_APPLICATION)
+        if (_mapping.getIdentityType() == ClassMetaData.ID_APPLICATION)
             pks = ApplicationIds.toPKValues(oid, _mapping);
 
         Object[] val = new Object[_pkCols.length];
@@ -142,6 +146,7 @@ public class FinderQueryImpl
         return val;
     }
 
+    @Override
     public Result execute(OpenJPAStateManager sm, StoreManager store,
         FetchConfiguration fetch) {
         boolean forUpdate = false;
@@ -184,6 +189,7 @@ public class FinderQueryImpl
         return null;
     }
 
+    @Override
     public String toString() {
         return _mapping + ": [" + getQueryString() + "]";
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/GenericResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/GenericResultObjectProvider.java
index ce4f8f8cc..978769b7f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/GenericResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/GenericResultObjectProvider.java
@@ -75,6 +75,7 @@ public class GenericResultObjectProvider
         _res = res;
     }
 
+    @Override
     public boolean supportsRandomAccess() {
         try {
             return _res.supportsRandomAccess();
@@ -83,9 +84,11 @@ public class GenericResultObjectProvider
         }
     }
 
+    @Override
     public void open() {
     }
 
+    @Override
     public Object getResultObject()
         throws SQLException {
         // rather than use the standard result.load(), we go direct to
@@ -94,16 +97,19 @@ public class GenericResultObjectProvider
             StoreContext.EXCLUDE_ALL, _res);
     }
 
+    @Override
     public boolean next()
         throws SQLException {
         return _res.next();
     }
 
+    @Override
     public boolean absolute(int pos)
         throws SQLException {
         return _res.absolute(pos);
     }
 
+    @Override
     public int size()
         throws SQLException {
         if (_fetch.getLRSSize() == LRSSizes.SIZE_UNKNOWN
@@ -112,14 +118,17 @@ public class GenericResultObjectProvider
         return _res.size();
     }
 
+    @Override
     public void reset() {
         throw new UnsupportedException();
     }
 
+    @Override
     public void close() {
         _res.close();
     }
 
+    @Override
     public void handleCheckedException(Exception e) {
         if (e instanceof SQLException)
             throw SQLExceptions.getStore((SQLException) e, _store.getDBDictionary(), _fetch.getReadLockLevel());
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/InstanceResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/InstanceResultObjectProvider.java
index 820b2dfae..073bd36cf 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/InstanceResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/InstanceResultObjectProvider.java
@@ -50,6 +50,7 @@ public class InstanceResultObjectProvider
         _mapping = mapping;
     }
 
+    @Override
     public Object getResultObject()
         throws SQLException {
         Result res = getResult();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBC3SavepointManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBC3SavepointManager.java
index 803c70bcd..885eb0c06 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBC3SavepointManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBC3SavepointManager.java
@@ -22,6 +22,8 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Savepoint;
 
+import org.apache.openjpa.kernel.Broker;
+import org.apache.openjpa.kernel.SavepointManager;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.UserException;
 
@@ -42,6 +44,7 @@ public class JDBC3SavepointManager
     private static final Localizer _loc = Localizer.forPackage
         (JDBC3SavepointManager.class);
 
+    @Override
     protected void rollbackDataStore(ConnectionSavepoint savepoint) {
         try {
             Connection conn = savepoint.getConnection();
@@ -52,6 +55,7 @@ public class JDBC3SavepointManager
         }
     }
 
+    @Override
     protected void setDataStore(ConnectionSavepoint savepoint) {
         try {
             Connection conn = savepoint.getConnection();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java
index ff26d5591..1597c000b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java
@@ -18,25 +18,6 @@
  */
 package org.apache.openjpa.jdbc.kernel;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-
-import org.apache.openjpa.conf.SchemaGenerationSource;
-import org.apache.openjpa.lib.util.StringUtil;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
-import org.apache.openjpa.jdbc.meta.MappingRepository;
-import org.apache.openjpa.jdbc.meta.MappingTool;
-import org.apache.openjpa.kernel.AbstractBrokerFactory;
-import org.apache.openjpa.kernel.Bootstrap;
-import org.apache.openjpa.kernel.BrokerImpl;
-import org.apache.openjpa.kernel.StoreManager;
-import org.apache.openjpa.lib.conf.ConfigurationProvider;
-import org.apache.openjpa.lib.conf.Configurations;
-import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.util.UserException;
-
 import static org.apache.openjpa.conf.SchemaGenerationAction.CREATE;
 import static org.apache.openjpa.conf.SchemaGenerationAction.DROP;
 import static org.apache.openjpa.conf.SchemaGenerationAction.DROP_AND_CREATE;
@@ -50,15 +31,33 @@ import static org.apache.openjpa.jdbc.meta.MappingTool.ACTION_SCRIPT_CREATE;
 import static org.apache.openjpa.jdbc.meta.MappingTool.ACTION_SCRIPT_DROP;
 import static org.apache.openjpa.jdbc.meta.MappingTool.ACTION_SCRIPT_LOAD;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.openjpa.conf.SchemaGenerationSource;
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
+import org.apache.openjpa.jdbc.meta.MappingRepository;
+import org.apache.openjpa.jdbc.meta.MappingTool;
+import org.apache.openjpa.kernel.AbstractBrokerFactory;
+import org.apache.openjpa.kernel.Bootstrap;
+import org.apache.openjpa.kernel.BrokerImpl;
+import org.apache.openjpa.kernel.StoreManager;
+import org.apache.openjpa.lib.conf.ConfigurationProvider;
+import org.apache.openjpa.lib.conf.Configurations;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.util.UserException;
+
 /**
  * BrokerFactory type for use with the JDBC runtime.
  *
  * @author Abe White
  * @author Marc Prud'hommeaux
  */
-@SuppressWarnings("serial")
-public class JDBCBrokerFactory
-    extends AbstractBrokerFactory {
+public class JDBCBrokerFactory extends AbstractBrokerFactory {
+    private static final long serialVersionUID = 1L;
 
     private static final Localizer _loc = Localizer.forPackage
         (JDBCBrokerFactory.class);
@@ -100,6 +99,7 @@ public class JDBCBrokerFactory
         super(conf);
     }
 
+    @Override
     public Map<String,Object> getProperties() {
         // add platform property
         Map<String,Object> props = super.getProperties();
@@ -119,10 +119,12 @@ public class JDBCBrokerFactory
         super.postCreationCallback();
     }
 
+    @Override
     protected StoreManager newStoreManager() {
         return new JDBCStoreManager();
     }
 
+    @Override
     protected BrokerImpl newBrokerImpl(String user, String pass) {
         BrokerImpl broker = super.newBrokerImpl(user, pass);
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfiguration.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfiguration.java
index b7b27af5c..532d8178a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfiguration.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfiguration.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.jdbc.kernel;
 
-import java.sql.ResultSet;
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Set;
 
@@ -41,76 +41,76 @@ public interface JDBCFetchConfiguration
      * Return the eager fetch mode. Defaults to the
      * <code>openjpa.jdbc.EagerFetchMode</code> setting.
      */
-    public int getEagerFetchMode();
+    int getEagerFetchMode();
 
     /**
      * Set the eager fetch mode. Defaults to the
      * <code>openjpa.jdbc.EagerFetchMode</code> setting.
      */
-    public JDBCFetchConfiguration setEagerFetchMode(int mode);
+    JDBCFetchConfiguration setEagerFetchMode(int mode);
 
     /**
      * Return the subclass fetch mode. Defaults to the
      * <code>openjpa.jdbc.SubclassFetchMode</code> setting.
      */
-    public int getSubclassFetchMode();
+    int getSubclassFetchMode();
 
     /**
      * Return the effective subclass fetch mode for the given type.
      */
-    public int getSubclassFetchMode(ClassMapping cls);
+    int getSubclassFetchMode(ClassMapping cls);
 
     /**
      * Set the subclass fetch mode. Defaults to the
      * <code>openjpa.jdbc.SubclassFetchMode</code> setting.
      */
-    public JDBCFetchConfiguration setSubclassFetchMode(int mode);
+    JDBCFetchConfiguration setSubclassFetchMode(int mode);
 
     /**
      * The result set type to use as a constant from {@link ResultSet}.
      * Defaults to the <code>openjpa.jdbc.ResultSetType</code> setting.
      */
-    public int getResultSetType();
+    int getResultSetType();
 
     /**
      * The result set type to use as a constant from {@link ResultSet}.
      * Defaults to the <code>openjpa.jdbc.ResultSetType</code> setting.
      */
-    public JDBCFetchConfiguration setResultSetType(int type);
+    JDBCFetchConfiguration setResultSetType(int type);
 
     /**
      * The fetch direction to use as a constant from {@link ResultSet}.
      * Defaults to the <code>openjpa.jdbc.FetchDirection</code> setting.
      */
-    public int getFetchDirection();
+    int getFetchDirection();
 
     /**
      * The fetch direction to use as a constant from {@link ResultSet}.
      * Defaults to the <code>openjpa.jdbc.FetchDirection</code> setting.
      */
-    public JDBCFetchConfiguration setFetchDirection(int direction);
+    JDBCFetchConfiguration setFetchDirection(int direction);
 
     /**
      * The large result set size mode to use.
      * Defaults to the <code>openjpa.jdbc.LRSSize</code> setting.
      */
-    public int getLRSSize();
+    int getLRSSize();
 
     /**
      * The large result set size mode to use.
      * Defaults to the <code>openjpa.jdbc.LRSSize</code> setting.
      */
-    public JDBCFetchConfiguration setLRSSize(int lrsSize);
+    JDBCFetchConfiguration setLRSSize(int lrsSize);
 
     /**
      * The join syntax to use.
      */
-    public int getJoinSyntax();
+    int getJoinSyntax();
 
     /**
      * The join syntax to use.
      */
-    public JDBCFetchConfiguration setJoinSyntax(int syntax);
+    JDBCFetchConfiguration setJoinSyntax(int syntax);
 
     /**
      * Returns the names of the joins that this component will use
@@ -119,14 +119,14 @@ public interface JDBCFetchConfiguration
      *
      * @since 0.4.0.0
      */
-    public Set<String> getJoins();
+    Set<String> getJoins();
 
     /**
      * Return true if the given fully-qualified join has been added.
      *
      * @since 0.4.0.0
      */
-    public boolean hasJoin(String field);
+    boolean hasJoin(String field);
 
     /**
      * Adds <code>field</code> to the set of fully-qualified field names to
@@ -135,7 +135,7 @@ public interface JDBCFetchConfiguration
      *
      * @since 0.4.0.0
      */
-    public JDBCFetchConfiguration addJoin(String field);
+    JDBCFetchConfiguration addJoin(String field);
 
     /**
      * Adds <code>fields</code> to the set of fully-qualified field names to
@@ -144,7 +144,7 @@ public interface JDBCFetchConfiguration
      *
      * @since 0.4.0.0
      */
-    public JDBCFetchConfiguration addJoins(Collection<String> fields);
+    JDBCFetchConfiguration addJoins(Collection<String> fields);
 
     /**
      * Removes <code>field</code> to the set of fully-qualified field names to
@@ -152,7 +152,7 @@ public interface JDBCFetchConfiguration
      *
      * @since 0.4.0.0
      */
-    public JDBCFetchConfiguration removeJoin(String field);
+    JDBCFetchConfiguration removeJoin(String field);
 
     /**
      * Removes <code>fields</code> from the set of fully-qualified
@@ -160,14 +160,14 @@ public interface JDBCFetchConfiguration
      *
      * @since 0.4.0.0
      */
-    public JDBCFetchConfiguration removeJoins(Collection<String> fields);
+    JDBCFetchConfiguration removeJoins(Collection<String> fields);
 
     /**
      * Clears the set of field names to join when loading data.
      *
      * @since 0.4.0.0
      */
-    public JDBCFetchConfiguration clearJoins();
+    JDBCFetchConfiguration clearJoins();
 
     /**
      * <p>The isolation level for queries issued to the database. This overrides
@@ -184,7 +184,7 @@ public interface JDBCFetchConfiguration
      *
      * @since 0.9.7
      */
-    public int getIsolation();
+    int getIsolation();
 
     /**
      * <p>The isolation level for queries issued to the database. This overrides
@@ -201,12 +201,12 @@ public interface JDBCFetchConfiguration
      *
      * @since 0.9.7
      */
-    public JDBCFetchConfiguration setIsolation(int level);
+    JDBCFetchConfiguration setIsolation(int level);
 
     /**
      * Convenience method to cast traversal to store-specific type.
      */
-    public JDBCFetchConfiguration traverseJDBC(FieldMetaData fm);
+    JDBCFetchConfiguration traverseJDBC(FieldMetaData fm);
 
     /**
      * Returns the names of the inner fetch joins that this component will use
@@ -215,14 +215,14 @@ public interface JDBCFetchConfiguration
      *
      * @since 1.0.3
      */
-    public Set<String> getFetchInnerJoins();
+    Set<String> getFetchInnerJoins();
 
     /**
      * Return true if the given fully-qualified inner fetch join has been added.
      *
      * @since 1.0.3
      */
-    public boolean hasFetchInnerJoin(String field);
+    boolean hasFetchInnerJoin(String field);
 
     /**
      * Adds <code>field</code> to the set of fully-qualified field names to
@@ -231,7 +231,7 @@ public interface JDBCFetchConfiguration
      *
      * @since 1.0.3
      */
-    public JDBCFetchConfiguration addFetchInnerJoin(String field);
+    JDBCFetchConfiguration addFetchInnerJoin(String field);
 
     /**
      * Adds <code>fields</code> to the set of fully-qualified field names to
@@ -240,7 +240,7 @@ public interface JDBCFetchConfiguration
      *
      * @since 1.0.3
      */
-    public JDBCFetchConfiguration addFetchInnerJoins(Collection<String> fields);
+    JDBCFetchConfiguration addFetchInnerJoins(Collection<String> fields);
 
     /**
      * Affirms if foreign key for a relation field will be pre-fetched as part of the owning object irrespective of
@@ -250,7 +250,7 @@ public interface JDBCFetchConfiguration
      *
      * @since 2.2.0
      */
-    public boolean getIgnoreDfgForFkSelect();
+    boolean getIgnoreDfgForFkSelect();
 
     /**
      * Affirms if foreign key for a relation field will be pre-fetched as part of the owning object irrespective of
@@ -260,5 +260,5 @@ public interface JDBCFetchConfiguration
      *
      * @since 2.2.0
      */
-    public void setIgnoreDfgForFkSelect(boolean b);
+    void setIgnoreDfgForFkSelect(boolean b);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java
index eec6a3c06..6b6a43755 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCFetchConfigurationImpl.java
@@ -27,7 +27,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -43,6 +42,7 @@ import org.apache.openjpa.lib.rop.SimpleResultList;
 import org.apache.openjpa.lib.rop.SoftRandomAccessResultList;
 import org.apache.openjpa.lib.rop.WindowResultList;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.util.UserException;
 
@@ -51,11 +51,11 @@ import org.apache.openjpa.util.UserException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class JDBCFetchConfigurationImpl
     extends FetchConfigurationImpl
     implements JDBCFetchConfiguration {
 
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage(JDBCFetchConfigurationImpl.class);
 
     /**
@@ -82,6 +82,8 @@ public class JDBCFetchConfigurationImpl
      * Configurable JDBC state shared throughout a traversal chain.
      */
     protected static class JDBCConfigurationState implements Serializable {
+        
+        private static final long serialVersionUID = 1L;
         public int eagerMode = 0;
         public int subclassMode = 0;
         public int type = 0;
@@ -106,11 +108,13 @@ public class JDBCFetchConfigurationImpl
         _state = (jstate == null) ? new JDBCConfigurationState() : jstate;
     }
 
+    @Override
     protected FetchConfigurationImpl newInstance(ConfigurationState state) {
         JDBCConfigurationState jstate = (state == null) ? null : _state;
         return new JDBCFetchConfigurationImpl(state, jstate);
     }
 
+    @Override
     public void setContext(StoreContext ctx) {
         super.setContext(ctx);
         JDBCConfiguration conf = getJDBCConfiguration();
@@ -125,6 +129,7 @@ public class JDBCFetchConfigurationImpl
         setJoinSyntax(conf.getDBDictionaryInstance().joinSyntax);
     }
 
+    @Override
     public void copy(FetchConfiguration fetch) {
         super.copy(fetch);
         JDBCFetchConfiguration jf = (JDBCFetchConfiguration) fetch;
@@ -148,10 +153,12 @@ public class JDBCFetchConfigurationImpl
         _state.ignoreDfgForFkSelect = b;
     }
 
+    @Override
     public int getEagerFetchMode() {
         return _state.eagerMode;
     }
 
+    @Override
     public JDBCFetchConfiguration setEagerFetchMode(int mode) {
         if (mode != DEFAULT
             && mode != EagerFetchModes.EAGER_NONE
@@ -169,10 +176,12 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getSubclassFetchMode() {
         return _state.subclassMode;
     }
 
+    @Override
     public int getSubclassFetchMode(ClassMapping cls) {
         if (cls == null)
             return _state.subclassMode;
@@ -182,6 +191,7 @@ public class JDBCFetchConfigurationImpl
         return Math.min(mode, _state.subclassMode);
     }
 
+    @Override
     public JDBCFetchConfiguration setSubclassFetchMode(int mode) {
         if (mode != DEFAULT
             && mode != EagerFetchModes.EAGER_NONE
@@ -199,10 +209,12 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getResultSetType() {
         return _state.type;
     }
 
+    @Override
     public JDBCFetchConfiguration setResultSetType(int type) {
         if (type != DEFAULT
             && type != ResultSet.TYPE_FORWARD_ONLY
@@ -219,10 +231,12 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getFetchDirection() {
         return _state.direction;
     }
 
+    @Override
     public JDBCFetchConfiguration setFetchDirection(int direction) {
         if (direction != DEFAULT
             && direction != ResultSet.FETCH_FORWARD
@@ -240,10 +254,12 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getLRSSize() {
         return _state.size;
     }
 
+    @Override
     public JDBCFetchConfiguration setLRSSize(int size) {
         if (size != DEFAULT
             && size != LRSSizes.SIZE_QUERY
@@ -260,10 +276,12 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getJoinSyntax() {
         return _state.syntax;
     }
 
+    @Override
     public JDBCFetchConfiguration setJoinSyntax(int syntax) {
         if (syntax != DEFAULT
             && syntax != JoinSyntaxes.SYNTAX_SQL92
@@ -280,6 +298,7 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public ResultList<?> newResultList(ResultObjectProvider rop) {
         // if built around a list, just use a simple wrapper
         if (rop instanceof ListResultObjectProvider)
@@ -312,16 +331,19 @@ public class JDBCFetchConfigurationImpl
         return new SimpleResultList(rop);
     }
 
+    @Override
     public Set<String> getJoins() {
         if (_state.joins == null)
             return Collections.emptySet();
         return _state.joins;
     }
 
+    @Override
     public boolean hasJoin(String field) {
         return _state.joins != null && _state.joins.contains(field);
     }
 
+    @Override
     public JDBCFetchConfiguration addJoin(String join) {
         if (StringUtil.isEmpty(join))
             throw new UserException(_loc.get("null-join"));
@@ -329,7 +351,7 @@ public class JDBCFetchConfigurationImpl
         lock();
         try {
             if (_state.joins == null)
-                _state.joins = new HashSet<String>();
+                _state.joins = new HashSet<>();
             _state.joins.add(join);
         } finally {
             unlock();
@@ -337,6 +359,7 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public JDBCFetchConfiguration addJoins(Collection<String> joins) {
         if (joins == null || joins.isEmpty())
             return this;
@@ -345,6 +368,7 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public JDBCFetchConfiguration removeJoin(String field) {
         lock();
         try {
@@ -356,6 +380,7 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public JDBCFetchConfiguration removeJoins(Collection<String> joins) {
         lock();
         try {
@@ -367,6 +392,7 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public JDBCFetchConfiguration clearJoins() {
         lock();
         try {
@@ -378,10 +404,12 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getIsolation() {
         return _state.isolationLevel;
     }
 
+    @Override
     public JDBCFetchConfiguration setIsolation(int level) {
         if (level != -1 && level != DEFAULT
             && level != Connection.TRANSACTION_NONE
@@ -398,6 +426,7 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public JDBCFetchConfiguration traverseJDBC(FieldMetaData fm) {
         return (JDBCFetchConfiguration) traverse(fm);
     }
@@ -417,17 +446,20 @@ public class JDBCFetchConfigurationImpl
         return (JDBCConfiguration) conf;
     }
 
+    @Override
     public Set<String> getFetchInnerJoins() {
         if (_state.fetchInnerJoins == null)
             return Collections.emptySet();
         return _state.fetchInnerJoins;
     }
 
+    @Override
     public boolean hasFetchInnerJoin(String field) {
         return _state.fetchInnerJoins != null &&
             _state.fetchInnerJoins.contains(field);
     }
 
+    @Override
     public JDBCFetchConfiguration addFetchInnerJoin(String join) {
         if (StringUtil.isEmpty(join))
             throw new UserException(_loc.get("null-join"));
@@ -435,7 +467,7 @@ public class JDBCFetchConfigurationImpl
         lock();
         try {
             if (_state.fetchInnerJoins == null)
-                _state.fetchInnerJoins = new HashSet<String>();
+                _state.fetchInnerJoins = new HashSet<>();
             _state.fetchInnerJoins.add(join);
         } finally {
             unlock();
@@ -443,11 +475,12 @@ public class JDBCFetchConfigurationImpl
         return this;
     }
 
+    @Override
     public JDBCFetchConfiguration addFetchInnerJoins(Collection<String> joins) {
         if (joins == null || joins.isEmpty())
             return this;
         for (Iterator<String> itr = joins.iterator(); itr.hasNext();)
-            addFetchInnerJoin((String) itr.next());
+            addFetchInnerJoin(itr.next());
         return this;
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCLockManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCLockManager.java
index 4ff301c35..7ced295c6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCLockManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCLockManager.java
@@ -39,16 +39,16 @@ public interface JDBCLockManager
      * Return whether to issue the given select FOR UPDATE, depending on
      * the capabilities of the dictionary and the fetch configuration.
      */
-    public boolean selectForUpdate(Select sel, int lockLevel);
+    boolean selectForUpdate(Select sel, int lockLevel);
 
     /**
      * Notification that the given instance was loaded via a result set
      * produced by a FOR UPDATE select.
      */
-    public void loadedForUpdate(OpenJPAStateManager sm);
+    void loadedForUpdate(OpenJPAStateManager sm);
 
     /**
      * Return true if locking is not desired for relation fields.
      */
-    public boolean skipRelationFieldLock();
+    boolean skipRelationFieldLock();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCSeq.java
index 904626ddb..d906bb664 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCSeq.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCSeq.java
@@ -37,5 +37,5 @@ public interface JDBCSeq
      * Add any tables, etc needed by this factory for the given mapping
      * to the given schema group, if they do not exist already.
      */
-    public void addSchema(ClassMapping mapping, SchemaGroup group);
+    void addSchema(ClassMapping mapping, SchemaGroup group);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStore.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStore.java
index cd6bdab41..309dafe33 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStore.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStore.java
@@ -39,27 +39,27 @@ public interface JDBCStore {
     /**
      * Current persistence context.
      */
-    public StoreContext getContext();
+    StoreContext getContext();
 
     /**
      * Return the configuration for this runtime.
      */
-    public JDBCConfiguration getConfiguration();
+    JDBCConfiguration getConfiguration();
 
     /**
      * Return the dictionary in use.
      */
-    public DBDictionary getDBDictionary();
+    DBDictionary getDBDictionary();
 
     /**
      * Return the SQL factory for this runtime.
      */
-    public SQLFactory getSQLFactory();
+    SQLFactory getSQLFactory();
 
     /**
      * If the lock manager in use is a {@link JDBCLockManager}, return it.
      */
-    public JDBCLockManager getLockManager();
+    JDBCLockManager getLockManager();
 
     /**
      * Return a SQL connection to the database.
@@ -67,7 +67,7 @@ public interface JDBCStore {
      * to free any resources it is using. When appropriate, the close
      * method is implemented as a no-op.
      */
-    public Connection getConnection();
+    Connection getConnection();
 
     /**
      * Return a new SQL connection to the database.
@@ -77,18 +77,18 @@ public interface JDBCStore {
      * to free any resources it is using. When appropriate, the close
      * method is implemented as a no-op.
      */
-    public Connection getNewConnection();
+    Connection getNewConnection();
 
     /**
      * Return the current default fetch configuration.
      */
-    public JDBCFetchConfiguration getFetchConfiguration();
+    JDBCFetchConfiguration getFetchConfiguration();
 
     /**
      * Create a new datastore identity object from the given id value and
      * mapping.
      */
-    public Id newDataStoreId(long id, ClassMapping mapping, boolean subs);
+    Id newDataStoreId(long id, ClassMapping mapping, boolean subs);
 
     /**
      * Find the object with the given oid. Convenience method on top of
@@ -96,12 +96,12 @@ public interface JDBCStore {
      *
      * @param vm the mapping holding this oid, or null if not applicable
      */
-    public Object find(Object oid, ValueMapping vm,
+    Object find(Object oid, ValueMapping vm,
         JDBCFetchConfiguration fetch);
 
     /**
      * Makes sure all subclasses of the given type are loaded in the JVM.
      * This is usually done automatically.
      */
-    public void loadSubclasses(ClassMapping mapping);
+    void loadSubclasses(ClassMapping mapping);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
index 0f3d6f026..2ebd6b62a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
@@ -109,13 +109,15 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
     private List<Statement> _stmnts = Collections.synchronizedList(new ArrayList<Statement>());
 
     // pool statements so that we can try to reuse rather than recreate
-    private List<CancelPreparedStatement> _cancelPreparedStatementsPool = new ArrayList<CancelPreparedStatement>();
-    private List<CancelStatement> _cancelStatementPool = new ArrayList<CancelStatement>();
+    private List<CancelPreparedStatement> _cancelPreparedStatementsPool = new ArrayList<>();
+    private List<CancelStatement> _cancelStatementPool = new ArrayList<>();
 
+    @Override
     public StoreContext getContext() {
         return _ctx;
     }
 
+    @Override
     public void setContext(StoreContext ctx) {
         setContext(ctx, (JDBCConfiguration) ctx.getConfiguration());
     }
@@ -153,32 +155,40 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return ds;
     }
 
+    @Override
     public JDBCConfiguration getConfiguration() {
         return _conf;
     }
 
+    @Override
     public DBDictionary getDBDictionary() {
         return _dict;
     }
 
+    @Override
     public SQLFactory getSQLFactory() {
         return _sql;
     }
 
+    @Override
     public JDBCLockManager getLockManager() {
         return _lm;
     }
 
+    @Override
     public JDBCFetchConfiguration getFetchConfiguration() {
         return (JDBCFetchConfiguration) _ctx.getFetchConfiguration();
     }
 
+    @Override
     public void beginOptimistic() {
     }
 
+    @Override
     public void rollbackOptimistic() {
     }
 
+    @Override
     public void begin() {
         _active = true;
         try {
@@ -191,6 +201,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         }
     }
 
+    @Override
     public void commit() {
         try {
             if (!_ctx.isManaged() || !_conf.isConnectionFactoryModeManaged())
@@ -206,6 +217,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         }
     }
 
+    @Override
     public void rollback() {
         // already rolled back ourselves?
         if (!_active)
@@ -223,20 +235,24 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         }
     }
 
+    @Override
     public void retainConnection() {
         connect(false);
         _conn.setRetain(true);
     }
 
+    @Override
     public void releaseConnection() {
         if (_conn != null)
             _conn.setRetain(false);
     }
 
+    @Override
     public Object getClientConnection() {
         return new ClientConnection(getConnection());
     }
 
+    @Override
     public Connection getConnection() {
         connect(true);
         return _conn;
@@ -246,6 +262,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return _ds;
     }
 
+    @Override
     public boolean exists(OpenJPAStateManager sm, Object context) {
         // add where conditions on base class to avoid joins if subclass
         // doesn't use oid as identifier
@@ -253,6 +270,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return exists(mapping, sm.getObjectId(), context);
     }
 
+    @Override
     public boolean isCached(List<Object> oids, BitSet edata) {
         // JDBCStoreManager doesn't store oids in memory.
         return false;
@@ -276,6 +294,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         }
     }
 
+    @Override
     public boolean syncVersion(OpenJPAStateManager sm, Object context) {
         ClassMapping mapping = (ClassMapping) sm.getMetaData();
         try {
@@ -293,11 +312,13 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return -1;
     }
 
+    @Override
     public int compareVersion(OpenJPAStateManager state, Object v1, Object v2) {
         ClassMapping mapping = (ClassMapping) state.getMetaData();
         return mapping.getVersion().compareVersion(v1, v2);
     }
 
+    @Override
     public boolean initialize(OpenJPAStateManager sm, PCState state,
         FetchConfiguration fetch, Object context) {
         ConnectionInfo info = (ConnectionInfo) context;
@@ -538,7 +559,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             return fq.execute(sm, this, fetch);
         Select sel = _sql.newSelect();
         if (!select(sel, mapping, subs, sm, null, fetch,
-            JDBCFetchConfiguration.EAGER_JOIN, true, false))
+            EagerFetchModes.EAGER_JOIN, true, false))
             return null;
         sel.wherePrimaryKey(sm.getObjectId(), mapping, this);
         sel.setExpectedResultCount(1, false);
@@ -562,13 +583,14 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             return fq.execute(sm, this, fetch);
         final JDBCStoreManager store = this;
         final int eager = Math.min(fetch.getEagerFetchMode(),
-            JDBCFetchConfiguration.EAGER_JOIN);
+            EagerFetchModes.EAGER_JOIN);
 
         Union union = _sql.newUnion(mappings.length);
         union.setExpectedResultCount(1, false);
         if (fetch.getSubclassFetchMode(mapping) != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int i) {
                 sel.select(mappings[i], Select.SUBS_ANY_JOINABLE, store, fetch,
                     eager);
@@ -613,6 +635,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         }
     }
 
+    @Override
     public boolean load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, int lockLevel, Object context) {
         JDBCFetchConfiguration jfetch = (JDBCFetchConfiguration) fetch;
@@ -713,15 +736,18 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
                 fields.clear(i);
     }
 
+    @Override
     public Collection loadAll(Collection sms, PCState state, int load,
         FetchConfiguration fetch, Object context) {
         return ImplHelper.loadAll(sms, this, state, load, fetch, context);
     }
 
+    @Override
     public void beforeStateChange(OpenJPAStateManager sm, PCState fromState,
         PCState toState) {
     }
 
+    @Override
     public Collection flush(Collection sms) {
         try {
             if (_conn != null && _conn.getInnermostDelegate().isReadOnly())
@@ -731,6 +757,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return _conf.getUpdateManagerInstance().flush(sms, this);
     }
 
+    @Override
     public boolean cancelAll() {
         // note that this method does not lock the context, since
         // we want to allow a different thread to be able to cancel the
@@ -740,7 +767,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         synchronized (_stmnts) {
             if (_stmnts.isEmpty())
                 return false;
-            stmnts = new ArrayList<Statement>(_stmnts);
+            stmnts = new ArrayList<>(_stmnts);
         }
 
         try {
@@ -752,6 +779,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         }
     }
 
+    @Override
     public boolean assignObjectId(OpenJPAStateManager sm, boolean preFlush) {
         ClassMetaData meta = sm.getMetaData();
         if (meta.getIdentityType() == ClassMetaData.ID_APPLICATION)
@@ -768,6 +796,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return true;
     }
 
+    @Override
     public boolean assignField(OpenJPAStateManager sm, int field,
         boolean preFlush) {
         FieldMetaData fmd = sm.getMetaData().getField(field);
@@ -778,29 +807,35 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return true;
     }
 
+    @Override
     public Class<?> getManagedType(Object oid) {
         if (oid instanceof Id)
             return ((Id) oid).getType();
         return null;
     }
 
+    @Override
     public Class<?> getDataStoreIdType(ClassMetaData meta) {
         return Id.class;
     }
 
+    @Override
     public Object copyDataStoreId(Object oid, ClassMetaData meta) {
         Id id = (Id) oid;
         return new Id(meta.getDescribedType(), id.getId(), id.hasSubclasses());
     }
 
+    @Override
     public Object newDataStoreId(Object val, ClassMetaData meta) {
         return Id.newInstance(meta.getDescribedType(), val);
     }
 
+    @Override
     public Id newDataStoreId(long id, ClassMapping mapping, boolean subs) {
         return new Id(mapping.getDescribedType(), id, subs);
     }
 
+    @Override
     public ResultObjectProvider executeExtent(ClassMetaData meta,
         final boolean subclasses, FetchConfiguration fetch) {
         ClassMapping mapping = (ClassMapping) meta;
@@ -861,6 +896,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             union.setLRS(true);
             final BitSet[] paged = new BitSet[mappings.length];
             union.select(new Union.Selector() {
+                @Override
                 public void select(Select sel, int idx) {
                     paged[idx] = selectExtent(sel, mappings[idx], jfetch,
                         subclasses);
@@ -888,14 +924,14 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         int subs = (subclasses) ? Select.SUBS_JOINABLE : Select.SUBS_NONE;
         // decide between paging and standard iteration
         BitSet paged = PagingResultObjectProvider.getPagedFields(sel, mapping,
-            this, fetch, JDBCFetchConfiguration.EAGER_PARALLEL,
+            this, fetch, EagerFetchModes.EAGER_PARALLEL,
             Long.MAX_VALUE);
         if (paged == null)
             sel.selectIdentifier(mapping, subs, this, fetch,
-                JDBCFetchConfiguration.EAGER_PARALLEL);
+                EagerFetchModes.EAGER_PARALLEL);
         else
             sel.selectIdentifier(mapping, subs, this, fetch,
-                JDBCFetchConfiguration.EAGER_JOIN);
+                EagerFetchModes.EAGER_JOIN);
         return paged;
     }
 
@@ -916,6 +952,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return null;
     }
 
+    @Override
     public StoreQuery newQuery(String language) {
         StoreQuery sq = newStoreQuery(language);
         if (sq == null || QueryLanguages.parserForLanguage(language) == null) {
@@ -930,10 +967,12 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return new QueryCacheStoreQuery(sq, queryCache);
     }
 
+    @Override
     public FetchConfiguration newFetchConfiguration() {
         return new JDBCFetchConfigurationImpl();
     }
 
+    @Override
     public Seq getDataStoreIdSequence(ClassMetaData meta) {
         if (meta.getIdentityStrategy() == ValueStrategies.NATIVE
             || meta.getIdentityStrategy() == ValueStrategies.NONE)
@@ -941,10 +980,12 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return null;
     }
 
+    @Override
     public Seq getValueSequence(FieldMetaData fmd) {
         return null;
     }
 
+    @Override
     public void close() {
         if (_conn != null)
             _conn.free();
@@ -981,6 +1022,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         return new RefCountConnection(_ds.getConnection());
     }
 
+    @Override
     public Connection getNewConnection() {
         try {
             return _ds.getConnection();
@@ -992,6 +1034,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
     /**
      * Find the object with the given oid.
      */
+    @Override
     public Object find(Object oid, ValueMapping vm,
         JDBCFetchConfiguration fetch) {
         if (oid == null)
@@ -1213,7 +1256,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
     private FieldMapping createEagerSelects(Select sel, ClassMapping mapping,
         OpenJPAStateManager sm, BitSet fields, JDBCFetchConfiguration fetch,
         int eager) {
-        if (mapping == null || eager == JDBCFetchConfiguration.EAGER_NONE)
+        if (mapping == null || eager == EagerFetchModes.EAGER_NONE)
             return null;
 
         FieldMapping eagerToMany = createEagerSelects(sel,
@@ -1437,7 +1480,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
         FieldMapping[] fms;
         boolean joined;
         boolean canJoin = _dict.joinSyntax != JoinSyntaxes.SYNTAX_TRADITIONAL
-            && fetch.getSubclassFetchMode(mapping) != fetch.EAGER_NONE;
+            && fetch.getSubclassFetchMode(mapping) != EagerFetchModes.EAGER_NONE;
         for (int i = 0; i < subMappings.length; i++) {
             if (!subMappings[i].supportsEagerSelect(sel, sm, this, mapping,
                 fetch))
@@ -1493,6 +1536,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
      * Makes sure all subclasses of the given type are loaded in the JVM.
      * This is usually done automatically.
      */
+    @Override
     public void loadSubclasses(ClassMapping mapping) {
         Discriminator dsc = mapping.getDiscriminator();
         if (dsc.getSubclassesLoaded())
@@ -1557,11 +1601,13 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             super(conn);
         }
 
+        @Override
         public void close() throws SQLException {
             _closed = true;
             super.close();
         }
 
+        @Override
         protected void finalize() throws SQLException {
             if (!_closed)
                 close();
@@ -1597,6 +1643,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             _refs++;
         }
 
+        @Override
         public void close() throws SQLException {
             // lock at broker level to avoid deadlocks
             _ctx.lock();
@@ -1628,11 +1675,13 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             _conn = null;
         }
 
+        @Override
         protected Statement createStatement(boolean wrap) throws SQLException {
             return getCancelStatement(super.createStatement(false),
                 RefCountConnection.this);
         }
 
+        @Override
         protected Statement createStatement(int rsType, int rsConcur,
             boolean wrap) throws SQLException {
             return getCancelStatement(super.createStatement(rsType, rsConcur,
@@ -1640,12 +1689,14 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
 
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, boolean wrap)
             throws SQLException {
             return getCancelPreparedStatement(super.prepareStatement(sql,
                 false), RefCountConnection.this);
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, int rsType,
             int rsConcur, boolean wrap) throws SQLException {
             return getCancelPreparedStatement(super.prepareStatement(sql,
@@ -1686,6 +1737,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             super(stmnt, conn);
         }
 
+        @Override
         public int executeUpdate(String sql) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1695,6 +1747,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         protected ResultSet executeQuery(String sql, boolean wrap)
             throws SQLException {
             beforeExecuteStatement(this);
@@ -1705,6 +1758,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute(String sql) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1714,6 +1768,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public int executeUpdate(String sql, int i) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1723,6 +1778,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public int executeUpdate(String sql, int[] ia) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1732,6 +1788,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public int executeUpdate(String sql, String[] sa) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1741,6 +1798,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute(String sql, int i) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1750,6 +1808,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute(String sql, int[] ia) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1759,6 +1818,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute(String sql, String[] sa) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1768,6 +1828,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public void close() throws SQLException {
         	super.close();
     		synchronized (_cancelStatementPool) {
@@ -1788,6 +1849,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             super(stmnt, conn);
         }
 
+        @Override
         public int executeUpdate() throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1797,6 +1859,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         protected ResultSet executeQuery(boolean wrap) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1806,6 +1869,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public int[] executeBatch() throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1815,6 +1879,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute() throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1824,6 +1889,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute(String s) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1833,6 +1899,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public int executeUpdate(String s) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1842,6 +1909,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public int executeUpdate(String s, int i) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1851,6 +1919,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public int executeUpdate(String s, int[] ia) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1860,6 +1929,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public int executeUpdate(String s, String[] sa) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1869,6 +1939,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute(String s, int i) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1878,6 +1949,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute(String s, int[] ia) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1887,6 +1959,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public boolean execute(String s, String[] sa) throws SQLException {
             beforeExecuteStatement(this);
             try {
@@ -1896,6 +1969,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
             }
         }
 
+        @Override
         public void close() throws SQLException {
         	super.close();
     		synchronized (_cancelPreparedStatementsPool) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
index d9ea5409b..35d9e28e8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
@@ -67,6 +67,8 @@ import org.apache.openjpa.kernel.exps.ExpressionParser;
 import org.apache.openjpa.kernel.exps.FilterListener;
 import org.apache.openjpa.kernel.exps.Literal;
 import org.apache.openjpa.kernel.exps.QueryExpressions;
+import org.apache.openjpa.kernel.exps.StringContains;
+import org.apache.openjpa.kernel.exps.WildcardMatch;
 import org.apache.openjpa.lib.rop.MergedResultObjectProvider;
 import org.apache.openjpa.lib.rop.RangeResultObjectProvider;
 import org.apache.openjpa.lib.rop.ResultObjectProvider;
@@ -85,6 +87,9 @@ import org.apache.openjpa.util.UserException;
 public class JDBCStoreQuery
     extends ExpressionStoreQuery {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Table INVALID = new Table();
 
     // add all standard filter and aggregate listeners to these maps
@@ -92,8 +97,8 @@ public class JDBCStoreQuery
 
     static {
         // deprecated extensions
-        _listeners.put(JDBCStringContains.TAG, new JDBCStringContains());
-        _listeners.put(JDBCWildcardMatch.TAG, new JDBCWildcardMatch());
+        _listeners.put(StringContains.TAG, new JDBCStringContains());
+        _listeners.put(WildcardMatch.TAG, new JDBCWildcardMatch());
         _listeners.put(SQLExpression.TAG, new SQLExpression());
         _listeners.put(SQLValue.TAG, new SQLValue());
 
@@ -120,20 +125,24 @@ public class JDBCStoreQuery
         return _store;
     }
 
+    @Override
     public FilterListener getFilterListener(String tag) {
         return (FilterListener) _listeners.get(tag);
     }
 
+    @Override
     public Object newCompilationKey() {
         JDBCFetchConfiguration fetch = (JDBCFetchConfiguration) ctx
             .getFetchConfiguration();
         return fetch.getJoinSyntax();
     }
 
+    @Override
     public boolean supportsDataStoreExecution() {
         return true;
     }
 
+    @Override
     protected ClassMetaData[] getIndependentExpressionCandidates(
         ClassMetaData meta, boolean subclasses) {
         if (!subclasses)
@@ -141,6 +150,7 @@ public class JDBCStoreQuery
         return ((ClassMapping) meta).getIndependentAssignableMappings();
     }
 
+    @Override
     protected ExpressionFactory getExpressionFactory(ClassMetaData meta) {
         JDBCExpressionFactory factory = new JDBCExpressionFactory((ClassMapping) meta);
         if (_store.getDBDictionary() instanceof PostgresDictionary)
@@ -148,6 +158,7 @@ public class JDBCStoreQuery
         return factory;
     }
 
+    @Override
     protected ResultObjectProvider executeQuery(Executor ex,
         ClassMetaData base, ClassMetaData[] metas, boolean subclasses,
         ExpressionFactory[] facts, QueryExpressions[] exps, Object[] params,
@@ -192,7 +203,7 @@ public class JDBCStoreQuery
         boolean unionable = createWhereSelects(sels, mappings, selMappings,
             subclasses, subclassBits, nextBits, facts, exps, states, ctx,
             subclassMode)
-            && subclassMode == JDBCFetchConfiguration.EAGER_JOIN
+            && subclassMode == EagerFetchModes.EAGER_JOIN
             && start == 0
             && end == Long.MAX_VALUE;
 
@@ -262,6 +273,7 @@ public class JDBCStoreQuery
         final BitSet[] paged = (exps[0].projections.length > 0) ? null
             : new BitSet[mappings.length];
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 BitSet bits = populateSelect(sel, mappings[idx], subclasses,
                     (JDBCExpressionFactory) facts[idx], exps[idx], states[idx],
@@ -288,7 +300,7 @@ public class JDBCStoreQuery
             paged = PagingResultObjectProvider.getPagedFields(sel, mapping,
                 _store, ctx.fetch, eager, end - start);
             if (paged != null)
-                eager = JDBCFetchConfiguration.EAGER_JOIN;
+                eager = EagerFetchModes.EAGER_JOIN;
         }
 
         fact.getSelectConstructor().select(sel, ctx, mapping, subclasses, exps,
@@ -425,7 +437,7 @@ public class JDBCStoreQuery
         if (!subclasses || exps.projections.length > 0)
             return new ClassMapping[] { mapping };
 
-        if (subclassMode != JDBCFetchConfiguration.EAGER_PARALLEL
+        if (subclassMode != EagerFetchModes.EAGER_PARALLEL
             || !hasVerticalSubclasses(mapping))
             return new ClassMapping[] { mapping };
 
@@ -484,6 +496,7 @@ public class JDBCStoreQuery
         return EagerFetchModes.EAGER_PARALLEL;
     }
 
+    @Override
     protected Number executeDelete(Executor ex, ClassMetaData base,
         ClassMetaData[] metas, boolean subclasses, ExpressionFactory[] facts,
         QueryExpressions[] exps, Object[] params) {
@@ -491,6 +504,7 @@ public class JDBCStoreQuery
             params, null);
     }
 
+    @Override
     protected Number executeUpdate(Executor ex, ClassMetaData base,
         ClassMetaData[] metas, boolean subclasses, ExpressionFactory[] facts,
         QueryExpressions[] exps, Object[] params) {
@@ -545,7 +559,7 @@ public class JDBCStoreQuery
                 exps[i], state[i]);
             jdbcFactory.getSelectConstructor().select(sel, ctx, mappings[i],
                 subclasses, exps[i], state[i],
-                JDBCFetchConfiguration.EAGER_NONE);
+                EagerFetchModes.EAGER_NONE);
 
             // The bulk operation will return null to indicate that the database
             // does not support the request bulk delete operation; in
@@ -672,6 +686,7 @@ public class JDBCStoreQuery
         return null;
     }
 
+    @Override
     protected String[] getDataStoreActions(ClassMetaData base,
         ClassMetaData[] metas, boolean subclasses, ExpressionFactory[] facts,
         QueryExpressions[] exps, Object[] params, Range range) {
@@ -690,7 +705,7 @@ public class JDBCStoreQuery
             fetch.addFetchInnerJoins(Arrays.asList(exps[0].fetchInnerPaths));
 
         int eager = calculateEagerMode(exps[0], range.start, range.end);
-        eager = Math.min(eager, JDBCFetchConfiguration.EAGER_JOIN);
+        eager = Math.min(eager, EagerFetchModes.EAGER_JOIN);
         int subclassMode = fetch.getSubclassFetchMode((ClassMapping) base);
         DBDictionary dict = _store.getDBDictionary();
         long start = (mappings.length == 1 && dict.supportsSelectStartIndex)
@@ -709,7 +724,7 @@ public class JDBCStoreQuery
         BitSet nextBits = new BitSet();
         boolean unionable = createWhereSelects(sels, mappings, selMappings,
             subclasses, subclassBits, nextBits, facts, exps, states, ctx,
-            subclassMode) && subclassMode == JDBCFetchConfiguration.EAGER_JOIN;
+            subclassMode) && subclassMode == EagerFetchModes.EAGER_JOIN;
         if (sels.size() > 1)
             start = 0L;
 
@@ -759,6 +774,7 @@ public class JDBCStoreQuery
         return sql.prepareStatement(conn);
     }
 
+    @Override
     public Object evaluate(Object value, Object ob, Object[] params,
         OpenJPAStateManager sm) {
         int id = 0;
@@ -1033,6 +1049,7 @@ public class JDBCStoreQuery
     }
 
     private static class ThreadLocalContext extends ThreadLocal<Context[]> {
+        @Override
         public Context[] initialValue() {
           return null;
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/LRSSizes.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/LRSSizes.java
index d88830d9b..ddea01838 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/LRSSizes.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/LRSSizes.java
@@ -31,16 +31,16 @@ public interface LRSSizes {
      * Mode for returning {@link Integer#MAX_VALUE} for the size of
      * large result sets.
      */
-    public static final int SIZE_UNKNOWN = 0;
+    int SIZE_UNKNOWN = 0;
 
     /**
      * Mode for using {@link ResultSet#last} to calcualte the size of
      * large result sets.
      */
-    public static final int SIZE_LAST = 1;
+    int SIZE_LAST = 1;
 
     /**
      * Mode for using a query to calculate the size of large result sets.
      */
-    public static final int SIZE_QUERY = 2;
+    int SIZE_QUERY = 2;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java
index f56930ee5..ee145bfef 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java
@@ -76,6 +76,7 @@ class MappedQueryResultObjectProvider
         _mres = new MappingResult(res);
     }
 
+    @Override
     public boolean supportsRandomAccess() {
         try {
             return _mres.supportsRandomAccess();
@@ -84,9 +85,11 @@ class MappedQueryResultObjectProvider
         }
     }
 
+    @Override
     public void open() {
     }
 
+    @Override
     public Object getResultObject()
         throws SQLException {
         QueryResultMapping.PCResult[] pcs = _map.getPCResults();
@@ -108,16 +111,19 @@ class MappedQueryResultObjectProvider
         return ret;
     }
 
+    @Override
     public boolean next()
         throws SQLException {
         return _mres.next();
     }
 
+    @Override
     public boolean absolute(int pos)
         throws SQLException {
         return _mres.absolute(pos);
     }
 
+    @Override
     public int size()
         throws SQLException {
         if (_fetch.getLRSSize() == LRSSizes.SIZE_UNKNOWN
@@ -126,14 +132,17 @@ class MappedQueryResultObjectProvider
         return _mres.size();
     }
 
+    @Override
     public void reset() {
         throw new UnsupportedException();
     }
 
+    @Override
     public void close() {
         _mres.close();
     }
 
+    @Override
     public void handleCheckedException(Exception e) {
         if (e instanceof SQLException)
             throw SQLExceptions.getStore((SQLException) e,
@@ -174,12 +183,14 @@ class MappedQueryResultObjectProvider
             }
         }
 
+        @Override
         public Object load(ClassMapping mapping, JDBCStore store,
             JDBCFetchConfiguration fetch)
             throws SQLException {
             return load(mapping, store, fetch, null);
         }
 
+        @Override
         public Object load(ClassMapping mapping, JDBCStore store,
             JDBCFetchConfiguration fetch, Joins joins)
             throws SQLException {
@@ -192,6 +203,7 @@ class MappedQueryResultObjectProvider
                 _pc.getExcludes(_requests), this);
         }
 
+        @Override
         public Object getEager(FieldMapping key) {
             Object ret = _res.getEager(key);
             if (_pc == null || ret != null)
@@ -199,64 +211,78 @@ class MappedQueryResultObjectProvider
             return (_pc.hasEager(_requests, key)) ? this : null;
         }
 
+        @Override
         public void putEager(FieldMapping key, Object res) {
             _res.putEager(key, res);
         }
 
+        @Override
         public void close() {
             _res.close();
         }
 
+        @Override
         public Joins newJoins() {
             return _res.newJoins();
         }
 
+        @Override
         public boolean supportsRandomAccess()
             throws SQLException {
             return _res.supportsRandomAccess();
         }
 
+        @Override
         public ClassMapping getBaseMapping() {
             return _res.getBaseMapping();
         }
 
+        @Override
         public int size()
             throws SQLException {
             return _res.size();
         }
 
+        @Override
         public void startDataRequest(Object mapping) {
             _requests.push(mapping);
         }
 
+        @Override
         public void endDataRequest() {
             _requests.pop();
         }
 
+        @Override
         public boolean wasNull()
             throws SQLException {
             return _res.wasNull();
         }
 
+        @Override
         protected Object translate(Object obj, Joins joins) {
             return (_pc == null) ? obj : _pc.map(_requests, obj, joins);
         }
 
+        @Override
         protected boolean absoluteInternal(int row)
             throws SQLException {
             return _res.absolute(row);
         }
 
+        @Override
         protected boolean nextInternal()
             throws SQLException {
             return _res.next();
         }
 
+        @Override
         protected boolean containsInternal(Object obj, Joins joins)
             throws SQLException {
             return _res.contains(translate(obj, joins));
         }
 
+        @Override
         protected Array getArrayInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -264,6 +290,7 @@ class MappedQueryResultObjectProvider
             return _res.getArray(obj);
         }
 
+        @Override
         protected InputStream getAsciiStreamInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -271,6 +298,7 @@ class MappedQueryResultObjectProvider
             return _res.getAsciiStream(obj);
         }
 
+        @Override
         protected BigDecimal getBigDecimalInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -278,6 +306,7 @@ class MappedQueryResultObjectProvider
             return _res.getBigDecimal(obj);
         }
 
+        @Override
         protected Number getNumberInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -285,6 +314,7 @@ class MappedQueryResultObjectProvider
             return _res.getNumber(obj);
         }
 
+        @Override
         protected BigInteger getBigIntegerInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -292,6 +322,7 @@ class MappedQueryResultObjectProvider
             return _res.getBigInteger(obj);
         }
 
+        @Override
         protected InputStream getBinaryStreamInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -299,6 +330,7 @@ class MappedQueryResultObjectProvider
             return _res.getBinaryStream(obj);
         }
 
+        @Override
         protected Blob getBlobInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -306,6 +338,7 @@ class MappedQueryResultObjectProvider
             return _res.getBlob(obj);
         }
 
+        @Override
         protected boolean getBooleanInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -313,6 +346,7 @@ class MappedQueryResultObjectProvider
             return _res.getBoolean(obj);
         }
 
+        @Override
         protected byte getByteInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -320,6 +354,7 @@ class MappedQueryResultObjectProvider
             return _res.getByte(obj);
         }
 
+        @Override
         protected byte[] getBytesInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -327,6 +362,7 @@ class MappedQueryResultObjectProvider
             return _res.getBytes(obj);
         }
 
+        @Override
         protected Calendar getCalendarInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -334,6 +370,7 @@ class MappedQueryResultObjectProvider
             return _res.getCalendar(obj);
         }
 
+        @Override
         protected char getCharInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -341,6 +378,7 @@ class MappedQueryResultObjectProvider
             return _res.getChar(obj);
         }
 
+        @Override
         protected Reader getCharacterStreamInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -348,6 +386,7 @@ class MappedQueryResultObjectProvider
             return _res.getCharacterStream(obj);
         }
 
+        @Override
         protected Clob getClobInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -355,6 +394,7 @@ class MappedQueryResultObjectProvider
             return _res.getClob(obj);
         }
 
+        @Override
         protected Date getDateInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -362,6 +402,7 @@ class MappedQueryResultObjectProvider
             return _res.getDate(obj);
         }
 
+        @Override
         protected java.sql.Date getDateInternal(Object obj, Calendar cal,
             Joins joins)
             throws SQLException {
@@ -370,6 +411,7 @@ class MappedQueryResultObjectProvider
             return _res.getDate(obj, cal);
         }
 
+        @Override
         protected double getDoubleInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -377,6 +419,7 @@ class MappedQueryResultObjectProvider
             return _res.getDouble(obj);
         }
 
+        @Override
         protected float getFloatInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -384,6 +427,7 @@ class MappedQueryResultObjectProvider
             return _res.getFloat(obj);
         }
 
+        @Override
         protected int getIntInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -391,6 +435,7 @@ class MappedQueryResultObjectProvider
             return _res.getInt(obj);
         }
 
+        @Override
         protected Locale getLocaleInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -398,6 +443,7 @@ class MappedQueryResultObjectProvider
             return _res.getLocale(obj);
         }
 
+        @Override
         protected long getLongInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -413,12 +459,14 @@ class MappedQueryResultObjectProvider
          * @see org.apache.openjpa.jdbc.sql.AbstractResult#getObject(org.apache.
          * openjpa.jdbc.schema.Column, java.lang.Object, org.apache.openjpa.jdbc.sql.Joins)
          */
+        @Override
         public Object getObject(Column col, Object arg, Joins joins)
             throws SQLException {
             return getObjectInternal(translate(col, joins), col.getJavaType(),
                 arg, joins);
         }
 
+        @Override
         protected Object getObjectInternal(Object obj, int metaTypeCode,
             Object arg, Joins joins)
             throws SQLException {
@@ -435,6 +483,7 @@ class MappedQueryResultObjectProvider
             return _res.getObject(obj, metaTypeCode, arg);
         }
 
+        @Override
         protected Object getSQLObjectInternal(Object obj, Map map, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -442,6 +491,7 @@ class MappedQueryResultObjectProvider
             return _res.getSQLObject(obj, map);
         }
 
+        @Override
         protected Object getStreamInternal(JDBCStore store, Object obj,
             int metaTypeCode, Object arg, Joins joins) throws SQLException {
             if (obj instanceof Column)
@@ -449,6 +499,7 @@ class MappedQueryResultObjectProvider
             return _res.getObject(obj, metaTypeCode, arg);
         }
 
+        @Override
         protected Ref getRefInternal(Object obj, Map map, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -456,6 +507,7 @@ class MappedQueryResultObjectProvider
             return _res.getRef(obj, map);
         }
 
+        @Override
         protected short getShortInternal(Object obj, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -470,6 +522,7 @@ class MappedQueryResultObjectProvider
             return _res.getString(obj);
         }
 
+        @Override
         protected Time getTimeInternal(Object obj, Calendar cal, Joins joins)
             throws SQLException {
             if (obj instanceof Column)
@@ -477,6 +530,7 @@ class MappedQueryResultObjectProvider
             return _res.getTime(obj, cal);
         }
 
+        @Override
         protected Timestamp getTimestampInternal(Object obj, Calendar cal,
             Joins joins)
             throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MixedLockManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MixedLockManager.java
index c985ade2b..b068be544 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MixedLockManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MixedLockManager.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.SQLExceptions;
 import org.apache.openjpa.jdbc.sql.SQLFactory;
 import org.apache.openjpa.jdbc.sql.Select;
+import org.apache.openjpa.kernel.LockLevels;
 import org.apache.openjpa.kernel.MixedLockLevels;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.lib.util.Localizer;
@@ -51,6 +52,7 @@ public class MixedLockManager extends PessimisticLockManager {
      * @see org.apache.openjpa.jdbc.kernel.PessimisticLockManager
      *  #selectForUpdate(org.apache.openjpa.jdbc.sql.Select,int)
      */
+    @Override
     public boolean selectForUpdate(Select sel, int lockLevel) {
         return (lockLevel >= MixedLockLevels.LOCK_PESSIMISTIC_READ)
             ? super.selectForUpdate(sel, lockLevel) : false;
@@ -62,6 +64,7 @@ public class MixedLockManager extends PessimisticLockManager {
      *  lockInternal(org.apache.openjpa.kernel.OpenJPAStateManager, int, int,
      *               java.lang.Object)
      */
+    @Override
     protected void lockInternal(OpenJPAStateManager sm, int level, int timeout,
         Object sdata, boolean postLockVersionCheck) {
         if (level >= MixedLockLevels.LOCK_PESSIMISTIC_FORCE_INCREMENT) {
@@ -72,7 +75,7 @@ public class MixedLockManager extends PessimisticLockManager {
             setVersionCheckOnReadLock(true);
             setVersionUpdateOnWriteLock(false);
             super.lockInternal(sm, level, timeout, sdata, postLockVersionCheck);
-        } else if (level >= MixedLockLevels.LOCK_READ) {
+        } else if (level >= LockLevels.LOCK_READ) {
             setVersionCheckOnReadLock(true);
             setVersionUpdateOnWriteLock(true);
             optimisticLockInternal(sm, level, timeout, sdata,
@@ -80,6 +83,7 @@ public class MixedLockManager extends PessimisticLockManager {
         }
     }
 
+    @Override
     protected List<SQLBuffer> getLockRows(DBDictionary dict, Object id, ClassMapping mapping,
             JDBCFetchConfiguration fetch, SQLFactory factory) {
         List<SQLBuffer> sqls = super.getLockRows(dict, id, mapping, fetch, factory);
@@ -101,6 +105,7 @@ public class MixedLockManager extends PessimisticLockManager {
         return sqls;
     }
 
+    @Override
     protected void optimisticLockInternal(OpenJPAStateManager sm, int level,
         int timeout, Object sdata, boolean postLockVersionCheck) {
         super.optimisticLockInternal(sm, level, timeout, sdata,
@@ -123,6 +128,7 @@ public class MixedLockManager extends PessimisticLockManager {
         }
     }
 
+    @Override
     public boolean skipRelationFieldLock() {
         return true;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java
index 92cd10891..8369b4a31 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java
@@ -168,13 +168,16 @@ public class NativeJDBCSeq
         return _conf;
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (JDBCConfiguration) conf;
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
         buildSequence();
 
@@ -389,6 +392,7 @@ public class NativeJDBCSeq
         final String[] arguments = opts.setFromCmdLine(args);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws Exception {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
                 try {
@@ -451,6 +455,7 @@ public class NativeJDBCSeq
     /**
      * @deprecated
      */
+    @Deprecated
     public void setSchema(String schema) {
         _schema = DBIdentifier.newSchema(schema);
     }
@@ -458,6 +463,7 @@ public class NativeJDBCSeq
     /**
      * @deprecated
      */
+    @Deprecated
     public String getSchema() {
         return _schema.getName();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java
index 7009d974a..83875aa88 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/OperationOrderUpdateManager.java
@@ -41,19 +41,23 @@ import org.apache.openjpa.kernel.OpenJPAStateManager;
 public class OperationOrderUpdateManager
     extends AbstractUpdateManager {
 
+    @Override
     public boolean orderDirty() {
         return true;
     }
 
+    @Override
     protected RowManager newRowManager() {
         return new RowManagerImpl(true);
     }
 
+    @Override
     protected PreparedStatementManager newPreparedStatementManager
         (JDBCStore store, Connection conn) {
         return new PreparedStatementManagerImpl(store, conn);
     }
 
+    @Override
     protected Collection flush(RowManager rowMgr,
         PreparedStatementManager psMgr, Collection exceps) {
         RowManagerImpl rmimpl = (RowManagerImpl) rowMgr;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PagingResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PagingResultObjectProvider.java
index 0bdfbf0a1..a236ff14b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PagingResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PagingResultObjectProvider.java
@@ -86,7 +86,7 @@ public class PagingResultObjectProvider
 
         // not configured for eager selects?
         eagerMode = Math.min(eagerMode, fetch.getEagerFetchMode());
-        if (eagerMode != fetch.EAGER_PARALLEL)
+        if (eagerMode != EagerFetchModes.EAGER_PARALLEL)
             return null;
 
         // are there any mappings that require batched selects?
@@ -96,9 +96,9 @@ public class PagingResultObjectProvider
             if (fetch.requiresFetch(fms[i]) != FetchConfiguration.FETCH_LOAD)
                 continue;
 
-            if (fms[i].supportsSelect(sel, sel.EAGER_PARALLEL, null, store,
+            if (fms[i].supportsSelect(sel, Select.EAGER_PARALLEL, null, store,
                 fetch) > 0 && (fms[i].isEagerSelectToMany() || fms[i].
-                supportsSelect(sel, sel.EAGER_OUTER, null, store, fetch) == 0))
+                supportsSelect(sel, Select.EAGER_OUTER, null, store, fetch) == 0))
             {
                 if (paged == null)
                     paged = new BitSet();
@@ -186,12 +186,14 @@ public class PagingResultObjectProvider
         return _page.length;
     }
 
+    @Override
     public void open()
         throws SQLException {
         super.open();
         _pos = -1;
     }
 
+    @Override
     public boolean next()
         throws SQLException {
         _pos++;
@@ -204,6 +206,7 @@ public class PagingResultObjectProvider
         return true;
     }
 
+    @Override
     public boolean absolute(int pos)
         throws SQLException {
         _pos = pos;
@@ -212,6 +215,7 @@ public class PagingResultObjectProvider
         return super.absolute(pos);
     }
 
+    @Override
     public Object getResultObject()
         throws SQLException {
         if (!inPage())
@@ -375,7 +379,7 @@ public class PagingResultObjectProvider
 
             // get result
             fms[i].selectEagerParallel(esel, null, store, fetch,
-                JDBCFetchConfiguration.EAGER_PARALLEL);
+                EagerFetchModes.EAGER_PARALLEL);
             res = esel.execute(store, fetch);
             try {
                 // and load result into paged instances
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PessimisticLockManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PessimisticLockManager.java
index 3e0e7ab60..459f03a5b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PessimisticLockManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PessimisticLockManager.java
@@ -65,11 +65,13 @@ public class PessimisticLockManager
         setVersionUpdateOnWriteLock(false);
     }
 
+    @Override
     public void setContext(StoreContext ctx) {
         super.setContext(ctx);
         _store = (JDBCStore) ctx.getStoreManager().getInnermostDelegate();
     }
 
+    @Override
     public boolean selectForUpdate(Select sel, int lockLevel) {
         if (lockLevel == LOCK_NONE)
             return false;
@@ -91,6 +93,7 @@ public class PessimisticLockManager
         return true;
     }
 
+    @Override
     public void loadedForUpdate(OpenJPAStateManager sm) {
         // we set a low lock level to indicate that we don't need datastore
         // locking, but we don't necessarily have a read or write lock
@@ -99,6 +102,7 @@ public class PessimisticLockManager
             setLockLevel(sm, LOCK_DATASTORE_ONLY);
     }
 
+    @Override
     protected void lockInternal(OpenJPAStateManager sm, int level, int timeout,
         Object sdata, boolean postVersionCheck) {
         // we can skip any already-locked instance regardless of level because
@@ -135,7 +139,7 @@ public class PessimisticLockManager
         //a value of LockLevels.LOCK_NONE.
         List<SQLBuffer> sqls = (sm.getLock() == null || sm.getLock().equals(LockLevels.LOCK_NONE))
             ?  getLockRows(dict, id, mapping, fetch, _store.getSQLFactory())
-            : new ArrayList<SQLBuffer>();
+            : new ArrayList<>();
         if (ctx.getFetchConfiguration().getLockScope() == LockScopes.LOCKSCOPE_EXTENDED)
             lockJoinTables(sqls, dict, id, mapping, fetch, _store.getSQLFactory());
 
@@ -173,7 +177,7 @@ public class PessimisticLockManager
         Select select = factory.newSelect();
         select.select(mapping.getPrimaryKeyColumns());
         select.wherePrimaryKey(id, mapping, _store);
-        List<SQLBuffer> sqls = new ArrayList<SQLBuffer>();
+        List<SQLBuffer> sqls = new ArrayList<>();
         sqls.add(select.toSelect(true, fetch));
         return sqls;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedProjectionResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedProjectionResultObjectProvider.java
index 254c45d2e..bb7537a73 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedProjectionResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedProjectionResultObjectProvider.java
@@ -46,10 +46,12 @@ class PreparedProjectionResultObjectProvider
         _res = res;
     }
 
+    @Override
     public Result getResult() {
         return _res;
     }
 
+    @Override
     public void open() throws SQLException {
         // do nothing
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
index 854789741..000b85e11 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
@@ -28,7 +28,6 @@ import java.util.TreeMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.kernel.FetchConfiguration;
 import org.apache.openjpa.kernel.PreparedQuery;
@@ -40,6 +39,7 @@ import org.apache.openjpa.kernel.QueryStatistics;
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.util.CacheMap;
 
 /**
@@ -68,13 +68,14 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 	public PreparedQueryCacheImpl() {
 		_delegate = new CacheMap();
 		_uncachables = new CacheMap();
-		_exclusionPatterns = new ArrayList<Exclusion>();
+		_exclusionPatterns = new ArrayList<>();
 
 		ReentrantReadWriteLock _rwl = new ReentrantReadWriteLock();
         _writeLock = _rwl.writeLock();
         _readLock = _rwl.readLock();
 	}
 
+    @Override
     public Boolean register(String id, Query query, FetchConfiguration hints) {
         if (id == null
             || query == null
@@ -93,10 +94,11 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
         return cache(newEntry);
 	}
 
-	public Map<String,String> getMapView() {
+	@Override
+    public Map<String,String> getMapView() {
 		lock(false);
 		try {
-            Map<String, String> view = new TreeMap<String, String>();
+            Map<String, String> view = new TreeMap<>();
             for (Map.Entry<String, PreparedQuery> entry : _delegate.entrySet())
                 view.put(entry.getKey(), entry.getValue().getTargetQuery());
 			return view;
@@ -111,7 +113,8 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 	 * non-cachable. Also register the identifier as not cachable against the
 	 * matched exclusion pattern.
 	 */
-	public boolean cache(PreparedQuery q) {
+	@Override
+    public boolean cache(PreparedQuery q) {
 		lock(false);
 		try {
 			String id = q.getIdentifier();
@@ -141,6 +144,7 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 		}
 	}
 
+    @Override
     public PreparedQuery initialize(String key, Object result) {
         PreparedQuery pq = get(key);
         if (pq == null)
@@ -154,7 +158,8 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
         return pq;
     }
 
-	public boolean invalidate(String id) {
+	@Override
+    public boolean invalidate(String id) {
 		lock(false);
 		try {
 			if (_log != null && _log.isTraceEnabled())
@@ -169,6 +174,7 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 		}
 	}
 
+    @Override
     public PreparedQuery get(String id) {
         lock(true);
         try {
@@ -178,7 +184,8 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
         }
     }
 
-	public Boolean isCachable(String id) {
+	@Override
+    public Boolean isCachable(String id) {
 		lock(true);
 		try {
 			if (_uncachables.containsKey(id))
@@ -191,7 +198,8 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 		}
 	}
 
-	public PreparedQuery markUncachable(String id, Exclusion exclusion) {
+	@Override
+    public PreparedQuery markUncachable(String id, Exclusion exclusion) {
 		lock(false);
 		try {
 			if (_uncachables.put(id, exclusion) == null) {
@@ -208,11 +216,13 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 		}
 	}
 
-	public Exclusion isExcluded(String id) {
+	@Override
+    public Exclusion isExcluded(String id) {
 		return getMatchedExclusionPattern(id);
 	}
 
-	public void setExcludes(String excludes) {
+	@Override
+    public void setExcludes(String excludes) {
 		lock(false);
 		try {
 			if (StringUtil.isEmpty(excludes))
@@ -225,7 +235,8 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 		}
 	}
 
-	public List<Exclusion> getExcludes() {
+	@Override
+    public List<Exclusion> getExcludes() {
 		return Collections.unmodifiableList(_exclusionPatterns);
 	}
 
@@ -233,7 +244,8 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
      * Adds a pattern for exclusion. Any query cached currently whose identifier
      * matches the given pattern will be marked invalidated as a side-effect.
 	 */
-	public void addExclusionPattern(String pattern) {
+	@Override
+    public void addExclusionPattern(String pattern) {
 		lock(false);
 		try {
 		    String reason = _loc.get("prepared-query-excluded-by-user", pattern).getMessage();
@@ -254,7 +266,8 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
      * cachable due to the given pattern will now be removed from the list of
 	 * uncachables as a side-effect.
 	 */
-	public void removeExclusionPattern(String pattern) {
+	@Override
+    public void removeExclusionPattern(String pattern) {
 		lock(false);
 		try {
             Exclusion exclusion = new WeakExclusion(pattern, null);
@@ -270,7 +283,8 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 		}
 	}
 
-	public QueryStatistics<String> getStatistics() {
+	@Override
+    public QueryStatistics<String> getStatistics() {
 		return _stats;
 	}
 
@@ -288,7 +302,7 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 	 * Gets the keys of the given map whose values match the given pattern.
 	 */
 	private Collection<String> getMatchedKeys(String pattern, Map<String,Exclusion> map) {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
 		for (Map.Entry<String, Exclusion> entry : map.entrySet()) {
 		    Exclusion exclusion = entry.getValue();
 			if (!exclusion.isStrong() && exclusion.matches(pattern)) {
@@ -302,7 +316,7 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 	 * Gets the elements of the given list which match the given pattern.
 	 */
 	private Collection<String> getMatchedKeys(String pattern, Collection<String> coll) {
-		List<String> result = new ArrayList<String>();
+		List<String> result = new ArrayList<>();
 		for (String key : coll) {
 			if (matches(pattern, key)) {
 				result.add(key);
@@ -350,15 +364,18 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
         return result != null && "true".equalsIgnoreCase(result.toString());
     }
 
+    @Override
     public void clear() {
         _delegate.clear();
         _stats.clear();
     }
 
+    @Override
     public void setEnableStatistics(boolean enable){
         _statsEnabled = enable;
     }
 
+    @Override
     public boolean getEnableStatistics(){
         return _statsEnabled;
     }
@@ -374,16 +391,19 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
 	//-------------------------------------------------------
 	// Configurable contract
 	//-------------------------------------------------------
+    @Override
     public void setConfiguration(Configuration conf) {
     	_log = conf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
-        _stats = _statsEnabled ? new QueryStatistics.Default<String>() :
-                                 new QueryStatistics.None<String>();
+        _stats = _statsEnabled ? new QueryStatistics.Default<>() :
+                                 new QueryStatistics.None<>();
     }
 
     /**
@@ -406,18 +426,22 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
             this._reason = reason;
         }
 
+        @Override
         public String getPattern() {
             return _pattern;
         }
 
+        @Override
         public String getReason() {
             return _reason;
         }
 
+        @Override
         public boolean isStrong() {
             return _strong;
         }
 
+        @Override
         public boolean matches(String id) {
             return _pattern != null && (_pattern.equals(id) || _pattern.matches(id));
         }
@@ -442,6 +466,7 @@ public class PreparedQueryCacheImpl implements PreparedQueryCache {
                  + (_pattern == null ? 0 : _pattern.hashCode());
         }
 
+        @Override
         public String toString() {
             StringBuilder buf = new StringBuilder();
             buf.append(" ").append(_strong ? STRONG : WEAK).append(". ");
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java
index 44d994025..41568aef6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryImpl.java
@@ -39,11 +39,11 @@ import org.apache.openjpa.jdbc.sql.SelectImpl;
 import org.apache.openjpa.jdbc.sql.Union;
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.PreparedQuery;
+import org.apache.openjpa.kernel.PreparedQueryCache.Exclusion;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.kernel.QueryLanguages;
 import org.apache.openjpa.kernel.StoreQuery;
-import org.apache.openjpa.kernel.PreparedQueryCache.Exclusion;
 import org.apache.openjpa.kernel.exps.Parameter;
 import org.apache.openjpa.kernel.exps.QueryExpressions;
 import org.apache.openjpa.lib.rop.RangeResultObjectProvider;
@@ -110,10 +110,12 @@ public class PreparedQueryImpl implements PreparedQuery {
         }
     }
 
+    @Override
     public String getIdentifier() {
         return _id;
     }
 
+    @Override
     public String getLanguage() {
         return QueryLanguages.LANG_PREPARED_SQL;
     }
@@ -122,10 +124,12 @@ public class PreparedQueryImpl implements PreparedQuery {
      * Get the original query string which is same as the identifier of this
      * receiver.
      */
+    @Override
     public String getOriginalQuery() {
         return getIdentifier();
     }
 
+    @Override
     public String getTargetQuery() {
         return _sql;
     }
@@ -134,6 +138,7 @@ public class PreparedQueryImpl implements PreparedQuery {
         _sql = sql;
     }
 
+    @Override
     public boolean isInitialized() {
         return _initialized;
     }
@@ -150,6 +155,7 @@ public class PreparedQueryImpl implements PreparedQuery {
      * Pours the post-compilation state held by this receiver to the given
      * query.
      */
+    @Override
     public void setInto(Query q) {
     	q.setQuery(_id);
         q.setCandidateType(_candidate, _subclasses);
@@ -164,6 +170,7 @@ public class PreparedQueryImpl implements PreparedQuery {
      * @return an exclusion if can not be initialized for some reason.
      * null if initialization is successful.
      */
+    @Override
     public Exclusion initialize(Object result) {
         if (isInitialized())
             return null;
@@ -307,6 +314,7 @@ public class PreparedQueryImpl implements PreparedQuery {
      * @return 0-based parameter index mapped to corresponding values.
      *
      */
+    @Override
     public Map<Integer, Object> reparametrize(Map user, Broker broker) {
         if (!isInitialized())
             throw new InternalException("reparameterize() on uninitialized.");
@@ -322,7 +330,7 @@ public class PreparedQueryImpl implements PreparedQuery {
             throw new UserException(_loc.get("uparam-mismatch",
                 _userParamPositions.keySet(), user.keySet(), this));
         }
-        Map<Integer, Object> result = new HashMap<Integer, Object>(_template);
+        Map<Integer, Object> result = new HashMap<>(_template);
 
         Set<Map.Entry<Object,Object>> userSet = user.entrySet();
         for (Map.Entry<Object,Object> userEntry : userSet) {
@@ -416,8 +424,8 @@ public class PreparedQueryImpl implements PreparedQuery {
      * key. A user parameter key may appear more than once.
      */
     void setUserParameterPositions(List list) {
-        _userParamPositions = new HashMap<Object, Integer[]>();
-        List<Integer> positions = new ArrayList<Integer>();
+        _userParamPositions = new HashMap<>();
+        List<Integer> positions = new ArrayList<>();
         for (int i = 1; list != null && i < list.size(); i += 2) {
             Object key = ((Parameter)list.get(i)).getParameterKey();
             positions.clear();
@@ -431,7 +439,7 @@ public class PreparedQueryImpl implements PreparedQuery {
     }
 
     void setParameters(List list) {
-        Map<Integer, Object> tmp = new HashMap<Integer, Object>();
+        Map<Integer, Object> tmp = new HashMap<>();
         for (int i = 0; list != null && i < list.size(); i++) {
             tmp.put(i, list.get(i));
         }
@@ -442,6 +450,7 @@ public class PreparedQueryImpl implements PreparedQuery {
         return select;
     }
 
+    @Override
     public String toString() {
         return "PreparedQuery: [" + getOriginalQuery() + "] --> [" +
                getTargetQuery() + "]";
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedResultObjectProvider.java
index 927b6a127..27814c9a1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedResultObjectProvider.java
@@ -47,6 +47,7 @@ public class PreparedResultObjectProvider extends InstanceResultObjectProvider {
         _res = res;
     }
 
+    @Override
     public void open() throws SQLException {
         // do nothing
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java
index 7b25d3fed..e5be42a73 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java
@@ -34,8 +34,8 @@ import org.apache.openjpa.jdbc.sql.ResultSetResult;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.SQLExceptions;
 import org.apache.openjpa.jdbc.sql.SelectImpl;
-import org.apache.openjpa.kernel.StoreQuery;
 import org.apache.openjpa.kernel.ExpressionStoreQuery.AbstractExpressionExecutor;
+import org.apache.openjpa.kernel.StoreQuery;
 import org.apache.openjpa.kernel.exps.QueryExpressions;
 import org.apache.openjpa.lib.rop.RangeResultObjectProvider;
 import org.apache.openjpa.lib.rop.ResultObjectProvider;
@@ -48,18 +48,20 @@ import org.apache.openjpa.util.InternalException;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class PreparedSQLStoreQuery extends SQLStoreQuery {
+    private static final long serialVersionUID = 1L;
     private PreparedQueryImpl _cached;
     public PreparedSQLStoreQuery(JDBCStore store) {
         super(store);
     }
 
+    @Override
     public Executor newDataStoreExecutor(ClassMetaData meta,
         boolean subclasses) {
         return new PreparedSQLExecutor(this, meta);
     }
 
+    @Override
     public boolean setQuery(Object query) {
         if (query instanceof PreparedQueryImpl == false) {
             throw new InternalException(query.getClass() + " not recognized");
@@ -86,14 +88,17 @@ public class PreparedSQLStoreQuery extends SQLStoreQuery {
             _query = q;
         }
 
+        @Override
         public QueryExpressions[] getQueryExpressions() {
             return _query.getPreparedQuery().getQueryExpressions();
         }
 
+        @Override
         public Class[] getProjectionTypes(StoreQuery q) {
             return _query.getPreparedQuery().getProjectionTypes();
         }
 
+        @Override
         public ResultObjectProvider executeQuery(StoreQuery q, Object[] params, Range range) {
             PreparedSQLStoreQuery psq = (PreparedSQLStoreQuery) q;
             PreparedQueryImpl pq = psq.getPreparedQuery();
@@ -152,6 +157,7 @@ public class PreparedSQLStoreQuery extends SQLStoreQuery {
          *
          * @see PreparedQueryImpl#reparametrize(Map, org.apache.openjpa.kernel.Broker)
          */
+        @Override
         public synchronized Object[] toParameterArray(StoreQuery q, Map userParams) {
             Object[] array = new Object[userParams.size()];
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManager.java
index a36c95a28..7620cc88f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManager.java
@@ -32,16 +32,16 @@ public interface PreparedStatementManager {
     /**
      * Return the exceptions encountered during all flushes.
      */
-    public Collection getExceptions();
+    Collection getExceptions();
 
     /**
      * Flush the given row.
      */
-    public void flush(RowImpl row);
+    void flush(RowImpl row);
 
     /**
      * This method must be called after the last row has been
      * flushed, to flush any remaining statements.
      */
-    public void flush();
+    void flush();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
index 030b1ac69..3eae0b0a1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
@@ -65,7 +65,7 @@ public class PreparedStatementManagerImpl
     protected transient Log _log = null;
 
     // track exceptions
-    protected final Collection<Exception> _exceptions = new LinkedList<Exception>();
+    protected final Collection<Exception> _exceptions = new LinkedList<>();
 
     /**
      * Constructor. Supply connection.
@@ -78,10 +78,12 @@ public class PreparedStatementManagerImpl
             _log = store.getConfiguration().getLog(JDBCConfiguration.LOG_JDBC);
     }
 
+    @Override
     public Collection<Exception> getExceptions() {
         return _exceptions;
     }
 
+    @Override
     public void flush(RowImpl row) {
         try {
             if (!row.isFlushed())
@@ -228,7 +230,7 @@ public class PreparedStatementManagerImpl
         DBIdentifier[] autoAssignColNames)
         throws SQLException {
         ResultSet rs = stmnt.getGeneratedKeys();
-        List<Object> vals = new ArrayList<Object>();
+        List<Object> vals = new ArrayList<>();
         while (rs.next()) {
             for (int i = 0; i < autoAssignColNames.length; i++)
                 vals.add(rs.getObject(i + 1));
@@ -256,6 +258,7 @@ public class PreparedStatementManagerImpl
         return autoAssignColNames;
     }
 
+    @Override
     public void flush() {
     }
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java
index 054d3824b..6e15b107d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ProjectionResultObjectProvider.java
@@ -67,6 +67,7 @@ class ProjectionResultObjectProvider
         _ctx = ctx;
     }
 
+    @Override
     public Object getResultObject()
         throws Exception {
         Result res = getResult();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java
index bf4f2db35..b8f182b24 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLProjectionResultObjectProvider.java
@@ -69,6 +69,7 @@ class SQLProjectionResultObjectProvider
             _packer = null;
     }
 
+    @Override
     public boolean supportsRandomAccess() {
         try {
             return _res.supportsRandomAccess();
@@ -77,9 +78,11 @@ class SQLProjectionResultObjectProvider
         }
     }
 
+    @Override
     public void open() {
     }
 
+    @Override
     public Object getResultObject()
         throws SQLException {
         if (_cols == 1) {
@@ -95,16 +98,19 @@ class SQLProjectionResultObjectProvider
         return (_packer == null) ? vals : _packer.pack(vals);
     }
 
+    @Override
     public boolean next()
         throws SQLException {
         return _res.next();
     }
 
+    @Override
     public boolean absolute(int pos)
         throws SQLException {
         return _res.absolute(pos);
     }
 
+    @Override
     public int size()
         throws SQLException {
         if (_fetch.getLRSSize() == LRSSizes.SIZE_UNKNOWN
@@ -113,14 +119,17 @@ class SQLProjectionResultObjectProvider
         return _res.size();
     }
 
+    @Override
     public void reset() {
         throw new UnsupportedException();
     }
 
+    @Override
     public void close() {
         _res.close();
     }
 
+    @Override
     public void handleCheckedException(Exception e) {
         if (e instanceof SQLException)
             throw SQLExceptions.getStore((SQLException) e,
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java
index 7216dfa1a..98ad3d646 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java
@@ -31,7 +31,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.meta.QueryResultMapping;
@@ -45,6 +44,7 @@ import org.apache.openjpa.kernel.StoreQuery;
 import org.apache.openjpa.lib.rop.RangeResultObjectProvider;
 import org.apache.openjpa.lib.rop.ResultObjectProvider;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.util.UserException;
 
@@ -57,6 +57,9 @@ import org.apache.openjpa.util.UserException;
 public class SQLStoreQuery
     extends AbstractStoreQuery {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (SQLStoreQuery.class);
 
@@ -73,23 +76,28 @@ public class SQLStoreQuery
         return _store;
     }
 
+    @Override
     public boolean supportsParameterDeclarations() {
         return false;
     }
 
+    @Override
     public boolean supportsDataStoreExecution() {
         return true;
     }
 
+    @Override
     public Executor newDataStoreExecutor(ClassMetaData meta,
         boolean subclasses) {
         return new SQLExecutor(this, meta);
     }
 
+    @Override
     public boolean requiresCandidateType() {
         return false;
     }
 
+    @Override
     public boolean requiresParameterDeclarations() {
         return false;
     }
@@ -128,6 +136,7 @@ public class SQLStoreQuery
                 && sql.substring(0, 4).equalsIgnoreCase("call");
         }
 
+        @Override
         public int getOperation(StoreQuery q) {
            return _select ? OP_SELECT :
                 (q.getContext().getCandidateType() != null
@@ -137,6 +146,7 @@ public class SQLStoreQuery
                         ? OP_SELECT : OP_UPDATE;
         }
 
+        @Override
         public Number executeUpdate(StoreQuery q, Object[] params) {
             JDBCStore store = ((SQLStoreQuery) q).getStore();
             DBDictionary dict = store.getDBDictionary();
@@ -186,6 +196,7 @@ public class SQLStoreQuery
             }
         }
 
+        @Override
         public ResultObjectProvider executeQuery(StoreQuery q,
             Object[] params, Range range) {
             JDBCStore store = ((SQLStoreQuery) q).getStore();
@@ -242,11 +253,13 @@ public class SQLStoreQuery
             return rop;
         }
 
+        @Override
         public String[] getDataStoreActions(StoreQuery q, Object[] params,
             Range range) {
             return new String[]{ q.getContext().getQueryString() };
         }
 
+        @Override
         public boolean isPacking(StoreQuery q) {
             return q.getContext().getCandidateType() == null;
         }
@@ -328,11 +341,12 @@ public class SQLStoreQuery
          * the same Integers must appear in the tokens.
          *
          */
+        @Override
         public Object[] toParameterArray(StoreQuery q, Map userParams) {
             if (userParams == null || userParams.isEmpty())
                 return StoreQuery.EMPTY_OBJECTS;
             String sql = q.getContext().getQueryString();
-            List<Integer> paramOrder = new ArrayList<Integer>();
+            List<Integer> paramOrder = new ArrayList<>();
             try {
                 sql = substituteParams(sql, paramOrder);
             } catch (IOException ex) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SelectResultObjectProvider.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SelectResultObjectProvider.java
index 9ab647291..402004948 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SelectResultObjectProvider.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SelectResultObjectProvider.java
@@ -72,6 +72,7 @@ public abstract class SelectResultObjectProvider
         return _res;
     }
 
+    @Override
     public boolean supportsRandomAccess() {
         if (_ra == null) {
             boolean ra;
@@ -88,21 +89,25 @@ public abstract class SelectResultObjectProvider
         return _ra.booleanValue();
     }
 
+    @Override
     public void open()
         throws SQLException {
         _res = _sel.execute(_store, _fetch);
     }
 
+    @Override
     public boolean next()
         throws SQLException {
         return _res.next();
     }
 
+    @Override
     public boolean absolute(int pos)
         throws SQLException {
         return _res.absolute(pos);
     }
 
+    @Override
     public int size()
         throws SQLException {
         if (_size == -1) {
@@ -136,12 +141,14 @@ public abstract class SelectResultObjectProvider
             _size = size;
     }
 
+    @Override
     public void reset()
         throws SQLException {
         close();
         open();
     }
 
+    @Override
     public void close() {
         if (_res != null) {
             _res.close();
@@ -149,6 +156,7 @@ public abstract class SelectResultObjectProvider
         }
     }
 
+    @Override
     public void handleCheckedException(Exception e) {
         if (e instanceof SQLException)
             throw SQLExceptions.getStore((SQLException) e, _store.getDBDictionary(), _fetch.getReadLockLevel());
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/StoredProcedureQuery.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/StoredProcedureQuery.java
index 71d0a32db..b270e8a49 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/StoredProcedureQuery.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/StoredProcedureQuery.java
@@ -18,6 +18,15 @@
  */
 package org.apache.openjpa.jdbc.kernel;
 
+import static java.util.Arrays.asList;
+
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.meta.QueryResultMapping;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -33,23 +42,15 @@ import org.apache.openjpa.meta.MultiQueryMetaData;
 import org.apache.openjpa.meta.QueryMetaData;
 import org.apache.openjpa.util.InternalException;
 
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static java.util.Arrays.asList;
-
 /**
  * Executes a stored procedure.
  *
  * @author ppoddar
  *
  */
-@SuppressWarnings("serial")
 public class StoredProcedureQuery extends AbstractStoreQuery {
+    private static final long serialVersionUID = 1L;
+
     private static final Object[] NO_PARAM = new Object[0];
 
     JDBCStore _store;
@@ -82,14 +83,15 @@ public class StoredProcedureQuery extends AbstractStoreQuery {
         }
     }
 
+    @Override
     public Executor newDataStoreExecutor(ClassMetaData meta,  boolean subclasses) {
         List<QueryResultMapping> mappings = null;
         List<Class<?>> classes = null;
         if (_meta != null) {
             List<QueryMetaData> parts = _meta.getComponents();
             if (parts != null && !parts.isEmpty()) {
-                mappings = new ArrayList<QueryResultMapping>();
-                classes = new ArrayList<Class<?>>();
+                mappings = new ArrayList<>();
+                classes = new ArrayList<>();
                 MappingRepository repos = _store.getConfiguration().getMappingRepositoryInstance();
                 for (QueryMetaData part : parts) {
                     QueryResultMapping mapping = repos.getQueryResultMapping(ctx.getResultMappingScope(),
@@ -107,18 +109,22 @@ public class StoredProcedureQuery extends AbstractStoreQuery {
         return new StoredProcedureQueryExecutor(this, mappings, classes);
     }
 
+    @Override
     public boolean supportsParameterDeclarations() {
         return false;
     }
 
+    @Override
     public boolean supportsDataStoreExecution() {
         return true;
     }
 
+    @Override
     public boolean requiresCandidateType() {
         return false;
     }
 
+    @Override
     public boolean requiresParameterDeclarations() {
         return false;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
index 53d907b58..8f8c08abd 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
@@ -28,13 +28,13 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import javax.transaction.NotSupportedException;
 
-import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
-import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.PrimaryKey;
@@ -45,7 +45,7 @@ import org.apache.openjpa.jdbc.schema.Schemas;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.jdbc.schema.Unique;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
-import org.apache.openjpa.jdbc.sql.RowImpl;
+import org.apache.openjpa.jdbc.sql.Row;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.lib.conf.Configurable;
 import org.apache.openjpa.lib.conf.Configuration;
@@ -54,6 +54,7 @@ import org.apache.openjpa.lib.identifier.IdentifierUtil;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.InvalidStateException;
 import org.apache.openjpa.util.UserException;
@@ -86,7 +87,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
     private transient Log _log = null;
     private int _alloc = 50;
     private int _intValue = 1;
-    private final ConcurrentHashMap<ClassMapping, Status> _stat = new ConcurrentHashMap<ClassMapping, Status>();
+    private final ConcurrentHashMap<ClassMapping, Status> _stat = new ConcurrentHashMap<>();
 
     private DBIdentifier _table = DBIdentifier.newTable(DEFAULT_TABLE);
     private DBIdentifier _seqColumnName = DBIdentifier.newColumn("SEQUENCE_VALUE");
@@ -128,6 +129,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
      * @deprecated Use {@link #setTable}. Retained for
      * backwards-compatibility	with auto-configuration.
      */
+    @Deprecated
     public void setTableName(String name) {
         setTable(name);
     }
@@ -224,27 +226,33 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
      * @deprecated Use {@link #setAllocate}. Retained for backwards
      * compatibility of auto-configuration.
      */
+    @Deprecated
     public void setIncrement(int inc) {
         setAllocate(inc);
     }
 
+    @Override
     public JDBCConfiguration getConfiguration() {
         return _conf;
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (JDBCConfiguration) conf;
-        _log = _conf.getLog(JDBCConfiguration.LOG_RUNTIME);
+        _log = _conf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
         buildTable();
     }
 
 
+    @Override
     public void addSchema(ClassMapping mapping, SchemaGroup group) {
         // Since the table is created by openjpa internally
         // we can create the table for each schema within the PU
@@ -283,6 +291,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
         }
     }
 
+    @Override
     protected Object nextInternal(JDBCStore store, ClassMapping mapping) throws Exception {
         // if needed, grab the next handful of ids
         Status stat = getStatus(mapping);
@@ -302,6 +311,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
         }
     }
 
+    @Override
     protected Object currentInternal(JDBCStore store, ClassMapping mapping)
         throws Exception {
         if (current == null) {
@@ -323,6 +333,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
         return super.currentInternal(store, mapping);
     }
 
+    @Override
     protected void allocateInternal(int count, JDBCStore store,
         ClassMapping mapping)
         throws SQLException {
@@ -346,7 +357,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
      * if cannot handle the given class. The mapping may be null.
      */
     protected Status getStatus(ClassMapping mapping) {
-        Status status = (Status) _stat.get(mapping);
+        Status status = _stat.get(mapping);
         if (status == null){
             status = new Status();
             Status tStatus = _stat.putIfAbsent(mapping, status);
@@ -500,7 +511,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
         try {
             stmnt = prepareStatement(conn, insert);
             dict.setTimeouts(stmnt, _conf, true);
-            executeUpdate(_conf, conn, stmnt, insert, RowImpl.ACTION_INSERT);
+            executeUpdate(_conf, conn, stmnt, insert, Row.ACTION_INSERT);
         } finally {
             if (stmnt != null)
                 try { stmnt.close(); } catch (SQLException se) {}
@@ -604,7 +615,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
                 stmnt = prepareStatement(conn, upd);
                 dict.setTimeouts(stmnt, _conf, true);
                 updates = executeUpdate(_conf, conn, stmnt, upd,
-                        RowImpl.ACTION_UPDATE);
+                        Row.ACTION_UPDATE);
             } finally {
                 if (rs != null)
                     try { rs.close(); } catch (SQLException se) {}
@@ -629,6 +640,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
      *            mapping to get the schema name
      * @deprecated
      */
+    @Deprecated
     public String resolveTableName(ClassMapping mapping, Table table) {
         return resolveTableIdentifier(mapping, table).getName();
     }
@@ -718,6 +730,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
         final String[] arguments = opts.setFromCmdLine(args);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws Exception {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
                 try {
@@ -803,10 +816,8 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
     /**
      * Helper struct to hold status information.
      */
-    @SuppressWarnings("serial")
-    protected static class Status
-        implements Serializable {
-
+    protected static class Status implements Serializable {
+        private static final long serialVersionUID = 1L;
         public long seq = 1L;
         public long max = 0L;
     }
@@ -896,6 +907,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
          *             breaking the Runnable method signature. The caller can
          *             obtain the "real" exception by calling getCause().
          */
+        @Override
         public void run() throws RuntimeException {
             Connection conn = null;
             SQLException err = null;
@@ -967,6 +979,7 @@ public class TableJDBCSeq extends AbstractJDBCSeq implements Configurable {
          *             breaking the Runnable method signature. The caller can
          *             obtain the "real" exception by calling getCause().
          */
+        @Override
         public void run() throws RuntimeException {
             Connection conn = null;
             try {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/UpdateManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/UpdateManager.java
index 6850ab132..ccd5cd127 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/UpdateManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/UpdateManager.java
@@ -32,12 +32,12 @@ public interface UpdateManager {
      * Whether the store context should maintain the order in which instances
      * are dirtied.
      */
-    public boolean orderDirty();
+    boolean orderDirty();
 
     /**
      * Flush the given instances to the data store.
      *
      * @see org.apache.openjpa.kernel.StoreManager#flush
      */
-    public Collection flush(Collection states, JDBCStore store);
+    Collection flush(Collection states, JDBCStore store);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
index ce70697c8..ceee96568 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
@@ -75,6 +75,7 @@ public class ValueTableJDBCSeq
         _value = value;
     }
 
+    @Override
     protected Column addPrimaryKeyColumn(Table table) {
         DBDictionary dict = getConfiguration().getDBDictionaryInstance();
         Column pkColumn = table.addColumn(dict.getValidColumnName
@@ -85,6 +86,7 @@ public class ValueTableJDBCSeq
         return pkColumn;
     }
 
+    @Override
     protected Object getPrimaryKey(ClassMapping mapping) {
         return _value;
     }
@@ -123,6 +125,7 @@ public class ValueTableJDBCSeq
         final String[] arguments = opts.setFromCmdLine(args);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws Exception {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
                 try {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/XROP.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/XROP.java
index 58df050c7..09c5ddefd 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/XROP.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/XROP.java
@@ -19,17 +19,17 @@
 package org.apache.openjpa.jdbc.kernel;
 
 
+import java.sql.CallableStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
 import org.apache.openjpa.jdbc.meta.QueryResultMapping;
 import org.apache.openjpa.jdbc.sql.ResultSetResult;
 import org.apache.openjpa.lib.rop.BatchedResultObjectProvider;
 import org.apache.openjpa.lib.rop.ResultObjectProvider;
 import org.apache.openjpa.util.InternalException;
 
-import java.sql.CallableStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
 /**
  * Gets multiple Result Object Providers each with different mapping.
  *
@@ -123,6 +123,7 @@ public class XROP implements BatchedResultObjectProvider {
      * <br>
      * <b.NOTE</b>: The side effect is to advance to the statement's next result.
      */
+    @Override
     public boolean hasMoreResults() {
         try {
             return stmt.getMoreResults();
@@ -131,6 +132,7 @@ public class XROP implements BatchedResultObjectProvider {
         }
     }
 
+    @Override
     public boolean getExecutionResult() {
         return executionResult;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Abs.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Abs.java
index 78d130c7c..0170d7a26 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Abs.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Abs.java
@@ -29,6 +29,9 @@ import org.apache.openjpa.kernel.Filters;
 public class Abs
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the value to operate on.
      */
@@ -36,6 +39,7 @@ public class Abs
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         Class wrap = Filters.wrap(c);
         if (wrap == Integer.class
@@ -48,10 +52,12 @@ public class Abs
         return int.class;
     }
 
+    @Override
     protected String getOperator() {
         return "ABS";
     }
 
+    @Override
     public int getId() {
         return Val.ABS_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java
index 6de17642e..e836635d7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java
@@ -32,89 +32,109 @@ import org.apache.openjpa.kernel.exps.Value;
 abstract class AbstractVal
     implements Val {
 
+    
+    private static final long serialVersionUID = 1L;
     protected static final String TRUE = "1 = 1";
     protected static final String FALSE = "1 <> 1";
     private String _alias = null;
 
+    @Override
     public boolean isVariable() {
         return false;
     }
 
+    @Override
     public boolean isAggregate() {
         return false;
     }
 
+    @Override
     public boolean isXPath() {
         return false;
     }
 
+    @Override
     public Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state,
         Object val) {
         return val;
     }
 
+    @Override
     public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         sql.append(FALSE);
     }
 
+    @Override
     public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql){
         sql.append(TRUE);
     }
 
+    @Override
     public void appendIsNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         appendTo(sel, ctx, state, sql, 0);
         sql.append(" IS ").appendValue(null);
     }
 
+    @Override
     public void appendIsNotNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         appendTo(sel, ctx, state, sql, 0);
         sql.append(" IS NOT ").appendValue(null);
     }
 
+    @Override
     public void appendIndex(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         sql.append("1");
     }
 
+    @Override
     public void appendType(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         sql.append("1");
     }
 
+    @Override
     public void appendSize(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         sql.append("1");
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.VAL;
     }
 
+    @Override
     public String getAlias() {
         return _alias;
     }
 
+    @Override
     public void setAlias(String alias) {
         _alias = alias;
     }
 
+    @Override
     public Value getSelectAs() {
         return _alias != null ? this : null;
     }
 
+    @Override
     public Path getPath() {
         return null;
     }
 
+    @Override
     public String getName() {
         return null;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java
index 47e6a9949..1a8f141a7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Aggregate.java
@@ -37,6 +37,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 class Aggregate
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final JDBCAggregateListener _listener;
     private final Val _arg;
     private final ClassMapping _candidate;
@@ -53,18 +55,22 @@ class Aggregate
         _candidate = candidate;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public boolean isAggregate() {
         return true;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
@@ -79,10 +85,12 @@ class Aggregate
         return new Class[]{ _arg.getType() };
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         if (_arg == null)
             return ExpState.NULL;
@@ -96,22 +104,26 @@ class Aggregate
         return _arg.initialize(sel, ctx, JOIN_REL);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
         sel.setAggregate(true);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         if (_arg != null)
             _arg.selectColumns(sel, ctx, state, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false,
@@ -125,22 +137,26 @@ class Aggregate
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this, JavaSQLTypes.JDBC_DEFAULT,
             null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         if (_arg != null)
             _arg.calculateValue(sel, ctx, state, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         _listener.appendTo(sql, getArgs(sel, ctx, state), _candidate,
@@ -158,6 +174,7 @@ class Aggregate
         };
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         if (_arg != null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/All.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/All.java
index e99aede46..4b00d3163 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/All.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/All.java
@@ -26,10 +26,14 @@ package org.apache.openjpa.jdbc.kernel.exps;
 class All
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public All(Val val) {
         super(val, true);
     }
 
+    @Override
     protected String getOperator() {
         return "ALL";
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
index 776a66646..7e5963b64 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AndExpression.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class AndExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp1;
     private final Exp _exp2;
 
@@ -43,12 +45,14 @@ class AndExpression
         _exp2 = exp2;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState s1 = _exp1.initialize(sel, ctx, contains);
         ExpState s2 = _exp2.initialize(sel, ctx, contains);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -68,6 +72,7 @@ class AndExpression
         sel.append(buf, state.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -75,6 +80,7 @@ class AndExpression
         _exp2.selectColumns(sel, ctx, bstate.state2, pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp1.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Any.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Any.java
index 26f88200e..3f47d24aa 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Any.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Any.java
@@ -26,10 +26,14 @@ package org.apache.openjpa.jdbc.kernel.exps;
 class Any
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public Any(Val val) {
         super(val, true);
     }
 
+    @Override
     protected String getOperator() {
         return "ANY";
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java
index c7353ccd8..f8b2d2638 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Args.java
@@ -40,6 +40,8 @@ public class Args
     extends AbstractVal
     implements Arguments {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val[] _args;
     private ClassMetaData _meta = null;
 
@@ -51,7 +53,7 @@ public class Args
     }
 
     public Args (Val... values) {
-        List<Val> list = new ArrayList<Val>();
+        List<Val> list = new ArrayList<>();
         if (values != null) {
             for (Val v : values) {
                 if (v instanceof Args) {
@@ -77,6 +79,7 @@ public class Args
         return filts;
     }
 
+    @Override
     public Value[] getValues() {
         return _args;
     }
@@ -85,18 +88,22 @@ public class Args
         return _args;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public boolean isVariable() {
         return false;
     }
 
+    @Override
     public Class getType() {
         return Object[].class;
     }
@@ -108,9 +115,11 @@ public class Args
         return c;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState[] states = new ExpState[_args.length];
         Joins joins = null;
@@ -138,10 +147,12 @@ public class Args
         }
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         ArgsExpState astate = (ArgsExpState) state;
@@ -149,17 +160,21 @@ public class Args
             _args[i].selectColumns(sel, ctx, astate.states[i], pks);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res) {
         return null;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         ArgsExpState astate = (ArgsExpState) state;
@@ -167,10 +182,12 @@ public class Args
             _args[i].calculateValue(sel, ctx, astate.states[i], null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 0;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state, SQLBuffer sql, int index) {
         appendTo(sel, ctx, state, sql, index, null);
     }
@@ -187,26 +204,32 @@ public class Args
         }
     }
 
+    @Override
     public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
     }
 
+    @Override
     public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql){
     }
 
+    @Override
     public void appendSize(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
     }
 
+    @Override
     public void appendIsNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
     }
 
+    @Override
     public void appendIsNotNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         for (int i = 0; i < _args.length; i++)
@@ -214,6 +237,7 @@ public class Args
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.ARGS_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Avg.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Avg.java
index 22624d8ea..e91d2c50f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Avg.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Avg.java
@@ -23,9 +23,8 @@ package org.apache.openjpa.jdbc.kernel.exps;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class Avg
-    extends NullableAggregateUnaryOp { // OPENJPA-1794
+class Avg extends NullableAggregateUnaryOp { // OPENJPA-1794
+    private static final long serialVersionUID = 1L;
 
     /**
      * Constructor. Provide the value to operate on.
@@ -34,10 +33,12 @@ class Avg
         super(val);
     }
 
+    @Override
     protected String getOperator() {
         return "AVG";
     }
 
+    @Override
     public boolean isAggregate() {
         return true;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java
index 2f5eecd84..d88b4387e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableAndExpression.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class BindVariableAndExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final BindVariableExpression _bind;
     private final Exp _exp;
 
@@ -43,12 +45,14 @@ class BindVariableAndExpression
         _exp = exp;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState s1 = _bind.initialize(sel, ctx, contains);
         ExpState s2 = _exp.initialize(sel, ctx, contains);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         boolean or = _exp instanceof OrExpression;
@@ -59,11 +63,13 @@ class BindVariableAndExpression
             buf.append(")");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         _exp.selectColumns(sel, ctx, ((BinaryOpExpState) state).state2, pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _bind.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java
index 40f4a6f12..39bb23765 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/BindVariableExpression.java
@@ -38,6 +38,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class BindVariableExpression
     extends EmptyExpression {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Variable _var;
 
     /**
@@ -54,19 +56,23 @@ class BindVariableExpression
         return _var;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         return _var.initialize(sel, ctx, 0);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         buf.append("1 = 1");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _var.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CoalesceExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CoalesceExpression.java
index 6174189e7..68210638d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CoalesceExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CoalesceExpression.java
@@ -39,6 +39,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class CoalesceExpression
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val[] _vals;
     private ClassMetaData _meta = null;
     private Class _cast = null;
@@ -56,6 +58,7 @@ public class CoalesceExpression
         return _vals;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
@@ -67,6 +70,7 @@ public class CoalesceExpression
         return type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState[] states = new ExpState[_vals.length];
         Joins joins = null;
@@ -91,6 +95,7 @@ public class CoalesceExpression
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf, int index) {
         CoalesceExpState cstate = (CoalesceExpState) state;
@@ -106,6 +111,7 @@ public class CoalesceExpression
         buf.append(")");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         CoalesceExpState cstate = (CoalesceExpState) state;
@@ -114,6 +120,7 @@ public class CoalesceExpression
             _vals[i].selectColumns(sel, ctx, cstate.states[i], pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         for (int i = 0; i < _vals.length; i++)
@@ -121,10 +128,12 @@ public class CoalesceExpression
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.COALESCE_VAL;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         CoalesceExpState cstate = (CoalesceExpState) state;
@@ -132,10 +141,12 @@ public class CoalesceExpression
             _vals[i].calculateValue(sel, ctx, cstate.states[i], other, otherState);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
@@ -147,29 +158,35 @@ public class CoalesceExpression
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state, boolean pks){
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java
index 87827741d..17d9c3c3c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java
@@ -40,6 +40,9 @@ import org.apache.openjpa.util.ImplHelper;
 public class CollectionParam
     extends Const
     implements Parameter {
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(
         CollectionParam.class);
 
@@ -56,6 +59,7 @@ public class CollectionParam
         setImplicitType(type);
     }
 
+    @Override
     public CollectionParam clone() {
         CollectionParam c = new CollectionParam(this._key, this._type);
         c._idx = this._idx;
@@ -63,14 +67,17 @@ public class CollectionParam
         return c;
     }
 
+    @Override
     public Object getParameterKey() {
         return _key;
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _type = type;
         _container = (getMetaData() == null || !ImplHelper.isManagedType(
@@ -83,14 +90,17 @@ public class CollectionParam
         return _idx;
     }
 
+    @Override
     public void setIndex(int idx) {
         _idx = idx;
     }
 
+    @Override
     public Object getValue(Object[] params) {
         return Filters.convert(params[_idx], getType());
     }
 
+    @Override
     public Object getValue(ExpContext ctx, ExpState state) {
         ParamExpState pstate = (ParamExpState) state;
         if (pstate.discValue[0] != null)
@@ -99,10 +109,12 @@ public class CollectionParam
             return getValue(ctx.params);
     }
 
+    @Override
     public Object getSQLValue(Select sel, ExpContext ctx, ExpState state) {
         return ((ParamExpState) state).sqlValue;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return new ParamExpState(ctx.params[_idx]);
     }
@@ -138,6 +150,7 @@ public class CollectionParam
         }
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         super.calculateValue(sel, ctx, state, other, otherState);
@@ -179,6 +192,7 @@ public class CollectionParam
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         ParamExpState pstate = (ParamExpState) state;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java
index 8b2c50f30..e9748a3e6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java
@@ -35,6 +35,9 @@ import org.apache.openjpa.util.UserException;
 abstract class CompareEqualExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (CompareEqualExpression.class);
 
@@ -61,6 +64,7 @@ abstract class CompareEqualExpression
         return _val2;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         boolean direct = isDirectComparison();
         int flags1 = 0;
@@ -91,6 +95,7 @@ abstract class CompareEqualExpression
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -110,6 +115,7 @@ abstract class CompareEqualExpression
             sel.append(buf, state.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -133,6 +139,7 @@ abstract class CompareEqualExpression
         return true;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareExpression.java
index 2fb53245f..16fb3fa22 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareExpression.java
@@ -20,13 +20,13 @@ package org.apache.openjpa.jdbc.kernel.exps;
 
 import java.util.Map;
 
+import org.apache.openjpa.jdbc.sql.Raw;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.Filters;
 import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.UserException;
-import org.apache.openjpa.jdbc.sql.Raw;
 
 /**
  * Compares two values.
@@ -36,6 +36,8 @@ import org.apache.openjpa.jdbc.sql.Raw;
 class CompareExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String LESS = "<";
     public static final String GREATER = ">";
     public static final String LESS_EQUAL = "<=";
@@ -57,12 +59,14 @@ class CompareExpression
         _op = op;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -89,6 +93,7 @@ class CompareExpression
             sel.append(buf, state.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -96,6 +101,7 @@ class CompareExpression
         _val2.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Concat.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Concat.java
index 661551da5..a399162e3 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Concat.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Concat.java
@@ -38,6 +38,7 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class Concat
     extends AbstractVal {
 
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
     private ClassMetaData _meta = null;
@@ -58,32 +59,39 @@ public class Concat
         return _val2;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -91,10 +99,12 @@ public class Concat
         _val2.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -107,12 +117,14 @@ public class Concat
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -120,10 +132,12 @@ public class Concat
         _val2.calculateValue(sel, ctx, bstate.state2, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -147,6 +161,7 @@ public class Concat
         sql.append(part3);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
@@ -154,6 +169,7 @@ public class Concat
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.CONCAT_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Const.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Const.java
index 5b4b75624..5a5968046 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Const.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Const.java
@@ -38,12 +38,16 @@ abstract class Const
     extends AbstractVal
     implements Constant {
 
+    
+    private static final long serialVersionUID = 1L;
     private ClassMetaData _meta = null;
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
@@ -81,6 +85,7 @@ abstract class Const
         return getValue(ctx.params);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return new ConstExpState();
     }
@@ -101,6 +106,7 @@ abstract class Const
         }
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         if (other instanceof PCPath)
@@ -108,6 +114,7 @@ abstract class Const
                 getColumns(otherState);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
@@ -120,28 +127,34 @@ abstract class Const
         return buf;
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return getValue(ctx, state);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         Object obj = getValue(ctx, state);
@@ -153,6 +166,7 @@ abstract class Const
             sql.append(FALSE);
     }
 
+    @Override
     public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql){
         Object obj = getValue(ctx, state);
@@ -164,6 +178,7 @@ abstract class Const
             sql.append(TRUE);
     }
 
+    @Override
     public void appendSize(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         Object obj = getValue(ctx, state);
@@ -175,6 +190,7 @@ abstract class Const
             sql.append("1");
     }
 
+    @Override
     public void appendIsNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         if (isSQLValueNull(sel, ctx, state))
@@ -183,6 +199,7 @@ abstract class Const
             sql.append(FALSE);
     }
 
+    @Override
     public void appendIsNotNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         if (!isSQLValueNull(sel, ctx, state))
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstGetObjectId.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstGetObjectId.java
index 12bc4cac3..a5b8a37fd 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstGetObjectId.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstGetObjectId.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.util.ImplHelper;
 class ConstGetObjectId
     extends Const {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Const _constant;
 
     /**
@@ -39,13 +41,16 @@ class ConstGetObjectId
         _constant = constant;
     }
 
+    @Override
     public Class getType() {
         return Object.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public Object getValue(Object[] params) {
         Object o = _constant.getValue(params);
         if (!(ImplHelper.isManageable(o)))
@@ -55,19 +60,23 @@ class ConstGetObjectId
             .pcFetchObjectId();
     }
 
+    @Override
     public Object getValue(ExpContext ctx, ExpState state) {
         return ctx.store.getContext().getObjectId(_constant.getValue(ctx,
             ((ConstGetObjectIdExpState) state).constantState));
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return new ConstGetObjectIdExpState(_constant.initialize(sel, ctx, 0));
     }
 
+    @Override
     public Object getSQLValue(Select sel, ExpContext ctx, ExpState state) {
         return ((ConstGetObjectIdExpState) state).sqlValue;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         super.calculateValue(sel, ctx, state, other, otherState);
@@ -82,6 +91,7 @@ class ConstGetObjectId
             cstate.sqlValue = oid;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         ConstGetObjectIdExpState cstate = (ConstGetObjectIdExpState) state;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstInstanceofExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstInstanceofExpression.java
index f022f4cd1..823b7cef6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstInstanceofExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstInstanceofExpression.java
@@ -33,6 +33,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class ConstInstanceofExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Const _const;
     private final Class _cls;
 
@@ -44,10 +46,12 @@ class ConstInstanceofExpression
         _cls = Filters.wrap(cls);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         return _const.initialize(sel, ctx, 0);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         _const.calculateValue(sel, ctx, state, null, null);
@@ -57,11 +61,13 @@ class ConstInstanceofExpression
             buf.append("1 <> 1");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         _const.selectColumns(sel, ctx, state, pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _const.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java
index b1984e0f6..40a727c21 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java
@@ -32,8 +32,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.XMLMetaData;
-import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.ImplHelper;
+import org.apache.openjpa.util.InternalException;
 
 /**
  * A field traversal starting with a constant filter parameter.
@@ -44,6 +44,8 @@ class ConstPath
     extends Const
     implements JDBCPath {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Const _constant;
     private final LinkedList _actions = new LinkedList();
 
@@ -54,6 +56,7 @@ class ConstPath
         _constant = constant;
     }
 
+    @Override
     public Class getType() {
         if (_actions.isEmpty()) {
             ClassMetaData meta = getMetaData();
@@ -69,17 +72,21 @@ class ConstPath
         return fmd.getDeclaredType();
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _actions.add(type);
     }
 
+    @Override
     public void get(FieldMetaData field, boolean nullTraversal) {
         _actions.add(field);
     }
 
+    @Override
     public void getKey() {
     }
 
+    @Override
     public FieldMetaData last() {
         ListIterator itr = _actions.listIterator(_actions.size());
         Object prev;
@@ -91,22 +98,27 @@ class ConstPath
         return null;
     }
 
+    @Override
     public Object getValue(Object[] params) {
         throw new InternalException();
     }
 
+    @Override
     public Object getValue(ExpContext ctx, ExpState state) {
         return ((ConstPathExpState) state).value;
     }
 
+    @Override
     public Object getSQLValue(Select sel, ExpContext ctx, ExpState state) {
         return ((ConstPathExpState) state).sqlValue;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return new ConstPathExpState(_constant.initialize(sel, ctx, 0));
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         super.calculateValue(sel, ctx, state, other, otherState);
@@ -177,6 +189,7 @@ class ConstPath
             cstate.sqlValue = cstate.value;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         ConstPathExpState cstate = (ConstPathExpState) state;
@@ -187,6 +200,7 @@ class ConstPath
             sql.appendValue(cstate.sqlValue, cstate.getColumn(index));
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _constant.acceptVisit(visitor);
@@ -209,26 +223,33 @@ class ConstPath
         }
     }
 
+    @Override
     public void get(FieldMetaData fmd, XMLMetaData meta) {
     }
 
+    @Override
     public void get(XMLMetaData meta, String name) {
     }
 
+    @Override
     public XMLMetaData getXmlMapping() {
         return null;
     }
 
+    @Override
     public void setSchemaAlias(String schemaAlias) {
     }
 
+    @Override
     public String getSchemaAlias() {
         return null;
     }
 
+    @Override
     public void setSubqueryContext(Context conext, String correlationVar) {
     }
 
+    @Override
     public String getCorrelationVar() {
         return null;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java
index 15252c83c..e91d48b66 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsExpression.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.jdbc.sql.Select;
 class ContainsExpression
     extends EqualExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to test.
      */
@@ -37,6 +40,7 @@ class ContainsExpression
         super(val1, val2);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         Val val1 = getValue1();
         if (contains != null && val1 instanceof PCPath) {
@@ -56,6 +60,7 @@ class ContainsExpression
         return super.initialize(sel, ctx, contains);
     }
 
+    @Override
     protected boolean isDirectComparison() {
         return false;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsKeyExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsKeyExpression.java
index 4ee06678a..aefbaedf0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsKeyExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ContainsKeyExpression.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.jdbc.sql.Select;
 class ContainsKeyExpression
     extends ContainsExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to test.
      */
@@ -37,6 +40,7 @@ class ContainsKeyExpression
         super(val1, val2);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         Val val1 = getValue1();
         if (val1 instanceof PCPath)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Count.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Count.java
index 1b8ccd3ae..bc71226af 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Count.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Count.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.jdbc.sql.Select;
 class Count
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
     private boolean isCountMultiColumns = false;
     private boolean isCountDistinct = false;
 
@@ -42,6 +44,7 @@ class Count
             isCountDistinct = true;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         // join into related object if present
         ExpState expState = initializeValue(sel, ctx, JOIN_REL);
@@ -56,14 +59,17 @@ class Count
         return expState;
     }
 
+    @Override
     protected Class getType(Class c) {
         return long.class;
     }
 
+    @Override
     protected String getOperator() {
         return "COUNT";
     }
 
+    @Override
     public boolean isAggregate() {
         return true;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CurrentDate.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CurrentDate.java
index 1c3601cb0..69cefd360 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CurrentDate.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CurrentDate.java
@@ -36,19 +36,24 @@ import org.apache.openjpa.util.InternalException;
 class CurrentDate
     extends Const {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Class<? extends Date> _type;
 
     public CurrentDate(Class<? extends Date> type) {
         _type = type;
     }
 
+    @Override
     public Class<? extends Date> getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res) throws SQLException {
         if (Timestamp.class.isAssignableFrom(_type)) {
             return res.getTimestamp(this, null);
@@ -61,6 +66,7 @@ class CurrentDate
         }
     }
 
+    @Override
     public Object getValue(Object[] params) {
         try {
             return _type.getConstructor(long.class).newInstance(System.currentTimeMillis());
@@ -69,6 +75,7 @@ class CurrentDate
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state, SQLBuffer sql, int index) {
         if (Timestamp.class.isAssignableFrom(_type)) {
             sql.append(ctx.store.getDBDictionary().currentTimestampFunction);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/DatastoreFunction.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/DatastoreFunction.java
index f8b233435..6a5c2ed2f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/DatastoreFunction.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/DatastoreFunction.java
@@ -28,8 +28,8 @@ import org.apache.openjpa.kernel.exps.Arguments;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class DatastoreFunction extends UnaryOp {
+    private static final long serialVersionUID = 1L;
     private final String _functionName;
 
     public DatastoreFunction(String name, Class<?> resultType, Arguments args) {
@@ -43,6 +43,7 @@ public class DatastoreFunction extends UnaryOp {
         return _functionName;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         Args args = (Args) getValue();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Distinct.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Distinct.java
index c06179548..b0bef47a5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Distinct.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Distinct.java
@@ -29,15 +29,20 @@ import org.apache.openjpa.jdbc.sql.Select;
 class Distinct
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public Distinct(Val val) {
         super(val, true);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         // join into related object if present
         return initializeValue(sel, ctx, JOIN_REL);
     }
 
+    @Override
     protected String getOperator() {
         return "DISTINCT";
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EmptyExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EmptyExpression.java
index 020917791..d7d6350b5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EmptyExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EmptyExpression.java
@@ -32,18 +32,25 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class EmptyExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         return ExpState.NULL;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         visitor.exit(this);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EndsWithExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EndsWithExpression.java
index 5ad521d4f..b72f76ff4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EndsWithExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EndsWithExpression.java
@@ -38,6 +38,8 @@ import org.apache.openjpa.meta.XMLMetaData;
 class EndsWithExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
 
@@ -49,12 +51,14 @@ class EndsWithExpression
         _val2 = val2;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -105,6 +109,7 @@ class EndsWithExpression
         sel.append(buf, state.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -112,6 +117,7 @@ class EndsWithExpression
         _val2.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
@@ -140,18 +146,22 @@ class EndsWithExpression
             _post = post;
         }
 
+        @Override
         public Class getType() {
             return int.class;
         }
 
+        @Override
         public int length() {
             return 1;
         }
 
+        @Override
         public void appendTo(SQLBuffer buf) {
             appendTo(buf, 0);
         }
 
+        @Override
         public void appendTo(SQLBuffer buf, int index) {
             buf.append(_pre);
             _val1.appendTo(_sel, _ctx, _state.state1, buf, index);
@@ -160,50 +170,62 @@ class EndsWithExpression
             buf.append(_post);
         }
 
+        @Override
         public String getColumnAlias(Column col) {
             return _sel.getColumnAlias(col, _state.joins);
         }
 
+        @Override
         public String getColumnAlias(String col, Table table) {
             return _sel.getColumnAlias(col, table, _state.joins);
         }
 
+        @Override
         public Object toDataStoreValue(Object val) {
             return val;
         }
 
+        @Override
         public boolean isConstant() {
             return false;
         }
 
+        @Override
         public Object getValue() {
             return null;
         }
 
+        @Override
         public Object getSQLValue() {
             return null;
         }
 
+        @Override
         public boolean isPath() {
             return false;
         }
 
+        @Override
         public ClassMapping getClassMapping() {
             return null;
         }
 
+        @Override
         public FieldMapping getFieldMapping() {
             return null;
         }
 
+        @Override
         public PCPath getXPath() {
             return null;
         }
 
+        @Override
         public XMLMetaData getXmlMapping() {
             return null;
         }
 
+        @Override
         public boolean requiresCast() {
             return false;
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualExpression.java
index 60d8abbdb..bcea9e2da 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualExpression.java
@@ -31,6 +31,9 @@ import org.apache.openjpa.jdbc.sql.Select;
 class EqualExpression
     extends CompareEqualExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -38,6 +41,7 @@ class EqualExpression
         super(val1, val2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, BinaryOpExpState bstate,
         SQLBuffer buf, boolean val1Null, boolean val2Null) {
         if (val1Null && val2Null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualTypeExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualTypeExpression.java
index 2b1c6d9c3..cb883d8b5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualTypeExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/EqualTypeExpression.java
@@ -35,6 +35,9 @@ import org.apache.openjpa.meta.ClassMetaData;
 class EqualTypeExpression
     extends CompareEqualExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -54,6 +57,7 @@ class EqualTypeExpression
         return sub;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
             SQLBuffer buf) {
         Val val1 = getValue1();
@@ -66,6 +70,7 @@ class EqualTypeExpression
         super.appendTo(sel, ctx, state, buf);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, BinaryOpExpState bstate,
         SQLBuffer buf, boolean val1Null, boolean val2Null) {
         if (val1Null && val2Null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Exp.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Exp.java
index 152faf368..71595be8a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Exp.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Exp.java
@@ -42,18 +42,18 @@ interface Exp
      * used to ensure paths used for contains() within
      * the same AND expression used different aliases
      */
-    public ExpState initialize(Select sel, ExpContext ctx, Map contains);
+    ExpState initialize(Select sel, ExpContext ctx, Map contains);
 
     /**
      * Append the SQL for this expression to the given buffer. The SQL
      * should optionally include any joins this expression needs.
      */
-    public void appendTo(Select sel, ExpContext ctx, ExpState state,
+    void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf);
 
     /**
      * Select just the columns for this expression.
      */
-    public void selectColumns(Select sel, ExpContext ctx, ExpState state,
+    void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Extension.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Extension.java
index b192a1bc7..e9ab13458 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Extension.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Extension.java
@@ -40,6 +40,8 @@ class Extension
     extends AbstractVal
     implements Val, Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final JDBCFilterListener _listener;
     private final Val _target;
     private final Val _arg;
@@ -58,22 +60,27 @@ class Extension
         _candidate = candidate;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public boolean isVariable() {
         return false;
     }
 
+    @Override
     public boolean isAggregate() {
         return false;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
@@ -89,10 +96,12 @@ class Extension
         return new Class[]{ _arg.getType() };
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         // note that we tell targets and args to extensions that are sql
         // paths to go ahead and join to their related object (if any),
@@ -129,11 +138,13 @@ class Extension
         }
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         ExtensionExpState estate = (ExtensionExpState) state;
@@ -143,10 +154,12 @@ class Extension
             _arg.selectColumns(sel, ctx, estate.argState, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -159,12 +172,14 @@ class Extension
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         ExtensionExpState estate = (ExtensionExpState) state;
@@ -174,10 +189,12 @@ class Extension
             _arg.calculateValue(sel, ctx, estate.argState, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         ExtensionExpState estate = (ExtensionExpState) state;
@@ -198,6 +215,7 @@ class Extension
         };
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter((Exp) this);
         if (_target != null)
@@ -211,10 +229,12 @@ class Extension
     // Exp implementation
     //////////////////////
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         return initialize(sel, ctx, 0);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         calculateValue(sel, ctx, state, null, null);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValue.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValue.java
index 472ea0550..613ed71b4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValue.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValue.java
@@ -36,90 +36,90 @@ public interface FilterValue {
     /**
      * Return the expected type of this value.
      */
-    public Class getType();
+    Class getType();
 
     /**
      * Return the number of SQL elements in this value. Usually 1.
      */
-    public int length();
+    int length();
 
     /**
      * Append the first SQL element for this value to the given buffer.
      */
-    public void appendTo(SQLBuffer buf);
+    void appendTo(SQLBuffer buf);
 
     /**
      * Append the <code>index</code>th SQL element for this value to the
      * given buffer.
      */
-    public void appendTo(SQLBuffer buf, int index);
+    void appendTo(SQLBuffer buf, int index);
 
     /**
      * Return the alias to use for the given column (this includes the table
      * alias prefix, if any).
      */
-    public String getColumnAlias(Column col);
+    String getColumnAlias(Column col);
 
     /**
      * Return the alias to use for the given column (this includes the table
      * alias prefix, if any).
      */
-    public String getColumnAlias(String col, Table table);
+    String getColumnAlias(String col, Table table);
 
     /**
      * Transform the given value into its datastore equivalent.
      */
-    public Object toDataStoreValue(Object val);
+    Object toDataStoreValue(Object val);
 
     /**
      * Return true if this value represents a literal or parameter.
      */
-    public boolean isConstant();
+    boolean isConstant();
 
     /**
      * If this is a constant, return its value, else return null.
      */
-    public Object getValue();
+    Object getValue();
 
     /**
      * If this is a constant, returns its value as it would be represented
      * in the database in this context, else return null.
      */
-    public Object getSQLValue();
+    Object getSQLValue();
 
     /**
      * Return true if this value represents a persistent field traversal,
      * such as 'this', 'address.street', or 'projectVariable.title'.
      */
-    public boolean isPath();
+    boolean isPath();
 
     /**
      * If this is a path to a persistent object, return its class mapping,
      * else return null.
      */
-    public ClassMapping getClassMapping();
+    ClassMapping getClassMapping();
 
     /**
      * If this is a path to a persistent field, return its mapping, else
      * return null.
      */
-    public FieldMapping getFieldMapping();
+    FieldMapping getFieldMapping();
 
     /**
      * If this is an XPath, return it,
      * else return null;
      */
-    public PCPath getXPath();
+    PCPath getXPath();
 
     /**
      * If this is an XPath, return XML mapping metadata,
      * else return null;
      */
-    public XMLMetaData getXmlMapping();
+    XMLMetaData getXmlMapping();
 
     /**
      * return true if CAST is required for this filter value
      * else return false.
      */
-    public boolean requiresCast();
+    boolean requiresCast();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValueImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValueImpl.java
index bb6df0a48..a3d5b57f7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValueImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/FilterValueImpl.java
@@ -47,59 +47,73 @@ class FilterValueImpl
         _val = val;
     }
 
+    @Override
     public Class getType() {
         return _val.getType();
     }
 
+    @Override
     public int length() {
         return _val.length(_sel, _ctx, _state);
     }
 
+    @Override
     public void appendTo(SQLBuffer buf) {
         appendTo(buf, 0);
     }
 
+    @Override
     public void appendTo(SQLBuffer buf, int index) {
         _val.appendTo(_sel, _ctx, _state, buf, index);
     }
 
+    @Override
     public String getColumnAlias(Column col) {
         return _sel.getColumnAlias(col, _state.joins);
     }
 
+    @Override
     public String getColumnAlias(String col, Table table) {
         return _sel.getColumnAlias(col, table, _state.joins);
     }
 
+    @Override
     public Object toDataStoreValue(Object val) {
         return _val.toDataStoreValue(_sel, _ctx, _state, val);
     }
 
+    @Override
     public boolean isConstant() {
         return _val instanceof Const;
     }
 
+    @Override
     public Object getValue() {
         return (isConstant()) ? ((Const) _val).getValue(_ctx.params) : null;
     }
 
+    @Override
     public Object getSQLValue() {
         return (isConstant()) ? ((Const) _val).getSQLValue(_sel, _ctx, _state)
             : null;
     }
 
+    @Override
     public boolean isPath() {
         return _val instanceof PCPath;
     }
 
+    @Override
     public ClassMapping getClassMapping() {
         return (isPath()) ? ((PCPath) _val).getClassMapping(_state) : null;
     }
 
+    @Override
     public FieldMapping getFieldMapping() {
         return (isPath()) ? ((PCPath) _val).getFieldMapping(_state) : null;
     }
 
+    @Override
     public PCPath getXPath() {
         if (isPath() && ((PCPath) _val).isXPath())
             return (PCPath) _val;
@@ -107,10 +121,12 @@ class FilterValueImpl
             return null;
     }
 
+    @Override
     public XMLMetaData getXmlMapping() {
         return (getXPath() == null) ? null : getXPath().getXmlMapping();
     }
 
+    @Override
     public boolean requiresCast() {
         return !(_val instanceof All || _val instanceof Any || _val instanceof PCPath);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GeneralCaseExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GeneralCaseExpression.java
index 35fdb92e2..1b1db1dcf 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GeneralCaseExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GeneralCaseExpression.java
@@ -39,6 +39,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class GeneralCaseExpression
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp[] _exp;
     private final Val _val;
     private ClassMetaData _meta = null;
@@ -62,6 +64,7 @@ public class GeneralCaseExpression
         return _val;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
@@ -74,6 +77,7 @@ public class GeneralCaseExpression
         return type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState[] states = new ExpState[_exp.length+1];
         Joins joins = null;
@@ -104,6 +108,7 @@ public class GeneralCaseExpression
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf, int index) {
         GeneralCaseExpState cstate = (GeneralCaseExpState) state;
@@ -119,6 +124,7 @@ public class GeneralCaseExpression
         buf.append(" END ");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         GeneralCaseExpState cstate = (GeneralCaseExpState) state;
@@ -128,6 +134,7 @@ public class GeneralCaseExpression
         _val.selectColumns(sel, ctx, cstate.states[i], pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         for (int i = 0; i < _exp.length; i++)
@@ -136,10 +143,12 @@ public class GeneralCaseExpression
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.SIMPLECASE_VAL;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         GeneralCaseExpState gstate = (GeneralCaseExpState) state;
@@ -152,10 +161,12 @@ public class GeneralCaseExpression
             otherState);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
@@ -167,29 +178,35 @@ public class GeneralCaseExpression
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state, boolean pks){
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetColumn.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetColumn.java
index ea157e253..a562a09f7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetColumn.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetColumn.java
@@ -40,28 +40,36 @@ import org.apache.openjpa.util.UserException;
 public class GetColumn
     implements JDBCFilterListener {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String TAG = "getColumn";
 
     private static final Localizer _loc = Localizer.forPackage
         (GetColumn.class);
 
+    @Override
     public String getTag() {
         return TAG;
     }
 
+    @Override
     public boolean expectsArguments() {
         return true;
     }
 
+    @Override
     public boolean expectsTarget() {
         return true;
     }
 
+    @Override
     public Object evaluate(Object target, Class targetClass, Object[] args,
         Class[] argClasses, Object candidate, StoreContext ctx) {
         throw new UnsupportedException(_loc.get("no-in-mem", TAG));
     }
 
+    @Override
     public void appendTo(SQLBuffer buf, FilterValue target,
         FilterValue[] args, ClassMapping type, JDBCStore store) {
         if (!args[0].isConstant())
@@ -76,6 +84,7 @@ public class GetColumn
         buf.append(target.getColumnAlias(colName, mapping.getTable()));
     }
 
+    @Override
     public Class getType(Class targetClass, Class[] argClasses) {
         return Object.class;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java
index 7a22403fd..9b40795e0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetMapValue.java
@@ -43,6 +43,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 class GetMapValue
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _map;
     private final Val _key;
     private final String _alias;
@@ -58,28 +60,34 @@ class GetMapValue
         _alias = alias;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public boolean isVariable() {
         return false;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
         return _map.getType();
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState mapState = _map.initialize(sel, ctx, 0);
         ExpState keyState = _key.initialize(sel, ctx, 0);
@@ -104,6 +112,7 @@ class GetMapValue
         }
     }
 
+    @Override
     public Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state,
         Object val) {
         GetMapValueExpState gstate = (GetMapValueExpState) state;
@@ -111,12 +120,14 @@ class GetMapValue
     }
 
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state).append(" AS ").append(_alias),
             this);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         GetMapValueExpState gstate = (GetMapValueExpState) state;
@@ -124,10 +135,12 @@ class GetMapValue
         _key.selectColumns(sel, ctx, gstate.keyState, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(_alias, asc, false);
@@ -140,12 +153,14 @@ class GetMapValue
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         GetMapValueExpState gstate = (GetMapValueExpState) state;
@@ -153,10 +168,12 @@ class GetMapValue
         _key.calculateValue(sel, ctx, gstate.keyState, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         if (!(_map instanceof PCPath))
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java
index 96a591a41..d3db9f8a7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/GetObjectId.java
@@ -43,6 +43,9 @@ import org.apache.openjpa.util.UserException;
 class GetObjectId
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (GetObjectId.class);
 
@@ -63,21 +66,26 @@ class GetObjectId
         return _path.getClassMapping(state).getPrimaryKeyColumns();
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Class getType() {
         return Object.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState state = _path.initialize(sel, ctx, JOIN_REL);
 
@@ -91,18 +99,19 @@ class GetObjectId
         return state;
     }
 
+    @Override
     public Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state,
         Object val) {
         // if datastore identity, try to convert to a long value
         ClassMapping mapping = _path.getClassMapping(state);
-        if (mapping.getIdentityType() == mapping.ID_DATASTORE) {
+        if (mapping.getIdentityType() == ClassMetaData.ID_DATASTORE) {
             if (val instanceof Id)
                 return ((Id) val).getId();
             return Filters.convert(val, long.class);
         }
 
         // if unknown identity, can't do much
-        if (mapping.getIdentityType() == mapping.ID_UNKNOWN)
+        if (mapping.getIdentityType() == ClassMetaData.ID_UNKNOWN)
             return (val instanceof OpenJPAId) ?
                 ((OpenJPAId) val).getIdObject() : val;
 
@@ -128,44 +137,53 @@ class GetObjectId
         return vals;
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         selectColumns(sel, ctx, state, true);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         _path.selectColumns(sel, ctx, state, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         _path.groupBy(sel, ctx, state);
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         _path.orderBy(sel, ctx, state, asc);
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return _path.load(ctx, state, res, true);
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         _path.calculateValue(sel, ctx, state, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return _path.length(sel, ctx, state);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         _path.appendTo(sel, ctx, state, sql, index);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _path.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/HasContainsExpressionVisitor.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/HasContainsExpressionVisitor.java
index e16380c93..1a75aff4b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/HasContainsExpressionVisitor.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/HasContainsExpressionVisitor.java
@@ -39,6 +39,7 @@ class HasContainsExpressionVisitor
         return v._found;
     }
 
+    @Override
     public void enter(Expression exp) {
         if (!_found)
             _found = exp instanceof ContainsExpression
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java
index c308960df..2cbec2160 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InExpression.java
@@ -41,6 +41,8 @@ import org.apache.openjpa.kernel.exps.Parameter;
 class InExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Const _const;
 
@@ -67,6 +69,7 @@ class InExpression
         return _val;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState valueState = _val.initialize(sel, ctx, 0);
         ExpState constantState = _const.initialize(sel, ctx, 0);
@@ -90,6 +93,7 @@ class InExpression
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         InExpState istate = (InExpState) state;
@@ -201,6 +205,7 @@ class InExpression
             buf.append(")");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         InExpState istate = (InExpState) state;
@@ -228,6 +233,7 @@ class InExpression
         return (Collection) val;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InKeyExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InKeyExpression.java
index 09a47bcdf..84a55f21e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InKeyExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InKeyExpression.java
@@ -29,6 +29,9 @@ import java.util.Map;
 class InKeyExpression
     extends InExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply the value to test and the constant to obtain
      * the parameters from.
@@ -40,6 +43,7 @@ class InKeyExpression
     /**
      * Return the collection to test for containment with.
      */
+    @Override
     protected Collection getCollection(ExpContext ctx, ExpState state) {
         Map map = (Map) getConstant().getValue(ctx, state);
         return (map == null) ? null : map.keySet();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InSubQExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InSubQExpression.java
index 85eadd514..dbe1d7141 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InSubQExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InSubQExpression.java
@@ -33,6 +33,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class InSubQExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final SubQ _sub;
 
@@ -44,6 +46,7 @@ class InSubQExpression
         _sub = sub;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState subqState = _sub.initialize(sel, ctx, 0);
         ExpState valueState = _val.initialize(sel, ctx, 0);
@@ -67,6 +70,7 @@ class InSubQExpression
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         InSubQExpState istate = (InSubQExpState) state;
@@ -77,6 +81,7 @@ class InSubQExpression
         _sub.appendTo(sel, ctx, istate.valueState, buf, 0);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         InSubQExpState istate = (InSubQExpState) state;
@@ -84,6 +89,7 @@ class InSubQExpression
         _val.selectColumns(sel, ctx, istate.valueState, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InValueExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InValueExpression.java
index 38eb9c526..318a01f4c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InValueExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InValueExpression.java
@@ -29,6 +29,9 @@ import java.util.Map;
 class InValueExpression
     extends InExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply the value to test and the constant to obtain
      * the parameters from.
@@ -40,6 +43,7 @@ class InValueExpression
     /**
      * Return the collection to test for containment with.
      */
+    @Override
     protected Collection getCollection(ExpContext ctx, ExpState state) {
         Map map = (Map) getConstant().getValue(ctx, state);
         return (map == null) ? null : map.values();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Index.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Index.java
index b5f6a7684..1049c128c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Index.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Index.java
@@ -30,15 +30,20 @@ import org.apache.openjpa.util.InternalException;
 class Index
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public Index(Val val) {
         super(val);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         // initialize the value with a null test
         return initializeValue(sel, ctx, NULL_CMP);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         getValue().calculateValue(sel, ctx, state, null, null);
@@ -46,10 +51,12 @@ class Index
         sel.append(sql, state.joins);
     }
 
+    @Override
     protected Class getType(Class c) {
         return long.class;
     }
 
+    @Override
     protected String getOperator() {
         // since we override appendTo(), this method should never be called
         throw new InternalException();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IndexOf.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IndexOf.java
index 8266751cb..981d891cc 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IndexOf.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IndexOf.java
@@ -36,6 +36,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class IndexOf
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
     private ClassMetaData _meta = null;
@@ -56,35 +58,42 @@ public class IndexOf
     public Val getVal2() {
         return _val2;
     }
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
         return int.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -92,10 +101,12 @@ public class IndexOf
         _val2.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -108,12 +119,14 @@ public class IndexOf
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this, JavaSQLTypes.JDBC_DEFAULT,
             null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -121,10 +134,12 @@ public class IndexOf
         _val2.calculateValue(sel, ctx, bstate.state2, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -142,6 +157,7 @@ public class IndexOf
         ctx.store.getDBDictionary().indexOf(sql, str, search, start);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
@@ -149,6 +165,7 @@ public class IndexOf
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.INDEXOF_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InstanceofExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InstanceofExpression.java
index 33a05ae9b..dfdefc02d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InstanceofExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/InstanceofExpression.java
@@ -38,6 +38,8 @@ import org.apache.openjpa.meta.JavaTypes;
 class InstanceofExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final PCPath _path;
     private final Class _cls;
 
@@ -49,6 +51,7 @@ class InstanceofExpression
         _cls = cls;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         // note that we tell the path to go ahead and join to its related
         // object (if any) in order to access its class indicator
@@ -133,6 +136,7 @@ class InstanceofExpression
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         // if no class indicator or a final class, just append true or false
@@ -152,6 +156,7 @@ class InstanceofExpression
         sel.append(sql, istate.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         InstanceofExpState istate = (InstanceofExpState) state;
@@ -159,6 +164,7 @@ class InstanceofExpression
             sel.select(istate.discrim.getColumns(), istate.joins);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _path.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsEmptyExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsEmptyExpression.java
index 0ab9dc50f..ba5f41381 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsEmptyExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsEmptyExpression.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class IsEmptyExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -41,10 +43,12 @@ class IsEmptyExpression
         _val = val;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         return _val.initialize(sel, ctx, Val.NULL_CMP);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         _val.calculateValue(sel, ctx, state, null, null);
@@ -52,11 +56,13 @@ class IsEmptyExpression
         sel.append(buf, state.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         _val.selectColumns(sel, ctx, state, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsNotEmptyExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsNotEmptyExpression.java
index 226f322bb..02af4ce7b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsNotEmptyExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/IsNotEmptyExpression.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class IsNotEmptyExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -41,10 +43,12 @@ class IsNotEmptyExpression
         _val = val;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         return _val.initialize(sel, ctx, Val.NULL_CMP);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         _val.calculateValue(sel, ctx, state, null, null);
@@ -52,11 +56,13 @@ class IsNotEmptyExpression
         sel.append(buf, state.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         _val.selectColumns(sel, ctx, state, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCAggregateListener.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCAggregateListener.java
index f73db264d..b9985642d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCAggregateListener.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCAggregateListener.java
@@ -40,6 +40,6 @@ public interface JDBCAggregateListener
      * @param mapping the class mapping for the query's candidate class
      * @param store the store that owns the query
      */
-    public void appendTo(SQLBuffer buf, FilterValue[] args,
+    void appendTo(SQLBuffer buf, FilterValue[] args,
         ClassMapping mapping, JDBCStore store);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
index eb9bec413..04f3a19b8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
@@ -50,6 +50,9 @@ import org.apache.openjpa.util.UserException;
 public class JDBCExpressionFactory
     implements ExpressionFactory, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Val NULL = new Null();
 
     private static final Localizer _loc = Localizer.forPackage(JDBCExpressionFactory.class);
@@ -78,14 +81,17 @@ public class JDBCExpressionFactory
         return _cons;
     }
 
+    @Override
     public Expression emptyExpression() {
         return new EmptyExpression();
     }
 
+    @Override
     public Expression asExpression(Value v) {
         return equal(v, newLiteral(Boolean.TRUE, Literal.TYPE_BOOLEAN));
     }
 
+    @Override
     public Expression equal(Value v1, Value v2) {
         // if we're comparing an unaccessed bound variable, like in:
         // coll.contains (var) && var == x, then translate into:
@@ -133,6 +139,7 @@ public class JDBCExpressionFactory
         }
     }
 
+    @Override
     public Expression notEqual(Value v1, Value v2) {
         if (v1 instanceof Type || v2 instanceof Type) {
             Value val = v1 instanceof Type ? v1 : v2;
@@ -143,34 +150,41 @@ public class JDBCExpressionFactory
         return new NotEqualExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression lessThan(Value v1, Value v2) {
         return new CompareExpression((Val) v1, (Val) v2,
             CompareExpression.LESS);
     }
 
+    @Override
     public Expression greaterThan(Value v1, Value v2) {
         return new CompareExpression((Val) v1, (Val) v2,
             CompareExpression.GREATER);
     }
 
+    @Override
     public Expression lessThanEqual(Value v1, Value v2) {
         return new CompareExpression((Val) v1, (Val) v2,
             CompareExpression.LESS_EQUAL);
     }
 
+    @Override
     public Expression greaterThanEqual(Value v1, Value v2) {
         return new CompareExpression((Val) v1, (Val) v2,
             CompareExpression.GREATER_EQUAL);
     }
 
+    @Override
     public Expression isEmpty(Value val) {
         return new IsEmptyExpression((Val) val);
     }
 
+    @Override
     public Expression isNotEmpty(Value val) {
         return new IsNotEmptyExpression((Val) val);
     }
 
+    @Override
     public Expression contains(Value map, Value arg) {
         if (map instanceof Const) {
             if (arg instanceof Type) {
@@ -187,24 +201,28 @@ public class JDBCExpressionFactory
         return new ContainsExpression((Val) map, (Val) arg);
     }
 
+    @Override
     public Expression containsKey(Value map, Value arg) {
         if (map instanceof Const)
             return new InKeyExpression((Val) arg, (Const) map);
         return new ContainsKeyExpression((Val) map, (Val) arg);
     }
 
+    @Override
     public Expression containsValue(Value map, Value arg) {
         if (map instanceof Const)
             return new InValueExpression((Val) arg, (Const) map);
         return new ContainsExpression((Val) map, (Val) arg);
     }
 
+    @Override
     public Expression isInstance(Value val, Class c) {
         if (val instanceof Const)
             return new ConstInstanceofExpression((Const) val, c);
         return new InstanceofExpression((PCPath) val, c);
     }
 
+    @Override
     public Expression and(Expression exp1, Expression exp2) {
         if (exp1 instanceof BindVariableExpression)
             return new BindVariableAndExpression((BindVariableExpression) exp1,
@@ -215,10 +233,12 @@ public class JDBCExpressionFactory
         return new AndExpression((Exp) exp1, (Exp) exp2);
     }
 
+    @Override
     public Expression or(Expression exp1, Expression exp2) {
         return new OrExpression((Exp) exp1, (Exp) exp2);
     }
 
+    @Override
     public Expression not(Expression exp) {
         if (!(exp instanceof IsNotEmptyExpression) &&
             !(exp instanceof InSubQExpression) &&
@@ -227,6 +247,7 @@ public class JDBCExpressionFactory
         return new NotExpression((Exp) exp);
     }
 
+    @Override
     public Expression bindVariable(Value var, Value val) {
         // handle the strange case of using a constant path to bind a
         // variable; in these cases the variable acts like an unbound
@@ -240,6 +261,7 @@ public class JDBCExpressionFactory
         return new BindVariableExpression((Variable) var, (PCPath) val, false);
     }
 
+    @Override
     public Expression bindKeyVariable(Value var, Value val) {
         // handle the strange case of using a constant path to bind a
         // variable; in these cases the variable acts like an unbound
@@ -253,23 +275,28 @@ public class JDBCExpressionFactory
         return new BindVariableExpression((Variable) var, (PCPath) val, true);
     }
 
+    @Override
     public Expression bindValueVariable(Value var, Value val) {
         return bindVariable(var, val);
     }
 
+    @Override
     public Expression startsWith(Value v1, Value v2) {
         return new StartsWithExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression endsWith(Value v1, Value v2) {
         return new EndsWithExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression notMatches(Value v1, Value v2,
         String single, String multi, String esc) {
         return not(matches(v1, v2, single, multi, esc));
     }
 
+    @Override
     public Expression matches(Value v1, Value v2,
         String single, String multi, String esc) {
         if (!(v2 instanceof Const))
@@ -282,6 +309,7 @@ public class JDBCExpressionFactory
         return new MatchesExpression((Val) v1, (Const) v2, single, multi, esc);
     }
 
+    @Override
     public Subquery newSubquery(ClassMetaData candidate, boolean subs,
         String alias) {
         DBDictionary dict = _type.getMappingRepository().getDBDictionary();
@@ -289,10 +317,12 @@ public class JDBCExpressionFactory
         return new SubQ((ClassMapping) candidate, subs, alias);
     }
 
+    @Override
     public Path newPath() {
         return new PCPath(_type);
     }
 
+    @Override
     public Path newPath(Value val) {
         if (val instanceof Const)
             return new ConstPath((Const) val);
@@ -301,57 +331,70 @@ public class JDBCExpressionFactory
         return new PCPath(_type, (Variable) val);
     }
 
+    @Override
     public Literal newLiteral(Object val, int ptype) {
         return new Lit(val, ptype);
     }
 
+    @Override
     public Literal newTypeLiteral(Object val, int ptype) {
         return new TypeLit(val, ptype);
     }
 
+    @Override
     public Value getThis() {
         return new PCPath(_type);
     }
 
+    @Override
     public Value getNull() {
         return NULL;
     }
 
+    @Override
     public <T extends Date> Value getCurrentDate(Class<T> dateType) {
         return new CurrentDate(dateType);
     }
 
+    @Override
     public <T extends Date> Value getCurrentTime(Class<T> dateType) {
         return  new CurrentDate(dateType);
     }
 
+    @Override
     public <T extends Date> Value getCurrentTimestamp(Class<T> dateType) {
         return  new CurrentDate(dateType);
     }
 
+    @Override
     public Parameter newParameter(Object name, Class type) {
         return new Param(name, type);
     }
 
+    @Override
     public Parameter newCollectionValuedParameter(Object key, Class type) {
         return new CollectionParam(key, type);
     }
 
+    @Override
     public Value newExtension(FilterListener listener, Value target,
         Value arg) {
         return new Extension((JDBCFilterListener) listener,
             (Val) target, (Val) arg, _type);
     }
 
+    @Override
     public Value newAggregate(AggregateListener listener, Value arg) {
         return new Aggregate((JDBCAggregateListener) listener,
             (Val) arg, _type);
     }
 
+    @Override
     public Arguments newArgumentList(Value v1, Value v2) {
         return new Args((Val) v1, (Val) v2);
     }
 
+    @Override
     public Arguments newArgumentList(Value... vs) {
         if (vs == null)
            return new Args(null);
@@ -363,139 +406,172 @@ public class JDBCExpressionFactory
         return new Args(vals);
     }
 
+    @Override
     public Value newUnboundVariable(String name, Class type) {
         return new Variable(name, type);
     }
 
+    @Override
     public Value newBoundVariable(String name, Class type) {
         return newUnboundVariable(name, type);
     }
 
+    @Override
     public Value cast(Value val, Class cls) {
         val.setImplicitType(cls);
         return val;
     }
 
+    @Override
     public Value add(Value v1, Value v2) {
         return new Math((Val) v1, (Val) v2, Math.ADD);
     }
 
+    @Override
     public Value subtract(Value v1, Value v2) {
         return new Math((Val) v1, (Val) v2, Math.SUBTRACT);
     }
 
+    @Override
     public Value multiply(Value v1, Value v2) {
         return new Math((Val) v1, (Val) v2, Math.MULTIPLY);
     }
 
+    @Override
     public Value divide(Value v1, Value v2) {
         return new Math((Val) v1, (Val) v2, Math.DIVIDE);
     }
 
+    @Override
     public Value mod(Value v1, Value v2) {
         return new Math((Val) v1, (Val) v2, Math.MOD);
     }
 
+    @Override
     public Value abs(Value val) {
         return new Abs((Val) val);
     }
 
+    @Override
     public Value indexOf(Value v1, Value v2) {
         return new IndexOf((Val) v1, (Val) v2);
     }
 
+    @Override
     public Value concat(Value v1, Value v2) {
         return new Concat((Val) v1, (Val) v2);
     }
 
+    @Override
     public Value stringLength(Value str) {
         return new StringLength((Val) str);
     }
 
+    @Override
     public Value trim(Value str, Value trimChar, Boolean where) {
         return new Trim((Val) str, (Val) trimChar, where);
     }
 
+    @Override
     public Value sqrt(Value val) {
         return new Sqrt((Val) val);
     }
 
+    @Override
     public Value substring(Value v1, Value v2) {
         return new Substring((Val) v1, (Val) v2);
     }
 
+    @Override
     public Value toUpperCase(Value val) {
         return new ToUpperCase((Val) val);
     }
 
+    @Override
     public Value toLowerCase(Value val) {
         return new ToLowerCase((Val) val);
     }
 
+    @Override
     public Value avg(Value val) {
         return new Avg((Val) val);
     }
 
+    @Override
     public Value count(Value val) {
         return new Count((Val) val);
     }
 
+    @Override
     public Value distinct(Value val) {
         return new Distinct((Val) val);
     }
 
+    @Override
     public Value max(Value val) {
         return new Max((Val) val);
     }
 
+    @Override
     public Value min(Value val) {
         return new Min((Val) val);
     }
 
+    @Override
     public Value sum(Value val) {
         return new Sum((Val) val);
     }
 
+    @Override
     public Value any(Value val) {
         return new Any((Val) val);
     }
 
+    @Override
     public Value all(Value val) {
         return new All((Val) val);
     }
 
+    @Override
     public Value size(Value val) {
         return new Size((Val) val);
     }
 
+    @Override
     public Value index(Value val) {
         ((PCPath) val).verifyIndexedField();
         return new Index((Val) val);
     }
 
+    @Override
     public Value type(Value val) {
         return new Type((Val) val);
     }
 
+    @Override
     public Value mapEntry(Value key, Value val) {
         return new MapEntry((Val) key, (Val) val);
     }
 
+    @Override
     public Value mapKey(Value key, Value val) {
         return new MapKey((Val) key);
     }
 
+    @Override
     public Value getKey(Value val) {
         ((PCPath) val).getKey();
         return val;
     }
 
+    @Override
     public Value getObjectId(Value val) {
         if (val instanceof Const)
             return new ConstGetObjectId((Const) val);
         return new GetObjectId((PCPath) val);
     }
 
+    @Override
     public Value getMapValue(Value map, Value arg) {
         return new GetMapValue((Val) map, (Val) arg,
             "gmv" + _getMapValueAlias++);
@@ -526,6 +602,7 @@ public class JDBCExpressionFactory
         return val;
     }
 
+    @Override
     public Value simpleCaseExpression(Value caseOperand, Expression[] exp,
             Value val1) {
         Exp[] exps = new Exp[exp.length];
@@ -536,6 +613,7 @@ public class JDBCExpressionFactory
             (Val) val1);
     }
 
+    @Override
     public Value generalCaseExpression(Expression[] exp,
             Value val) {
         Exp[] exps = new Exp[exp.length];
@@ -545,17 +623,20 @@ public class JDBCExpressionFactory
         return new GeneralCaseExpression(exps, (Val) val);
     }
 
+    @Override
     public Expression whenCondition(Expression exp, Value val) {
         val = getLiteralRawString(val);
         return new WhenCondition((Exp) exp, (Val) val);
     }
 
+    @Override
     public Expression whenScalar(Value val1, Value val2) {
         val1 = getLiteralRawString(val1);
         val2 = getLiteralRawString(val2);
         return new WhenScalar((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value coalesceExpression(Value[] vals) {;
         Object[] values = new Val[vals.length];
         for (int i = 0; i < vals.length; i++) {
@@ -564,16 +645,19 @@ public class JDBCExpressionFactory
         return new CoalesceExpression((Val[]) values);
     }
 
+    @Override
     public Value nullIfExpression(Value val1, Value val2) {
         val1 = getLiteralRawString(val1);
         val2 = getLiteralRawString(val2);
         return new NullIfExpression((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value newFunction(String functionName, Class<?> resultType, Value... args) {
         return new DatastoreFunction(functionName, resultType, newArgumentList(args));
     }
 
+    @Override
     public boolean isVerticalType(Value val) {
         if (!(val instanceof Type))
             return false;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCFilterListener.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCFilterListener.java
index e86656528..a231deadc 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCFilterListener.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCFilterListener.java
@@ -42,6 +42,6 @@ public interface JDBCFilterListener
      * @param mapping the class mapping for the query's candidate class
      * @param store the store that owns the query
      */
-    public void appendTo(SQLBuffer buf, FilterValue target, FilterValue[] args,
+    void appendTo(SQLBuffer buf, FilterValue target, FilterValue[] args,
         ClassMapping mapping, JDBCStore store);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCPath.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCPath.java
index b57360fcf..8efa9cd3a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCPath.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCPath.java
@@ -28,5 +28,5 @@ import org.apache.openjpa.kernel.exps.Path;
 interface JDBCPath
     extends Path, Val {
 
-    public void getKey();
+    void getKey();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCStringContains.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCStringContains.java
index 1d528cc1e..7eaf5d72d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCStringContains.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCStringContains.java
@@ -33,13 +33,17 @@ import org.apache.openjpa.util.UserException;
  *
  * @deprecated Use <code>matches()</code> instead.
  */
+@Deprecated
 public class JDBCStringContains
     extends StringContains
     implements JDBCFilterListener {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (JDBCStringContains.class);
 
+    @Override
     public void appendTo(SQLBuffer buf, FilterValue target, FilterValue[] args,
         ClassMapping type, JDBCStore store) {
         if (!args[0].isConstant())
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCWildcardMatch.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCWildcardMatch.java
index 040c9af0d..e98281d9d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCWildcardMatch.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCWildcardMatch.java
@@ -34,13 +34,17 @@ import org.apache.openjpa.util.UserException;
  *
  * @deprecated Use <code>matches()</code> instead.
  */
+@Deprecated
 public class JDBCWildcardMatch
     extends WildcardMatch
     implements JDBCFilterListener {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (JDBCWildcardMatch.class);
 
+    @Override
     public void appendTo(SQLBuffer sql, FilterValue target, FilterValue[] args,
         ClassMapping type, JDBCStore store) {
         if (!args[0].isConstant())
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Lit.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Lit.java
index 904f956dd..a0ed1bc22 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Lit.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Lit.java
@@ -34,6 +34,8 @@ public class Lit
     extends Const
     implements Literal {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object _val;
     private int _ptype;
     private boolean _isRaw;
@@ -50,28 +52,34 @@ public class Lit
             _isRaw = true;
     }
 
+    @Override
     public Class getType() {
         if (_isRaw && _rawVal != null)
             return Raw.class;
         return (_val == null) ? Object.class : _val.getClass();
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _val = Filters.convert(_val, type);
     }
 
+    @Override
     public int getParseType() {
         return _ptype;
     }
 
+    @Override
     public Object getValue() {
         return _val;
     }
 
+    @Override
     public void setValue(Object val) {
         _val = val;
     }
 
+    @Override
     public Object getValue(Object[] params) {
         return getValue();
     }
@@ -88,6 +96,7 @@ public class Lit
         return _rawVal;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return new LitExpState();
     }
@@ -102,6 +111,7 @@ public class Lit
         public int otherLength;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         super.calculateValue(sel, ctx, state, other, otherState);
@@ -113,6 +123,7 @@ public class Lit
             lstate.sqlValue = _val;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         LitExpState lstate = (LitExpState) state;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java
index ebdcd3b02..f6af0cabb 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java
@@ -35,6 +35,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class MapEntry
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _key;
     private final Val _val;
     private ClassMetaData _meta = null;
@@ -64,29 +66,35 @@ public class MapEntry
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         _val.calculateValue(sel, ctx, state, other, otherState);
         _key.calculateValue(sel, ctx, state, other, otherState);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState val = _val.initialize(sel, ctx, flags);
         ExpState key = _key.initialize(sel, ctx, flags);
         return new EntryExpState(key, val);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         EntryExpState estate = (EntryExpState) state;
@@ -97,15 +105,18 @@ public class MapEntry
         return new Entry(key, val);
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state, boolean asc)
     {
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state, boolean pks)
     {
         selectColumns(sel, ctx, state, pks);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         EntryExpState estate = (EntryExpState) state;
@@ -113,17 +124,21 @@ public class MapEntry
         _val.selectColumns(sel, ctx, estate.val, pks);
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public Class getType() {
         return Map.Entry.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
@@ -136,18 +151,22 @@ public class MapEntry
             key = k;
             value = v;
         }
+        @Override
         public K getKey() {
             return key;
         }
 
+        @Override
         public V getValue() {
             return value;
         }
 
+        @Override
         public V setValue(V v) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other instanceof Map.Entry == false)
                 return false;
@@ -158,6 +177,7 @@ public class MapEntry
                 that.getValue() == null : value.equals(that.getValue()));
         }
 
+        @Override
         public int hashCode() {
             return  (key == null   ? 0 : key.hashCode()) ^
             (value == null ? 0 : value.hashCode());
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java
index 7dee92674..32dcbd50e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java
@@ -34,6 +34,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class MapKey
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _key;
     private ClassMetaData _meta = null;
     private Class _cast = null;
@@ -60,38 +62,45 @@ public class MapKey
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         KeyExpState estate = (KeyExpState) state;
         _key.appendTo(sel, ctx, estate.key, sql, index);
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         KeyExpState estate = (KeyExpState) state;
         _key.calculateValue(sel, ctx, estate.key, other, otherState);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         KeyExpState estate = (KeyExpState) state;
         _key.groupBy(sel, ctx, estate.key);
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         KeyExpState estate = (KeyExpState) state;
         _key.orderBy(sel, ctx, estate.key, asc);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState key = _key.initialize(sel, ctx, flags);
         return new KeyExpState(key);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         KeyExpState estate = (KeyExpState) state;
@@ -99,32 +108,39 @@ public class MapKey
         return key;
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state, boolean pks)
     {
         selectColumns(sel, ctx, state, pks);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         KeyExpState estate = (KeyExpState) state;
         _key.selectColumns(sel, ctx, estate.key, pks);
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public Class getType() {
         return _key.getType();
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state,
         Object val) {
         KeyExpState estate = (KeyExpState) state;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MatchesExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MatchesExpression.java
index 9c3cda2a5..f33b5b2bf 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MatchesExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MatchesExpression.java
@@ -37,6 +37,8 @@ import org.apache.openjpa.lib.util.StringUtil;
 class MatchesExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Const _const;
     private final String _single;
@@ -55,12 +57,14 @@ class MatchesExpression
         _escape = escape;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState s1 = _val.initialize(sel, ctx, 0);
         ExpState s2 = _const.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -151,6 +155,7 @@ class MatchesExpression
         return repbuf.toString();
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -158,6 +163,7 @@ class MatchesExpression
         _const.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Math.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Math.java
index bf413ebc7..744130d3d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Math.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Math.java
@@ -36,6 +36,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class Math
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String ADD = "+";
     public static final String SUBTRACT = "-";
     public static final String MULTIPLY = "*";
@@ -69,14 +71,17 @@ public class Math
         return _op;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
@@ -85,21 +90,25 @@ public class Math
         return Filters.promote(c1, c2);
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -107,10 +116,12 @@ public class Math
         _val2.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -123,12 +134,14 @@ public class Math
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this, JavaSQLTypes.JDBC_DEFAULT,
             null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -136,10 +149,12 @@ public class Math
         _val2.calculateValue(sel, ctx, bstate.state2, _val1, bstate.state1);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -148,6 +163,7 @@ public class Math
             new FilterValueImpl(sel, ctx, bstate.state2, _val2));
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
@@ -155,6 +171,7 @@ public class Math
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.MATH_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Max.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Max.java
index 91b4a884c..cdc0bf6c0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Max.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Max.java
@@ -23,9 +23,8 @@ package org.apache.openjpa.jdbc.kernel.exps;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class Max
-    extends NullableAggregateUnaryOp { // OPENJPA-1794
+class Max extends NullableAggregateUnaryOp { // OPENJPA-1794
+    private static final long serialVersionUID = 1L;
 
     /**
      * Constructor. Provide the value to operate on.
@@ -34,10 +33,12 @@ class Max
         super(val);
     }
 
+    @Override
     protected String getOperator() {
         return "MAX";
     }
 
+    @Override
     public boolean isAggregate() {
         return true;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Min.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Min.java
index c21df54cb..5c1c9c98d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Min.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Min.java
@@ -23,9 +23,8 @@ package org.apache.openjpa.jdbc.kernel.exps;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class Min
-    extends NullableAggregateUnaryOp { // OPENJPA-1794
+class Min extends NullableAggregateUnaryOp { // OPENJPA-1794
+    private static final long serialVersionUID = 1L;
 
     /**
      * Constructor. Provide the value to operate on.
@@ -34,10 +33,12 @@ class Min
         super(val);
     }
 
+    @Override
     protected String getOperator() {
         return "MIN";
     }
 
+    @Override
     public boolean isAggregate() {
         return true;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotContainsExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotContainsExpression.java
index 199058862..3243b49e8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotContainsExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotContainsExpression.java
@@ -34,6 +34,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class NotContainsExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp;
 
     /**
@@ -43,6 +45,7 @@ class NotContainsExpression
         _exp = exp;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         return new NotContainsExpState(contains);
     }
@@ -60,6 +63,7 @@ class NotContainsExpression
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         DBDictionary dict = ctx.store.getDBDictionary();
@@ -84,6 +88,7 @@ class NotContainsExpression
         buf.appendCount(sub, ctx.fetch);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         ExpState estate = _exp.initialize(sel, ctx, ((NotContainsExpState)
@@ -91,6 +96,7 @@ class NotContainsExpression
         _exp.selectColumns(sel, ctx, estate, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualExpression.java
index 90cb7dea3..571859eb8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualExpression.java
@@ -29,6 +29,9 @@ import org.apache.openjpa.jdbc.sql.Select;
 class NotEqualExpression
     extends CompareEqualExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -36,6 +39,7 @@ class NotEqualExpression
         super(val1, val2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, BinaryOpExpState bstate,
         SQLBuffer buf, boolean val1Null, boolean val2Null) {
         if (val1Null && val2Null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualTypeExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualTypeExpression.java
index 110c8b4e6..b8b3ab5a1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualTypeExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotEqualTypeExpression.java
@@ -35,6 +35,9 @@ import org.apache.openjpa.meta.ClassMetaData;
 class NotEqualTypeExpression
     extends CompareEqualExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -54,6 +57,7 @@ class NotEqualTypeExpression
         return sub;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
             SQLBuffer buf) {
         Val val1 = getValue1();
@@ -67,6 +71,7 @@ class NotEqualTypeExpression
         super.appendTo(sel, ctx, state, buf);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, BinaryOpExpState bstate,
         SQLBuffer buf, boolean val1Null, boolean val2Null) {
         if (val1Null && val2Null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotExpression.java
index 2eb04ff37..b2eaee7a1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NotExpression.java
@@ -33,6 +33,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class NotExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp;
 
     /**
@@ -42,6 +44,7 @@ class NotExpression
         _exp = exp;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState state = _exp.initialize(sel, ctx, contains);
         return new NotExpState(sel.or(state.joins, null), state);
@@ -61,6 +64,7 @@ class NotExpression
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         buf.append("NOT (");
@@ -68,11 +72,13 @@ class NotExpression
         buf.append(")");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         _exp.selectColumns(sel, ctx, ((NotExpState) state).state, pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Null.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Null.java
index 16f495989..2578ea853 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Null.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Null.java
@@ -29,21 +29,29 @@ import org.apache.openjpa.jdbc.sql.Select;
 public class Null
     extends Const {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public Class getType() {
         return Object.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public Object getValue(Object[] params) {
         return null;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         sql.appendValue(null);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NullIfExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NullIfExpression.java
index 9ed28afdf..236821429 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NullIfExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NullIfExpression.java
@@ -38,6 +38,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class NullIfExpression
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
     private ClassMetaData _meta = null;
@@ -61,6 +63,7 @@ public class NullIfExpression
         return _val2;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
@@ -72,12 +75,14 @@ public class NullIfExpression
         return type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf, int index) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -91,6 +96,7 @@ public class NullIfExpression
         buf.append(")");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -98,6 +104,7 @@ public class NullIfExpression
         _val2.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
@@ -105,10 +112,12 @@ public class NullIfExpression
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.NULLIF_VAL;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -116,10 +125,12 @@ public class NullIfExpression
         _val2.calculateValue(sel, ctx, bstate.state2, _val1, bstate.state1);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
@@ -131,29 +142,35 @@ public class NullIfExpression
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state, boolean pks){
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NullableAggregateUnaryOp.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NullableAggregateUnaryOp.java
index cb67b2688..5955530af 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NullableAggregateUnaryOp.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/NullableAggregateUnaryOp.java
@@ -23,8 +23,8 @@ package org.apache.openjpa.jdbc.kernel.exps;
  * An aggregate unary operation that can indicate whether a null value from the data store
  * should be returned as null.
  */
-@SuppressWarnings("serial")
 public abstract class NullableAggregateUnaryOp extends UnaryOp {
+    private static final long serialVersionUID = 1L;
 
     public NullableAggregateUnaryOp(Val val) {
         super(val);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/OrExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/OrExpression.java
index 7e302d6fe..e24c2443f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/OrExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/OrExpression.java
@@ -34,6 +34,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 class OrExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp1;
     private final Exp _exp2;
 
@@ -45,6 +47,7 @@ class OrExpression
         _exp2 = exp2;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         // when OR'ing expressions each expression gets its own copy of the
         // contains counts, cause it's OK for each to use the same aliases
@@ -71,6 +74,7 @@ class OrExpression
         return ret;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -87,6 +91,7 @@ class OrExpression
         sel.append(buf, bstate.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -94,6 +99,7 @@ class OrExpression
         _exp2.selectColumns(sel, ctx, bstate.state2, pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp1.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
index 4591f52ce..ba735ee3c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
@@ -25,7 +25,7 @@ import java.util.LinkedList;
 import java.util.ListIterator;
 import java.util.Objects;
 
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCStoreQuery;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.Discriminator;
@@ -63,6 +63,8 @@ import org.apache.openjpa.util.UserException;
  */
 public class PCPath extends CandidatePath implements JDBCPath {
 
+    
+    private static final long serialVersionUID = 1L;
     protected static final String TRUE = "1 = 1";
     protected static final String FALSE = "1 <> 1";
 
@@ -138,15 +140,18 @@ public class PCPath extends CandidatePath implements JDBCPath {
         _varName = sub.getCandidateAlias();
     }
 
+    @Override
     public void setSchemaAlias(String schemaAlias) {
         if (_schemaAlias == null)
             _schemaAlias = schemaAlias;
     }
 
+    @Override
     public String getSchemaAlias() {
         return _schemaAlias;
     }
 
+    @Override
     public void setSubqueryContext(Context context, String correlationVar) {
         Action action = lastFieldAction();
         if (action == null)
@@ -203,10 +208,12 @@ public class PCPath extends CandidatePath implements JDBCPath {
         _cid = true;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _class;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _class = (ClassMapping) meta;
     }
@@ -215,6 +222,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         return _key;
     }
 
+    @Override
     public boolean isXPath() {
         return _type == XPATH;
     }
@@ -350,6 +358,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             : _class.getPrimaryKeyColumns();
     }
 
+    @Override
     public boolean isVariable() {
         if (_actions == null)
             return false;
@@ -357,6 +366,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         return action.op == Action.UNBOUND_VAR || action.op == Action.VAR;
     }
 
+    @Override
     public void get(FieldMetaData field, boolean nullTraversal) {
         if (_actions == null)
             _actions = new LinkedList();
@@ -370,6 +380,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         _key = false;
     }
 
+    @Override
     public void get(FieldMetaData fmd, XMLMetaData meta) {
         if (_actions == null)
             _actions = new LinkedList();
@@ -383,6 +394,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         _xmlfield = fmd;
     }
 
+    @Override
     public void get(XMLMetaData meta, String name) {
         Action action = new Action();
         action.op = Action.GET_XPATH;
@@ -393,6 +405,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         _type = XPATH;
     }
 
+    @Override
     public XMLMetaData getXmlMapping() {
         Action act = (Action) _actions.getLast();
         if (act != null)
@@ -400,6 +413,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         return null;
     }
 
+    @Override
     public synchronized void getKey() {
         if (_cid)
             return;
@@ -433,6 +447,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
          }
     }
 
+    @Override
     public FieldMetaData last() {
         Action act = lastFieldAction();
         return (act == null) ? null : isXPath() ?
@@ -460,6 +475,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         return null;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
@@ -493,10 +509,12 @@ public class PCPath extends CandidatePath implements JDBCPath {
         return Object.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         PathExpState pstate = new PathExpState(sel.newJoins());
         boolean key = false;
@@ -591,7 +609,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
 
                 owner = pstate.field.getDefiningMapping();
                 if (pstate.field.getManagement()
-                    != FieldMapping.MANAGE_PERSISTENT)
+                    != FieldMetaData.MANAGE_PERSISTENT)
                     throw new UserException(_loc.get("non-pers-field",
                         pstate.field));
 
@@ -725,6 +743,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         return true;
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         if (_actions == null)
@@ -826,6 +845,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         pstate.joinedRel = true;
     }
 
+    @Override
     public Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state,
         Object val) {
         PathExpState pstate = (PathExpState) state;
@@ -846,11 +866,13 @@ public class PCPath extends CandidatePath implements JDBCPath {
             ctx.store);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         selectColumns(sel, ctx, state, pks);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.setSchemaAlias(_schemaAlias);
@@ -872,10 +894,11 @@ public class PCPath extends CandidatePath implements JDBCPath {
             int subs = (_type == UNBOUND_VAR) ? Select.SUBS_JOINABLE
                 : Select.SUBS_ANY_JOINABLE;
             sel.select(mapping, subs, ctx.store, ctx.fetch,
-                JDBCFetchConfiguration.EAGER_NONE, sel.outer(pstate.joins));
+                EagerFetchModes.EAGER_NONE, sel.outer(pstate.joins));
         }
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         ClassMapping mapping = getClassMapping(state);
         PathExpState pstate = (PathExpState) state;
@@ -889,11 +912,13 @@ public class PCPath extends CandidatePath implements JDBCPath {
         }
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(getColumns(state), asc, sel.outer(state.joins), false);
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return load(ctx, state, res, false);
@@ -961,6 +986,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             pstate.joins);
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         // we don't create the SQL b/c it forces the Select to cache aliases
@@ -975,6 +1001,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             throw new UserException(_loc.get("no-order-column", fm.getName()));
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return getColumns(state).length;
     }
@@ -989,6 +1016,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         Column col = getColumns(state)[index];
@@ -1010,6 +1038,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             sql.append(sel.getColumnAlias(col, state.joins));
     }
 
+    @Override
     public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         PathExpState pstate = (PathExpState) state;
@@ -1019,6 +1048,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             pstate.field.appendIsEmpty(sql, sel, pstate.joins);
     }
 
+    @Override
     public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         PathExpState pstate = (PathExpState) state;
@@ -1028,6 +1058,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             pstate.field.appendIsNotEmpty(sql, sel, pstate.joins);
     }
 
+    @Override
     public void appendIndex(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         PathExpState pstate = (PathExpState) state;
@@ -1037,6 +1068,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             pstate.field.appendIndex(sql, sel, pstate.joins);
     }
 
+    @Override
     public void appendType(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         Discriminator disc = null;
@@ -1064,6 +1096,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
         }
     }
 
+    @Override
     public void appendSize(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         PathExpState pstate = (PathExpState) state;
@@ -1073,6 +1106,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             pstate.field.appendSize(sql, sel, pstate.joins);
     }
 
+    @Override
     public void appendIsNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         PathExpState pstate = (PathExpState) state;
@@ -1082,6 +1116,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             pstate.field.appendIsNull(sql, sel, pstate.joins);
     }
 
+    @Override
     public void appendIsNotNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         PathExpState pstate = (PathExpState) state;
@@ -1098,12 +1133,14 @@ public class PCPath extends CandidatePath implements JDBCPath {
         return false;
     }
 
+    @Override
     public int hashCode() {
         if (_actions == null)
             return _candidate.hashCode();
         return _candidate.hashCode() ^ _actions.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -1114,6 +1151,7 @@ public class PCPath extends CandidatePath implements JDBCPath {
             && Objects.equals(_actions, path._actions);
     }
 
+    @Override
     public int getId() {
         return Val.VAL;
     }
@@ -1125,6 +1163,8 @@ public class PCPath extends CandidatePath implements JDBCPath {
     private static class Action
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public static final int GET = 0;
         public static final int GET_OUTER = 1;
         public static final int GET_KEY = 2;
@@ -1139,16 +1179,19 @@ public class PCPath extends CandidatePath implements JDBCPath {
         public String var = null;
         public Context context = null;
 
+        @Override
         public String toString() {
             return op + "|" + data;
         }
 
+        @Override
         public int hashCode() {
             if (data == null)
                 return op;
             return op ^ data.hashCode();
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == null)
                 return false;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Param.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Param.java
index 05a539991..398deb630 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Param.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Param.java
@@ -39,6 +39,8 @@ public class Param
     extends Const
     implements Parameter {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage(Param.class);
     private final Object _key;
     private Class _type = null;
@@ -53,14 +55,17 @@ public class Param
         setImplicitType(type);
     }
 
+    @Override
     public Object getParameterKey() {
         return _key;
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _type = type;
         _container = (getMetaData() == null || !ImplHelper.isManagedType(
@@ -73,6 +78,7 @@ public class Param
         return _idx;
     }
 
+    @Override
     public void setIndex(int idx) {
         _idx = idx;
     }
@@ -85,20 +91,24 @@ public class Param
         return null;
     }
 
+    @Override
     public Object getValue(Object[] params) {
         return Filters.convert(params[_idx], getType());
     }
 
+    @Override
     public Object getValue(ExpContext ctx, ExpState state) {
         ParamExpState pstate = (ParamExpState) state;
         return (pstate.discValue != null) ? pstate.discValue :
             getValue(ctx.params);
     }
 
+    @Override
     public Object getSQLValue(Select sel, ExpContext ctx, ExpState state) {
         return ((ParamExpState) state).sqlValue;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return new ParamExpState();
     }
@@ -116,6 +126,7 @@ public class Param
         public Object discValue = null;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         super.calculateValue(sel, ctx, state, other, otherState);
@@ -142,6 +153,7 @@ public class Param
             pstate.sqlValue = val;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         ParamExpState pstate = (ParamExpState) state;
@@ -156,6 +168,7 @@ public class Param
             sql.appendValue(pstate.sqlValue, pstate.getColumn(index), this);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         ParamExpState pstate = (ParamExpState) state;
         if (getMetaData() == null || pstate.cols == null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLEmbed.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLEmbed.java
index 6a59d1980..84aa7e88e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLEmbed.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLEmbed.java
@@ -36,27 +36,35 @@ import org.apache.openjpa.util.UserException;
 public class SQLEmbed
     implements JDBCFilterListener {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static String TAG = "sql";
 
     private static final Localizer _loc = Localizer.forPackage(SQLEmbed.class);
 
+    @Override
     public String getTag() {
         return TAG;
     }
 
+    @Override
     public boolean expectsArguments() {
         return true;
     }
 
+    @Override
     public boolean expectsTarget() {
         return false;
     }
 
+    @Override
     public Object evaluate(Object target, Class targetClass, Object[] args,
         Class[] argClasses, Object candidate, StoreContext ctx) {
         throw new UnsupportedException(_loc.get("no-in-mem", TAG));
     }
 
+    @Override
     public void appendTo(SQLBuffer buf, FilterValue target, FilterValue[] args,
         ClassMapping type, JDBCStore store) {
         if (!args[0].isConstant())
@@ -64,6 +72,7 @@ public class SQLEmbed
         buf.append(args[0].getValue().toString());
     }
 
+    @Override
     public Class getType(Class targetClass, Class[] argClasses) {
         return Object.class;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLExpression.java
index 44af0f6fb..a3454cb27 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLExpression.java
@@ -29,11 +29,15 @@ package org.apache.openjpa.jdbc.kernel.exps;
  *
  * @deprecated Use {@link SQLEmbed} directly
  */
+@Deprecated
 public class SQLExpression
     extends SQLEmbed {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String TAG = "sqlExp";
 
+    @Override
     public String getTag() {
         return TAG;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLValue.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLValue.java
index ad872117e..2e3f5ce9b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLValue.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SQLValue.java
@@ -27,11 +27,15 @@ package org.apache.openjpa.jdbc.kernel.exps;
  *
  * @deprecated Use {@link SQLEmbed} directly
  */
+@Deprecated
 public class SQLValue
     extends SQLEmbed {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String TAG = "sqlVal";
 
+    @Override
     public String getTag() {
         return TAG;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java
index 7244411ab..a49c4c2f0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SelectConstructor.java
@@ -47,6 +47,8 @@ import org.apache.openjpa.util.UnsupportedException;
 public class SelectConstructor
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private boolean _extent = false;
     private Select _subselect = null;
     private static final Localizer _loc = Localizer.forPackage(SelectConstructor.class);
@@ -77,7 +79,7 @@ public class SelectConstructor
         Select sel;
         if (_extent) {
             sel = ctx.store.getSQLFactory().newSelect();
-            sel.setAutoDistinct((exps.distinct & exps.DISTINCT_AUTO) != 0);
+            sel.setAutoDistinct((exps.distinct & QueryExpressions.DISTINCT_AUTO) != 0);
             return sel;
         }
 
@@ -96,7 +98,7 @@ public class SelectConstructor
             && exps.ordering.length == 0
             && (sel.getJoins() == null || sel.getJoins().isEmpty())) {
             _extent = true;
-            sel.setAutoDistinct((exps.distinct & exps.DISTINCT_AUTO) != 0);
+            sel.setAutoDistinct((exps.distinct & QueryExpressions.DISTINCT_AUTO) != 0);
             return sel;
         }
 
@@ -141,7 +143,7 @@ public class SelectConstructor
         Select subselect = JDBCStoreQuery.getThreadLocalSelect(_subselect);
         Select sel = parent != null ? subselect
             : ctx.store.getSQLFactory().newSelect();
-        sel.setAutoDistinct((exps.distinct & exps.DISTINCT_AUTO) != 0);
+        sel.setAutoDistinct((exps.distinct & QueryExpressions.DISTINCT_AUTO) != 0);
         sel.setJoinSyntax(ctx.fetch.getJoinSyntax());
         sel.setParent(parent, alias);
 
@@ -172,12 +174,12 @@ public class SelectConstructor
         initialize(sel, ctx, exps, state);
 
         if (!sel.getAutoDistinct()) {
-            if ((exps.distinct & exps.DISTINCT_TRUE) != 0)
+            if ((exps.distinct & QueryExpressions.DISTINCT_TRUE) != 0)
                 sel.setDistinct(true);
-            else if ((exps.distinct & exps.DISTINCT_FALSE) != 0)
+            else if ((exps.distinct & QueryExpressions.DISTINCT_FALSE) != 0)
                 sel.setDistinct(false);
         } else if (exps.projections.length > 0) {
-            if (!sel.isDistinct() && (exps.distinct & exps.DISTINCT_TRUE) != 0){
+            if (!sel.isDistinct() && (exps.distinct & QueryExpressions.DISTINCT_TRUE) != 0){
                 // if the select is not distinct but the query is, force
                 // the select to be distinct
                 sel.setDistinct(true);
@@ -193,7 +195,7 @@ public class SelectConstructor
                 boolean candidate = ProjectionExpressionVisitor.
                     hasCandidateProjections(exps.projections);
                 if (agg || (candidate
-                    && (exps.distinct & exps.DISTINCT_TRUE) == 0)) {
+                    && (exps.distinct & QueryExpressions.DISTINCT_TRUE) == 0)) {
                     DBDictionary dict = ctx.store.getDBDictionary();
                     dict.assertSupport(dict.supportsSubselect,
                         "SupportsSubselect");
@@ -202,14 +204,14 @@ public class SelectConstructor
                     sel = ctx.store.getSQLFactory().newSelect();
                     sel.setParent(parent, alias);
                     sel.setDistinct(agg
-                        && (exps.distinct & exps.DISTINCT_TRUE) != 0);
+                        && (exps.distinct & QueryExpressions.DISTINCT_TRUE) != 0);
                     sel.setFromSelect(inner);
 
                 // auto-distincting happens to get unique candidate instances
                 // back; don't auto-distinct if the user isn't selecting
                 // candidate data
                 } else if (!candidate
-                    && (exps.distinct & exps.DISTINCT_TRUE) == 0)
+                    && (exps.distinct & QueryExpressions.DISTINCT_TRUE) == 0)
                     sel.setDistinct(false);
             }
         }
@@ -415,6 +417,7 @@ public class SelectConstructor
             return false;
         }
 
+        @Override
         public void enter(Value val) {
             if (!_candidate) {
                 _candidate = (_level == 0 && val instanceof Constant)
@@ -424,6 +427,7 @@ public class SelectConstructor
             _level++;
         }
 
+        @Override
         public void exit(Value val) {
             _level--;
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SimpleCaseExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SimpleCaseExpression.java
index 836e68d37..9bb389abc 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SimpleCaseExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SimpleCaseExpression.java
@@ -40,6 +40,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class SimpleCaseExpression
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _caseOperand;
     private final Exp[] _exp;
     private final Val _val;
@@ -69,6 +71,7 @@ public class SimpleCaseExpression
         return _val;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
@@ -81,6 +84,7 @@ public class SimpleCaseExpression
         return type;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState[] states = new ExpState[_exp.length+2];
         Joins joins = null;
@@ -116,6 +120,7 @@ public class SimpleCaseExpression
         }
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf, int index) {
         SimpleCaseExpState cstate = (SimpleCaseExpState) state;
@@ -147,6 +152,7 @@ public class SimpleCaseExpression
         buf.append(" END ");
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         SimpleCaseExpState cstate = (SimpleCaseExpState) state;
@@ -157,6 +163,7 @@ public class SimpleCaseExpression
         _val.selectColumns(sel, ctx, cstate.states[_exp.length+1], pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _caseOperand.acceptVisit(visitor);
@@ -166,10 +173,12 @@ public class SimpleCaseExpression
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.SIMPLECASE_VAL;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         SimpleCaseExpState cstate = (SimpleCaseExpState) state;
@@ -186,10 +195,12 @@ public class SimpleCaseExpression
             otherState);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
@@ -201,29 +212,35 @@ public class SimpleCaseExpression
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state, boolean pks){
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Size.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Size.java
index e81970859..b7d158dfd 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Size.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Size.java
@@ -30,15 +30,20 @@ import org.apache.openjpa.util.InternalException;
 class Size
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public Size(Val val) {
         super(val);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         // initialize the value with a null test
         return initializeValue(sel, ctx, NULL_CMP);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         getValue().calculateValue(sel, ctx, state, null, null);
@@ -46,10 +51,12 @@ class Size
         sel.append(sql, state.joins);
     }
 
+    @Override
     protected Class getType(Class c) {
         return long.class;
     }
 
+    @Override
     protected String getOperator() {
         // since we override appendTo(), this method should never be called
         throw new InternalException();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Sqrt.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Sqrt.java
index a7732df88..29f48dca7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Sqrt.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Sqrt.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.jdbc.kernel.exps;
 public class Sqrt
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the value to operate on.
      */
@@ -33,14 +36,17 @@ public class Sqrt
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         return double.class;
     }
 
+    @Override
     protected String getOperator() {
         return "SQRT";
     }
 
+    @Override
     public int getId() {
         return Val.SQRT_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java
index 412e4940d..9d2523fed 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StartsWithExpression.java
@@ -38,6 +38,8 @@ import org.apache.openjpa.meta.XMLMetaData;
 class StartsWithExpression
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
 
@@ -49,12 +51,14 @@ class StartsWithExpression
         _val2 = val2;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -105,6 +109,7 @@ class StartsWithExpression
         sel.append(buf, state.joins);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -112,6 +117,7 @@ class StartsWithExpression
         _val2.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
@@ -133,66 +139,82 @@ class StartsWithExpression
             _state = state;
         }
 
+        @Override
         public Class getType() {
             return int.class;
         }
 
+        @Override
         public int length() {
             return 1;
         }
 
+        @Override
         public void appendTo(SQLBuffer buf) {
             appendTo(buf, 0);
         }
 
+        @Override
         public void appendTo(SQLBuffer buf, int index) {
             buf.appendValue(0);
         }
 
+        @Override
         public String getColumnAlias(Column col) {
             return _sel.getColumnAlias(col, _state.joins);
         }
 
+        @Override
         public String getColumnAlias(String col, Table table) {
             return _sel.getColumnAlias(col, table, _state.joins);
         }
 
+        @Override
         public Object toDataStoreValue(Object val) {
             return val;
         }
 
+        @Override
         public boolean isConstant() {
             return true;
         }
 
+        @Override
         public Object getValue() {
             return 0;
         }
 
+        @Override
         public Object getSQLValue() {
             return 0;
         }
 
+        @Override
         public boolean isPath() {
             return false;
         }
 
+        @Override
         public ClassMapping getClassMapping() {
             return null;
         }
 
+        @Override
         public FieldMapping getFieldMapping() {
             return null;
         }
 
+        @Override
         public PCPath getXPath() {
             return null;
         }
 
+        @Override
         public XMLMetaData getXmlMapping() {
             return null;
         }
 
+        @Override
         public boolean requiresCast() {
             return false;
         }
@@ -220,68 +242,84 @@ class StartsWithExpression
             _post = post;
         }
 
+        @Override
         public Class getType() {
             return int.class;
         }
 
+        @Override
         public int length() {
             return 1;
         }
 
+        @Override
         public void appendTo(SQLBuffer buf) {
             appendTo(buf, 0);
         }
 
+        @Override
         public void appendTo(SQLBuffer buf, int index) {
             buf.append(_pre);
             _val2.appendTo(_sel, _ctx, _state, buf, index);
             buf.append(_post);
         }
 
+        @Override
         public String getColumnAlias(Column col) {
             return _sel.getColumnAlias(col, _state.joins);
         }
 
+        @Override
         public String getColumnAlias(String col, Table table) {
             return _sel.getColumnAlias(col, table, _state.joins);
         }
 
+        @Override
         public Object toDataStoreValue(Object val) {
             return _val2.toDataStoreValue(_sel, _ctx, _state, val);
         }
 
+        @Override
         public boolean isConstant() {
             return false;
         }
 
+        @Override
         public Object getValue() {
             return null;
         }
 
+        @Override
         public Object getSQLValue() {
             return null;
         }
 
+        @Override
         public boolean isPath() {
             return false;
         }
 
+        @Override
         public ClassMapping getClassMapping() {
             return null;
         }
 
+        @Override
         public FieldMapping getFieldMapping() {
             return null;
         }
 
+        @Override
         public PCPath getXPath() {
             return null;
         }
 
+        @Override
         public XMLMetaData getXmlMapping() {
             return null;
         }
 
+        @Override
         public boolean requiresCast() {
             return false;
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringFunction.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringFunction.java
index 021f8b3fe..ba2241fd4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringFunction.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringFunction.java
@@ -36,6 +36,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 abstract class StringFunction
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private ClassMetaData _meta = null;
 
@@ -50,39 +52,48 @@ abstract class StringFunction
         return _val;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return _val.initialize(sel, ctx, flags);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         _val.selectColumns(sel, ctx, state, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -95,21 +106,25 @@ abstract class StringFunction
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         _val.calculateValue(sel, ctx, state, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringLength.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringLength.java
index 5ef9771ba..4ec897a07 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringLength.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/StringLength.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.jdbc.sql.Select;
 public class StringLength
     extends StringFunction {
 
+    
+    private static final long serialVersionUID = 1L;
     private Class _cast = null;
 
     /**
@@ -39,16 +41,19 @@ public class StringLength
         super(val);
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
         return int.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf, int index) {
         DBDictionary dict = ctx.store.getDBDictionary();
@@ -62,6 +67,7 @@ public class StringLength
         buf.append(func.substring(idx + 3));
     }
 
+    @Override
     public int getId() {
         return Val.LENGTH_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java
index 408274ab2..b6dd5b7ec 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/SubQ.java
@@ -21,7 +21,7 @@ package org.apache.openjpa.jdbc.kernel.exps;
 import java.sql.SQLException;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCStoreQuery;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
@@ -44,6 +44,8 @@ public class SubQ
     extends AbstractVal
     implements Subquery {
 
+    
+    private static final long serialVersionUID = 1L;
     private final ClassMapping _candidate;
     private final boolean _subs;
     private String _subqAlias;
@@ -67,6 +69,7 @@ public class SubQ
         _cons.setSubselect(_select);
     }
 
+    @Override
     public Object getSelect() {
         return _select;
     }
@@ -82,14 +85,17 @@ public class SubQ
         return _subs;
     }
 
+    @Override
     public void setSubqAlias(String subqAlias) {
         _subqAlias = subqAlias;
     }
 
+    @Override
     public String getSubqAlias() {
         return _subqAlias;
     }
 
+    @Override
     public Class getType() {
         if (_exps != null && _type == null) {
             if (_exps.projections.length == 0)
@@ -100,29 +106,35 @@ public class SubQ
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         if (_exps != null && _exps.projections.length == 1)
             _exps.projections[0].setImplicitType(type);
         _type = type;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public String getCandidateAlias() {
         return _subqAlias;
     }
 
+    @Override
     public void setQueryExpressions(QueryExpressions query) {
         _exps = query;
         _select.setContext(query.ctx());
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         Select select = JDBCStoreQuery.getThreadLocalSelect(_select);
         select.setParent(sel, null);
@@ -132,6 +144,7 @@ public class SubQ
         return ExpState.NULL;
     }
 
+    @Override
     public Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state,
         Object val) {
         if (_exps.projections.length == 0)
@@ -143,20 +156,24 @@ public class SubQ
         return val;
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         selectColumns(sel, ctx, state, pks);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -168,12 +185,14 @@ public class SubQ
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         Value[] projs = _exps.projections;
@@ -194,10 +213,12 @@ public class SubQ
         }
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         appendTo(sel, ctx, state, sql, index, false);
@@ -208,7 +229,7 @@ public class SubQ
         QueryExpressionsState substate = new QueryExpressionsState();
         Select sub = _cons.evaluate(ctx, sel, _subqAlias, _exps, substate);
         _cons.select(sub, ctx, _candidate, _subs, _exps, substate,
-            JDBCFetchConfiguration.EAGER_NONE);
+            EagerFetchModes.EAGER_NONE);
 
         if (size)
             sql.appendCount(sub, ctx.fetch);
@@ -216,23 +237,27 @@ public class SubQ
             sql.append(sub, ctx.fetch);
     }
 
+    @Override
     public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         sql.append("NOT EXISTS ");
         appendTo(sel, ctx, state, sql, 0);
     }
 
+    @Override
     public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         sql.append("EXISTS ");
         appendTo(sel, ctx, state, sql, 0);
     }
 
+    @Override
     public void appendSize(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql) {
         appendTo(sel, ctx, state, sql, 0, true);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         for (int i = 0; i < _exps.projections.length; i++)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Substring.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Substring.java
index e6d01e373..932cc5e8e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Substring.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Substring.java
@@ -36,6 +36,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class Substring
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
     private ClassMetaData _meta = null;
@@ -56,32 +58,39 @@ public class Substring
         return _val2;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -89,10 +98,12 @@ public class Substring
         _val2.selectColumns(sel, ctx, bstate.state2, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -105,12 +116,14 @@ public class Substring
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -118,10 +131,12 @@ public class Substring
         _val2.calculateValue(sel, ctx, bstate.state2, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -139,6 +154,7 @@ public class Substring
         ctx.store.getDBDictionary().substring(sql, str, start, length);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
@@ -146,6 +162,7 @@ public class Substring
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.SUBSTRING_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Sum.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Sum.java
index c7dc1f4b2..677b808b6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Sum.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Sum.java
@@ -25,9 +25,8 @@ import org.apache.openjpa.kernel.Filters;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class Sum
-    extends NullableAggregateUnaryOp { // OPENJPA-1794
+class Sum extends NullableAggregateUnaryOp { // OPENJPA-1794
+    private static final long serialVersionUID = 1L;
 
     /**
      * Constructor. Provide the value to operate on.
@@ -36,6 +35,7 @@ class Sum
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         Class wrap = Filters.wrap(c);
         if (wrap == Integer.class
@@ -45,10 +45,12 @@ class Sum
         return c;
     }
 
+    @Override
     protected String getOperator() {
         return "SUM";
     }
 
+    @Override
     public boolean isAggregate() {
         return true;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToLowerCase.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToLowerCase.java
index 873144e65..38ada84c5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToLowerCase.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToLowerCase.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.jdbc.sql.Select;
 public class ToLowerCase
     extends StringFunction {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the string to operate on.
      */
@@ -37,6 +40,7 @@ public class ToLowerCase
         super(val);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf, int index) {
 
@@ -55,6 +59,7 @@ public class ToLowerCase
         buf.append(func.substring(idx + 3));
     }
 
+    @Override
     public int getId() {
         return Val.LOWER_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToUpperCase.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToUpperCase.java
index fa2a57d1f..c957dd3c4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToUpperCase.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ToUpperCase.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.jdbc.sql.Select;
 public class ToUpperCase
     extends StringFunction {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the string to operate on.
      */
@@ -37,6 +40,7 @@ public class ToUpperCase
         super(val);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf, int index) {
 
@@ -55,6 +59,7 @@ public class ToUpperCase
         buf.append(func.substring(idx + 3));
     }
 
+    @Override
     public int getId() {
         return Val.UPPER_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Trim.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Trim.java
index 7f20728e2..468ec69e3 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Trim.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Trim.java
@@ -39,6 +39,7 @@ import org.apache.openjpa.meta.ClassMetaData;
 public class Trim
     extends AbstractVal {
 
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Val _trimChar;
     private final Boolean _where;
@@ -65,21 +66,26 @@ public class Trim
         return _where;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         ExpState valueState =  _val.initialize(sel, ctx, 0);
         ExpState charState = _trimChar.initialize(sel, ctx, 0);
@@ -104,11 +110,13 @@ public class Trim
         }
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         TrimExpState tstate = (TrimExpState) state;
@@ -116,10 +124,12 @@ public class Trim
         _trimChar.selectColumns(sel, ctx, tstate.charState, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -132,12 +142,14 @@ public class Trim
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return Filters.convert(res.getObject(this,
             JavaSQLTypes.JDBC_DEFAULT, null), getType());
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         TrimExpState tstate = (TrimExpState) state;
@@ -145,10 +157,12 @@ public class Trim
         _trimChar.calculateValue(sel, ctx, tstate.charState, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         DBDictionary dict = ctx.store.getDBDictionary();
@@ -201,6 +215,7 @@ public class Trim
         }
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
@@ -208,6 +223,7 @@ public class Trim
         visitor.exit(this);
     }
 
+    @Override
     public int getId() {
         return Val.TRIM_VAL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Type.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Type.java
index 18e3e41b6..a5f39d61c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Type.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Type.java
@@ -37,6 +37,8 @@ import org.apache.openjpa.util.InternalException;
 class Type
     extends UnaryOp {
 
+    
+    private static final long serialVersionUID = 1L;
     Discriminator _disc = null;
 
     public Type(Val val) {
@@ -46,10 +48,12 @@ class Type
             _disc = ((ClassMapping) getMetaData()).getDiscriminator();
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return initializeValue(sel, ctx, flags);
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         Object type = null;
@@ -67,11 +71,13 @@ class Type
         return type.getClass();
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         super.calculateValue(sel, ctx, state, null, null);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         if (_disc != null && _disc.getColumns().length > 0)
@@ -80,6 +86,7 @@ class Type
             getValue().select(sel, ctx, state, pks);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         getValue().calculateValue(sel, ctx, state, null, null);
@@ -87,15 +94,18 @@ class Type
         sel.append(sql, state.joins);
     }
 
+    @Override
     protected Class getType(Class c) {
         return Class.class;
     }
 
+    @Override
     protected String getOperator() {
         // since we override appendTo(), this method should never be called
         throw new InternalException();
     }
 
+    @Override
     public Path getPath() {
         return getValue() instanceof Path ? (Path) getValue() : null;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/TypeLit.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/TypeLit.java
index d95e7b904..70eafe462 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/TypeLit.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/TypeLit.java
@@ -35,6 +35,8 @@ public class TypeLit
     extends Const
     implements Literal {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object _val;
     private int _ptype;
 
@@ -46,30 +48,37 @@ public class TypeLit
         _ptype = ptype;
     }
 
+    @Override
     public Class getType() {
         return (_val == null) ? Object.class : _val.getClass();
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _val = Filters.convert(_val, type);
     }
 
+    @Override
     public int getParseType() {
         return _ptype;
     }
 
+    @Override
     public Object getValue() {
         return _val;
     }
 
+    @Override
     public void setValue(Object val) {
         _val = val;
     }
 
+    @Override
     public Object getValue(Object[] params) {
         return getValue();
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return new LitExpState();
     }
@@ -87,6 +96,7 @@ public class TypeLit
         public Object discValue = null;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         super.calculateValue(sel, ctx, state, other, otherState);
@@ -99,6 +109,7 @@ public class TypeLit
             lstate.joins);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         LitExpState lstate = (LitExpState) state;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/UnaryOp.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/UnaryOp.java
index dfafbbbbb..3c8eadf30 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/UnaryOp.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/UnaryOp.java
@@ -36,6 +36,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 abstract class UnaryOp
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private ClassMetaData _meta = null;
     private Class _cast = null;
@@ -57,20 +59,24 @@ abstract class UnaryOp
         return _val;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
         return getType(_val.getType());
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
@@ -79,6 +85,7 @@ abstract class UnaryOp
         return _noParen;
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         return initializeValue(sel, ctx, flags);
     }
@@ -87,6 +94,7 @@ abstract class UnaryOp
         return _val.initialize(sel, ctx, flags);
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         sel.select(newSQLBuffer(sel, ctx, state), this);
@@ -94,15 +102,18 @@ abstract class UnaryOp
             sel.setAggregate(true);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         _val.selectColumns(sel, ctx, state, true);
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
         sel.groupBy(newSQLBuffer(sel, ctx, state));
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
         sel.orderBy(newSQLBuffer(sel, ctx, state), asc, false, getSelectAs());
@@ -115,6 +126,7 @@ abstract class UnaryOp
         return buf;
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         Object value = res.getObject(this, JavaSQLTypes.JDBC_DEFAULT, null);
@@ -130,15 +142,18 @@ abstract class UnaryOp
         return Filters.convert(value, type);
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         _val.calculateValue(sel, ctx, state, null, null);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 1;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
         sql.append(getOperator());
@@ -171,6 +186,7 @@ abstract class UnaryOp
      */
     protected abstract String getOperator();
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Val.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Val.java
index 779ffae14..049cec503 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Val.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Val.java
@@ -37,84 +37,84 @@ public interface Val
     /**
      * Initialization flag indicating that this value will be compared to null.
      */
-    public final int NULL_CMP = 2 << 0;
+    int NULL_CMP = 2 << 0;
 
     /**
      * Initialization flag indicating to join into any relation path.
      */
-    public final int JOIN_REL = 2 << 1;
+    int JOIN_REL = 2 << 1;
 
     /**
      * Initialization flag indicating to force an outer join into any relation
      * path.
      */
-    public final int FORCE_OUTER = 2 << 2;
+    int FORCE_OUTER = 2 << 2;
 
     /**
      * Initialization flag indicating to this value is for compare/equal
      * path.
      */
-    public final int CMP_EQUAL = 2 << 3;
+    int CMP_EQUAL = 2 << 3;
 
-    public final int VAL = 0;
-    public final int MATH_VAL = 1;
-    public final int CONCAT_VAL = 2;
-    public final int SUBSTRING_VAL = 3;
-    public final int UPPER_VAL = 4;
-    public final int LOWER_VAL = 5;
-    public final int TRIM_VAL = 6;
-    public final int LENGTH_VAL = 7;
-    public final int LOCATE_VAL = 8;
-    public final int ARGS_VAL = 9;
-    public final int INDEXOF_VAL = 10;
-    public final int ABS_VAL = 11;
-    public final int SQRT_VAL = 12;
-    public final int SIMPLECASE_VAL = 13;
-    public final int GENERALCASE_VAL = 14;
-    public final int WHENCONDITION_VAL = 15;
-    public final int WHENSCALAR_VAL = 16;
-    public final int COALESCE_VAL = 17;
-    public final int NULLIF_VAL = 18;
+    int VAL = 0;
+    int MATH_VAL = 1;
+    int CONCAT_VAL = 2;
+    int SUBSTRING_VAL = 3;
+    int UPPER_VAL = 4;
+    int LOWER_VAL = 5;
+    int TRIM_VAL = 6;
+    int LENGTH_VAL = 7;
+    int LOCATE_VAL = 8;
+    int ARGS_VAL = 9;
+    int INDEXOF_VAL = 10;
+    int ABS_VAL = 11;
+    int SQRT_VAL = 12;
+    int SIMPLECASE_VAL = 13;
+    int GENERALCASE_VAL = 14;
+    int WHENCONDITION_VAL = 15;
+    int WHENSCALAR_VAL = 16;
+    int COALESCE_VAL = 17;
+    int NULLIF_VAL = 18;
 
     /**
      * Initialize the value. This method should recursively initialize any
      * sub-values.
      */
-    public ExpState initialize(Select sel, ExpContext ctx, int flags);
+    ExpState initialize(Select sel, ExpContext ctx, int flags);
 
     /**
      * Return the datastore value of the given object in the context of this
      * value.
      */
-    public Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state,
+    Object toDataStoreValue(Select sel, ExpContext ctx, ExpState state,
         Object val);
 
     /**
      * Select the data for this value.
      */
-    public void select(Select sel, ExpContext ctx, ExpState state, boolean pks);
+    void select(Select sel, ExpContext ctx, ExpState state, boolean pks);
 
     /**
      * Select just the columns for this value.
      */
-    public void selectColumns(Select sel, ExpContext ctx, ExpState state,
+    void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks);
 
     /**
      * Group by this value.
      */
-    public void groupBy(Select sel, ExpContext ctx, ExpState state);
+    void groupBy(Select sel, ExpContext ctx, ExpState state);
 
     /**
      * Order by this value.
      */
-    public void orderBy(Select sel, ExpContext ctx, ExpState state,
+    void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc);
 
     /**
      * Load the data for this value.
      */
-    public Object load(ExpContext ctx, ExpState state, Result res)
+    Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException;
 
     /**
@@ -123,66 +123,66 @@ public interface Val
      *
      * @param other the value being compared to, or null if not a comparison
      */
-    public void calculateValue(Select sel, ExpContext ctx, ExpState state,
+    void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState);
 
     /**
      * Return the number of SQL elements in this value.
      */
-    public int length(Select sel, ExpContext ctx, ExpState state);
+    int length(Select sel, ExpContext ctx, ExpState state);
 
     /**
      * Append the <code>index</code>th SQL element to the given buffer.
      */
-    public void appendTo(Select sel, ExpContext ctx, ExpState state,
+    void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql,
         int index);
 
     /**
      * Append the SQL testing whether this value is empty to the given buffer.
      */
-    public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state,
+    void appendIsEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql);
 
     /**
      * Append the SQL testing whether this value is not empty to
      * the given buffer.
      */
-    public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
+    void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql);
 
     /**
      * Append the SQL checking the index of this value.
      */
-    public void appendIndex(Select sel, ExpContext ctx, ExpState state,
+    void appendIndex(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql);
 
     /**
      * Append the SQL checking the type of this value.
      */
-    public void appendType(Select sel, ExpContext ctx, ExpState state,
+    void appendType(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql);
 
     /**
      * Append the SQL checking the size of this value.
      */
-    public void appendSize(Select sel, ExpContext ctx, ExpState state,
+    void appendSize(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql);
 
     /**
      * Append the SQL testing whether this value is null to the given buffer.
      */
-    public void appendIsNull(Select sel, ExpContext ctx, ExpState state,
+    void appendIsNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql);
 
     /**
      * Append the SQL testing whether this value is not null to the given
      * buffer.
      */
-    public void appendIsNotNull(Select sel, ExpContext ctx, ExpState state,
+    void appendIsNotNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql);
 
-    public int getId();
+    int getId();
 
-    public Value getSelectAs();
+    @Override Value getSelectAs();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Variable.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Variable.java
index 71eee97aa..4d8f68315 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Variable.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Variable.java
@@ -41,6 +41,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 class Variable
     extends AbstractVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private final String _name;
     private Class _type;
     private ClassMetaData _meta;
@@ -58,6 +60,7 @@ class Variable
     /**
      * Return the variable name.
      */
+    @Override
     public String getName() {
         return _name;
     }
@@ -76,6 +79,7 @@ class Variable
         return _path;
     }
 
+    @Override
     public Path getPath() {
         return _path;
     }
@@ -87,32 +91,38 @@ class Variable
         _path = path;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
         if (meta != null)
             _type = meta.getDescribedType();
     }
 
+    @Override
     public boolean isVariable() {
         return true;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
         if (_path != null)
             _path.setImplicitType(type);
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, int flags) {
         if (_path != null) {
             _path.addVariableAction(this);
@@ -121,60 +131,74 @@ class Variable
         return ExpState.NULL;
     }
 
+    @Override
     public void select(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
     }
 
+    @Override
     public void groupBy(Select sel, ExpContext ctx, ExpState state) {
     }
 
+    @Override
     public void orderBy(Select sel, ExpContext ctx, ExpState state,
         boolean asc) {
     }
 
+    @Override
     public Object load(ExpContext ctx, ExpState state, Result res)
         throws SQLException {
         return null;
     }
 
+    @Override
     public void calculateValue(Select sel, ExpContext ctx, ExpState state,
         Val other, ExpState otherState) {
         if (_path != null)
             _path.calculateValue(sel, ctx, state, other, otherState);
     }
 
+    @Override
     public int length(Select sel, ExpContext ctx, ExpState state) {
         return 0;
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer sql, int index) {
     }
 
+    @Override
     public void appendIsEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
     }
 
+    @Override
     public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
     }
 
+    @Override
     public void appendSize(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
     }
 
+    @Override
     public void appendIsNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
     }
 
+    @Override
     public void appendIsNotNull(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         if (_path != null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/WhenCondition.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/WhenCondition.java
index d5f4d6fb7..3f6bc93ed 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/WhenCondition.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/WhenCondition.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 public class WhenCondition
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp;
     private final Val _val;
 
@@ -55,12 +57,14 @@ public class WhenCondition
         return _val.getType();
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState s1 = _exp.initialize(sel, ctx, contains);
         ExpState s2 = _val.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -73,6 +77,7 @@ public class WhenCondition
 
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -80,6 +85,7 @@ public class WhenCondition
         _val.selectColumns(sel, ctx, bstate.state2, pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/WhenScalar.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/WhenScalar.java
index 46371f0cf..62493503e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/WhenScalar.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/WhenScalar.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.kernel.exps.ExpressionVisitor;
 public class WhenScalar
     implements Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
 
@@ -55,12 +57,14 @@ public class WhenScalar
         return _val2.getType();
     }
 
+    @Override
     public ExpState initialize(Select sel, ExpContext ctx, Map contains) {
         ExpState s1 = _val1.initialize(sel, ctx, 0);
         ExpState s2 = _val2.initialize(sel, ctx, 0);
         return new BinaryOpExpState(sel.and(s1.joins, s2.joins), s1, s2);
     }
 
+    @Override
     public void appendTo(Select sel, ExpContext ctx, ExpState state,
         SQLBuffer buf) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -69,6 +73,7 @@ public class WhenScalar
         _val2.appendTo(sel, ctx, bstate.state2, buf, 0);
     }
 
+    @Override
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,
         boolean pks) {
         BinaryOpExpState bstate = (BinaryOpExpState) state;
@@ -76,6 +81,7 @@ public class WhenScalar
         _val2.selectColumns(sel, ctx, bstate.state2, pks);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMapping.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMapping.java
index af0d64a08..686c8e3e9 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMapping.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMapping.java
@@ -67,6 +67,9 @@ public class ClassMapping
     extends ClassMetaData
     implements ClassStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final ClassMapping[] EMPTY_MAPPINGS = new ClassMapping[0];
 
     private static final Localizer _loc = Localizer.forPackage
@@ -551,6 +554,7 @@ public class ClassMapping
     // MetaData interface
     //////////////////////
 
+    @Override
     protected void setDescribedType(Class type) {
         super.setDescribedType(type);
         // this method called from superclass constructor, so _info not yet
@@ -603,6 +607,7 @@ public class ClassMapping
      * if it has a null strategy, and therefore is probably in the process of
      * being mapped).
      */
+    @Override
     public boolean isMapped() {
         if (!super.isMapped())
             return false;
@@ -837,6 +842,7 @@ public class ClassMapping
         return (FieldMapping) addDeclaredField(name, type);
     }
 
+    @Override
     protected void resolveMapping(boolean runtime) {
         super.resolveMapping(runtime);
 
@@ -924,6 +930,7 @@ public class ClassMapping
         _version.resolve(MODE_MAPPING);
     }
 
+    @Override
     protected void initializeMapping() {
         super.initializeMapping();
 
@@ -935,23 +942,27 @@ public class ClassMapping
         _strategy.initialize();
     }
 
+    @Override
     protected void clearDefinedFieldCache() {
         // just make this method available to other classes in this package
         super.clearDefinedFieldCache();
     }
 
+    @Override
     protected void clearSubclassCache() {
         super.clearSubclassCache();
         _joinSubMaps = null;
         _assignMaps = null;
     }
 
+    @Override
     public void copy(ClassMetaData cls) {
         super.copy(cls);
         if (_subclassMode == Integer.MAX_VALUE)
             _subclassMode = ((ClassMapping) cls).getSubclassFetchMode();
     }
 
+    @Override
     protected boolean validateDataStoreExtensionPrefix(String prefix) {
         return "jdbc-".equals(prefix);
     }
@@ -960,78 +971,95 @@ public class ClassMapping
     // ClassStrategy implementation
     ////////////////////////////////
 
+    @Override
     public String getAlias() {
         return assertStrategy().getAlias();
     }
 
+    @Override
     public void map(boolean adapt) {
         assertStrategy().map(adapt);
     }
 
+    @Override
     public void initialize() {
         assertStrategy().initialize();
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().insert(sm, store, rm);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().update(sm, store, rm);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().delete(sm, store, rm);
     }
 
+    @Override
     public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomInsert(sm, store);
     }
 
+    @Override
     public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomUpdate(sm, store);
     }
 
+    @Override
     public Boolean isCustomDelete(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomDelete(sm, store);
     }
 
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customInsert(sm, store);
     }
 
+    @Override
     public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customUpdate(sm, store);
     }
 
+    @Override
     public void customDelete(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customDelete(sm, store);
     }
 
+    @Override
     public void setClassMapping(ClassMapping owner) {
         assertStrategy().setClassMapping(owner);
     }
 
+    @Override
     public boolean isPrimaryKeyObjectId(boolean hasAll) {
         return assertStrategy().isPrimaryKeyObjectId(hasAll);
     }
 
+    @Override
     public Joins joinSuperclass(Joins joins, boolean toThis) {
         return assertStrategy().joinSuperclass(joins, toThis);
     }
 
+    @Override
     public boolean supportsEagerSelect(Select sel, OpenJPAStateManager sm,
         JDBCStore store, ClassMapping base, JDBCFetchConfiguration fetch) {
         return assertStrategy().supportsEagerSelect(sel, sm, store, base,
             fetch);
     }
 
+    @Override
     public ResultObjectProvider customLoad(JDBCStore store, boolean subclasses,
         JDBCFetchConfiguration fetch, long startIdx, long endIdx)
         throws SQLException {
@@ -1039,12 +1067,14 @@ public class ClassMapping
             startIdx, endIdx);
     }
 
+    @Override
     public boolean customLoad(OpenJPAStateManager sm, JDBCStore store,
         PCState state, JDBCFetchConfiguration fetch)
         throws SQLException, ClassNotFoundException {
         return assertStrategy().customLoad(sm, store, state, fetch);
     }
 
+    @Override
     public boolean customLoad(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result result)
         throws SQLException {
@@ -1071,7 +1101,7 @@ public class ClassMapping
     		List<FieldMapping> fms = hasColumn(c, prime);
     		if (fms == null) continue;
 			if (result == null)
-				result = new ArrayList<FieldMapping>();
+				result = new ArrayList<>();
 			for (FieldMapping fm : fms)
 				if (!result.contains(fm))
 					result.add(fm);
@@ -1093,7 +1123,7 @@ public class ClassMapping
     		Column[] cols = fm.getColumns();
     		if (contains(cols, c)) {
     			if (result == null)
-    				result = new ArrayList<FieldMapping>();
+    				result = new ArrayList<>();
     			result.add(fm);
     		}
     	}
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
index d4427c726..0cad85db7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
@@ -31,7 +31,6 @@ import java.util.Map.Entry;
 
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
-import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.meta.strats.FullClassStrategy;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
@@ -42,6 +41,7 @@ import org.apache.openjpa.jdbc.schema.Unique;
 import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.xml.Commentable;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.MetaDataContext;
 import org.apache.openjpa.util.UserException;
 
@@ -53,11 +53,12 @@ import org.apache.openjpa.util.UserException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class ClassMappingInfo
     extends MappingInfo
     implements SourceTracker, Commentable {
 
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (ClassMappingInfo.class);
 
@@ -108,6 +109,7 @@ public class ClassMappingInfo
      * The given table name.
      * @deprecated
      */
+    @Deprecated
     public String getTableName() {
         return getTableIdentifier().getName();
     }
@@ -120,6 +122,7 @@ public class ClassMappingInfo
      * The given table name.
      * @deprecated
      */
+    @Deprecated
     public void setTableName(String table) {
         setTableIdentifier(DBIdentifier.newTable(table));
     }
@@ -132,6 +135,7 @@ public class ClassMappingInfo
      * The default schema name for unqualified tables.
      * @deprecated
      */
+    @Deprecated
     public String getSchemaName() {
         return getSchemaIdentifier().getName();
     }
@@ -144,6 +148,7 @@ public class ClassMappingInfo
      * The default schema name for unqualified tables.
      * @deprecated
      */
+    @Deprecated
     public void setSchemaName(String schema) {
         setSchemaIdentifier(DBIdentifier.newSchema(schema));
     }
@@ -170,6 +175,7 @@ public class ClassMappingInfo
      * Return the class-level joined tables.
      * @deprecated
      */
+    @Deprecated
     public String[] getSecondaryTableNames() {
         if (_seconds == null)
             return new String[0];
@@ -179,7 +185,7 @@ public class ClassMappingInfo
     public DBIdentifier[] getSecondaryTableIdentifiers() {
         if (_seconds == null)
             return new DBIdentifier[0];
-        return (DBIdentifier[]) _seconds.keySet().toArray(new DBIdentifier[_seconds.size()]);
+        return _seconds.keySet().toArray(new DBIdentifier[_seconds.size()]);
     }
 
     /**
@@ -189,6 +195,7 @@ public class ClassMappingInfo
      * class-level join, or the given name if no join exists.
      * @deprecated
      */
+    @Deprecated
     public String getSecondaryTableName(String tableName) {
         return getSecondaryTableIdentifier(DBIdentifier.newTable(tableName)).getName();
     }
@@ -209,7 +216,7 @@ public class ClassMappingInfo
         DBIdentifier join = DBIdentifier.NULL;
         for (Iterator<DBIdentifier> itr = _seconds.keySet().iterator(); itr.hasNext();) {
             // award a caseless match without schema 2 points
-            fullJoin = (DBIdentifier) itr.next();
+            fullJoin = itr.next();
             QualifiedDBIdentifier joinPath = QualifiedDBIdentifier.getPath(fullJoin);
             if (joinPath.isUnqualifiedObject() && pts < 2 && fullJoin.equalsIgnoreCase(tableName)) {
                 best = fullJoin;
@@ -236,6 +243,7 @@ public class ClassMappingInfo
      * list if none.
      * @deprecated
      */
+    @Deprecated
     public List<Column> getSecondaryTableJoinColumns(String tableName) {
         return getSecondaryTableJoinColumns(DBIdentifier.newTable(tableName));
     }
@@ -267,6 +275,7 @@ public class ClassMappingInfo
      * must be known before unique constraints are added to a Secondary table.
      * @deprecated
      */
+    @Deprecated
     public void addSecondaryTable(String second) {
     	setSecondaryTableJoinColumns(DBIdentifier.newTable(second), null);
     }
@@ -279,6 +288,7 @@ public class ClassMappingInfo
      * Declare the given class-level join to the named (secondary) table.
      * @deprecated
      */
+    @Deprecated
     public void setSecondaryTableJoinColumns(String tableName, List<Column> cols) {
         if (cols == null)
             cols = Collections.emptyList();
@@ -289,7 +299,7 @@ public class ClassMappingInfo
         if (cols == null)
             cols = Collections.emptyList();
         if (_seconds == null)
-            _seconds = new LinkedHashMap<DBIdentifier, List<Column>>();
+            _seconds = new LinkedHashMap<>();
         _seconds.put(tableName, cols);
     }
 
@@ -297,6 +307,7 @@ public class ClassMappingInfo
      * Return the named table for the given class.
      * @deprecated
      */
+    @Deprecated
     public Table getTable(final ClassMapping cls, String tableName,
         boolean adapt) {
         return getTable(cls, DBIdentifier.newTable(tableName), adapt);
@@ -309,12 +320,14 @@ public class ClassMappingInfo
             boolean adapt) {
 
         Table t = createTable(cls, new TableDefaults() {
+            @Override
             public String get(Schema schema) {
                 // delay this so that we don't do schema reflection for unique
                 // table name unless necessary
                 return cls.getMappingRepository().getMappingDefaults().
                     getTableName(cls, schema);
             }
+            @Override
             public DBIdentifier getIdentifier(Schema schema) {
                 return cls.getMappingRepository().getMappingDefaults().
                     getTableIdentifier(cls, schema);
@@ -355,11 +368,13 @@ public class ClassMappingInfo
             return null;
 
         ForeignKeyDefaults def = new ForeignKeyDefaults() {
+            @Override
             public ForeignKey get(Table local, Table foreign, boolean inverse) {
                 return cls.getMappingRepository().getMappingDefaults().
                     getJoinForeignKey(cls, local, foreign);
             }
 
+            @Override
             public void populate(Table local, Table foreign, Column col,
                 Object target, boolean inverse, int pos, int cols) {
                 cls.getMappingRepository().getMappingDefaults().
@@ -390,7 +405,7 @@ public class ClassMappingInfo
             && sup.getTable() != null)
             syncForeignKey(cls, cls.getJoinForeignKey(), cls.getTable(),
                 sup.getTable());
-        else if (cls.getIdentityType() == ClassMapping.ID_DATASTORE)
+        else if (cls.getIdentityType() == ClassMetaData.ID_DATASTORE)
             syncColumns(cls, cls.getPrimaryKeyColumns(), false);
 
         // record inheritance strategy if class does not use default strategy
@@ -403,15 +418,18 @@ public class ClassMappingInfo
             setStrategy(strat);
     }
 
+    @Override
     public boolean hasSchemaComponents() {
         return super.hasSchemaComponents() || !DBIdentifier.isNull(_tableName);
     }
 
+    @Override
     protected void clear(boolean canFlags) {
         super.clear(canFlags);
         _tableName = DBIdentifier.NULL;
     }
 
+    @Override
     public void copy(MappingInfo info) {
         super.copy(info);
         if (!(info instanceof ClassMappingInfo))
@@ -424,7 +442,7 @@ public class ClassMappingInfo
             _subStrat = cinfo.getHierarchyStrategy();
         if (cinfo._seconds != null) {
             if (_seconds == null)
-                _seconds = new HashMap<DBIdentifier, List<Column>>();
+                _seconds = new HashMap<>();
             DBIdentifier key;
             for (Iterator<DBIdentifier> itr = cinfo._seconds.keySet().iterator();
                 itr.hasNext();) {
@@ -435,7 +453,7 @@ public class ClassMappingInfo
         }
         if (cinfo._uniques != null) {
         	if (_uniques == null)
-        		_uniques = new HashMap<DBIdentifier, List<Unique>>();
+        		_uniques = new HashMap<>();
         for (Entry<DBIdentifier, List<Unique>> entry : cinfo._uniques.entrySet())
         		if (!_uniques.containsKey(entry.getKey()))
         			_uniques.put(entry.getKey(), entry.getValue());
@@ -450,6 +468,7 @@ public class ClassMappingInfo
      * @param unique the unique constraint. null means no-op.
      * @deprecated
      */
+    @Deprecated
     public void addUnique(String table, Unique unique) {
         addUnique(DBIdentifier.newTable(table), unique);
     }
@@ -470,11 +489,11 @@ public class ClassMappingInfo
     	if (unique == null)
     		return;
         if (_uniques == null)
-            _uniques = new HashMap<DBIdentifier,List<Unique>>();
+            _uniques = new HashMap<>();
         unique.setTableIdentifier(table);
         List<Unique> uniques = _uniques.get(table);
         if (uniques == null) {
-        	uniques = new ArrayList<Unique>();
+        	uniques = new ArrayList<>();
         	uniques.add(unique);
         	_uniques.put(table, uniques);
         } else {
@@ -486,6 +505,7 @@ public class ClassMappingInfo
      * Get the unique constraints of the given primary or secondary table.
      * @deprecated
      */
+    @Deprecated
     public Unique[] getUniques(String table) {
         return getUniques(DBIdentifier.newTable(table));
     }
@@ -509,7 +529,7 @@ public class ClassMappingInfo
     public Unique[] getUniques(MetaDataContext cm, boolean adapt) {
         if (_uniques == null || _uniques.isEmpty())
             return new Unique[0];
-        List<Unique> result = new ArrayList<Unique>();
+        List<Unique> result = new ArrayList<>();
         for (DBIdentifier tableName : _uniques.keySet()) {
         	List<Unique> uniqueConstraints = _uniques.get(tableName);
         	for (Unique template : uniqueConstraints) {
@@ -536,14 +556,17 @@ public class ClassMappingInfo
         return result.toArray(new Unique[result.size()]);
     }
 
+    @Override
     public File getSourceFile() {
         return _file;
     }
 
+    @Override
     public Object getSourceScope() {
         return null;
     }
 
+    @Override
     public int getSourceType() {
         return _srcType;
     }
@@ -553,18 +576,22 @@ public class ClassMappingInfo
         _srcType = srcType;
     }
 
+    @Override
     public String getResourceName() {
         return _className;
     }
 
+    @Override
     public String[] getComments() {
         return (_comments == null) ? EMPTY_COMMENTS : _comments;
     }
 
+    @Override
     public void setComments(String[] comments) {
         _comments = comments;
     }
 
+    @Override
     public int getLineNumber() {
         return _lineNum;
     }
@@ -573,6 +600,7 @@ public class ClassMappingInfo
         _lineNum = lineNum;
     }
 
+    @Override
     public int getColNumber() {
         return _colNum;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassStrategy.java
index dc011daa8..3e1a9ad02 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassStrategy.java
@@ -42,7 +42,7 @@ public interface ClassStrategy
      * Set the class mapping using this strategy. This will be called before
      * use.
      */
-    public void setClassMapping(ClassMapping owner);
+    void setClassMapping(ClassMapping owner);
 
     /**
      * Return true if the this class' primary key columns correspond to the
@@ -60,7 +60,7 @@ public interface ClassStrategy
      * base class primary key column; if false the primary key
      * must only match a subset of the base class primary key columns
      */
-    public boolean isPrimaryKeyObjectId(boolean hasAll);
+    boolean isPrimaryKeyObjectId(boolean hasAll);
 
     /**
      * Join the mapping and its superclass.
@@ -68,21 +68,21 @@ public interface ClassStrategy
      * @param toThis if false, inner join to the superclass table; if
      * true, outer join from the superclass table to this table
      */
-    public Joins joinSuperclass(Joins joins, boolean toThis);
+    Joins joinSuperclass(Joins joins, boolean toThis);
 
     /**
      * Return true if this strategy can perform the given select from
      * the given <code>base</code> mapping.
      * The given state manager may be null if selecting multiple instances.
      */
-    public boolean supportsEagerSelect(Select sel, OpenJPAStateManager sm,
+    boolean supportsEagerSelect(Select sel, OpenJPAStateManager sm,
         JDBCStore store, ClassMapping base, JDBCFetchConfiguration fetch);
 
     /**
      * Implement this method to customize obtaining a result containing all
      * instances of this class. Return null for standard loading.
      */
-    public ResultObjectProvider customLoad(JDBCStore store, boolean subclasses,
+    ResultObjectProvider customLoad(JDBCStore store, boolean subclasses,
         JDBCFetchConfiguration fetch, long startIdx, long endIdx)
         throws SQLException;
 
@@ -100,7 +100,7 @@ public interface ClassStrategy
      * subclasses); initialization looks like this: <code>
      * sm.initialize (pcClass, state)</code>
      */
-    public boolean customLoad(OpenJPAStateManager sm, JDBCStore store,
+    boolean customLoad(OpenJPAStateManager sm, JDBCStore store,
         PCState state, JDBCFetchConfiguration fetch)
         throws SQLException, ClassNotFoundException;
 
@@ -109,7 +109,7 @@ public interface ClassStrategy
      * into an instance. Return true if this mapping handles the
      * load; false if normal loading should proceed after calling this method.
      */
-    public boolean customLoad(OpenJPAStateManager sm, JDBCStore store,
+    boolean customLoad(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result result)
         throws SQLException;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DelegatingJoinable.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DelegatingJoinable.java
index f9694426e..d86cf3df0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DelegatingJoinable.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DelegatingJoinable.java
@@ -41,9 +41,8 @@ import org.apache.openjpa.util.MetaDataException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class DelegatingJoinable
-    implements Joinable {
+public class DelegatingJoinable implements Joinable {
+    private static final long serialVersionUID = 1L;
 
     private static final Localizer _loc = Localizer.forPackage
         (DelegatingJoinable.class);
@@ -88,29 +87,35 @@ public class DelegatingJoinable
                 join.getColumns()[0].getFullDBIdentifier()));
     }
 
+    @Override
     public int getFieldIndex() {
         return _join.getFieldIndex();
     }
 
+    @Override
     public Object getPrimaryKeyValue(Result res, Column[] cols, ForeignKey fk,
         JDBCStore store, Joins joins)
         throws SQLException {
         return _join.getPrimaryKeyValue(res, cols, fk, store, joins);
     }
 
+    @Override
     public Column[] getColumns() {
         return _cols;
     }
 
+    @Override
     public Object getJoinValue(Object val, Column col, JDBCStore store) {
         return _join.getJoinValue(val, translate(col), store);
     }
 
+    @Override
     public Object getJoinValue(OpenJPAStateManager sm, Column col,
         JDBCStore store) {
         return _join.getJoinValue(sm, translate(col), store);
     }
 
+    @Override
     public void setAutoAssignedValue(OpenJPAStateManager sm, JDBCStore store,
         Column col, Object autogen) {
         _join.setAutoAssignedValue(sm, store, translate(col), autogen);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Discriminator.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Discriminator.java
index a01448e7c..d118dd7bf 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Discriminator.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Discriminator.java
@@ -43,10 +43,11 @@ import org.apache.openjpa.util.InternalException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class Discriminator
     implements DiscriminatorStrategy, MetaDataContext, MetaDataModes {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * Null discriminator value marker.
      */
@@ -76,6 +77,7 @@ public class Discriminator
         _info = getMappingRepository().newMappingInfo(this);
     }
 
+    @Override
     public MetaDataRepository getRepository() {
         return _mapping.getRepository();
     }
@@ -326,82 +328,100 @@ public class Discriminator
     // DiscriminatorStrategy implementation
     ////////////////////////////////////////
 
+    @Override
     public String getAlias() {
         return assertStrategy().getAlias();
     }
 
+    @Override
     public void map(boolean adapt) {
         assertStrategy().map(adapt);
     }
 
+    @Override
     public void initialize() {
         assertStrategy().initialize();
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().insert(sm, store, rm);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().update(sm, store, rm);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().delete(sm, store, rm);
     }
 
+    @Override
     public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomInsert(sm, store);
     }
 
+    @Override
     public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomUpdate(sm, store);
     }
 
+    @Override
     public Boolean isCustomDelete(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomDelete(sm, store);
     }
 
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customInsert(sm, store);
     }
 
+    @Override
     public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customUpdate(sm, store);
     }
 
+    @Override
     public void customDelete(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customDelete(sm, store);
     }
 
+    @Override
     public void setDiscriminator(Discriminator owner) {
         assertStrategy().setDiscriminator(owner);
     }
 
+    @Override
     public boolean select(Select sel, ClassMapping mapping) {
         return assertStrategy().select(sel, mapping);
     }
 
+    @Override
     public void loadSubclasses(JDBCStore store)
         throws SQLException, ClassNotFoundException {
         assertStrategy().loadSubclasses(store);
     }
 
+    @Override
     public Class<?> getClass(JDBCStore store, ClassMapping base, Result result)
         throws SQLException, ClassNotFoundException {
         return assertStrategy().getClass(store, base, result);
     }
 
+    @Override
     public boolean hasClassConditions(ClassMapping base, boolean subs) {
         return assertStrategy().hasClassConditions(base, subs);
     }
 
+    @Override
     public SQLBuffer getClassConditions(Select sel, Joins joins,
         ClassMapping base, boolean subs) {
         return assertStrategy().getClassConditions(sel, joins, base, subs);
@@ -413,6 +433,7 @@ public class Discriminator
         return _strategy;
     }
 
+    @Override
     public String toString() {
         return _mapping + "<discriminator>";
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
index 9cbbbd55a..d9a125b9c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
@@ -20,7 +20,6 @@ package org.apache.openjpa.jdbc.meta;
 
 import java.lang.reflect.Modifier;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.meta.strats.NoneDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.meta.strats.SuperclassDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.meta.strats.ValueMapDiscriminatorStrategy;
@@ -28,6 +27,7 @@ import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.Index;
 import org.apache.openjpa.jdbc.schema.SchemaGroup;
 import org.apache.openjpa.jdbc.schema.Table;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 
 /**
@@ -38,10 +38,8 @@ import org.apache.openjpa.meta.JavaTypes;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class DiscriminatorMappingInfo
-    extends MappingInfo {
-
+public class DiscriminatorMappingInfo extends MappingInfo {
+    private static final long serialVersionUID = 1L;
     private String _value = null;
 
     /**
@@ -150,11 +148,13 @@ public class DiscriminatorMappingInfo
             setStrategy(strat);
     }
 
+    @Override
     protected void clear(boolean canFlags) {
         super.clear(canFlags);
         _value = null;
     }
 
+    @Override
     public void copy(MappingInfo info) {
         super.copy(info);
         if (!(info instanceof DiscriminatorMappingInfo))
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorStrategy.java
index 09c3871e1..b43f24c6b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorStrategy.java
@@ -38,7 +38,7 @@ public interface DiscriminatorStrategy
      * Set the Discriminator that uses this strategy. This will be called
      * before use.
      */
-    public void setDiscriminator(Discriminator owner);
+    void setDiscriminator(Discriminator owner);
 
     /**
      * Select the data for this Discriminator.
@@ -47,18 +47,18 @@ public interface DiscriminatorStrategy
      * not be the base class in the inheritance hierarchy
      * @return true if anything was selected; false otherwise
      */
-    public boolean select(Select sel, ClassMapping mapping);
+    boolean select(Select sel, ClassMapping mapping);
 
     /**
      * Load all subclasses of the owning class mapping into the JVM.
      */
-    public void loadSubclasses(JDBCStore store)
+    void loadSubclasses(JDBCStore store)
         throws SQLException, ClassNotFoundException;
 
     /**
      * Return the class for the current result row.
      */
-    public Class<?> getClass(JDBCStore store, ClassMapping base, Result result)
+    Class<?> getClass(JDBCStore store, ClassMapping base, Result result)
         throws SQLException, ClassNotFoundException;
 
     /**
@@ -66,13 +66,13 @@ public interface DiscriminatorStrategy
      *
      * @see #getClassConditions
      */
-    public boolean hasClassConditions(ClassMapping base, boolean subs);
+    boolean hasClassConditions(ClassMapping base, boolean subs);
 
     /**
      * Return SQL to limit the classes selected as much as possible to the
      * given base class, and optionally its subclasses. The select and joins
      * instances are supplied in order to get column aliases.
      */
-    public SQLBuffer getClassConditions(Select sel, Joins joins,
+    SQLBuffer getClassConditions(Select sel, Joins joins,
         ClassMapping base, boolean subs);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Embeddable.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Embeddable.java
index d5fc19fae..9234df189 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Embeddable.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Embeddable.java
@@ -37,23 +37,23 @@ import org.apache.openjpa.kernel.OpenJPAStateManager;
  */
 public interface Embeddable {
 
-    public static final Object UNSUPPORTED = new Object();
+    Object UNSUPPORTED = new Object();
 
     /**
      * Return the columns used by this strategy.
      */
-    public Column[] getColumns();
+    Column[] getColumns();
 
     /**
      * Return column I/O information for this mapping.
      */
-    public ColumnIO getColumnIO();
+    ColumnIO getColumnIO();
 
     /**
      * Return the arguments needed to extract datastore values via
      * {@link Result#getObject} for each column.
      */
-    public Object[] getResultArguments();
+    Object[] getResultArguments();
 
     /**
      * Convert the given Java value to its datastore equivalent. If this
@@ -61,7 +61,7 @@ public interface Embeddable {
      * element per column. For relation id columns, return the state manager
      * the column depends on.
      */
-    public Object toEmbeddedDataStoreValue(Object val, JDBCStore store);
+    Object toEmbeddedDataStoreValue(Object val, JDBCStore store);
 
     /**
      * Convert the given datastore value to its Java equivalent.
@@ -71,7 +71,7 @@ public interface Embeddable {
      * cases {@link #loadEmbedded} will be used instead. Return
      * {@link #UNSUPPORTED} if this mapping cannot support this method.
      */
-    public Object toEmbeddedObjectValue(Object val);
+    Object toEmbeddedObjectValue(Object val);
 
     /**
      * Load this strategy's field by transforming the given datastore value.
@@ -79,7 +79,7 @@ public interface Embeddable {
      * value will be an object array of the corresponding length. The value
      * does not have to be loaded immediately; it may be stored as impl data.
      */
-    public void loadEmbedded(OpenJPAStateManager sm, JDBCStore store,
+    void loadEmbedded(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object val)
         throws SQLException;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java
index 50362ad0b..63372b287 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java
@@ -59,7 +59,6 @@ import org.apache.openjpa.util.ObjectId;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class FieldMapping
     extends FieldMetaData
     implements ValueMapping, FieldStrategy {
@@ -295,6 +294,7 @@ public class FieldMapping
     /**
      * Increment the reference count of used schema components.
      */
+    @Override
     public void refSchemaComponents() {
         if (_fk != null) {
             _fk.ref();
@@ -317,6 +317,7 @@ public class FieldMapping
     /**
      * Clear mapping information, including strategy.
      */
+    @Override
     public void clearMapping() {
         _strategy = null;
         _fk = null;
@@ -334,6 +335,7 @@ public class FieldMapping
     /**
      * Update {@link MappingInfo} with our current mapping information.
      */
+    @Override
     public void syncMappingInfo() {
         if (isVersion()) {
             // we rely on the fact that the version will setup our mapping
@@ -368,6 +370,7 @@ public class FieldMapping
      * if it has a null strategy, and therefore is probably in the process of
      * being mapped).
      */
+    @Override
     public boolean isMapped() {
         return _strategy != NoneFieldStrategy.getInstance();
     }
@@ -398,6 +401,7 @@ public class FieldMapping
      * Convenience method to perform cast from
      * {@link FieldMetaData#getRepository}
      */
+    @Override
     public MappingRepository getMappingRepository() {
         return (MappingRepository) getRepository();
     }
@@ -455,6 +459,7 @@ public class FieldMapping
         return (FieldMapping[]) getInverseMetaDatas();
     }
 
+    @Override
     public boolean resolve(int mode) {
         int cur = getResolve();
         if (super.resolve(mode))
@@ -547,12 +552,14 @@ public class FieldMapping
             _strategy.initialize();
     }
 
+    @Override
     public void copy(FieldMetaData fmd) {
         super.copy(fmd);
         if (_fetchMode == Integer.MAX_VALUE)
             _fetchMode = ((FieldMapping) fmd).getEagerFetchMode();
     }
 
+    @Override
     protected boolean validateDataStoreExtensionPrefix(String prefix) {
         return "jdbc-".equals(prefix);
     }
@@ -561,10 +568,12 @@ public class FieldMapping
     // FieldStrategy implementation
     ////////////////////////////////
 
+    @Override
     public String getAlias() {
         return assertStrategy().getAlias();
     }
 
+    @Override
     public void map(boolean adapt) {
         assertStrategy().map(adapt);
     }
@@ -615,10 +624,12 @@ public class FieldMapping
                 installPrimaryKey(this, _fk.getTable());
     }
 
+    @Override
     public void initialize() {
         assertStrategy().initialize();
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
     	setPKValueFromMappedByIdField(sm);
@@ -696,11 +707,13 @@ public class FieldMapping
             val);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().update(sm, store, rm);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().delete(sm, store, rm);
@@ -801,56 +814,68 @@ public class FieldMapping
         }
     }
 
+    @Override
     public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomInsert(sm, store);
     }
 
+    @Override
     public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomUpdate(sm, store);
     }
 
+    @Override
     public Boolean isCustomDelete(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomDelete(sm, store);
     }
 
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customInsert(sm, store);
     }
 
+    @Override
     public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customUpdate(sm, store);
     }
 
+    @Override
     public void customDelete(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customDelete(sm, store);
     }
 
+    @Override
     public void setFieldMapping(FieldMapping owner) {
         assertStrategy().setFieldMapping(owner);
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         return assertStrategy().supportsSelect(sel, type, sm, store, fetch);
     }
 
+    @Override
     public void selectEagerParallel(SelectExecutor sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode) {
         assertStrategy().selectEagerParallel(sel, sm, store, fetch, eagerMode);
     }
 
+    @Override
     public void selectEagerJoin(Select sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode) {
         assertStrategy().selectEagerJoin(sel, sm, store, fetch, eagerMode);
     }
 
+    @Override
     public boolean isEagerSelectToMany() {
         return assertStrategy().isEagerSelectToMany();
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
         return assertStrategy().select(sel, sm, store, fetch, eagerMode);
@@ -912,79 +937,96 @@ public class FieldMapping
                 orders[i].order(sel, elem, joins);
     }
 
+    @Override
     public Object loadEagerParallel(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object res)
         throws SQLException {
         return assertStrategy().loadEagerParallel(sm, store, fetch, res);
     }
 
+    @Override
     public void loadEagerJoin(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
         assertStrategy().loadEagerJoin(sm, store, fetch, res);
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
         assertStrategy().load(sm, store, fetch, res);
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException {
         assertStrategy().load(sm, store, fetch);
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return assertStrategy().toDataStoreValue(val, store);
     }
 
+    @Override
     public Object toKeyDataStoreValue(Object val, JDBCStore store) {
         return assertStrategy().toKeyDataStoreValue(val, store);
     }
 
+    @Override
     public void appendIsEmpty(SQLBuffer sql, Select sel, Joins joins) {
         assertStrategy().appendIsEmpty(sql, sel, joins);
     }
 
+    @Override
     public void appendIsNotEmpty(SQLBuffer sql, Select sel, Joins joins) {
         assertStrategy().appendIsNotEmpty(sql, sel, joins);
     }
 
+    @Override
     public void appendIsNull(SQLBuffer sql, Select sel, Joins joins) {
         assertStrategy().appendIsNull(sql, sel, joins);
     }
 
+    @Override
     public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins) {
         assertStrategy().appendIsNotNull(sql, sel, joins);
     }
 
+    @Override
     public void appendSize(SQLBuffer sql, Select sel, Joins joins) {
         assertStrategy().appendSize(sql, sel, joins);
     }
 
+    @Override
     public void appendIndex(SQLBuffer sql, Select sel, Joins joins) {
         assertStrategy().appendIndex(sql, sel, joins);
     }
 
+    @Override
     public void appendType(SQLBuffer sql, Select sel, Joins joins) {
         assertStrategy().appendType(sql, sel, joins);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return assertStrategy().join(joins, forceOuter);
     }
 
+    @Override
     public Joins joinKey(Joins joins, boolean forceOuter) {
         return assertStrategy().joinKey(joins, forceOuter);
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         return assertStrategy().joinRelation(joins, forceOuter, traverse);
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         return assertStrategy().joinKeyRelation(joins, forceOuter, traverse);
@@ -1002,6 +1044,7 @@ public class FieldMapping
         return joins.join(_fk, true, toMany);
     }
 
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
@@ -1013,6 +1056,7 @@ public class FieldMapping
         return assertStrategy().loadProjection(store, fetch, res, joins);
     }
 
+    @Override
     public Object loadKeyProjection(JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -1020,10 +1064,12 @@ public class FieldMapping
             .loadKeyProjection(store, fetch, res, joins);
     }
 
+    @Override
     public boolean isVersionable() {
         return assertStrategy().isVersionable();
     }
 
+    @Override
     public void where(OpenJPAStateManager sm, JDBCStore store, RowManager rm,
         Object prevValue)
         throws SQLException {
@@ -1040,38 +1086,47 @@ public class FieldMapping
     // ValueMapping implementation
     ///////////////////////////////
 
+    @Override
     public ValueMappingInfo getValueInfo() {
         return _val.getValueInfo();
     }
 
+    @Override
     public ValueHandler getHandler() {
         return _val.getHandler();
     }
 
+    @Override
     public void setHandler(ValueHandler handler) {
         _val.setHandler(handler);
     }
 
+    @Override
     public FieldMapping getFieldMapping() {
         return this;
     }
 
+    @Override
     public ClassMapping getTypeMapping() {
         return _val.getTypeMapping();
     }
 
+    @Override
     public ClassMapping getDeclaredTypeMapping() {
         return _val.getDeclaredTypeMapping();
     }
 
+    @Override
     public ClassMapping getEmbeddedMapping() {
         return _val.getEmbeddedMapping();
     }
 
+    @Override
     public FieldMapping getValueMappedByMapping() {
         return _val.getValueMappedByMapping();
     }
 
+    @Override
     public Column[] getColumns() {
         // pcl: 6 July 2007: this seems a bit hacky, but if the mapping is a
         // version, it will have a NoneFieldMapping (since the version strategy
@@ -1088,89 +1143,110 @@ public class FieldMapping
             return _val.getColumns();
     }
 
+    @Override
     public void setColumns(Column[] cols) {
         _val.setColumns(cols);
     }
 
+    @Override
     public ColumnIO getColumnIO() {
         return _val.getColumnIO();
     }
 
+    @Override
     public void setColumnIO(ColumnIO io) {
         _val.setColumnIO(io);
     }
 
+    @Override
     public ForeignKey getForeignKey() {
         return _val.getForeignKey();
     }
 
+    @Override
     public ForeignKey getForeignKey(ClassMapping target) {
         return _val.getForeignKey(target);
     }
 
+    @Override
     public void setForeignKey(ForeignKey fk) {
         _val.setForeignKey(fk);
     }
 
+    @Override
     public int getJoinDirection() {
         return _val.getJoinDirection();
     }
 
+    @Override
     public void setJoinDirection(int direction) {
         _val.setJoinDirection(direction);
     }
 
+    @Override
     public void setForeignKey(Row row, OpenJPAStateManager sm)
         throws SQLException {
         _val.setForeignKey(row, sm);
     }
 
+    @Override
     public void setForeignKey(Row row, OpenJPAStateManager sm, int targetNumber)
         throws SQLException {
         _val.setForeignKey(row, sm, targetNumber);
     }
 
+    @Override
     public void whereForeignKey(Row row, OpenJPAStateManager sm)
         throws SQLException {
         _val.whereForeignKey(row, sm);
     }
 
+    @Override
     public ClassMapping[] getIndependentTypeMappings() {
         return _val.getIndependentTypeMappings();
     }
 
+    @Override
     public int getSelectSubclasses() {
         return _val.getSelectSubclasses();
     }
 
+    @Override
     public Unique getValueUnique() {
         return _val.getValueUnique();
     }
 
+    @Override
     public void setValueUnique(Unique unq) {
         _val.setValueUnique(unq);
     }
 
+    @Override
     public Index getValueIndex() {
         return _val.getValueIndex();
     }
 
+    @Override
     public void setValueIndex(Index idx) {
         _val.setValueIndex(idx);
     }
 
+    @Override
     public boolean getUseClassCriteria() {
         return _val.getUseClassCriteria();
     }
 
+    @Override
     public void setUseClassCriteria(boolean criteria) {
         _val.setUseClassCriteria(criteria);
     }
 
+    @Override
     public int getPolymorphic() {
         return _val.getPolymorphic();
     }
 
+    @Override
     public void setPolymorphic(int poly) {
         _val.setPolymorphic(poly);
     }
@@ -1178,14 +1254,18 @@ public class FieldMapping
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public void mapConstraints(String name, boolean adapt) {
         _val.mapConstraints(name, adapt);
     }
 
+    @Override
     public void mapConstraints(DBIdentifier name, boolean adapt) {
         _val.mapConstraints(name, adapt);
     }
 
+    @Override
     public void copyMappingInfo(ValueMapping vm) {
         _val.copyMappingInfo(vm);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java
index 108a882fd..1a3549756 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java
@@ -46,11 +46,12 @@ import org.apache.openjpa.util.MetaDataException;
  * @author Abe White
  * @author Pinaki Poddar
  */
-@SuppressWarnings("serial")
 public class FieldMappingInfo
     extends MappingInfo
     implements Commentable {
 
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (FieldMappingInfo.class);
 
@@ -65,6 +66,7 @@ public class FieldMappingInfo
      * The user-supplied name of the table for this field.
      * @deprecated
      */
+    @Deprecated
     public String getTableName() {
         return getTableIdentifier().getName();
     }
@@ -77,6 +79,7 @@ public class FieldMappingInfo
      * The user-supplied name of the table for this field.
      * @deprecated
      */
+    @Deprecated
     public void setTableName(String tableName) {
         setTableIdentifier(DBIdentifier.newTable(tableName));
     }
@@ -149,12 +152,14 @@ public class FieldMappingInfo
                 getSecondaryTableIdentifier(tableName);
 
         return createTable(field, new TableDefaults() {
+            @Override
             public String get(Schema schema) {
                 // delay this so that we don't do schema reflection for unique
                 // table name unless necessary
                 return field.getMappingRepository().getMappingDefaults().
                     getTableName(field, schema);
             }
+            @Override
             public DBIdentifier getIdentifier(Schema schema) {
                 return field.getMappingRepository().getMappingDefaults().
                     getTableIdentifier(field, schema);
@@ -196,11 +201,13 @@ public class FieldMappingInfo
                 getSecondaryTableJoinColumns(_tableName);
         }
         ForeignKeyDefaults def = new ForeignKeyDefaults() {
+            @Override
             public ForeignKey get(Table local, Table foreign, boolean inverse) {
                 return field.getMappingRepository().getMappingDefaults().
                     getJoinForeignKey(field, local, foreign);
             }
 
+            @Override
             public void populate(Table local, Table foreign, Column col,
                 Object target, boolean inverse, int pos, int cols) {
                 field.getMappingRepository().getMappingDefaults().
@@ -243,7 +250,7 @@ public class FieldMappingInfo
      */
     public void addJoinTableUnique(Unique u) {
     	if (_joinTableUniques == null)
-    		_joinTableUniques = new ArrayList<Unique>();
+    		_joinTableUniques = new ArrayList<>();
     	_joinTableUniques.add(u);
     }
 
@@ -259,7 +266,7 @@ public class FieldMappingInfo
     		boolean def, boolean adapt) {
         if (uniques == null || uniques.isEmpty())
             return new Unique[0];
-        Collection<Unique> result = new ArrayList<Unique>();
+        Collection<Unique> result = new ArrayList<>();
         for (Unique template : uniques) {
             Column[] templateColumns = template.getColumns();
             Column[] uniqueColumns = new Column[templateColumns.length];
@@ -405,7 +412,7 @@ public class FieldMappingInfo
             _joinTableUniques = null;
             return;
         }
-        _joinTableUniques = new ArrayList<Unique>();
+        _joinTableUniques = new ArrayList<>();
         for (Unique unique:unqs) {
         	Unique copy = new Unique();
         	copy.setIdentifier(unique.getIdentifier());
@@ -415,11 +422,13 @@ public class FieldMappingInfo
     }
 
 
+    @Override
     public boolean hasSchemaComponents() {
         return super.hasSchemaComponents() || !DBIdentifier.isNull(_tableName)
             || _orderCol != null;
     }
 
+    @Override
     protected void clear(boolean canFlags) {
         super.clear(canFlags);
         _tableName = DBIdentifier.NULL;
@@ -428,6 +437,7 @@ public class FieldMappingInfo
             _canOrderCol = true;
     }
 
+    @Override
     public void copy(MappingInfo info) {
         super.copy(info);
         if (!(info instanceof FieldMappingInfo))
@@ -447,10 +457,12 @@ public class FieldMappingInfo
         }
     }
 
+    @Override
     public String[] getComments() {
         return (_comments == null) ? EMPTY_COMMENTS : _comments;
     }
 
+    @Override
     public void setComments(String[] comments) {
         _comments = comments;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldStrategy.java
index 575c950ed..d1bdc2d75 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldStrategy.java
@@ -43,7 +43,7 @@ public interface FieldStrategy
      * Set the class mapping using this strategy. This will be called before
      * use.
      */
-    public void setFieldMapping(FieldMapping owner);
+    void setFieldMapping(FieldMapping owner);
 
     /**
      * Return whether this mapping can perform the given select type.
@@ -55,7 +55,7 @@ public interface FieldStrategy
      *
      * @see Select
      */
-    public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
+    int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch);
 
     /**
@@ -63,7 +63,7 @@ public interface FieldStrategy
      *
      * @see #select
      */
-    public void selectEagerParallel(SelectExecutor sel, OpenJPAStateManager sm,
+    void selectEagerParallel(SelectExecutor sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode);
 
     /**
@@ -71,13 +71,13 @@ public interface FieldStrategy
      *
      * @see #select
      */
-    public void selectEagerJoin(Select sel, OpenJPAStateManager sm,
+    void selectEagerJoin(Select sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode);
 
     /**
      * Whether the eager joins or selects used by this field are to-many.
      */
-    public boolean isEagerSelectToMany();
+    boolean isEagerSelectToMany();
 
     /**
      * Select the virtual row columns of this mapping.
@@ -93,7 +93,7 @@ public interface FieldStrategy
      * (if any), 0 if it selected data but does not
      * require it, or &lt; 0 if no data was selected
      */
-    public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
+    int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode);
 
     /**
@@ -103,14 +103,14 @@ public interface FieldStrategy
      * method may return a processed result form that will be
      * passed to subsequent calls
      */
-    public Object loadEagerParallel(OpenJPAStateManager sm, JDBCStore store,
+    Object loadEagerParallel(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object res)
         throws SQLException;
 
     /**
      * Load the joined eager result.
      */
-    public void loadEagerJoin(OpenJPAStateManager sm, JDBCStore store,
+    void loadEagerJoin(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException;
 
@@ -119,14 +119,14 @@ public interface FieldStrategy
      * data for this field, so the field mapping should make sure the
      * result contains its needed column data before loading.
      */
-    public void load(OpenJPAStateManager sm, JDBCStore store,
+    void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException;
 
     /**
      * Load secondary data using a connection from the store manager.
      */
-    public void load(OpenJPAStateManager sm, JDBCStore store,
+    void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException;
 
@@ -140,7 +140,7 @@ public interface FieldStrategy
      * object array, else return a single object. Simply returns the given
      * object by default.
      */
-    public Object toDataStoreValue(Object val, JDBCStore store);
+    Object toDataStoreValue(Object val, JDBCStore store);
 
     /**
      * Translate the given key value to its datastore equivalent. If the
@@ -148,57 +148,57 @@ public interface FieldStrategy
      * array, else return a single object. Simply returns the given object by
      * default.
      */
-    public Object toKeyDataStoreValue(Object val, JDBCStore store);
+    Object toKeyDataStoreValue(Object val, JDBCStore store);
 
     /**
      * Append a where clause to the given statement checking if this value
      * is empty. Appends impossible-to-satisfy SQL by default.
      */
-    public void appendIsEmpty(SQLBuffer sql, Select sel, Joins joins);
+    void appendIsEmpty(SQLBuffer sql, Select sel, Joins joins);
 
     /**
      * Append a where clause to the given statement checking if this value
      * is not empty. Appends always-satisfied SQL by default.
      */
-    public void appendIsNotEmpty(SQLBuffer sql, Select sel, Joins joins);
+    void appendIsNotEmpty(SQLBuffer sql, Select sel, Joins joins);
 
     /**
      * Append a where clause to the given statement checking if this value
      * is null.
      */
-    public void appendIsNull(SQLBuffer sql, Select sel, Joins joins);
+    void appendIsNull(SQLBuffer sql, Select sel, Joins joins);
 
     /**
      * Append a where clause to the given statement checking if this value
      * is not null.
      */
-    public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins);
+    void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins);
 
     /**
      * Append a where clause to the given statement checking the size
      * of the value.
      */
-    public void appendSize(SQLBuffer sql, Select sel, Joins joins);
+    void appendSize(SQLBuffer sql, Select sel, Joins joins);
 
     /**
      * Append the ordered column alias to the given statement.
      */
-    public void appendIndex(SQLBuffer sql, Select sel, Joins joins);
+    void appendIndex(SQLBuffer sql, Select sel, Joins joins);
 
     /**
      * Append the entity discriminator value to the given statement.
      */
-    public void appendType(SQLBuffer sql, Select sel, Joins joins);
+    void appendType(SQLBuffer sql, Select sel, Joins joins);
 
     /**
      * Join this value to the class table. Does nothing by default.
      */
-    public Joins join(Joins joins, boolean forceOuter);
+    Joins join(Joins joins, boolean forceOuter);
 
     /**
      * Join the key value to the class table. Does nothing by default.
      */
-    public Joins joinKey(Joins joins, boolean forceOuter);
+    Joins joinKey(Joins joins, boolean forceOuter);
 
     /**
      * Join this value's table to the table for the related first class object
@@ -207,7 +207,7 @@ public interface FieldStrategy
      * @param traverse if true, throw proper exception if it is not
      * possible for this mapping to traverse into the related type
      */
-    public Joins joinRelation(Joins joins, boolean forceOuter,
+    Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse);
 
     /**
@@ -217,14 +217,14 @@ public interface FieldStrategy
      * @param traverse if true, throw proper exception if it is not
      * possible for this mapping to traverse into the related type
      */
-    public Joins joinKeyRelation(Joins joins, boolean forceOuter,
+    Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse);
 
     /**
      * Load this field value using the given result. The result
      * will contain the columns from {@link ValueMapping#getColumns}.
      */
-    public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
+    Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException;
 
@@ -232,7 +232,7 @@ public interface FieldStrategy
      * Load this field's key value using the given result. The result will
      * contain the columns from {@link ValueMapping#getColumns}.
      */
-    public Object loadKeyProjection(JDBCStore store,
+    Object loadKeyProjection(JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException;
 
@@ -244,14 +244,14 @@ public interface FieldStrategy
      * Return true if this field can be used as part of a state image for
      * optimistic locking.
      */
-    public boolean isVersionable();
+    boolean isVersionable();
 
     /**
      * Add a WHERE condition to the row for this field such that the field's
      * current DB value must equal the given previous value. Only versionable
      * mappings must implement this method meaningfully.
      */
-    public void where(OpenJPAStateManager sm, JDBCStore store, RowManager rm,
+    void where(OpenJPAStateManager sm, JDBCStore store, RowManager rm,
         Object prevValue)
         throws SQLException;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCColumnOrder.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCColumnOrder.java
index afd50ba54..8831d8e7a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCColumnOrder.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCColumnOrder.java
@@ -31,10 +31,8 @@ import org.apache.openjpa.jdbc.sql.Select;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class JDBCColumnOrder
-    implements JDBCOrder {
-
+class JDBCColumnOrder implements JDBCOrder {
+    private static final long serialVersionUID = 1L;
     private Column _col = null;
     private ColumnIO _io = null;
 
@@ -69,26 +67,33 @@ class JDBCColumnOrder
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public String getName() {
         return (_col == null) ? "" : _col.getName();
     }
 
+    @Override
     public DBIdentifier getIdentifier() {
         return (_col == null) ? DBIdentifier.newColumn("") : _col.getIdentifier();
     }
 
+    @Override
     public boolean isAscending() {
         return true;
     }
 
+    @Override
     public Comparator<?> getComparator() {
         return null;
     }
 
+    @Override
     public boolean isInRelation() {
         return false;
     }
 
+    @Override
     public void order(Select sel, ClassMapping elem, Joins joins) {
         if (_col != null)
             sel.orderBy(_col, true, joins, true);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCOrder.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCOrder.java
index 0dd83e151..f4b022bba 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCOrder.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCOrder.java
@@ -35,7 +35,7 @@ interface JDBCOrder
      * Whether the value is a member of the field's related type, rather than
      * columns of the field itself.
      */
-    public boolean isInRelation();
+    boolean isInRelation();
 
     /**
      * Order by this value.
@@ -43,8 +43,8 @@ interface JDBCOrder
      * @param elem if this value has independent mappings, the mapping
      * we're selecting
      */
-    public void order(Select sel, ClassMapping elem, Joins joins);
+    void order(Select sel, ClassMapping elem, Joins joins);
 
-    public DBIdentifier getIdentifier();
+    DBIdentifier getIdentifier();
 
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCRelatedFieldOrder.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCRelatedFieldOrder.java
index ee1a8202a..559bd8cfb 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCRelatedFieldOrder.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCRelatedFieldOrder.java
@@ -31,9 +31,8 @@ import org.apache.openjpa.util.MetaDataException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class JDBCRelatedFieldOrder
-    implements JDBCOrder {
+class JDBCRelatedFieldOrder implements JDBCOrder {
+    private static final long serialVersionUID = 1L;
 
     private static final Localizer _loc = Localizer.forPackage
         (JDBCRelatedFieldOrder.class);
@@ -54,26 +53,33 @@ class JDBCRelatedFieldOrder
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public String getName() {
         return _fm.getName();
     }
 
+    @Override
     public DBIdentifier getIdentifier() {
         return DBIdentifier.newColumn(_fm.getName());
     }
 
+    @Override
     public boolean isAscending() {
         return _asc;
     }
 
+    @Override
     public Comparator<?> getComparator() {
         return null;
     }
 
+    @Override
     public boolean isInRelation() {
         return true;
     }
 
+    @Override
     public void order(Select sel, ClassMapping elem, Joins joins) {
         FieldMapping fm = _fm;
         if (elem != null) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCValueOrder.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCValueOrder.java
index 2f8332616..c885ca040 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCValueOrder.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/JDBCValueOrder.java
@@ -31,10 +31,8 @@ import org.apache.openjpa.meta.Order;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class JDBCValueOrder
-    implements JDBCOrder {
-
+class JDBCValueOrder implements JDBCOrder {
+    private static final long serialVersionUID = 1L;
     private final FieldMapping _fm;
     private final boolean _asc;
     private static final DBIdentifier SQL_ELEMENT = DBIdentifier.newColumn(Order.ELEMENT);
@@ -44,26 +42,32 @@ class JDBCValueOrder
         _asc = asc;
     }
 
+    @Override
     public String getName() {
         return Order.ELEMENT;
     }
 
+    @Override
     public DBIdentifier getIdentifier() {
         return SQL_ELEMENT;
     }
 
+    @Override
     public boolean isAscending() {
         return _asc;
     }
 
+    @Override
     public Comparator<?> getComparator() {
         return null;
     }
 
+    @Override
     public boolean isInRelation() {
         return _fm.getElement().getTypeMetaData() != null;
     }
 
+    @Override
     public void order(Select sel, ClassMapping elem, Joins joins) {
         if (elem != null)
             sel.orderBy(elem.getPrimaryKeyColumns(), _asc, joins, false);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Joinable.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Joinable.java
index 003455a89..7b0bcf1e7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Joinable.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Joinable.java
@@ -48,7 +48,7 @@ public interface Joinable
     /**
      * Return the field index of this joinable, or -1 if not a field.
      */
-    public int getFieldIndex();
+    int getFieldIndex();
 
     /**
      * Return the value for this joinable from the given result, using the
@@ -56,14 +56,14 @@ public interface Joinable
      * key's columns by translating the given columns through
      * {@link ForeignKey#getColumn}.
      */
-    public Object getPrimaryKeyValue(Result res, Column[] cols, ForeignKey fk,
+    Object getPrimaryKeyValue(Result res, Column[] cols, ForeignKey fk,
         JDBCStore store, Joins joins)
         throws SQLException;
 
     /**
      * The columns managed by this joinable.
      */
-    public Column[] getColumns();
+    Column[] getColumns();
 
     /**
      * Return the join value of the given column.
@@ -71,7 +71,7 @@ public interface Joinable
      * @param val the value of the field for this joinable
      * @param col the column of this joinable whose value to return
      */
-    public Object getJoinValue(Object val, Column col, JDBCStore store);
+    Object getJoinValue(Object val, Column col, JDBCStore store);
 
     /**
      * Return the join value of the given column.
@@ -79,13 +79,13 @@ public interface Joinable
      * @param sm the instance from which to get the value
      * @param col the column whose value to return
      */
-    public Object getJoinValue(OpenJPAStateManager sm, Column col,
+    Object getJoinValue(OpenJPAStateManager sm, Column col,
         JDBCStore store);
 
     /**
      * Use the given auto-assigned value to set this join value's field
      * on the given instance.
      */
-    public void setAutoAssignedValue(OpenJPAStateManager sm, JDBCStore store,
+    void setAutoAssignedValue(OpenJPAStateManager sm, JDBCStore store,
         Column col, Object autogen);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaults.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaults.java
index 3cbfc4c68..13073b010 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaults.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaults.java
@@ -38,13 +38,13 @@ public interface MappingDefaults {
      * default values supplied by this plugin. A value of false means that
      * all mapping information must be present at runtime.
      */
-    public boolean defaultMissingInfo();
+    boolean defaultMissingInfo();
 
     /**
      * The default for whether relations use the related object's
      * expected class as part of the join criteria.
      */
-    public boolean useClassCriteria();
+    boolean useClassCriteria();
 
     /**
      * Default mapping strategy when there is no explicit strategy
@@ -55,7 +55,7 @@ public interface MappingDefaults {
      * @param adapt whether we can adapt the mapping or schema
      * @return the strategy alias or a strategy instance, or null
      */
-    public Object getStrategy(ClassMapping cls, boolean adapt);
+    Object getStrategy(ClassMapping cls, boolean adapt);
 
     /**
      * Default version mapping strategy when there is no explicit strategy.
@@ -65,7 +65,7 @@ public interface MappingDefaults {
      * @param adapt whether we can adapt the mapping or schema
      * @return the strategy alias or a strategy instance, or null
      */
-    public Object getStrategy(Version vers, boolean adapt);
+    Object getStrategy(Version vers, boolean adapt);
 
     /**
      * Default discriminator mapping strategy when there is no explicit
@@ -76,7 +76,7 @@ public interface MappingDefaults {
      * @param adapt whether we can adapt the mapping or schema
      * @return the strategy alias or a strategy instance, or null
      */
-    public Object getStrategy(Discriminator disc, boolean adapt);
+    Object getStrategy(Discriminator disc, boolean adapt);
 
     /**
      * Custom handler or strategy for the given field, or null if none
@@ -88,25 +88,25 @@ public interface MappingDefaults {
      * @param adapt whether we can adapt the mapping or schema
      * @return the handler/strategy alias or instance, or null
      */
-    public Object getStrategy(ValueMapping vm, Class<?> type, boolean adapt);
+    Object getStrategy(ValueMapping vm, Class<?> type, boolean adapt);
 
     /**
      * Return the default discriminator value for the given instance.
      */
-    public Object getDiscriminatorValue(Discriminator disc, boolean adapt);
+    Object getDiscriminatorValue(Discriminator disc, boolean adapt);
 
     /**
      * Return the default table name for the given class. This method is
      * only called for classes mapped to their own table.
      * @deprecated
      */
-    public String getTableName(ClassMapping cls, Schema defaultSchema);
+    @Deprecated String getTableName(ClassMapping cls, Schema defaultSchema);
 
     /**
      * Return the default table name for the given class. This method is
      * only called for classes mapped to their own table.
      */
-    public DBIdentifier getTableIdentifier(ClassMapping cls, Schema defaultSchema);
+    DBIdentifier getTableIdentifier(ClassMapping cls, Schema defaultSchema);
 
     /**
      * Return the default secondary table name for the given field. This
@@ -114,21 +114,21 @@ public interface MappingDefaults {
      * table.
      * @deprecated
      */
-    public String getTableName(FieldMapping fm, Schema defaultSchema);
+    @Deprecated String getTableName(FieldMapping fm, Schema defaultSchema);
 
     /**
      * Return the default secondary table name for the given field. This
      * method is only called for fields whose strategy requires a secondary
      * table.
      */
-    public DBIdentifier getTableIdentifier(FieldMapping fm, Schema defaultSchema);
+    DBIdentifier getTableIdentifier(FieldMapping fm, Schema defaultSchema);
 
     /**
      * Fill in default information for the given datastore identity columns.
      * The columns' name and Java type will already be populated with generic
      * defaults that may be replaced.
      */
-    public void populateDataStoreIdColumns(ClassMapping cls, Table table,
+    void populateDataStoreIdColumns(ClassMapping cls, Table table,
         Column[] cols);
 
     /**
@@ -136,14 +136,14 @@ public interface MappingDefaults {
      * The columns' name and Java type will already be populated with generic
      * defaults that may be replaced.
      */
-    public void populateColumns(Version vers, Table table, Column[] cols);
+    void populateColumns(Version vers, Table table, Column[] cols);
 
     /**
      * Fill in default information for the given discriminator columns.
      * The columns' name and Java type will already be populated with generic
      * defaults that may be replaced.
      */
-    public void populateColumns(Discriminator disc, Table table,
+    void populateColumns(Discriminator disc, Table table,
         Column[] cols);
 
     /**
@@ -157,7 +157,7 @@ public interface MappingDefaults {
      * @param pos the index of this column in the logical foreign key
      * @param cols the number of columns in the logical foreign key
      */
-    public void populateJoinColumn(ClassMapping cm, Table local, Table foreign,
+    void populateJoinColumn(ClassMapping cm, Table local, Table foreign,
         Column col, Object target, int pos, int cols);
 
     /**
@@ -171,7 +171,7 @@ public interface MappingDefaults {
      * @param pos the index of this column in the logical foreign key
      * @param cols the number of columns in the logical foreign key
      */
-    public void populateJoinColumn(FieldMapping fm, Table local, Table foreign,
+    void populateJoinColumn(FieldMapping fm, Table local, Table foreign,
         Column col, Object target, int pos, int cols);
 
     /**
@@ -188,7 +188,7 @@ public interface MappingDefaults {
      * @param cols the number of columns in the logical foreign key
      * @deprecated
      */
-    public void populateForeignKeyColumn(ValueMapping vm, String name,
+    @Deprecated void populateForeignKeyColumn(ValueMapping vm, String name,
         Table local, Table foreign, Column col, Object target, boolean inverse,
         int pos, int cols);
 
@@ -205,7 +205,7 @@ public interface MappingDefaults {
      * @param pos the index of this column in the logical foreign key
      * @param cols the number of columns in the logical foreign key
      */
-    public void populateForeignKeyColumn(ValueMapping vm, DBIdentifier name,
+    void populateForeignKeyColumn(ValueMapping vm, DBIdentifier name,
         Table local, Table foreign, Column col, Object target, boolean inverse,
         int pos, int cols);
 
@@ -217,7 +217,7 @@ public interface MappingDefaults {
      * @param name base name for value, as decided by mapping
      * @deprecated
      */
-    public void populateColumns(ValueMapping vm, String name, Table table,
+    @Deprecated void populateColumns(ValueMapping vm, String name, Table table,
         Column[] cols);
 
     /**
@@ -227,7 +227,7 @@ public interface MappingDefaults {
      *
      * @param name base name for value, as decided by mapping
      */
-    public void populateColumns(ValueMapping vm, DBIdentifier name, Table table,
+    void populateColumns(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols);
 
     /**
@@ -239,7 +239,7 @@ public interface MappingDefaults {
      * by default; fill in default information even when returning
      * false in case the user forces ordering
      */
-    public boolean populateOrderColumns(FieldMapping fm, Table table,
+    boolean populateOrderColumns(FieldMapping fm, Table table,
         Column[] cols);
 
     /**
@@ -253,7 +253,7 @@ public interface MappingDefaults {
      * when returning false in case the user forces an indicator
      * @deprecated
      */
-    public boolean populateNullIndicatorColumns(ValueMapping vm, String name,
+    @Deprecated boolean populateNullIndicatorColumns(ValueMapping vm, String name,
         Table table, Column[] cols);
 
     /**
@@ -266,7 +266,7 @@ public interface MappingDefaults {
      * columns by default; fill in default information even
      * when returning false in case the user forces an indicator
      */
-    public boolean populateNullIndicatorColumns(ValueMapping vm, DBIdentifier name,
+    boolean populateNullIndicatorColumns(ValueMapping vm, DBIdentifier name,
         Table table, Column[] cols);
 
     /**
@@ -275,7 +275,7 @@ public interface MappingDefaults {
      * add columns to the key or add the key to the table; only fill in
      * its information such as name, delete action, etc.
      */
-    public ForeignKey getJoinForeignKey(ClassMapping cls, Table local,
+    ForeignKey getJoinForeignKey(ClassMapping cls, Table local,
         Table foreign);
 
     /**
@@ -284,7 +284,7 @@ public interface MappingDefaults {
      * add columns to the key or add the key to the table; only fill in
      * its information such as name, delete action, etc.
      */
-    public ForeignKey getJoinForeignKey(FieldMapping fm, Table local,
+    ForeignKey getJoinForeignKey(FieldMapping fm, Table local,
         Table foreign);
 
     /**
@@ -297,7 +297,7 @@ public interface MappingDefaults {
      * @param inverse whether this is an inverse key
      * @deprecated
      */
-    public ForeignKey getForeignKey(ValueMapping vm, String name, Table local,
+    @Deprecated ForeignKey getForeignKey(ValueMapping vm, String name, Table local,
         Table foreign, boolean inverse);
 
     /**
@@ -309,7 +309,7 @@ public interface MappingDefaults {
      * @param name base name for value, as decided by mapping
      * @param inverse whether this is an inverse key
      */
-    public ForeignKey getForeignKey(ValueMapping vm, DBIdentifier name, Table local,
+    ForeignKey getForeignKey(ValueMapping vm, DBIdentifier name, Table local,
         Table foreign, boolean inverse);
 
     /**
@@ -318,7 +318,7 @@ public interface MappingDefaults {
      * add columns to the index or add the index to the table; only fill in
      * its information such as name, uniqueness, etc.
      */
-    public Index getJoinIndex(FieldMapping fm, Table table, Column[] cols);
+    Index getJoinIndex(FieldMapping fm, Table table, Column[] cols);
 
     /**
      * Return a default index for the value, or null if the value columns
@@ -329,7 +329,7 @@ public interface MappingDefaults {
      * @param name base name for value, as decided by mapping
      * @deprecated
      */
-    public Index getIndex(ValueMapping vm, String name, Table table,
+    @Deprecated Index getIndex(ValueMapping vm, String name, Table table,
         Column[] cols);
 
     /**
@@ -340,7 +340,7 @@ public interface MappingDefaults {
      *
      * @param name base name for value, as decided by mapping
      */
-    public Index getIndex(ValueMapping vm, DBIdentifier name, Table table,
+    Index getIndex(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols);
 
     /**
@@ -349,7 +349,7 @@ public interface MappingDefaults {
      * add columns to the index or add the index to the table; only fill in
      * its information such as name, uniqueness, etc.
      */
-    public Index getIndex(Version vers, Table table, Column[] cols);
+    Index getIndex(Version vers, Table table, Column[] cols);
 
     /**
      * Return a default index for the discriminator, or null if the
@@ -357,7 +357,7 @@ public interface MappingDefaults {
      * add columns to the index or add the index to the table; only fill in
      * its information such as name, uniqueness, etc.
      */
-    public Index getIndex(Discriminator disc, Table table, Column[] cols);
+    Index getIndex(Discriminator disc, Table table, Column[] cols);
 
     /**
      * Return a default constraint for the join, or null if the join columns
@@ -365,7 +365,7 @@ public interface MappingDefaults {
      * constraint or add the constraint to the table; only fill in its
      * information such as name, deferrability, etc.
      */
-    public Unique getJoinUnique(FieldMapping fm, Table table, Column[] cols);
+    Unique getJoinUnique(FieldMapping fm, Table table, Column[] cols);
 
     /**
      * Return a default constraint for the value, or null if the value columns
@@ -376,7 +376,7 @@ public interface MappingDefaults {
      * @param name base name for value, as decided by mapping
      * @deprecated
      */
-    public Unique getUnique(ValueMapping vm, String name, Table table,
+    @Deprecated Unique getUnique(ValueMapping vm, String name, Table table,
         Column[] cols);
 
     /**
@@ -387,7 +387,7 @@ public interface MappingDefaults {
      *
      * @param name base name for value, as decided by mapping
      */
-    public Unique getUnique(ValueMapping vm, DBIdentifier name, Table table,
+    Unique getUnique(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols);
 
     /**
@@ -395,16 +395,16 @@ public interface MappingDefaults {
      * or null for database default.
      * @deprecated
      */
-    public String getPrimaryKeyName(ClassMapping cm, Table table);
+    @Deprecated String getPrimaryKeyName(ClassMapping cm, Table table);
 
     /**
      * Return the name of the primary key for the table of the given class,
      * or null for database default.
      */
-    public DBIdentifier getPrimaryKeyIdentifier(ClassMapping cm, Table table);
+    DBIdentifier getPrimaryKeyIdentifier(ClassMapping cm, Table table);
 
     /**
      * If desired, install a primary key on the given secondary table.
      */
-    public void installPrimaryKey(FieldMapping fm, Table table);
+    void installPrimaryKey(FieldMapping fm, Table table);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
index f30095ddc..e783f2fd4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
@@ -24,10 +24,10 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.meta.strats.UntypedPCValueHandler;
+import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.meta.strats.EnumValueHandler;
+import org.apache.openjpa.jdbc.meta.strats.UntypedPCValueHandler;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
 import org.apache.openjpa.jdbc.schema.Index;
@@ -337,6 +337,7 @@ public class MappingDefaultsImpl
      * mapping's built-in name.
      * @deprecated
      */
+    @Deprecated
     public String getDataStoreIdColumnName() {
         return getDataStoreIdColumnIdentifier().getName();
     }
@@ -350,6 +351,7 @@ public class MappingDefaultsImpl
      * mapping's built-in name.
      * @deprecated
      */
+    @Deprecated
     public void setDataStoreIdColumnName(String dsIdName) {
         setDataStoreIdColumnIdentifier(DBIdentifier.newColumn(dsIdName));
     }
@@ -363,6 +365,7 @@ public class MappingDefaultsImpl
      * built-in name.
      * @deprecated
      */
+    @Deprecated
     public String getVersionColumnName() {
         return getVersionColumnIdentifier().getName();
     }
@@ -376,6 +379,7 @@ public class MappingDefaultsImpl
      * built-in name.
      * @deprecated
      */
+    @Deprecated
     public void setVersionColumnName(String versName) {
         setVersionColumnIdentifier(DBIdentifier.newColumn(versName));
     }
@@ -389,6 +393,7 @@ public class MappingDefaultsImpl
      * built-in name.
      * @deprecated
      */
+    @Deprecated
     public String getDiscriminatorColumnName() {
         return getDiscriminatorColumnIdentifier().getName();
     }
@@ -402,6 +407,7 @@ public class MappingDefaultsImpl
      * built-in name.
      * @deprecated
      */
+    @Deprecated
     public void setDiscriminatorColumnName(String discName) {
         setDiscriminatorColumnIdentifier(DBIdentifier.newColumn(discName));
     }
@@ -415,6 +421,7 @@ public class MappingDefaultsImpl
      * built-in name.
      * @deprecated
      */
+    @Deprecated
     public String getOrderColumnName() {
         return getOrderColumnIdentifier().getName();
     }
@@ -428,6 +435,7 @@ public class MappingDefaultsImpl
      * built-in name.
      * @deprecated
      */
+    @Deprecated
     public void setOrderColumnName(String orderName) {
         setOrderColumnIdentifier(DBIdentifier.newColumn(orderName));
     }
@@ -441,6 +449,7 @@ public class MappingDefaultsImpl
      * built-in name.
      * @deprecated
      */
+    @Deprecated
     public String getNullIndicatorColumnName() {
         return getNullIndicatorColumnIdentifier().getName();
     }
@@ -454,6 +463,7 @@ public class MappingDefaultsImpl
      * built-in name.
      * @deprecated
      */
+    @Deprecated
     public void setNullIndicatorColumnName(String nullIndName) {
         setNullIndicatorColumnIdentifier(DBIdentifier.newColumn(nullIndName));
     }
@@ -462,6 +472,7 @@ public class MappingDefaultsImpl
         _nullIndName = nullIndName;
     }
 
+    @Override
     public boolean defaultMissingInfo() {
         return _defMissing;
     }
@@ -470,6 +481,7 @@ public class MappingDefaultsImpl
         _defMissing = defMissing;
     }
 
+    @Override
     public boolean useClassCriteria() {
         return _classCriteria;
     }
@@ -478,6 +490,7 @@ public class MappingDefaultsImpl
         _classCriteria = classCriteria;
     }
 
+    @Override
     public Object getStrategy(ClassMapping cls, boolean adapt) {
         if (adapt || defaultMissingInfo())
             return (cls.getMappedPCSuperclassMapping() == null)
@@ -485,6 +498,7 @@ public class MappingDefaultsImpl
         return null;
     }
 
+    @Override
     public Object getStrategy(Version vers, boolean adapt) {
         ClassMapping cls = vers.getClassMapping();
         if ((adapt || defaultMissingInfo())
@@ -494,6 +508,7 @@ public class MappingDefaultsImpl
         return null;
     }
 
+    @Override
     public Object getStrategy(Discriminator disc, boolean adapt) {
         ClassMapping cls = disc.getClassMapping();
         if ((adapt || defaultMissingInfo())
@@ -503,6 +518,7 @@ public class MappingDefaultsImpl
         return null;
     }
 
+    @Override
     public Object getStrategy(ValueMapping vm, Class<?> type, boolean adapt) {
         Object ret = _fieldMap.get(type.getName());
         if (ret != null)
@@ -540,6 +556,7 @@ public class MappingDefaultsImpl
      *
      * @return A new object containing the generated Discriminator value.
      */
+    @Override
     public Object getDiscriminatorValue(Discriminator disc, boolean adapt) {
         if (!adapt && !defaultMissingInfo())
             return null;
@@ -560,6 +577,7 @@ public class MappingDefaultsImpl
         }
     }
 
+    @Override
     public String getTableName(ClassMapping cls, Schema schema) {
         String name = ClassUtil.getClassName(cls.getDescribedType()).
             replace(IdentifierUtil.DOLLAR_CHAR, IdentifierUtil.UNDERSCORE_CHAR);
@@ -568,14 +586,17 @@ public class MappingDefaultsImpl
         return name;
     }
 
+    @Override
     public DBIdentifier getTableIdentifier(ClassMapping cls, Schema schema) {
         return DBIdentifier.newTable(getTableName(cls, schema));
     }
 
+    @Override
     public String getTableName(FieldMapping fm, Schema schema) {
         return getTableIdentifier(fm, schema).getName();
     }
 
+    @Override
     public DBIdentifier getTableIdentifier(FieldMapping fm, Schema schema) {
         DBIdentifier sName = DBIdentifier.newTable(fm.getName());
         Table table = fm.getDefiningMapping().getTable();
@@ -588,6 +609,7 @@ public class MappingDefaultsImpl
         return sName;
     }
 
+    @Override
     public void populateDataStoreIdColumns(ClassMapping cls, Table table,
         Column[] cols) {
         for (int i = 0; i < cols.length; i++) {
@@ -618,6 +640,7 @@ public class MappingDefaultsImpl
         return Normalizer.removeHungarianNotation(columnName);
     }
 
+    @Override
     public void populateColumns(Version vers, Table table, Column[] cols) {
         for (int i = 0; i < cols.length; i++) {
             if (!DBIdentifier.isNull(_versName) && cols.length == 1)
@@ -634,6 +657,7 @@ public class MappingDefaultsImpl
         }
     }
 
+    @Override
     public void populateColumns(Discriminator disc, Table table,
         Column[] cols) {
         for (int i = 0; i < cols.length; i++) {
@@ -645,11 +669,13 @@ public class MappingDefaultsImpl
         }
     }
 
+    @Override
     public void populateJoinColumn(ClassMapping cm, Table local, Table foreign,
         Column col, Object target, int pos, int cols) {
         correctName(local, col);
     }
 
+    @Override
     public void populateJoinColumn(FieldMapping fm, Table local, Table foreign,
         Column col, Object target, int pos, int cols) {
         correctName(local, col);
@@ -658,6 +684,8 @@ public class MappingDefaultsImpl
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public void populateForeignKeyColumn(ValueMapping vm, String name,
         Table local, Table foreign, Column col, Object target, boolean inverse,
         int pos, int cols) {
@@ -665,6 +693,7 @@ public class MappingDefaultsImpl
             target, inverse, pos, cols);
     }
 
+    @Override
     public void populateForeignKeyColumn(ValueMapping vm, DBIdentifier name,
         Table local, Table foreign, Column col, Object target, boolean inverse,
         int pos, int cols) {
@@ -675,17 +704,20 @@ public class MappingDefaultsImpl
         correctName(local, col);
     }
 
+    @Override
     public void populateColumns(ValueMapping vm, String name, Table table,
         Column[] cols) {
         populateColumns(vm, DBIdentifier.newColumn(name), table, cols);
     }
 
+    @Override
     public void populateColumns(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols) {
         for (int i = 0; i < cols.length; i++)
             correctName(table, cols[i]);
     }
 
+    @Override
     public boolean populateOrderColumns(FieldMapping fm, Table table,
         Column[] cols) {
         for (int i = 0; i < cols.length; i++) {
@@ -702,11 +734,14 @@ public class MappingDefaultsImpl
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public boolean populateNullIndicatorColumns(ValueMapping vm, String name,
         Table table, Column[] cols) {
         return populateNullIndicatorColumns(vm, DBIdentifier.newColumn(name), table, cols);
     }
 
+    @Override
     public boolean populateNullIndicatorColumns(ValueMapping vm, DBIdentifier name,
         Table table, Column[] cols) {
         for (int i = 0; i < cols.length; i++) {
@@ -719,6 +754,7 @@ public class MappingDefaultsImpl
         return _addNullInd;
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(ClassMapping cls, Table local,
         Table foreign) {
         if (_joinFKAction == ForeignKey.ACTION_NONE)
@@ -729,6 +765,7 @@ public class MappingDefaultsImpl
         return fk;
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(FieldMapping fm, Table local,
         Table foreign) {
         if (_joinFKAction == ForeignKey.ACTION_NONE)
@@ -742,11 +779,14 @@ public class MappingDefaultsImpl
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public ForeignKey getForeignKey(ValueMapping vm, String name, Table local,
         Table foreign, boolean inverse) {
         return getForeignKey(vm, DBIdentifier.newForeignKey(name), local, foreign, inverse);
     }
 
+    @Override
     public ForeignKey getForeignKey(ValueMapping vm, DBIdentifier name, Table local,
         Table foreign, boolean inverse) {
         if (_fkAction == ForeignKey.ACTION_NONE)
@@ -757,6 +797,7 @@ public class MappingDefaultsImpl
         return fk;
     }
 
+    @Override
     public Index getJoinIndex(FieldMapping fm, Table table, Column[] cols) {
         if (!_indexFK || fm.getJoinForeignKey() == null
             || !fm.getJoinForeignKey().isLogical())
@@ -783,6 +824,7 @@ public class MappingDefaultsImpl
      * Generate an index name.
      * @deprecated
      */
+    @Deprecated
     protected String getIndexName(String name, Table table, Column[] cols) {
         return getIndexName(DBIdentifier.newIndex(name), table, cols).getName();
     }
@@ -803,11 +845,14 @@ public class MappingDefaultsImpl
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Index getIndex(ValueMapping vm, String name, Table table,
         Column[] cols) {
         return getIndex(vm, DBIdentifier.newIndex(name), table, cols);
     }
 
+    @Override
     public Index getIndex(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols) {
         if (!_indexFK || vm.getForeignKey() == null
@@ -821,6 +866,7 @@ public class MappingDefaultsImpl
         return idx;
     }
 
+    @Override
     public Index getIndex(Version vers, Table table, Column[] cols) {
         if (!_indexVers)
             return null;
@@ -829,6 +875,7 @@ public class MappingDefaultsImpl
         return idx;
     }
 
+    @Override
     public Index getIndex(Discriminator disc, Table table, Column[] cols) {
         if (!_indexDisc)
             return null;
@@ -837,6 +884,7 @@ public class MappingDefaultsImpl
         return idx;
     }
 
+    @Override
     public Unique getJoinUnique(FieldMapping fm, Table table, Column[] cols) {
         return null;
     }
@@ -844,11 +892,14 @@ public class MappingDefaultsImpl
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Unique getUnique(ValueMapping vm, String name, Table table,
         Column[] cols) {
         return null;
     }
 
+    @Override
     public Unique getUnique(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols) {
         return null;
@@ -857,14 +908,18 @@ public class MappingDefaultsImpl
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public String getPrimaryKeyName(ClassMapping cm, Table table) {
         return null;
     }
 
+    @Override
     public DBIdentifier getPrimaryKeyIdentifier(ClassMapping cm, Table table) {
         return DBIdentifier.NULL;
     }
 
+    @Override
     public void installPrimaryKey(FieldMapping fm, Table table) {
     }
 
@@ -872,13 +927,16 @@ public class MappingDefaultsImpl
     // Configurable implementation
     ///////////////////////////////
 
+    @Override
     public void setConfiguration(Configuration conf) {
         dict = ((JDBCConfiguration) conf).getDBDictionaryInstance();
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
index 51b2a10f5..2af5541b7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
@@ -24,12 +24,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
+import org.apache.openjpa.jdbc.identifier.Normalizer;
+import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ColumnIO;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
@@ -45,6 +44,7 @@ import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.ClassUtil;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Localizer.Message;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.MetaDataContext;
 import org.apache.openjpa.util.MetaDataException;
@@ -55,10 +55,8 @@ import org.apache.openjpa.util.MetaDataException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public abstract class MappingInfo
-    implements Serializable {
-
+public abstract class MappingInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
     public static final int JOIN_NONE = 0;
     public static final int JOIN_FORWARD = 1;
     public static final int JOIN_INVERSE = 2;
@@ -108,6 +106,7 @@ public abstract class MappingInfo
      * Gets the columns whose table name matches the given table name.
      * @deprecated
      */
+    @Deprecated
     public List<Column> getColumns(String tableName) {
         return getColumns(DBIdentifier.newTable(tableName));
     }
@@ -118,7 +117,7 @@ public abstract class MappingInfo
     public List<Column> getColumns(DBIdentifier tableName) {
         if (_cols == null)
         	return Collections.emptyList();
-        List<Column> result = new ArrayList<Column>();
+        List<Column> result = new ArrayList<>();
         for (Column col : _cols) {
         	if (DBIdentifier.equal(col.getTableIdentifier(),
         			tableName))
@@ -342,11 +341,11 @@ public abstract class MappingInfo
         if (!icols.isEmpty() && (cols.isEmpty()
             || cols.size() == icols.size())) {
             if (cols.isEmpty())
-                cols = new ArrayList<Column>(icols.size());
+                cols = new ArrayList<>(icols.size());
             for (int i = 0; i < icols.size(); i++) {
                 if (cols.size() == i)
                     cols.add(new Column());
-                ((Column) cols.get(i)).copy((Column) icols.get(i));
+                cols.get(i).copy(icols.get(i));
             }
             setColumns(cols);
         }
@@ -463,7 +462,7 @@ public abstract class MappingInfo
         if (_cols != null) {
             Column col;
             for (int i = 0; !join && i < _cols.size(); i++) {
-                col = (Column) _cols.get(i);
+                col = _cols.get(i);
                 if (!DBIdentifier.isNull(col.getTargetIdentifier()))
                     join = true;
             }
@@ -487,6 +486,7 @@ public abstract class MappingInfo
      * @param adapt whether we can alter the schema or mappings
      * @deprecated
      */
+    @Deprecated
     public Table createTable(MetaDataContext context, TableDefaults def,
         String schemaName, String given, boolean adapt) {
         return createTable(context, def, DBIdentifier.newSchema(schemaName),
@@ -1262,7 +1262,7 @@ public abstract class MappingInfo
                 idx = fk.getColumns().length + constIdx++;
             else
                 continue;
-            setIOFromColumnFlags((Column) cols.get(i), idx);
+            setIOFromColumnFlags(cols.get(i), idx);
         }
     }
 
@@ -1329,7 +1329,7 @@ public abstract class MappingInfo
         joins = new Object[given.size()][3];
         Column col;
         for (int i = 0; i < joins.length; i++) {
-            col = (Column) given.get(i);
+            col = given.get(i);
             mergeJoinColumn(context, prefix, col, joins, i, table, cls, rel,
                 def, inversable && !col.getFlag(Column.FLAG_PK_JOIN), adapt,
                 fill);
@@ -1626,7 +1626,7 @@ public abstract class MappingInfo
         if (cols == null || cols.length == 0)
             _cols = null;
         else {
-            _cols = new ArrayList<Column>(cols.length);
+            _cols = new ArrayList<>(cols.length);
             Column col;
             for (int i = 0; i < cols.length; i++) {
                 col = syncColumn(context, cols[i], cols.length,
@@ -1716,7 +1716,7 @@ public abstract class MappingInfo
         Object[] cpks = fk.getPrimaryKeyConstants();
 
         int size = cols.length + ccols.length + cpkCols.length;
-        _cols = new ArrayList<Column>(size);
+        _cols = new ArrayList<>(size);
         Column col;
         for (int i = 0; i < cols.length; i++) {
             col = syncColumn(context, cols[i], size, false, local,
@@ -1891,20 +1891,20 @@ public abstract class MappingInfo
     /**
      * Supplies default table information.
      */
-    public static interface TableDefaults {
+    public interface TableDefaults {
 
         /**
          * Return the default table name.
          * @deprecated
          */
-        public String get(Schema schema);
-        public DBIdentifier getIdentifier(Schema schema);
+        @Deprecated String get(Schema schema);
+        DBIdentifier getIdentifier(Schema schema);
     }
 
     /**
      * Supplies default foreign key information.
      */
-    public static interface ForeignKeyDefaults {
+    public interface ForeignKeyDefaults {
 
         /**
          * Return a default foreign key for the given tables, or null to
@@ -1912,7 +1912,7 @@ public abstract class MappingInfo
          * the foreign key, only attributes like its name, delete action, etc.
          * Do not add the foreign key to the table.
          */
-        public ForeignKey get(Table local, Table foreign, boolean inverse);
+        ForeignKey get(Table local, Table foreign, boolean inverse);
 
         /**
          * Populate the given foreign key column with defaults.
@@ -1921,7 +1921,7 @@ public abstract class MappingInfo
          * @param pos the index of this column in the foreign key
          * @param cols the number of columns in the foreign key
          */
-        public void populate(Table local, Table foreign, Column col,
+        void populate(Table local, Table foreign, Column col,
             Object target, boolean inverse, int pos, int cols);
 	}
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
index 4e4c74bbd..66f697048 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
@@ -106,6 +106,9 @@ import org.apache.openjpa.util.UserException;
  */
 public class MappingRepository extends MetaDataRepository {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (MappingRepository.class);
 
@@ -113,7 +116,7 @@ public class MappingRepository extends MetaDataRepository {
     private transient MappingDefaults _defaults = null;
 
     // object->queryresultmapping
-    private Map<Object, QueryResultMapping> _results = new HashMap<Object, QueryResultMapping>();
+    private Map<Object, QueryResultMapping> _results = new HashMap<>();
     private SchemaGroup _schema = null;
     private StrategyInstaller _installer = null;
 
@@ -369,6 +372,7 @@ public class MappingRepository extends MetaDataRepository {
             mustExist);
     }
 
+    @Override
     public void clear() {
         if (_locking) {
             synchronized (this) {
@@ -383,6 +387,7 @@ public class MappingRepository extends MetaDataRepository {
         }
     }
 
+    @Override
     protected void prepareMapping(ClassMetaData meta) {
         // make sure superclass resolved first; resolving superclass may have
         // resolved this mapping
@@ -416,45 +421,55 @@ public class MappingRepository extends MetaDataRepository {
         mapping.resolveNonRelationMappings();
     }
 
+    @Override
     protected ClassMetaData newClassMetaData(Class<?> type) {
         return new ClassMapping(type, this);
     }
 
+    @Override
     protected ClassMetaData[] newClassMetaDataArray(int length) {
         return new ClassMapping[length];
     }
 
+    @Override
     protected FieldMetaData newFieldMetaData(String name, Class<?> type,
         ClassMetaData owner) {
         return new FieldMapping(name, type, (ClassMapping) owner);
     }
 
+    @Override
     protected FieldMetaData[] newFieldMetaDataArray(int length) {
         return new FieldMapping[length];
     }
 
+    @Override
     protected ClassMetaData newEmbeddedClassMetaData(ValueMetaData owner) {
         return new ClassMapping(owner);
     }
 
+    @Override
     protected ValueMetaData newValueMetaData(FieldMetaData owner) {
         return new ValueMappingImpl((FieldMapping) owner);
     }
 
+    @Override
     protected SequenceMetaData newSequenceMetaData(String name) {
         return new SequenceMapping(name, this);
     }
 
+    @Override
     protected Order newValueOrder(FieldMetaData owner, boolean asc) {
         return new JDBCValueOrder((FieldMapping) owner, asc);
     }
 
+    @Override
     protected Order newRelatedFieldOrder(FieldMetaData owner,
         FieldMetaData rel, boolean asc) {
         return new JDBCRelatedFieldOrder((FieldMapping) owner,
             (FieldMapping) rel, asc);
     }
 
+    @Override
     protected Order[] newOrderArray(int size) {
         return new JDBCOrder[size];
     }
@@ -1369,8 +1384,8 @@ public class MappingRepository extends MetaDataRepository {
      */
     private boolean useUntypedPCHandler(ValueMapping val) {
         ClassMapping rel = val.getTypeMapping();
-        return rel.getIdentityType() == ClassMapping.ID_UNKNOWN
-            || (rel.getIdentityType() == ClassMapping.ID_APPLICATION
+        return rel.getIdentityType() == ClassMetaData.ID_UNKNOWN
+            || (rel.getIdentityType() == ClassMetaData.ID_APPLICATION
             && (rel.getPrimaryKeyFields().length == 0
             || (!rel.isOpenJPAIdentity() && Modifier.isAbstract
             (rel.getObjectIdType().getModifiers()))));
@@ -1513,6 +1528,7 @@ public class MappingRepository extends MetaDataRepository {
         }
     }
 
+    @Override
     public void endConfiguration() {
         super.endConfiguration();
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingStrategyInstaller.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingStrategyInstaller.java
index 6347b3762..654e4c2b8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingStrategyInstaller.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingStrategyInstaller.java
@@ -27,9 +27,8 @@ import org.apache.openjpa.meta.MetaDataModes;
  * @author Abe White
  * @since 0.4.0
  */
-@SuppressWarnings("serial")
-public class MappingStrategyInstaller
-    extends StrategyInstaller {
+public class MappingStrategyInstaller extends StrategyInstaller {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Constructor; supply configuration.
@@ -38,10 +37,12 @@ public class MappingStrategyInstaller
         super(repos);
     }
 
+    @Override
     public boolean isAdapting() {
         return true;
     }
 
+    @Override
     public void installStrategy(ClassMapping cls) {
         ClassStrategy strat = repos.namedStrategy(cls);
         if (strat == null)
@@ -50,6 +51,7 @@ public class MappingStrategyInstaller
         cls.setSourceMode(MetaDataModes.MODE_MAPPING, true);
     }
 
+    @Override
     public void installStrategy(FieldMapping field) {
         FieldStrategy strategy = repos.namedStrategy(field, true);
         if (strategy == null)
@@ -57,6 +59,7 @@ public class MappingStrategyInstaller
         field.setStrategy(strategy, Boolean.TRUE);
     }
 
+    @Override
     public void installStrategy(Version version) {
         VersionStrategy strat = repos.namedStrategy(version);
         if (strat == null)
@@ -64,6 +67,7 @@ public class MappingStrategyInstaller
         version.setStrategy(strat, Boolean.TRUE);
     }
 
+    @Override
     public void installStrategy(Discriminator discrim) {
         DiscriminatorStrategy strat = repos.namedStrategy(discrim);
         if (strat == null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
index 36bc46430..511eabb79 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
@@ -152,7 +152,7 @@ public class MappingTool
      */
     public MappingTool(JDBCConfiguration conf, String action, boolean meta, ClassLoader loader) {
         _conf = conf;
-        _log = conf.getLog(JDBCConfiguration.LOG_METADATA);
+        _log = conf.getLog(OpenJPAConfiguration.LOG_METADATA);
         _meta = meta;
 
         if (action == null)
@@ -593,7 +593,7 @@ public class MappingTool
             // if we're outputting to stream, set all metas to same file so
             // they get placed in single string
             if (_mappingWriter != null) {
-                output = new HashMap<File, String>();
+                output = new HashMap<>();
                 File tmp = new File("openjpatmp");
                 for (int i = 0; i < mappings.length; i++) {
                     mappings[i].setSource(tmp, SourceTracker.SRC_OTHER, "openjpatmp");
@@ -677,7 +677,7 @@ public class MappingTool
             seq = smd.getInstance(null);
         else if (mapping.getIdentityStrategy() == ValueStrategies.NATIVE
             || (mapping.getIdentityStrategy() == ValueStrategies.NONE
-            && mapping.getIdentityType() == ClassMapping.ID_DATASTORE))
+            && mapping.getIdentityType() == ClassMetaData.ID_DATASTORE))
             seq = _conf.getSequenceInstance();
 
         if (seq instanceof JDBCSeq)
@@ -847,7 +847,7 @@ public class MappingTool
             return;
 
         if (_dropCls == null)
-            _dropCls = new HashSet<Class<?>>();
+            _dropCls = new HashSet<>();
         _dropCls.add(cls);
         if (!contains(_schemaActions,SchemaTool.ACTION_DROP))
             return;
@@ -863,7 +863,7 @@ public class MappingTool
         if (mapping != null) {
             _flushSchema = true;
             if (_dropMap == null)
-                _dropMap = new HashSet<ClassMapping>();
+                _dropMap = new HashSet<>();
             _dropMap.add(mapping);
         } else
             _log.warn(_loc.get("no-drop-meta", cls));
@@ -997,6 +997,7 @@ public class MappingTool
         final String[] args = opts.setFromCmdLine(arguments);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws IOException, SQLException {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
                 try {
@@ -1095,7 +1096,7 @@ public class MappingTool
             classes = conf.getMappingRepositoryInstance().
                 loadPersistentTypes(true, loader);
         } else {
-            classes = new HashSet<Class<?>>();
+            classes = new HashSet<>();
             ClassArgParser classParser = conf.getMetaDataRepositoryInstance().
                 getMetaDataFactory().newClassArgParser();
             classParser.setClassLoader(loader);
@@ -1211,19 +1212,19 @@ public class MappingTool
     /**
      * Helper used to import and export mapping data.
      */
-    public static interface ImportExport {
+    public interface ImportExport {
 
         /**
          * Import mappings for the given classes based on the given arguments.
          */
-        public boolean importMappings(JDBCConfiguration conf, Class<?>[] act,
+        boolean importMappings(JDBCConfiguration conf, Class<?>[] act,
             String[] args, boolean meta, Log log, ClassLoader loader)
             throws IOException;
 
         /**
          * Export mappings for the given classes based on the given arguments.
          */
-        public boolean exportMappings(JDBCConfiguration conf, Class<?>[] act,
+        boolean exportMappings(JDBCConfiguration conf, Class<?>[] act,
             boolean meta, Log log, Writer writer)
             throws IOException;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MetaDataPlusMappingFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MetaDataPlusMappingFactory.java
index b8f0c23e3..0e400472d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MetaDataPlusMappingFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MetaDataPlusMappingFactory.java
@@ -84,25 +84,30 @@ public class MetaDataPlusMappingFactory
         return _map;
     }
 
+    @Override
     public void setRepository(MetaDataRepository repos) {
         super.setRepository(repos);
         _map.setRepository(repos);
     }
 
+    @Override
     public void setStoreDirectory(File dir) {
         super.setStoreDirectory(dir);
         _map.setStoreDirectory(dir);
     }
 
+    @Override
     public void setStoreMode(int store) {
         super.setStoreMode(store);
         _map.setStoreMode(store);
     }
 
+    @Override
     public void setStrict(boolean strict) {
         // always in strict mode
     }
 
+    @Override
     public void load(Class cls, int mode, ClassLoader envLoader) {
         if ((mode & ~MODE_MAPPING) != MODE_NONE)
             super.load(cls, mode & ~MODE_MAPPING, envLoader);
@@ -110,6 +115,7 @@ public class MetaDataPlusMappingFactory
             _map.load(cls, mode & ~MODE_META, envLoader);
     }
 
+    @Override
     public boolean store(ClassMetaData[] metas, QueryMetaData[] queries,
         SequenceMetaData[] seqs, int mode, Map output) {
         boolean store = true;
@@ -122,6 +128,7 @@ public class MetaDataPlusMappingFactory
         return store;
     }
 
+    @Override
     public boolean drop(Class[] cls, int mode, ClassLoader envLoader) {
         boolean drop = true;
         if ((mode & ~MODE_MAPPING) != MODE_NONE)
@@ -131,6 +138,7 @@ public class MetaDataPlusMappingFactory
         return drop;
     }
 
+    @Override
     public Set getPersistentTypeNames(boolean classpath,
         ClassLoader envLoader) {
         Set names = super.getPersistentTypeNames(classpath, envLoader);
@@ -139,16 +147,19 @@ public class MetaDataPlusMappingFactory
         return _map.getPersistentTypeNames(classpath, envLoader);
     }
 
+    @Override
     public void clear() {
         super.clear();
         _map.clear();
     }
 
+    @Override
     public void addClassExtensionKeys(Collection exts) {
         super.addClassExtensionKeys(exts);
         _map.addClassExtensionKeys(exts);
     }
 
+    @Override
     public void addFieldExtensionKeys(Collection exts) {
         super.addFieldExtensionKeys(exts);
         _map.addFieldExtensionKeys(exts);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/NoneMappingDefaults.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/NoneMappingDefaults.java
index a1252f217..7edf181cf 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/NoneMappingDefaults.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/NoneMappingDefaults.java
@@ -25,7 +25,6 @@ import org.apache.openjpa.jdbc.schema.Index;
 import org.apache.openjpa.jdbc.schema.Schema;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.jdbc.schema.Unique;
-
 import org.apache.openjpa.lib.util.ClassUtil;
 
 /**
@@ -43,57 +42,71 @@ public class NoneMappingDefaults
         return _instance;
     }
 
+    @Override
     public boolean defaultMissingInfo() {
         return false;
     }
 
+    @Override
     public boolean useClassCriteria() {
         return false;
     }
 
+    @Override
     public Object getStrategy(ClassMapping cls, boolean adapt) {
         return null;
     }
 
+    @Override
     public Object getStrategy(Version vers, boolean adapt) {
         return null;
     }
 
+    @Override
     public Object getStrategy(Discriminator disc, boolean adapt) {
         return null;
     }
 
+    @Override
     public Object getStrategy(ValueMapping vm, Class<?> type, boolean adapt) {
         return null;
     }
 
+    @Override
     public Object getDiscriminatorValue(Discriminator disc, boolean adapt) {
         return null;
     }
 
+    @Override
     public String getTableName(ClassMapping cls, Schema schema) {
         return ClassUtil.getClassName(cls.getDescribedType()).replace('$', '_');
     }
 
+    @Override
     public String getTableName(FieldMapping fm, Schema schema) {
         return fm.getName();
     }
 
+    @Override
     public void populateDataStoreIdColumns(ClassMapping cls, Table table,
         Column[] cols) {
     }
 
+    @Override
     public void populateColumns(Version vers, Table table, Column[] cols) {
     }
 
+    @Override
     public void populateColumns(Discriminator disc, Table table,
         Column[] cols) {
     }
 
+    @Override
     public void populateJoinColumn(ClassMapping cm, Table local, Table foreign,
         Column col, Object target, int pos, int cols) {
     }
 
+    @Override
     public void populateJoinColumn(FieldMapping fm, Table local, Table foreign,
         Column col, Object target, int pos, int cols) {
     }
@@ -101,6 +114,8 @@ public class NoneMappingDefaults
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public void populateForeignKeyColumn(ValueMapping vm, String name,
         Table local, Table foreign, Column col, Object target, boolean inverse,
         int pos, int cols) {
@@ -109,10 +124,13 @@ public class NoneMappingDefaults
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public void populateColumns(ValueMapping vm, String name, Table table,
         Column[] cols) {
     }
 
+    @Override
     public boolean populateOrderColumns(FieldMapping fm, Table table,
         Column[] cols) {
         return false;
@@ -121,16 +139,20 @@ public class NoneMappingDefaults
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public boolean populateNullIndicatorColumns(ValueMapping vm, String name,
         Table table, Column[] cols) {
         return false;
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(ClassMapping cls, Table local,
         Table foreign) {
         return null;
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(FieldMapping fm, Table local,
         Table foreign) {
         return null;
@@ -139,81 +161,100 @@ public class NoneMappingDefaults
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public ForeignKey getForeignKey(ValueMapping vm, String name, Table local,
         Table foreign, boolean inverse) {
         return null;
     }
 
+    @Override
     public Index getJoinIndex(FieldMapping fm, Table table, Column[] cols) {
         return null;
     }
 
+    @Override
     public Index getIndex(ValueMapping vm, String name, Table table,
         Column[] cols) {
         return null;
     }
 
+    @Override
     public Index getIndex(Version vers, Table table, Column[] cols) {
         return null;
     }
 
+    @Override
     public Index getIndex(Discriminator disc, Table table, Column[] cols) {
         return null;
     }
 
+    @Override
     public Unique getJoinUnique(FieldMapping fm, Table table, Column[] cols) {
         return null;
     }
 
+    @Override
     public Unique getUnique(ValueMapping vm, String name, Table table,
         Column[] cols) {
         return null;
     }
 
+    @Override
     public String getPrimaryKeyName(ClassMapping cm, Table table) {
         return null;
     }
 
+    @Override
     public void installPrimaryKey(FieldMapping fm, Table table) {
     }
 
+    @Override
     public ForeignKey getForeignKey(ValueMapping vm, DBIdentifier name, Table local,
         Table foreign, boolean inverse) {
         return null;
     }
 
+    @Override
     public Index getIndex(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols) {
         return null;
     }
 
+    @Override
     public Unique getUnique(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols) {
         return null;
     }
 
+    @Override
     public void populateColumns(ValueMapping vm, DBIdentifier name, Table table,
         Column[] cols) {
     }
 
+    @Override
     public void populateForeignKeyColumn(ValueMapping vm, DBIdentifier name,
         Table local, Table foreign, Column col, Object target, boolean inverse,
         int pos, int cols) {
     }
 
+    @Override
     public boolean populateNullIndicatorColumns(ValueMapping vm, DBIdentifier name,
         Table table, Column[] cols) {
         return false;
     }
 
+    @Override
     public DBIdentifier getTableIdentifier(ClassMapping cls, Schema defaultSchema) {
         return DBIdentifier.newTable(getTableName(cls, defaultSchema));
     }
 
+    @Override
     public DBIdentifier getTableIdentifier(FieldMapping fm, Schema defaultSchema) {
         return DBIdentifier.newTable(getTableName(fm, defaultSchema));
     }
 
+    @Override
     public DBIdentifier getPrimaryKeyIdentifier(ClassMapping cm, Table table) {
         return DBIdentifier.NULL;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/NoneStrategyInstaller.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/NoneStrategyInstaller.java
index 642aac897..3e647c7f5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/NoneStrategyInstaller.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/NoneStrategyInstaller.java
@@ -22,6 +22,7 @@ import org.apache.openjpa.jdbc.meta.strats.NoneClassStrategy;
 import org.apache.openjpa.jdbc.meta.strats.NoneDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.meta.strats.NoneFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.NoneVersionStrategy;
+import org.apache.openjpa.meta.MetaDataModes;
 
 /**
  * Clears all mapping information from classes and installs none strategies.
@@ -32,6 +33,9 @@ import org.apache.openjpa.jdbc.meta.strats.NoneVersionStrategy;
 public class NoneStrategyInstaller
     extends StrategyInstaller {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor; supply configuration.
      */
@@ -39,22 +43,26 @@ public class NoneStrategyInstaller
         super(repos);
     }
 
+    @Override
     public void installStrategy(ClassMapping cls) {
         cls.clearMapping();
         cls.setStrategy(NoneClassStrategy.getInstance(), null);
-        cls.setSourceMode(cls.MODE_MAPPING, true);
+        cls.setSourceMode(MetaDataModes.MODE_MAPPING, true);
     }
 
+    @Override
     public void installStrategy(FieldMapping field) {
         field.clearMapping();
         field.setStrategy(NoneFieldStrategy.getInstance(), null);
     }
 
+    @Override
     public void installStrategy(Version version) {
         version.clearMapping();
         version.setStrategy(NoneVersionStrategy.getInstance(), null);
     }
 
+    @Override
     public void installStrategy(Discriminator discrim) {
         discrim.clearMapping();
         discrim.setStrategy(NoneDiscriminatorStrategy.getInstance(), null);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/PropertiesReverseCustomizer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/PropertiesReverseCustomizer.java
index 7ab02b2e5..3dde777a1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/PropertiesReverseCustomizer.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/PropertiesReverseCustomizer.java
@@ -22,12 +22,13 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.lib.util.ClassUtil;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.meta.ClassMetaData;
 
 /**
  * Simple {@link ReverseCustomizer} that uses a properties file to
@@ -82,15 +83,18 @@ public class PropertiesReverseCustomizer
     private Properties _props = null;
     private Set _unaccessed = null;
 
+    @Override
     public void setConfiguration(Properties props) {
         _props = props;
         _unaccessed = new TreeSet(props.keySet());
     }
 
+    @Override
     public void setTool(ReverseMappingTool tool) {
         this.tool = tool;
     }
 
+    @Override
     public int getTableType(Table table, int defaultType) {
         String type = getProperty(table.getName() + ".table-type");
         if (type == null && table.getSchemaName() != null)
@@ -113,6 +117,7 @@ public class PropertiesReverseCustomizer
             + type);
     }
 
+    @Override
     public String getClassName(Table table, String defaultName) {
         // check for a rename property or a table-naming property
         String name = getProperty(defaultName + ".rename");
@@ -141,30 +146,34 @@ public class PropertiesReverseCustomizer
         return name;
     }
 
+    @Override
     public void customize(ClassMapping cls) {
         // customize identity type
         String id = getProperty(cls.getDescribedType().getName()
             + ".identity");
         if ("datastore".equals(id)) {
             cls.setObjectIdType(null, false);
-            cls.setIdentityType(ClassMapping.ID_DATASTORE);
+            cls.setIdentityType(ClassMetaData.ID_DATASTORE);
         } else if ("builtin".equals(id)) {
             cls.setObjectIdType(null, false);
-            cls.setIdentityType(ClassMapping.ID_APPLICATION);
+            cls.setIdentityType(ClassMetaData.ID_APPLICATION);
         } else if (id != null)
             cls.setObjectIdType(tool.generateClass(id, null), false);
     }
 
+    @Override
     public String getClassCode(ClassMapping mapping) {
         return null;
     }
 
+    @Override
     public void customize(FieldMapping field) {
         String type = getProperty(field.getFullName(false) + ".type");
         if (type != null)
             field.setDeclaredType(ClassUtil.toClass(type, null));
     }
 
+    @Override
     public String getFieldName(ClassMapping dec, Column[] cols, ForeignKey fk,
         String defaultName) {
         // check for a rename property or a column-naming property
@@ -198,22 +207,27 @@ public class PropertiesReverseCustomizer
         return name;
     }
 
+    @Override
     public String getInitialValue(FieldMapping field) {
         return getProperty(field.getFullName(false) + ".value");
     }
 
+    @Override
     public String getDeclaration(FieldMapping field) {
         return null;
     }
 
+    @Override
     public String getFieldCode(FieldMapping field) {
         return null;
     }
 
+    @Override
     public boolean unmappedTable(Table table) {
         return false;
     }
 
+    @Override
     public void close() {
         if (!_unaccessed.isEmpty() && tool.getLog().isTraceEnabled())
             tool.getLog().trace(_loc.get("custom-unused-props", _unaccessed));
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java
index dde309454..9ee3e4f47 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/QueryResultMapping.java
@@ -124,7 +124,7 @@ public class QueryResultMapping
     public void addColumnResult(Object id) {
         _cols = null;
         if (_colList == null) {
-            _colList = new ArrayList<Object>();
+            _colList = new ArrayList<>();
         }
         _colList.add(id);
     }
@@ -153,7 +153,7 @@ public class QueryResultMapping
         _pcs = null;
         PCResult pc = new PCResult(candidate);
         if (_pcList == null) {
-            _pcList = new ArrayList<PCResult>();
+            _pcList = new ArrayList<>();
         }
         _pcList.add(pc);
         return pc;
@@ -187,6 +187,7 @@ public class QueryResultMapping
         _idx = idx;
     }
 
+    @Override
     public String toString() {
         return _name;
     }
@@ -195,10 +196,12 @@ public class QueryResultMapping
     // Commentable
     ///////////////
 
+    @Override
     public String[] getComments() {
         return (_comments == null) ? EMPTY_COMMENTS : _comments;
     }
 
+    @Override
     public void setComments(String[] comments) {
         _comments = comments;
     }
@@ -207,14 +210,17 @@ public class QueryResultMapping
     // SourceTracker implementation
     ////////////////////////////////
 
+    @Override
     public File getSourceFile() {
         return _file;
     }
 
+    @Override
     public Object getSourceScope() {
         return _scope;
     }
 
+    @Override
     public int getSourceType() {
         return _srcType;
     }
@@ -225,10 +231,12 @@ public class QueryResultMapping
         _srcType = srcType;
     }
 
+    @Override
     public String getResourceName() {
         return (_class == null) ? _name : _class.getName() + ":" + _name;
     }
 
+    @Override
     public int getLineNumber() {
         return _lineNum;
     }
@@ -237,6 +245,7 @@ public class QueryResultMapping
         _lineNum = lineNum;
     }
 
+    @Override
     public int getColNumber() {
         return _colNum;
     }
@@ -318,7 +327,7 @@ public class QueryResultMapping
             _eager = null;
             _fetchInfo = null;
             if (_rawMappings == null) {
-                _rawMappings = new HashMap<String, Object>();
+                _rawMappings = new HashMap<>();
             }
             _rawMappings.put(path, id);
         }
@@ -395,7 +404,7 @@ public class QueryResultMapping
                 return;
             }
 
-            _mappings = new HashMap<List<MetaDataContext>, ColumnMap>();
+            _mappings = new HashMap<>();
             _fetchInfo = new FetchInfo(getCandidateTypeMapping());
 
             for(Map.Entry<String, Object>  entry : _rawMappings.entrySet()) {
@@ -409,7 +418,7 @@ public class QueryResultMapping
         private void resolveMapping(String path, Object id) {
             // build up path to second-to-last token
             String[] tokens = StringUtil.split(path, ".", 0);
-            List<MetaDataContext> rpath = new ArrayList<MetaDataContext>(tokens.length);
+            List<MetaDataContext> rpath = new ArrayList<>(tokens.length);
             ClassMapping candidate = getCandidateTypeMapping();
             FieldMapping fm = null;
             for (int i = 0; i < tokens.length - 1; i++) {
@@ -457,7 +466,7 @@ public class QueryResultMapping
                     // otherwise, record that we have an eager result
                     Column fkCol = fm.getForeignKey().getColumn(col);
                     if (fkCol != null)
-                        addComplexColumnMapping(fm, new ArrayList<MetaDataContext>(rpath),
+                        addComplexColumnMapping(fm, new ArrayList<>(rpath),
                             fkCol, id);
                     else {
                         recordEager(candidate, rpath, fm);
@@ -512,12 +521,12 @@ public class QueryResultMapping
                 _fetchInfo.excludes.clear(fm.getIndex());
             } else {
                 // record at previous path
-                List<MetaDataContext> copy = new ArrayList<MetaDataContext>(path.size() - 1);
+                List<MetaDataContext> copy = new ArrayList<>(path.size() - 1);
                 for (int i = 0; i < copy.size(); i++)
                     copy.add(path.get(i));
 
                 if (_eager == null)
-                    _eager = new HashMap<List<MetaDataContext>, FetchInfo>();
+                    _eager = new HashMap<>();
                 FetchInfo info = _eager.get(copy);
                 if (info == null) {
                     info = new FetchInfo(candidate);
@@ -537,11 +546,11 @@ public class QueryResultMapping
                 _fetchInfo.excludes.clear(fm.getIndex());
             else {
                 if (_eager == null)
-                    _eager = new HashMap<List<MetaDataContext>, FetchInfo>();
+                    _eager = new HashMap<>();
                 FetchInfo info = _eager.get(path);
                 if (info == null) {
                     info = new FetchInfo(candidate);
-                    _eager.put(new ArrayList<MetaDataContext>(path), info);
+                    _eager.put(new ArrayList<>(path), info);
                 }
                 info.excludes.clear(fm.getIndex());
             }
@@ -549,7 +558,7 @@ public class QueryResultMapping
 
         public void addConstructorParam(final String name) {
             if (_constructorParams == null) {
-                _constructorParams = new ArrayList<String>();
+                _constructorParams = new ArrayList<>();
             }
             _constructorParams.add(name);
         }
@@ -583,13 +592,13 @@ public class QueryResultMapping
     /**
      * Mapping of columns to result ids.
      */
-    private static interface ColumnMap {
+    private interface ColumnMap {
 
         /**
          * Return the result id for the given column, or the given colum
          * if none.
          */
-        public Object map(Column col);
+        Object map(Column col);
     }
 
     /**
@@ -604,10 +613,12 @@ public class QueryResultMapping
             _id = id;
         }
 
+        @Override
         public Object map(Column col) {
             return _id;
         }
 
+        @Override
         public String toString() {
             return _id.toString();
         }
@@ -628,6 +639,7 @@ public class QueryResultMapping
             _ids = new Object[cols.length];
         }
 
+        @Override
         public Object map(Column col) {
             int idx = _cols.indexOf(col);
             return (idx == -1) ? col : _ids[idx];
@@ -639,6 +651,7 @@ public class QueryResultMapping
                 _ids[idx] = id;
         }
 
+        @Override
         public String toString() {
             return _cols + "=" + Arrays.asList(_ids);
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RefreshStrategyInstaller.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RefreshStrategyInstaller.java
index 7ac86b051..a7be56fe8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RefreshStrategyInstaller.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RefreshStrategyInstaller.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.jdbc.meta;
 
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.util.MetaDataException;
 
 /**
@@ -31,6 +32,8 @@ import org.apache.openjpa.util.MetaDataException;
 public class RefreshStrategyInstaller
     extends StrategyInstaller {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (RefreshStrategyInstaller.class);
 
@@ -41,10 +44,12 @@ public class RefreshStrategyInstaller
         super(repos);
     }
 
+    @Override
     public boolean isAdapting() {
         return true;
     }
 
+    @Override
     public void installStrategy(ClassMapping cls) {
         ClassStrategy strat = repos.namedStrategy(cls);
         if (strat == null)
@@ -61,9 +66,10 @@ public class RefreshStrategyInstaller
             cls.clearMapping();
             cls.setStrategy(repos.defaultStrategy(cls, true), Boolean.TRUE);
         }
-        cls.setSourceMode(cls.MODE_MAPPING, true);
+        cls.setSourceMode(MetaDataModes.MODE_MAPPING, true);
     }
 
+    @Override
     public void installStrategy(FieldMapping field) {
         FieldStrategy strategy = repos.namedStrategy(field, true);
         if (strategy == null)
@@ -86,6 +92,7 @@ public class RefreshStrategyInstaller
         }
     }
 
+    @Override
     public void installStrategy(Version version) {
         VersionStrategy strat = repos.namedStrategy(version);
         if (strat == null)
@@ -105,6 +112,7 @@ public class RefreshStrategyInstaller
         }
     }
 
+    @Override
     public void installStrategy(Discriminator discrim) {
         DiscriminatorStrategy strat = repos.namedStrategy(discrim);
         if (strat == null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RelationId.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RelationId.java
index 0f18fa014..92fdbb3dc 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RelationId.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RelationId.java
@@ -33,6 +33,6 @@ public interface RelationId {
      * Return the serialized value for the given related object, now that
      * its id has been assigned.
      */
-    public Object toRelationDataStoreValue(OpenJPAStateManager sm, Column col);
+    Object toRelationDataStoreValue(OpenJPAStateManager sm, Column col);
 }
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseCustomizer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseCustomizer.java
index b4d1847f7..108e8e286 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseCustomizer.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseCustomizer.java
@@ -37,27 +37,27 @@ public interface ReverseCustomizer
     /**
      * Set configuration properties given by the user.
      */
-    public void setConfiguration(Properties props);
+    void setConfiguration(Properties props);
 
     /**
      * Set the reverse mapping tool using this customizer. You can use
      * the tool to see how it is configured, or to use utility methods the
      * tool provides.
      */
-    public void setTool(ReverseMappingTool tool);
+    void setTool(ReverseMappingTool tool);
 
     /**
      * Return the type of the given table, or the given default type.
      * See the TABLE_XXX constants in {@link ReverseMappingTool}.
      */
-    public int getTableType(Table table, int defaultType);
+    int getTableType(Table table, int defaultType);
 
     /**
      * Return the fully-qualified class name to generate for the given table.
      * Return null to prevent the table from being mapped. Return the given
      * default name if it is acceptable.
      */
-    public String getClassName(Table table, String defaultName);
+    String getClassName(Table table, String defaultName);
 
     /**
      * Customize the given class information produced by the reverse mapping
@@ -65,7 +65,7 @@ public interface ReverseCustomizer
      * {@link ReverseMappingTool#generateClass} to creat the new class object.
      * The class will not have any fields at the time of this call.
      */
-    public void customize(ClassMapping cls);
+    void customize(ClassMapping cls);
 
     /**
      * Return a code template for the given class, or null to use the standard
@@ -86,7 +86,7 @@ public interface ReverseCustomizer
      * <li>${fieldCode}: Get/set methods for all the generated fields.</li>
      * </ul>
      */
-    public String getClassCode(ClassMapping mapping);
+    String getClassCode(ClassMapping mapping);
 
     /**
      * Return the field name used to map the given columns, or null to prevent
@@ -97,20 +97,20 @@ public interface ReverseCustomizer
      * @param cols the column(s) this field will represent
      * @param fk for relation fields, the foreign key to the related type
      */
-    public String getFieldName(ClassMapping dec, Column[] cols, ForeignKey fk,
+    String getFieldName(ClassMapping dec, Column[] cols, ForeignKey fk,
         String defaultName);
 
     /**
      * Customize the given field information produced by the reverse mapping
      * tool.
      */
-    public void customize(FieldMapping field);
+    void customize(FieldMapping field);
 
     /**
      * Return code for the initial value for the given field, or null to use
      * the default generated by the system.
      */
-    public String getInitialValue(FieldMapping field);
+    String getInitialValue(FieldMapping field);
 
     /**
      * Return a code template for the declaration of the given field, or null
@@ -126,7 +126,7 @@ public interface ReverseCustomizer
      * " = &lt;value&gt;", or empty string if none.</li>
      * </ul>
      */
-    public String getDeclaration(FieldMapping field);
+    String getDeclaration(FieldMapping field);
 
     /**
      * Return a code template for the get/set methods of the given field, or
@@ -142,7 +142,7 @@ public interface ReverseCustomizer
      * "= &lt;value&gt;", or empty string if none.</li>
      * </ul>
      */
-    public String getFieldCode(FieldMapping field);
+    String getFieldCode(FieldMapping field);
 
     /**
      * Notification that a table has gone unmapped. You can map the table
@@ -154,10 +154,10 @@ public interface ReverseCustomizer
      *
      * @return true if you map the table, false otherwise
      */
-    public boolean unmappedTable(Table table);
+    boolean unmappedTable(Table table);
 
     /**
      * Invoked when the customizer is no longer needed.
      */
-    public void close();
+    @Override void close();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
index 172c97305..ece945723 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
@@ -90,11 +90,13 @@ import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.MetaDataFactory;
 import org.apache.openjpa.meta.MetaDataModes;
+import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.NoneMetaDataFactory;
 import org.apache.openjpa.meta.QueryMetaData;
 import org.apache.openjpa.meta.SequenceMetaData;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.BCClassLoader;
 import serp.bytecode.Project;
@@ -221,7 +223,7 @@ public class ReverseMappingTool
      */
     public ReverseMappingTool(JDBCConfiguration conf) {
         _conf = conf;
-        _log = conf.getLog(JDBCConfiguration.LOG_METADATA);
+        _log = conf.getLog(OpenJPAConfiguration.LOG_METADATA);
     }
 
     /**
@@ -609,7 +611,7 @@ public class ReverseMappingTool
             _repos.setMetaDataFactory(NoneMetaDataFactory.getInstance());
             _repos.setMappingDefaults(NoneMappingDefaults.getInstance());
             _repos.setResolve(MODE_NONE);
-            _repos.setValidate(_repos.VALIDATE_NONE);
+            _repos.setValidate(MetaDataRepository.VALIDATE_NONE);
         }
         return _repos;
     }
@@ -717,13 +719,13 @@ public class ReverseMappingTool
             // it might have to switch to std application identity if pk field
             // not compatible
             if (cls.getPCSuperclass() == null
-                && cls.getIdentityType() == ClassMapping.ID_APPLICATION) {
+                && cls.getIdentityType() == ClassMetaData.ID_APPLICATION) {
                 if (cls.getPrimaryKeyFields().length == 0)
                     throw new MetaDataException(_loc.get("no-pk-fields", cls));
                 if (cls.getObjectIdType() == null
                     || (cls.isOpenJPAIdentity() && !isBuiltinIdentity(cls)))
                     setObjectIdType(cls);
-            } else if (cls.getIdentityType() == ClassMapping.ID_DATASTORE)
+            } else if (cls.getIdentityType() == ClassMetaData.ID_DATASTORE)
                 cls.getPrimaryKeyColumns()[0].setJavaType(JavaTypes.LONG);
 
             // set java types for simple fields;
@@ -977,7 +979,7 @@ public class ReverseMappingTool
      */
     private ApplicationIdTool newApplicationIdTool(ClassMapping mapping) {
         ApplicationIdTool tool;
-        if (mapping.getIdentityType() == ClassMapping.ID_APPLICATION
+        if (mapping.getIdentityType() == ClassMetaData.ID_APPLICATION
             && !mapping.isOpenJPAIdentity()
             && mapping.getPCSuperclass() == null) {
             tool = new ApplicationIdTool(_conf, mapping.getDescribedType(),
@@ -1210,7 +1212,7 @@ public class ReverseMappingTool
         if (pks.length == 1 && _datastore
             && pks[0].isCompatible(Types.BIGINT, null, 0, 0)) {
             cls.setObjectIdType(null, false);
-            cls.setIdentityType(ClassMapping.ID_DATASTORE);
+            cls.setIdentityType(ClassMetaData.ID_DATASTORE);
         } else if (pks.length == 1 && _builtin)
             cls.setObjectIdType(null, false);
         cls.setStrategy(new FullClassStrategy(), null);
@@ -1347,7 +1349,7 @@ public class ReverseMappingTool
         Column[] cols = table.getColumns();
         for (int i = 0; i < cols.length; i++) {
             pkcol = pk != null && pk.containsColumn(cols[i]);
-            if (pkcol && cls.getIdentityType() == ClassMapping.ID_DATASTORE)
+            if (pkcol && cls.getIdentityType() == ClassMetaData.ID_DATASTORE)
                 continue;
             if ((cls.getPCSuperclass() == null && pkcol)
                 || !isForeignKeyColumn(cols[i]))
@@ -1403,13 +1405,13 @@ public class ReverseMappingTool
             field2.setMappedBy(field1.getName());
         if (unq) {
             field2.setForeignKey(fk);
-            field2.setJoinDirection(field2.JOIN_INVERSE);
+            field2.setJoinDirection(ValueMapping.JOIN_INVERSE);
             field2.setStrategy(new RelationFieldStrategy(), null);
         } else {
             ValueMapping vm = field2.getElementMapping();
             vm.setDeclaredType(cls.getDescribedType());
             vm.setForeignKey(fk);
-            vm.setJoinDirection(vm.JOIN_EXPECTED_INVERSE);
+            vm.setJoinDirection(ValueMapping.JOIN_EXPECTED_INVERSE);
             field2.setStrategy(new RelationCollectionInverseKeyFieldStrategy(),
                 null);
         }
@@ -1432,7 +1434,7 @@ public class ReverseMappingTool
         field.setColumns(new Column[]{ col });
         addConstraints(field);
         if (col.isPrimaryKey()
-            && cls.getIdentityType() != ClassMapping.ID_DATASTORE)
+            && cls.getIdentityType() != ClassMetaData.ID_DATASTORE)
             field.setPrimaryKey(true);
 
         FieldStrategy strat;
@@ -1730,6 +1732,7 @@ public class ReverseMappingTool
     /**
      * Return a new tool with the same settings as this one. Used in workbench.
      */
+    @Override
     public Object clone() {
         ReverseMappingTool tool = new ReverseMappingTool(_conf);
         tool.setSchemaGroup(getSchemaGroup());
@@ -1857,6 +1860,7 @@ public class ReverseMappingTool
         final String[] arguments = opts.setFromCmdLine(args);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws Exception {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
                 try {
@@ -2115,18 +2119,24 @@ public class ReverseMappingTool
     private class ReverseStrategyInstaller
         extends StrategyInstaller {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public ReverseStrategyInstaller(MappingRepository repos) {
             super(repos);
         }
 
+        @Override
         public void installStrategy(ClassMapping cls) {
             throw new InternalException();
         }
 
+        @Override
         public void installStrategy(FieldMapping field) {
             throw new InternalException();
         }
 
+        @Override
         public void installStrategy(Version version) {
             ClassMapping cls = version.getClassMapping();
             if (cls.getPCSuperclass() != null)
@@ -2140,6 +2150,7 @@ public class ReverseMappingTool
                     null);
         }
 
+        @Override
         public void installStrategy(Discriminator discrim) {
             ClassMapping cls = discrim.getClassMapping();
             if (cls.getPCSuperclass() != null) {
@@ -2196,6 +2207,7 @@ public class ReverseMappingTool
          * If there is an inner application identity class, then
          * add it to the bottom of the class code.
          */
+        @Override
         protected void closeClassBrace(CodeFormat code) {
             if (_appid != null) {
                 code.afterSection();
@@ -2210,6 +2222,7 @@ public class ReverseMappingTool
          * Add the list of imports for any inner app id classes
          *
          */
+        @Override
         public Set getImportPackages() {
             Set pkgs = super.getImportPackages();
             if (_appid != null)
@@ -2217,28 +2230,33 @@ public class ReverseMappingTool
             return pkgs;
         }
 
+        @Override
         protected String getClassCode() {
             return (_custom == null) ? null : _custom.getClassCode(_mapping);
         }
 
+        @Override
         protected String getInitialValue(FieldMetaData field) {
             if (_custom == null)
                 return null;
             return _custom.getInitialValue((FieldMapping) field);
         }
 
+        @Override
         protected String getDeclaration(FieldMetaData field) {
             if (_custom == null)
                 return null;
             return _custom.getDeclaration((FieldMapping) field);
         }
 
+        @Override
         protected String getFieldCode(FieldMetaData field) {
             if (_custom == null)
                 return null;
             return _custom.getFieldCode((FieldMapping) field);
         }
 
+        @Override
         protected boolean useGenericCollections() {
             return _useGenericColl;
         }
@@ -2252,20 +2270,24 @@ public class ReverseMappingTool
             super (mapping, aid);
         }
 
+        @Override
         public Set getImportPackages() {
             Set pkgs = super.getImportPackages();
             pkgs.add("javax.persistence");
             return pkgs;
         }
 
+        @Override
         protected List getClassAnnotations() {
             return getAnnotationsForMeta(_mapping);
         }
 
+        @Override
         protected List getFieldAnnotations(FieldMetaData field) {
             return getAnnotationsForMeta(field);
         }
 
+        @Override
         protected boolean usePropertyBasedAccess () {
             return ACCESS_TYPE_PROPERTY.equals(_accessType);
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java
index d799b9935..13bc85d3e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/RuntimeStrategyInstaller.java
@@ -22,6 +22,7 @@ import java.lang.reflect.Modifier;
 
 import org.apache.openjpa.jdbc.meta.strats.NoneFieldStrategy;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.ValueMetaData;
 import org.apache.openjpa.util.MetaDataException;
 
@@ -35,6 +36,8 @@ import org.apache.openjpa.util.MetaDataException;
 public class RuntimeStrategyInstaller
     extends StrategyInstaller {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (RuntimeStrategyInstaller.class);
 
@@ -45,8 +48,9 @@ public class RuntimeStrategyInstaller
         super(repos);
     }
 
+    @Override
     public void installStrategy(ClassMapping cls) {
-        if ((cls.getSourceMode() & cls.MODE_MAPPING) == 0)
+        if ((cls.getSourceMode() & MetaDataModes.MODE_MAPPING) == 0)
             throw new MetaDataException(_loc.get("no-mapping", cls));
 
         ClassStrategy strat = repos.namedStrategy(cls);
@@ -55,6 +59,7 @@ public class RuntimeStrategyInstaller
         cls.setStrategy(strat, Boolean.FALSE);
     }
 
+    @Override
     public void installStrategy(FieldMapping field) {
         FieldStrategy strategy = null;
         ClassMapping owner = getOutermostDefiningMapping(field);
@@ -95,6 +100,7 @@ public class RuntimeStrategyInstaller
         return null;
     }
 
+    @Override
     public void installStrategy(Version version) {
         VersionStrategy strat = repos.namedStrategy(version);
         if (strat == null)
@@ -102,6 +108,7 @@ public class RuntimeStrategyInstaller
         version.setStrategy(strat, Boolean.FALSE);
     }
 
+    @Override
     public void installStrategy(Discriminator discrim) {
         DiscriminatorStrategy strat = repos.namedStrategy(discrim);
         if (strat == null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/SequenceMapping.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/SequenceMapping.java
index f5079d94d..6a6c1d7be 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/SequenceMapping.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/SequenceMapping.java
@@ -36,9 +36,8 @@ import org.apache.openjpa.meta.SequenceMetaData;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class SequenceMapping
-    extends SequenceMetaData {
+public class SequenceMapping extends SequenceMetaData {
+    private static final long serialVersionUID = 1L;
 
     /**
      * {@link ValueTableJDBCSeq} alias.
@@ -76,6 +75,7 @@ public class SequenceMapping
      * @param name
      * @param repos
      */
+    @Deprecated
     public SequenceMapping(String name, MappingRepository repos) {
         super(name, repos);
     }
@@ -110,6 +110,7 @@ public class SequenceMapping
      * Name of sequence table, if any.
      * @deprecated
      */
+    @Deprecated
     public String getTable() {
         return getTableIdentifier().getName();
     }
@@ -122,6 +123,7 @@ public class SequenceMapping
      * Name of sequence table, if any.
      * @deprecated
      */
+    @Deprecated
     public void setTable(String table) {
         setTableIdentifier(DBIdentifier.newTable(table));
     }
@@ -134,6 +136,7 @@ public class SequenceMapping
      * Name of sequence column, if any.
      * @deprecated
      */
+    @Deprecated
     public String getSequenceColumn() {
         return getSequenceColumnIdentifier().getName();
     }
@@ -146,6 +149,7 @@ public class SequenceMapping
      * Name of sequence column, if any.
      * @deprecated
      */
+    @Deprecated
     public void setSequenceColumn(String sequenceColumn) {
         setSequenceColumnIdentifier(DBIdentifier.newColumn(sequenceColumn));
     }
@@ -158,6 +162,7 @@ public class SequenceMapping
      * Name of primary key column, if any.
      * @deprecated
      */
+    @Deprecated
     public String getPrimaryKeyColumn() {
         return getPrimaryKeyColumnIdentifier().getName();
     }
@@ -170,6 +175,7 @@ public class SequenceMapping
      * Name of primary key column, if any.
      * @deprecated
      */
+    @Deprecated
     public void setPrimaryKeyColumn(String primaryKeyColumn) {
         setPrimaryKeyColumnIdentifier(DBIdentifier.newColumn(primaryKeyColumn));
     }
@@ -196,6 +202,7 @@ public class SequenceMapping
      * @deprecated
      * @param cols
      */
+    @Deprecated
     public void setUniqueColumns(String[] cols) {
         setUniqueColumnsIdentifier(DBIdentifier.toArray(cols, DBIdentifierType.COLUMN));
     }
@@ -207,6 +214,7 @@ public class SequenceMapping
     /**
      * @deprecated
      */
+    @Deprecated
     public String[] getUniqueColumns() {
         return DBIdentifier.toStringArray(getUniqueColumnsIdentifier());
     }
@@ -216,6 +224,7 @@ public class SequenceMapping
     }
 
 
+    @Override
     protected PluginValue newPluginValue(String property) {
         return new JDBCSeqValue(property);
     }
@@ -257,6 +266,7 @@ public class SequenceMapping
      * @deprecated
      * @param name
      */
+    @Deprecated
     public void setUniqueConstraintName(String name) {
         _uniqueConstraintName = DBIdentifier.newConstraint(name);
     }
@@ -268,6 +278,7 @@ public class SequenceMapping
     /**
      * @deprecated
      */
+    @Deprecated
     public String getUniqueConstraintName() {
         return getUniqueConstraintIdentifier().getName();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Strategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Strategy.java
index af6078178..882a14809 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Strategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Strategy.java
@@ -39,7 +39,7 @@ public interface Strategy
      * Return the alias of this strategy. For custom strategies, return the
      * full class name.
      */
-    public String getAlias();
+    String getAlias();
 
     /**
      * Map the owning mapping using this strategy.
@@ -48,21 +48,21 @@ public interface Strategy
      * to set its ORM data; if false, ORM data will already be set
      * @throws MetaDataException if unable to map
      */
-    public void map(boolean adapt);
+    void map(boolean adapt);
 
     /**
      * Perform caching and other initialization operations. This method is
      * called after {@link #map}, and after all related components have been
      * mapped as well.
      */
-    public void initialize();
+    void initialize();
 
     /**
      * Set values for the mapping into the proper rows. For class mappings,
      * this method	will be called only after the corresponding method has
      * been called for all fields of this mapping.
      */
-    public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
+    void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException;
 
     /**
@@ -70,7 +70,7 @@ public interface Strategy
      *
      * @see #insert
      */
-    public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
+    void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException;
 
     /**
@@ -80,7 +80,7 @@ public interface Strategy
      *
      * @see #insert
      */
-    public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
+    void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException;
 
     /**
@@ -90,7 +90,7 @@ public interface Strategy
      * being called. Implement the {@link #customInsert} method
      * to implement the custom insertion behavior.
      */
-    public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store);
+    Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store);
 
     /**
      * Return {@link Boolean#FALSE} if this mapping does not customize the
@@ -99,7 +99,7 @@ public interface Strategy
      * being called. Implement the {@link #customUpdate} method
      * to override the default update behavior.
      */
-    public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store);
+    Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store);
 
     /**
      * Return {@link Boolean#FALSE} if this mapping does not customize the
@@ -108,7 +108,7 @@ public interface Strategy
      * being called. Implement the {@link #customDelete} method
      * to override the default deletion behavior.
      */
-    public Boolean isCustomDelete(OpenJPAStateManager sm, JDBCStore store);
+    Boolean isCustomDelete(OpenJPAStateManager sm, JDBCStore store);
 
     /**
      * Override this method to customize flushing this mapping. For classes,
@@ -116,14 +116,14 @@ public interface Strategy
      * is called after the owning object is inserted, so if this field is in
      * a row with other fields, that row will already exist.
      */
-    public void customInsert(OpenJPAStateManager sm, JDBCStore store)
+    void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException;
 
     /**
      * Override this method to customize flushing this mapping. For classes,
      * this method must also flush all fields.
      */
-    public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
+    void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException;
 
     /**
@@ -131,6 +131,6 @@ public interface Strategy
      * this method must also flush all fields. For fields, this method
      * will be called after the owning object is deleted.
      */
-    public void customDelete(OpenJPAStateManager sm, JDBCStore store)
+    void customDelete(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/StrategyInstaller.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/StrategyInstaller.java
index ded586a67..4cc10a28d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/StrategyInstaller.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/StrategyInstaller.java
@@ -29,6 +29,8 @@ import java.io.Serializable;
 public abstract class StrategyInstaller
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     protected final MappingRepository repos;
 
     /**
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueHandler.java
index 08223bfb1..b5224dff3 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueHandler.java
@@ -49,20 +49,20 @@ public interface ValueHandler
      * have to set this information if returning templates
      * @param adapt whether to adapt the mapping or schema
      */
-    public Column[] map(ValueMapping vm, String name, ColumnIO io,
+    Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt);
 
     /**
      * Return whether the values managed by this handler can be used in
      * state image versioning.
      */
-    public boolean isVersionable(ValueMapping vm);
+    boolean isVersionable(ValueMapping vm);
 
     /**
      * Return whether this handler potentially must load extra data to extract
      * the object value from its datastore representation.
      */
-    public boolean objectValueRequiresLoad(ValueMapping vm);
+    boolean objectValueRequiresLoad(ValueMapping vm);
 
     /**
      * Return the argument to pass to the result set when loading data
@@ -70,7 +70,7 @@ public interface ValueHandler
      * occupies multiple columns, return an array with one element per
      * column. You may return null if all array elements would be null.
      */
-    public Object getResultArgument(ValueMapping vm);
+    Object getResultArgument(ValueMapping vm);
 
     /**
      * Translate the given value to its datastore equivalent. If this value
@@ -78,7 +78,7 @@ public interface ValueHandler
      * per column. For relation id columns, return the state manager
      * the column depends on.
      */
-    public Object toDataStoreValue(ValueMapping vm, Object val,
+    Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store);
 
     /**
@@ -87,7 +87,7 @@ public interface ValueHandler
      * array with one entry per column. This method is only called if
      * {@link #objectValueRequiresLoad} returns false.
      */
-    public Object toObjectValue(ValueMapping vm, Object val);
+    Object toObjectValue(ValueMapping vm, Object val);
 
     /**
      * Translate the given datastore value into its Java equivalent. If
@@ -98,7 +98,7 @@ public interface ValueHandler
      * @param sm the state manager that owns the value; may be null if
      * loading a projection
      */
-    public Object toObjectValue(ValueMapping vm, Object val,
+    Object toObjectValue(ValueMapping vm, Object val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch)
         throws SQLException;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMapping.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMapping.java
index 10b3dcc96..3c0046692 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMapping.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMapping.java
@@ -44,139 +44,139 @@ public interface ValueMapping
     /**
      * Standard forward join.
      */
-    public static final int JOIN_FORWARD = 0;
+    int JOIN_FORWARD = 0;
 
     /**
      * Inverse join.
      */
-    public static final int JOIN_INVERSE = 1;
+    int JOIN_INVERSE = 1;
 
     /**
      * Inverse join that is marked up as a forward join because the
      * backing mapping expects an inverse direction.
      */
-    public static final int JOIN_EXPECTED_INVERSE = 2;
+    int JOIN_EXPECTED_INVERSE = 2;
 
     /**
      * A fully polymorphic relation (the default).
      */
-    public static final int POLY_TRUE = 0;
+    int POLY_TRUE = 0;
 
     /**
      * A non-polymorphic relation.
      */
-    public static final int POLY_FALSE = 1;
+    int POLY_FALSE = 1;
 
     /**
      * A relation that can hold any joinable subclass type.
      */
-    public static final int POLY_JOINABLE = 2;
+    int POLY_JOINABLE = 2;
 
     /**
      * Raw mapping data.
      */
-    public ValueMappingInfo getValueInfo();
+    ValueMappingInfo getValueInfo();
 
     /**
      * The handler used for this value, or null if none.
      */
-    public ValueHandler getHandler();
+    ValueHandler getHandler();
 
     /**
      * The handler used for this value, or null if none.
      */
-    public void setHandler(ValueHandler handler);
+    void setHandler(ValueHandler handler);
 
     /**
      * Convenience method to perform cast from
      * {@link ValueMetaData#getRepository}.
      */
-    public MappingRepository getMappingRepository();
+    MappingRepository getMappingRepository();
 
     /**
      * Convenience method to perform cast from
      * {@link ValueMetaData#getFieldMetaData}.
      */
-    public FieldMapping getFieldMapping();
+    FieldMapping getFieldMapping();
 
     /**
      * Convenience method to perform cast from
      * {@link ValueMetaData#getTypeMetaData}.
      */
-    public ClassMapping getTypeMapping();
+    ClassMapping getTypeMapping();
 
     /**
      * Convenience method to perform cast from
      * {@link ValueMetaData#getDeclaredTypeMetaData}.
      */
-    public ClassMapping getDeclaredTypeMapping();
+    ClassMapping getDeclaredTypeMapping();
 
     /**
      * Convenience method to perform cast from
      * {@link ValueMetaData#getEmbeddedMetaData}.
      */
-    public ClassMapping getEmbeddedMapping();
+    ClassMapping getEmbeddedMapping();
 
     /**
      * Convenience method to perform cast from
      * {@link ValueMetaData#getValueMappedByMetaData}.
      */
-    public FieldMapping getValueMappedByMapping();
+    FieldMapping getValueMappedByMapping();
 
     /**
      * The columns that hold the data for this value.
      */
-    public Column[] getColumns();
+    Column[] getColumns();
 
     /**
      * The columns that hold the data for this value.
      */
-    public void setColumns(Column[] cols);
+    void setColumns(Column[] cols);
 
     /**
      * I/O information on the foreign key, or columns if this value doesn't
      * have a key.
      */
-    public ColumnIO getColumnIO();
+    ColumnIO getColumnIO();
 
     /**
      * I/O information on the foreign key, or columns if this value doesn't
      * have a key.
      */
-    public void setColumnIO(ColumnIO io);
+    void setColumnIO(ColumnIO io);
 
     /**
      * If this value joins to another record, the foreign key.
      */
-    public ForeignKey getForeignKey();
+    ForeignKey getForeignKey();
 
     /**
      * Return an equivalent of this value's foreign key, but joining to the
      * given target, which may be an unjoined subclass of this value's
      * related type.
      */
-    public ForeignKey getForeignKey(ClassMapping target);
+    ForeignKey getForeignKey(ClassMapping target);
 
     /**
      * If this value joins to another record, the foreign key.
      */
-    public void setForeignKey(ForeignKey fk);
+    void setForeignKey(ForeignKey fk);
 
     /**
      * The join direction.
      */
-    public int getJoinDirection();
+    int getJoinDirection();
 
     /**
      * The join direction.
      */
-    public void setJoinDirection(int direction);
+    void setJoinDirection(int direction);
 
     /**
      * Sets this value's foreign key to the given related object. The object
      * may be null.
      */
-    public void setForeignKey(Row row, OpenJPAStateManager rel)
+    void setForeignKey(Row row, OpenJPAStateManager rel)
         throws SQLException;
 
     /**
@@ -184,14 +184,14 @@ public interface ValueMapping
      * may be null. If the object is one of2or more foreign keys with the
      * same target, the targetNumber specifies the one to set.
      */
-    public void setForeignKey(Row row, OpenJPAStateManager rel, int targetNumber)
+    void setForeignKey(Row row, OpenJPAStateManager rel, int targetNumber)
         throws SQLException;
 
     /**
      * Sets this value's foreign key to the given related object. The object
      * may be null.
      */
-    public void whereForeignKey(Row row, OpenJPAStateManager rel)
+    void whereForeignKey(Row row, OpenJPAStateManager rel)
         throws SQLException;
 
     /**
@@ -199,7 +199,7 @@ public interface ValueMapping
      * on whether this value is polymorphic and how the related type is mapped.
      * Return an empty array if value type is not PC.
      */
-    public ClassMapping[] getIndependentTypeMappings();
+    ClassMapping[] getIndependentTypeMappings();
 
     /**
      * Return the {@link org.apache.openjpa.sql.Select} subclasses constant
@@ -207,52 +207,52 @@ public interface ValueMapping
      * whether this relation is polymorphic, and whether it is configured to
      * use class criteria.
      */
-    public int getSelectSubclasses();
+    int getSelectSubclasses();
 
     /**
      * Unique constraint on this value's columns, or null if none.
      */
-    public Unique getValueUnique();
+    Unique getValueUnique();
 
     /**
      * Unique constraint on this value's columns, or null if none.
      */
-    public void setValueUnique(Unique unq);
+    void setValueUnique(Unique unq);
 
     /**
      * Index on this value's columns, or null if none.
      */
-    public Index getValueIndex();
+    Index getValueIndex();
 
     /**
      * Index on this value's columns, or null if none.
      */
-    public void setValueIndex(Index idx);
+    void setValueIndex(Index idx);
 
     /**
      * Whether to use class criteria when joining to related type.
      */
-    public boolean getUseClassCriteria();
+    boolean getUseClassCriteria();
 
     /**
      * Whether to use class criteria when joining to related type.
      */
-    public void setUseClassCriteria(boolean criteria);
+    void setUseClassCriteria(boolean criteria);
 
     /**
      * The degree to which this relation is polymorphic.
      */
-    public int getPolymorphic();
+    int getPolymorphic();
 
     /**
      * The degree to which this relation is polymorphic.
      */
-    public void setPolymorphic(int polymorphic);
+    void setPolymorphic(int polymorphic);
 
     /**
      * Increase the reference count on used schema components.
      */
-    public void refSchemaComponents();
+    void refSchemaComponents();
 
     /**
      * Map indexes and constraints for this value, using the current
@@ -260,27 +260,27 @@ public interface ValueMapping
      * must be set before calling this method.
      * @deprecated
      */
-    public void mapConstraints(String name, boolean adapt);
+    @Deprecated void mapConstraints(String name, boolean adapt);
 
     /**
      * Map indexes and constraints for this value, using the current
      * {@link ValueMappingInfo}. The foreign key or columns of this value
      * must be set before calling this method.
      */
-    public void mapConstraints(DBIdentifier name, boolean adapt);
+    void mapConstraints(DBIdentifier name, boolean adapt);
 
     /**
      * Clear mapping information, including strategy.
      */
-    public void clearMapping();
+    void clearMapping();
 
     /**
      * Update {@link MappingInfo} with our current mapping information.
      */
-    public void syncMappingInfo();
+    void syncMappingInfo();
 
     /**
      * Copy mapping info from the given instance to this one.
      */
-    public void copyMappingInfo(ValueMapping vm);
+    void copyMappingInfo(ValueMapping vm);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java
index f1c2f4b93..9fe8173b3 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingImpl.java
@@ -46,7 +46,6 @@ import org.apache.openjpa.util.MetaDataException;
  * @author Abe White
  * @since 0.4.0
  */
-@SuppressWarnings("serial")
 public class ValueMappingImpl
     extends ValueMetaDataImpl
     implements ValueMapping {
@@ -87,42 +86,52 @@ public class ValueMappingImpl
         super();
     }
 
+    @Override
     public ValueMappingInfo getValueInfo() {
         return _info;
     }
 
+    @Override
     public ValueHandler getHandler() {
         return _handler;
     }
 
+    @Override
     public void setHandler(ValueHandler handler) {
         _handler = handler;
     }
 
+    @Override
     public MappingRepository getMappingRepository() {
         return (MappingRepository) getRepository();
     }
 
+    @Override
     public FieldMapping getFieldMapping() {
         return (FieldMapping) getFieldMetaData();
     }
 
+    @Override
     public ClassMapping getTypeMapping() {
         return (ClassMapping) getTypeMetaData();
     }
 
+    @Override
     public ClassMapping getDeclaredTypeMapping() {
         return (ClassMapping) getDeclaredTypeMetaData();
     }
 
+    @Override
     public ClassMapping getEmbeddedMapping() {
         return (ClassMapping) getEmbeddedMetaData();
     }
 
+    @Override
     public FieldMapping getValueMappedByMapping() {
         return (FieldMapping) getValueMappedByMetaData();
     }
 
+    @Override
     public Column[] getColumns() {
         if (_cols.length != 0)
             return _cols;
@@ -133,28 +142,33 @@ public class ValueMappingImpl
         return _cols;
     }
 
+    @Override
     public void setColumns(Column[] cols) {
         if (cols == null)
             cols = Schemas.EMPTY_COLUMNS;
         _cols = cols;
     }
 
+    @Override
     public ColumnIO getColumnIO() {
         if (_cols.length == 0 && _fk == null && getValueMappedBy() != null)
             return getValueMappedByMapping().getColumnIO();
         return (_io == null) ? ColumnIO.UNRESTRICTED : _io;
     }
 
+    @Override
     public void setColumnIO(ColumnIO io) {
         _io = io;
     }
 
+    @Override
     public ForeignKey getForeignKey() {
         if (_fk == null && getValueMappedBy() != null)
             return getValueMappedByMapping().getForeignKey();
         return _fk;
     }
 
+    @Override
     public void setForeignKey(ForeignKey fk) {
         _fk = fk;
         if (fk == null)
@@ -196,7 +210,7 @@ public class ValueMappingImpl
                 if (cachedFK != null)
                     return (ForeignKey) cachedFK;
             } else
-                _targetFKs = new HashMap<ClassMapping, ForeignKey>();
+                _targetFKs = new HashMap<>();
 
             ForeignKey newfk = (_join == JOIN_FORWARD)
                 ? newForwardForeignKey(target) : newInverseForeignKey(target);
@@ -204,6 +218,7 @@ public class ValueMappingImpl
             return newfk;
         }
     }
+    @Override
     public ForeignKey getForeignKey(ClassMapping target) {
         return getForeignKey(target, 0);
     }
@@ -321,16 +336,19 @@ public class ValueMappingImpl
         return mapped.getForeignKey();
     }
 
+    @Override
     public int getJoinDirection() {
         if (_fk == null && getValueMappedBy() != null)
             return getValueMappedByMapping().getJoinDirection();
         return _join;
     }
 
+    @Override
     public void setJoinDirection(int direction) {
         _join = direction;
     }
 
+    @Override
     public void setForeignKey(Row row, OpenJPAStateManager rel, int targetNumber)
         throws SQLException {
         if (rel != null) {
@@ -349,11 +367,13 @@ public class ValueMappingImpl
             }
         }
     }
+    @Override
     public void setForeignKey(Row row, OpenJPAStateManager rel)
         throws SQLException {
         setForeignKey(row, rel, 0);
     }
 
+    @Override
     public void whereForeignKey(Row row, OpenJPAStateManager rel)
         throws SQLException {
         if (rel != null)
@@ -366,6 +386,7 @@ public class ValueMappingImpl
                 row.whereNull(_cols[i]);
     }
 
+    @Override
     public ClassMapping[] getIndependentTypeMappings() {
         ClassMapping rel = getTypeMapping();
         if (rel == null)
@@ -380,6 +401,7 @@ public class ValueMappingImpl
         return rel.getIndependentAssignableMappings();
     }
 
+    @Override
     public int getSelectSubclasses() {
         ClassMapping rel = getTypeMapping();
         if (rel == null || !rel.isMapped())
@@ -401,40 +423,49 @@ public class ValueMappingImpl
         }
     }
 
+    @Override
     public Unique getValueUnique() {
         return _unq;
     }
 
+    @Override
     public void setValueUnique(Unique unq) {
         _unq = unq;
     }
 
+    @Override
     public Index getValueIndex() {
         return _idx;
     }
 
+    @Override
     public void setValueIndex(Index idx) {
         _idx = idx;
     }
 
+    @Override
     public boolean getUseClassCriteria() {
         if (_fk == null && getValueMappedBy() != null)
             return getValueMappedByMapping().getUseClassCriteria();
         return _criteria;
     }
 
+    @Override
     public void setUseClassCriteria(boolean criteria) {
         _criteria = criteria;
     }
 
+    @Override
     public int getPolymorphic() {
         return _poly;
     }
 
+    @Override
     public void setPolymorphic(int poly) {
         _poly = poly;
     }
 
+    @Override
     public void refSchemaComponents() {
         for (int i = 0; i < _cols.length; i++)
             _cols[i].ref();
@@ -451,15 +482,19 @@ public class ValueMappingImpl
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public void mapConstraints(String name, boolean adapt) {
         mapConstraints(DBIdentifier.newConstraint(name), adapt);
     }
 
+    @Override
     public void mapConstraints(DBIdentifier name, boolean adapt) {
         _unq = _info.getUnique(this, name, adapt);
         _idx = _info.getIndex(this, name, adapt);
     }
 
+    @Override
     public void clearMapping() {
         _handler = null;
         _cols = Schemas.EMPTY_COLUMNS;
@@ -471,6 +506,7 @@ public class ValueMappingImpl
         setResolve(MODE_MAPPING | MODE_MAPPING_INIT, false);
     }
 
+    @Override
     public void syncMappingInfo() {
         if (getValueMappedBy() != null)
             _info.clear();
@@ -482,11 +518,13 @@ public class ValueMappingImpl
         }
     }
 
+    @Override
     public void copy(ValueMetaData vmd) {
         super.copy(vmd);
         copyMappingInfo((ValueMapping)vmd);
     }
 
+    @Override
     public void copyMappingInfo(ValueMapping vm) {
         setValueMappedBy(vm.getValueMappedBy());
         setPolymorphic(vm.getPolymorphic());
@@ -502,6 +540,7 @@ public class ValueMappingImpl
         }
     }
 
+    @Override
     public boolean resolve(int mode) {
         int cur = getResolve();
         if (super.resolve(mode))
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingInfo.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingInfo.java
index 1ed38045d..8ce42df30 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingInfo.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ValueMappingInfo.java
@@ -41,9 +41,8 @@ import org.apache.openjpa.util.MetaDataException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class ValueMappingInfo
-    extends MappingInfo {
+public class ValueMappingInfo extends MappingInfo {
+    private static final long serialVersionUID = 1L;
 
     private static final Localizer _loc = Localizer.forPackage
         (ValueMappingInfo.class);
@@ -87,6 +86,7 @@ public class ValueMappingInfo
      * @param inversable whether an inverse join is allowed
      * @deprecated
      */
+    @Deprecated
     public ForeignKey getTypeJoin(final ValueMapping val, final String name,
         boolean inversable, boolean adapt) {
         return getTypeJoin(val, DBIdentifier.newForeignKey(name), inversable, adapt);
@@ -99,11 +99,13 @@ public class ValueMappingInfo
             return null;
 
         ForeignKeyDefaults def = new ForeignKeyDefaults() {
+            @Override
             public ForeignKey get(Table local, Table foreign, boolean inverse) {
                 return val.getMappingRepository().getMappingDefaults().
                     getForeignKey(val, name, local, foreign, inverse);
             }
 
+            @Override
             public void populate(Table local, Table foreign, Column col,
                 Object target, boolean inverse, int pos, int cols) {
                 val.getMappingRepository().getMappingDefaults().
@@ -133,6 +135,7 @@ public class ValueMappingInfo
      * Return the join from the related type to this value.
      * @deprecated
      */
+    @Deprecated
     public ForeignKey getInverseTypeJoin(final ValueMapping val,
         final String name, boolean adapt) {
         return getInverseTypeJoin(val, DBIdentifier.newForeignKey(name), adapt);
@@ -145,11 +148,13 @@ public class ValueMappingInfo
             return null;
 
         ForeignKeyDefaults def = new ForeignKeyDefaults() {
+            @Override
             public ForeignKey get(Table local, Table foreign, boolean inverse) {
                 return val.getMappingRepository().getMappingDefaults().
                     getForeignKey(val, name, local, foreign, !inverse);
             }
 
+            @Override
             public void populate(Table local, Table foreign, Column col,
                 Object target, boolean inverse, int pos, int cols) {
                 val.getMappingRepository().getMappingDefaults().
@@ -165,6 +170,7 @@ public class ValueMappingInfo
      * Return the columns for this value, based on the given templates.
      * @deprecated
      */
+    @Deprecated
     public Column[] getColumns(ValueMapping val, String name,
         Column[] tmplates, Table table, boolean adapt) {
         return getColumns(val, DBIdentifier.newColumn(name), tmplates, table, adapt);
@@ -191,7 +197,7 @@ public class ValueMappingInfo
             return;
 
         int pos = 0;
-        Column cur = (Column) cols.get(0);
+        Column cur = cols.get(0);
         Column next;
         for (int i = 0; i < cols.size(); i++) {
             if (cur.getTargetField() == null)
@@ -202,7 +208,7 @@ public class ValueMappingInfo
                 throw new MetaDataException(_loc.get("bad-targetfield",
                     val, cur.getTargetField()));
 
-            next = (Column) cols.get(pos);
+            next = cols.get(pos);
             cols.set(pos, cur);
             cur = next;
         }
@@ -222,6 +228,7 @@ public class ValueMappingInfo
      * Return a unique constraint for the given columns, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Unique getUnique(ValueMapping val, String name, boolean adapt) {
         return getUnique(val, DBIdentifier.newConstraint(name), adapt);
     }
@@ -240,6 +247,7 @@ public class ValueMappingInfo
      * Return an index for the given columns, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Index getIndex(ValueMapping val, String name, boolean adapt) {
         return getIndex(val, DBIdentifier.newIndex(name), adapt);
     }
@@ -258,6 +266,7 @@ public class ValueMappingInfo
      * Return the null indicator column for this value, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Column getNullIndicatorColumn(ValueMapping val, String name,
         Table table, boolean adapt) {
         return getNullIndicatorColumn(val, DBIdentifier.newColumn(name), table, adapt);
@@ -351,6 +360,7 @@ public class ValueMappingInfo
         }
     }
 
+    @Override
     protected void clear(boolean canFlags) {
         super.clear(canFlags);
         if (canFlags) {
@@ -359,6 +369,7 @@ public class ValueMappingInfo
         }
     }
 
+    @Override
     public void copy(MappingInfo info) {
         super.copy(info);
         if (!(info instanceof ValueMappingInfo))
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Version.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Version.java
index 1c944d0b1..f045470dd 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Version.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/Version.java
@@ -46,6 +46,9 @@ import org.apache.openjpa.util.InternalException;
 public class Version
     implements VersionStrategy, MetaDataContext, MetaDataModes {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(Version.class);
 
     private final ClassMapping _mapping;
@@ -65,6 +68,7 @@ public class Version
         _info = getMappingRepository().newMappingInfo(this);
     }
 
+    @Override
     public MetaDataRepository getRepository() {
         return _mapping.getRepository();
     }
@@ -277,88 +281,107 @@ public class Version
     // VersionStrategy implementation
     //////////////////////////////////
 
+    @Override
     public String getAlias() {
         return assertStrategy().getAlias();
     }
 
+    @Override
     public void map(boolean adapt) {
         assertStrategy().map(adapt);
     }
 
+    @Override
     public void initialize() {
         assertStrategy().initialize();
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().insert(sm, store, rm);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().update(sm, store, rm);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         assertStrategy().delete(sm, store, rm);
     }
 
+    @Override
     public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomInsert(sm, store);
     }
 
+    @Override
     public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomUpdate(sm, store);
     }
 
+    @Override
     public Boolean isCustomDelete(OpenJPAStateManager sm, JDBCStore store) {
         return assertStrategy().isCustomDelete(sm, store);
     }
 
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customInsert(sm, store);
     }
 
+    @Override
     public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customUpdate(sm, store);
     }
 
+    @Override
     public void customDelete(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         assertStrategy().customDelete(sm, store);
     }
 
+    @Override
     public void setVersion(Version owner) {
         assertStrategy().setVersion(owner);
     }
 
+    @Override
     public boolean select(Select sel, ClassMapping mapping) {
         return assertStrategy().select(sel, mapping);
     }
 
+    @Override
     public Object load(OpenJPAStateManager sm, JDBCStore store, Result res)
         throws SQLException {
         return assertStrategy().load(sm, store, res);
     }
 
+    @Override
     public Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
         throws SQLException {
         return assertStrategy().load(sm, store, res, joins);
     }
 
+    @Override
     public void afterLoad(OpenJPAStateManager sm, JDBCStore store) {
         assertStrategy().afterLoad(sm, store);
     }
 
+    @Override
     public boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
         boolean updateVersion)
         throws SQLException {
         return assertStrategy().checkVersion(sm, store, updateVersion);
     }
 
+    @Override
     public int compareVersion(Object v1, Object v2) {
         return assertStrategy().compareVersion(v1, v2);
     }
@@ -369,6 +392,7 @@ public class Version
         return _strategy;
     }
 
+    @Override
     public String toString() {
         return _mapping + "<version>";
     }
@@ -379,6 +403,7 @@ public class Version
      *
      * @since 1.0.0
      */
+    @Override
     public Map<Column,?> getBulkUpdateValues() {
         return _strategy.getBulkUpdateValues();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java
index be744dfc2..b138f1424 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java
@@ -47,6 +47,8 @@ import org.apache.openjpa.util.UserException;
 public class VersionMappingInfo
     extends MappingInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
     	(VersionMappingInfo.class);
     /**
@@ -71,8 +73,7 @@ public class VersionMappingInfo
     	Table primaryTable = vers.getClassMapping().getTable();
     	List<DBIdentifier> secondaryTableNames = Arrays.asList(vers
                 .getClassMapping().getMappingInfo().getSecondaryTableIdentifiers());
-        Map<Table, List<Column>> assign = new LinkedHashMap<Table,
-                List<Column>>();
+        Map<Table, List<Column>> assign = new LinkedHashMap<>();
     	for (Column col : templates) {
     	    DBIdentifier tableName = col.getTableIdentifier();
     	    Table table;
@@ -90,7 +91,7 @@ public class VersionMappingInfo
     		assign.get(table).add(col);
     	}
     	MappingDefaults def = vers.getMappingRepository().getMappingDefaults();
-    	List<Column> result = new ArrayList<Column>();
+    	List<Column> result = new ArrayList<>();
 
         Set<Map.Entry<Table,List<Column>>> assignSet = assign.entrySet();
         for (Map.Entry<Table,List<Column>> assignEntry : assignSet) {
@@ -150,7 +151,7 @@ public class VersionMappingInfo
     boolean spansMultipleTables(Column[] cols) {
     	if (cols == null || cols.length <= 1)
     		return false;
-    	Set<DBIdentifier> tables = new HashSet<DBIdentifier>();
+    	Set<DBIdentifier> tables = new HashSet<>();
     	for (Column col : cols)
     		if (tables.add(col.getTableIdentifier()) && tables.size() > 1)
     			return true;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionStrategy.java
index ce1dc1a8b..f1cbf5a24 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionStrategy.java
@@ -40,7 +40,7 @@ public interface VersionStrategy
     /**
      * Set the version that uses this strategy. This will be called before use.
      */
-    public void setVersion(Version owner);
+    void setVersion(Version owner);
 
     /**
      * Select the data for this indicator.
@@ -49,25 +49,25 @@ public interface VersionStrategy
      * not be the base class in the inheritance hierarchy
      * @return true if anything was selected; false otherwise
      */
-    public boolean select(Select sel, ClassMapping mapping);
+    boolean select(Select sel, ClassMapping mapping);
 
     /**
      * Load data.
      */
-    public Object load(OpenJPAStateManager sm, JDBCStore store, Result res)
+    Object load(OpenJPAStateManager sm, JDBCStore store, Result res)
         throws SQLException;
 
     /**
      * Load data.
      */
-    public Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
+    Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
         throws SQLException;
 
     /**
      * This method is called after data is loaded into the instance, in
      * case the version indicator works off of a state image.
      */
-    public void afterLoad(OpenJPAStateManager sm, JDBCStore store);
+    void afterLoad(OpenJPAStateManager sm, JDBCStore store);
 
     /**
      * Checks the version of the given state manager with the version
@@ -75,14 +75,14 @@ public interface VersionStrategy
      *
      * @return true if the in-memory version was up-to-date, false otherwise
      */
-    public boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
+    boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
         boolean updateVersion)
         throws SQLException;
 
     /**
      * @see StoreManager#compareVersion
      */
-    public int compareVersion(Object v1, Object v2);
+    int compareVersion(Object v1, Object v2);
 
     /**
      * @return a Map<Column,Object> specifying how to update each version
@@ -90,5 +90,5 @@ public interface VersionStrategy
      *
      * @since 1.0.0
      */
-    public Map<Column,?> getBulkUpdateValues();
+    Map<Column,?> getBulkUpdateValues();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractClassStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractClassStrategy.java
index 91eee79c2..9799cb4ad 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractClassStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractClassStrategy.java
@@ -40,40 +40,49 @@ public abstract class AbstractClassStrategy
     extends AbstractStrategy
     implements ClassStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     /**
      * The owning class mapping.
      */
     protected ClassMapping cls = null;
 
+    @Override
     public void setClassMapping(ClassMapping owner) {
         cls = owner;
     }
 
+    @Override
     public boolean isPrimaryKeyObjectId(boolean hasAll) {
         return false;
     }
 
+    @Override
     public Joins joinSuperclass(Joins joins, boolean toThis) {
         return joins;
     }
 
+    @Override
     public boolean supportsEagerSelect(Select sel, OpenJPAStateManager sm,
         JDBCStore store, ClassMapping base, JDBCFetchConfiguration fetch) {
         return true;
     }
 
+    @Override
     public ResultObjectProvider customLoad(JDBCStore store, boolean subclasses,
         JDBCFetchConfiguration fetch, long startIdx, long endIdx)
         throws SQLException {
         return null;
     }
 
+    @Override
     public boolean customLoad(OpenJPAStateManager sm, JDBCStore store,
         PCState state, JDBCFetchConfiguration fetch)
         throws SQLException, ClassNotFoundException {
         return false;
     }
 
+    @Override
     public boolean customLoad(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result result)
         throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractDiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractDiscriminatorStrategy.java
index 87cb44bbe..0761b5a8e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractDiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractDiscriminatorStrategy.java
@@ -41,6 +41,9 @@ public abstract class AbstractDiscriminatorStrategy
     extends AbstractStrategy
     implements DiscriminatorStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (AbstractDiscriminatorStrategy.class);
 
@@ -54,12 +57,14 @@ public abstract class AbstractDiscriminatorStrategy
      */
     protected boolean isFinal = false;
 
+    @Override
     public void setDiscriminator(Discriminator owner) {
         disc = owner;
         ClassMapping cls = disc.getClassMapping();
         isFinal = Modifier.isFinal(cls.getDescribedType().getModifiers());
     }
 
+    @Override
     public boolean select(Select sel, ClassMapping mapping) {
         return false;
     }
@@ -68,6 +73,7 @@ public abstract class AbstractDiscriminatorStrategy
      * By default, logs a warning that this discriminator cannot calculate
      * its list of subclasses on its own.
      */
+    @Override
     public void loadSubclasses(JDBCStore store)
         throws SQLException, ClassNotFoundException {
         if (!isFinal) {
@@ -80,15 +86,18 @@ public abstract class AbstractDiscriminatorStrategy
         disc.setSubclassesLoaded(true);
     }
 
+    @Override
     public Class getClass(JDBCStore store, ClassMapping base, Result result)
         throws SQLException, ClassNotFoundException {
         return base.getDescribedType();
     }
 
+    @Override
     public boolean hasClassConditions(ClassMapping base, boolean subs) {
         return false;
     }
 
+    @Override
     public SQLBuffer getClassConditions(Select sel, Joins joins,
         ClassMapping base, boolean subs) {
         return null;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractFieldStrategy.java
index 6b0ed509d..204176a2d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractFieldStrategy.java
@@ -43,6 +43,9 @@ public abstract class AbstractFieldStrategy
     extends AbstractStrategy
     implements FieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (AbstractFieldStrategy.class);
 
@@ -60,123 +63,150 @@ public abstract class AbstractFieldStrategy
                 getAlias()));
     }
 
+    @Override
     public void setFieldMapping(FieldMapping owner) {
         field = owner;
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         return 0;
     }
 
+    @Override
     public void selectEagerJoin(Select sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode) {
     }
 
+    @Override
     public void selectEagerParallel(SelectExecutor sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode) {
     }
 
+    @Override
     public boolean isEagerSelectToMany() {
         return false;
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
         return -1;
     }
 
+    @Override
     public Object loadEagerParallel(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object res)
         throws SQLException {
         return res;
     }
 
+    @Override
     public void loadEagerJoin(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException {
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return val;
     }
 
+    @Override
     public Object toKeyDataStoreValue(Object val, JDBCStore store) {
         return val;
     }
 
+    @Override
     public void appendIsEmpty(SQLBuffer sql, Select sel, Joins joins) {
         sql.append("1 <> 1");
     }
 
+    @Override
     public void appendIsNotEmpty(SQLBuffer sql, Select sel, Joins joins) {
         sql.append("1 = 1");
     }
 
+    @Override
     public void appendIsNull(SQLBuffer sql, Select sel, Joins joins) {
         sql.append("1 <> 1");
     }
 
+    @Override
     public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins) {
         sql.append("1 <> 1");
     }
 
+    @Override
     public void appendSize(SQLBuffer sql, Select sel, Joins joins) {
         sql.append("1");
     }
 
+    @Override
     public void appendIndex(SQLBuffer sql, Select sel, Joins joins) {
         sql.append("1");
     }
 
+    @Override
     public void appendType(SQLBuffer sql, Select sel, Joins joins) {
         sql.append("1");
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return joins;
     }
 
+    @Override
     public Joins joinKey(Joins joins, boolean forceOuter) {
         return joins;
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         return joins;
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         return joins;
     }
 
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
         return null;
     }
 
+    @Override
     public Object loadKeyProjection(JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
         return null;
     }
 
+    @Override
     public boolean isVersionable() {
         return false;
     }
 
+    @Override
     public void where(OpenJPAStateManager sm, JDBCStore store, RowManager rm,
         Object prevValue)
         throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractStrategy.java
index 115b91016..57d544015 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractStrategy.java
@@ -33,48 +33,63 @@ import org.apache.openjpa.kernel.OpenJPAStateManager;
 public abstract class AbstractStrategy
     implements Strategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public String getAlias() {
         return getClass().getName();
     }
 
+    @Override
     public void map(boolean adapt) {
     }
 
+    @Override
     public void initialize() {
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
     }
 
+    @Override
     public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store) {
         return Boolean.FALSE;
     }
 
+    @Override
     public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store) {
         return Boolean.FALSE;
     }
 
+    @Override
     public Boolean isCustomDelete(OpenJPAStateManager sm, JDBCStore store) {
         return Boolean.FALSE;
     }
 
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
     }
 
+    @Override
     public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
     }
 
+    @Override
     public void customDelete(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractValueHandler.java
index 06960f7d3..83b0fa2ad 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractValueHandler.java
@@ -32,27 +32,36 @@ import org.apache.openjpa.kernel.OpenJPAStateManager;
 public abstract class AbstractValueHandler
     implements ValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public boolean isVersionable(ValueMapping vm) {
         return false;
     }
 
+    @Override
     public boolean objectValueRequiresLoad(ValueMapping vm) {
         return false;
     }
 
+    @Override
     public Object getResultArgument(ValueMapping vm) {
         return null;
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         return val;
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val) {
         return val;
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch)
         throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
index 09654d96c..7123f5019 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
@@ -41,42 +41,52 @@ public abstract class AbstractVersionStrategy
     extends AbstractStrategy
     implements VersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     /**
      * The owning version.
      */
     protected Version vers = null;
 
+    @Override
     public void setVersion(Version owner) {
         vers = owner;
     }
 
+    @Override
     public boolean select(Select sel, ClassMapping mapping) {
         return false;
     }
 
+    @Override
     public Object load(OpenJPAStateManager sm, JDBCStore store, Result res)
         throws SQLException {
     	return null;
     }
 
+    @Override
     public Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
         throws SQLException {
         return null;
     }
 
+    @Override
     public void afterLoad(OpenJPAStateManager sm, JDBCStore store) {
     }
 
+    @Override
     public boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
         boolean updateVersion)
         throws SQLException {
         return !updateVersion;
     }
 
+    @Override
     public int compareVersion(Object v1, Object v2) {
         return StoreManager.VERSION_SAME;
     }
 
+    @Override
     public Map getBulkUpdateValues() {
         return Collections.EMPTY_MAP;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/BlobValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/BlobValueHandler.java
index d6fd9d7c4..ed76deb82 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/BlobValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/BlobValueHandler.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.meta.JavaTypes;
 public class BlobValueHandler
     extends AbstractValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final BlobValueHandler _instance = new BlobValueHandler();
 
     /**
@@ -44,6 +46,8 @@ public class BlobValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ByteArrayValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ByteArrayValueHandler.java
index b1e4e62a5..f760b947a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ByteArrayValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ByteArrayValueHandler.java
@@ -33,6 +33,8 @@ import org.apache.openjpa.jdbc.sql.DBDictionary;
 public class ByteArrayValueHandler
     extends AbstractValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final ByteArrayValueHandler _instance =
         new ByteArrayValueHandler();
 
@@ -46,6 +48,8 @@ public class ByteArrayValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -62,11 +66,13 @@ public class ByteArrayValueHandler
         return new Column[]{ col };
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         return PrimitiveWrapperArrays.toByteArray(val);
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val) {
         return PrimitiveWrapperArrays.toObjectValue(vm, (byte[]) val);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/CharArrayStreamValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/CharArrayStreamValueHandler.java
index bb5ac1745..a4463a908 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/CharArrayStreamValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/CharArrayStreamValueHandler.java
@@ -40,6 +40,8 @@ import org.apache.openjpa.util.StoreException;
 public class CharArrayStreamValueHandler
     extends AbstractValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final CharArrayStreamValueHandler _instance =
         new CharArrayStreamValueHandler();
 
@@ -53,6 +55,8 @@ public class CharArrayStreamValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -69,6 +73,7 @@ public class CharArrayStreamValueHandler
         return new Column[]{ col };
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         if (val == null)
@@ -77,6 +82,7 @@ public class CharArrayStreamValueHandler
         return new Sized(new CharArrayReader(chars), chars.length);
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val) {
         if (val == null)
             return null;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/CharArrayValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/CharArrayValueHandler.java
index ff11d5b60..9a82d699c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/CharArrayValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/CharArrayValueHandler.java
@@ -33,6 +33,8 @@ import org.apache.openjpa.meta.JavaTypes;
 public class CharArrayValueHandler
     extends AbstractValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final CharArrayValueHandler _instance =
         new CharArrayValueHandler();
 
@@ -46,6 +48,8 @@ public class CharArrayValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -61,12 +65,14 @@ public class CharArrayValueHandler
         return new Column[]{ col };
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         return (val == null) ? null
             : String.valueOf(PrimitiveWrapperArrays.toCharArray(val));
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val) {
         if (val == null)
             return null;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java
index 3166fbf78..1bbbb51c4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java
@@ -23,7 +23,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -32,6 +31,7 @@ import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 
 /**
@@ -42,29 +42,37 @@ import org.apache.openjpa.meta.JavaTypes;
 public class ClassNameDiscriminatorStrategy
     extends InValueDiscriminatorStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (ClassNameDiscriminatorStrategy.class);
 
     public static final String ALIAS = "class-name";
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     protected int getJavaType() {
         return JavaTypes.STRING;
     }
 
+    @Override
     protected Object getDiscriminatorValue(ClassMapping cls) {
         return cls.getDescribedType().getName();
     }
 
+    @Override
     protected Class getClass(Object val, JDBCStore store)
         throws ClassNotFoundException {
         ClassLoader loader = getClassLoader(store);
         return Class.forName((String) val, true, loader);
     }
 
+    @Override
     public void loadSubclasses(JDBCStore store)
         throws SQLException, ClassNotFoundException {
         if (isFinal) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClobValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClobValueHandler.java
index 0e21bf012..51f74fb4d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClobValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClobValueHandler.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.meta.JavaTypes;
 public class ClobValueHandler
     extends AbstractValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final ClobValueHandler _instance = new ClobValueHandler();
 
     /**
@@ -44,6 +46,8 @@ public class ClobValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
index fe69a7746..7af3be73f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
@@ -28,7 +28,6 @@ import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.VersionMappingInfo;
-import org.apache.openjpa.jdbc.meta.strats.AbstractVersionStrategy;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ColumnIO;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
@@ -39,6 +38,7 @@ import org.apache.openjpa.jdbc.sql.Result;
 import org.apache.openjpa.jdbc.sql.Row;
 import org.apache.openjpa.jdbc.sql.RowManager;
 import org.apache.openjpa.jdbc.sql.Select;
+import org.apache.openjpa.kernel.LockLevels;
 import org.apache.openjpa.kernel.MixedLockLevels;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StoreManager;
@@ -56,6 +56,8 @@ import org.apache.openjpa.util.MetaDataException;
 public abstract class ColumnVersionStrategy
     extends AbstractVersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (ColumnVersionStrategy.class);
 
@@ -136,6 +138,7 @@ public abstract class ColumnVersionStrategy
 		return total;
 	}
 
+    @Override
     public void map(boolean adapt) {
         ClassMapping cls = vers.getClassMapping();
         if (cls.getJoinablePCSuperclassMapping() != null
@@ -181,6 +184,7 @@ public abstract class ColumnVersionStrategy
         }
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Column[] cols = vers.getColumns();
@@ -198,6 +202,7 @@ public abstract class ColumnVersionStrategy
         sm.setNextVersion(nextVersion);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Column[] cols = vers.getColumns();
@@ -231,6 +236,7 @@ public abstract class ColumnVersionStrategy
             sm.setNextVersion(nextVersion);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Column[] cols = vers.getColumns();
@@ -255,16 +261,19 @@ public abstract class ColumnVersionStrategy
         }
     }
 
+    @Override
     public boolean select(Select sel, ClassMapping mapping) {
         sel.select(vers.getColumns());
         return true;
     }
 
+    @Override
     public Object load(OpenJPAStateManager sm, JDBCStore store, Result res)
         throws SQLException {
         return this.load(sm, store, res, null);
     }
 
+    @Override
     public Object load(OpenJPAStateManager sm, JDBCStore store, Result res, Joins joins)
         throws SQLException {
         // typically if one version column is in the result, they all are, so
@@ -284,6 +293,7 @@ public abstract class ColumnVersionStrategy
         return version;
     }
 
+    @Override
     public boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
         boolean updateVersion)
         throws SQLException {
@@ -296,7 +306,7 @@ public abstract class ColumnVersionStrategy
         JDBCFetchConfiguration fetch = store.getFetchConfiguration();
         if (!updateVersion && fetch.getReadLockLevel() >= MixedLockLevels.LOCK_PESSIMISTIC_READ) {
             fetch = (JDBCFetchConfiguration) fetch.clone();
-            fetch.setReadLockLevel(MixedLockLevels.LOCK_NONE);
+            fetch.setReadLockLevel(LockLevels.LOCK_NONE);
         }
         Result res = sel.execute(store, fetch);
         try {
@@ -315,6 +325,7 @@ public abstract class ColumnVersionStrategy
         }
     }
 
+    @Override
     public int compareVersion(Object v1, Object v2) {
         if (v1 == v2)
             return StoreManager.VERSION_SAME;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java
index b842ad824..51d2ca5db 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java
@@ -37,6 +37,9 @@ import org.apache.openjpa.jdbc.sql.Select;
 public abstract class ContainerFieldStrategy
     extends AbstractFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Return all independent mappings to which this strategy must join in
      * order to access collection elements, or empty array if none.
@@ -48,18 +51,22 @@ public abstract class ContainerFieldStrategy
     protected abstract ClassMapping[] getIndependentElementMappings
         (boolean traverse);
 
+    @Override
     public void appendIsEmpty(SQLBuffer sql, Select sel, Joins joins) {
         testEmpty(sql, sel, joins, true);
     }
 
+    @Override
     public void appendIsNotEmpty(SQLBuffer sql, Select sel, Joins joins) {
         testEmpty(sql, sel, joins, false);
     }
 
+    @Override
     public void appendIsNull(SQLBuffer sql, Select sel, Joins joins) {
         testEmpty(sql, sel, joins, true);
     }
 
+    @Override
     public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins) {
         testEmpty(sql, sel, joins, false);
     }
@@ -79,6 +86,7 @@ public abstract class ContainerFieldStrategy
 
     public abstract ForeignKey getJoinForeignKey();
 
+    @Override
     public void appendSize(SQLBuffer sql, Select sel, Joins joins) {
         DBDictionary dict = field.getMappingRepository().getDBDictionary();
         dict.assertSupport(dict.supportsSubselect, "SupportsSubselect");
@@ -91,6 +99,7 @@ public abstract class ContainerFieldStrategy
         appendJoinCount(sql, sel, joins, dict, field, fk);
     }
 
+    @Override
     public void appendIndex(SQLBuffer sql, Select sel, Joins joins) {
         sql.append(sel.getColumnAlias(field.getOrderColumn(),
             field.getName()));
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ElementEmbedValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ElementEmbedValueHandler.java
index 6a4e8beac..18d14439c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ElementEmbedValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ElementEmbedValueHandler.java
@@ -18,17 +18,24 @@
  */
 package org.apache.openjpa.jdbc.meta.strats;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.LinkedList;
 
-import org.apache.openjpa.lib.util.*;
-import org.apache.openjpa.kernel.*;
-import org.apache.openjpa.util.*;
-import org.apache.openjpa.jdbc.meta.*;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.kernel.*;
-import org.apache.openjpa.jdbc.schema.*;
+import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
+import org.apache.openjpa.jdbc.meta.Embeddable;
+import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.jdbc.meta.RelationId;
+import org.apache.openjpa.jdbc.meta.ValueMapping;
+import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.ColumnIO;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.util.InternalException;
 
 /**
  * <p>Handler for embedded objects as elements of a collection or map.  For
@@ -42,6 +49,9 @@ public class ElementEmbedValueHandler
     extends EmbedValueHandler
     implements RelationId {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (ElementEmbedValueHandler.class);
 
@@ -54,6 +64,8 @@ public class ElementEmbedValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -90,14 +102,17 @@ public class ElementEmbedValueHandler
         return _cols;
     }
 
+    @Override
     public boolean objectValueRequiresLoad(ValueMapping vm) {
         return true;
     }
 
+    @Override
     public Object getResultArgument(ValueMapping vm) {
         return _args;
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         OpenJPAStateManager em = store.getContext().getStateManager(val);
@@ -118,6 +133,7 @@ public class ElementEmbedValueHandler
         return super.toDataStoreValue(em, vm, store, _cols, rval, idx);
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch)
         throws SQLException {
@@ -148,6 +164,7 @@ public class ElementEmbedValueHandler
     // RelationId implementation
     /////////////////////////////
 
+    @Override
     public Object toRelationDataStoreValue(OpenJPAStateManager sm, Column col) {
         return toRelationDataStoreValue(sm, col, 0);
     }
@@ -178,7 +195,7 @@ public class ElementEmbedValueHandler
         FieldMapping[] fms = _vm.getEmbeddedMapping().getFieldMappings();
         Column[] cols;
         for (int i = idx; i < fms.length; i++) {
-            if (fms[i].getManagement() != FieldMapping.MANAGE_PERSISTENT)
+            if (fms[i].getManagement() != FieldMetaData.MANAGE_PERSISTENT)
                 continue;
             cols = ((Embeddable) fms[i]).getColumns();
             for (int j = 0; j < cols.length; j++)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedFieldStrategy.java
index 4a34f9999..ac86302cc 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedFieldStrategy.java
@@ -37,6 +37,7 @@ import java.util.Locale;
 
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.StateManager;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -66,6 +67,7 @@ import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FetchGroup;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.ValueMetaData;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
@@ -80,6 +82,8 @@ public class EmbedFieldStrategy
     extends AbstractFieldStrategy
     implements Embeddable {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final int INSERT = 0;
     private static final int UPDATE = 1;
     private static final int DELETE = 2;
@@ -89,6 +93,7 @@ public class EmbedFieldStrategy
 
     private boolean _synthetic = false;
 
+    @Override
     public void map(boolean adapt) {
         if (field.getEmbeddedMetaData() == null)
             throw new MetaDataException(_loc.get("not-embed", field));
@@ -109,7 +114,7 @@ public class EmbedFieldStrategy
 
         // before we map the null indicator column, we need to make sure our
         // value is mapped so we can tell whether the column is synthetic
-        field.getValueMapping().resolve(field.MODE_META | field.MODE_MAPPING);
+        field.getValueMapping().resolve(MetaDataModes.MODE_META | MetaDataModes.MODE_MAPPING);
         Column col = vinfo.getNullIndicatorColumn(field, field.getName(),
             field.getTable(), adapt);
         if (col != null) {
@@ -120,6 +125,7 @@ public class EmbedFieldStrategy
         field.mapPrimaryKey(adapt);
     }
 
+    @Override
     public void initialize() {
         Column[] cols = field.getColumns();
         if (cols.length != 1)
@@ -141,6 +147,7 @@ public class EmbedFieldStrategy
         }
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = field.getRow(sm, store, rm, Row.ACTION_INSERT);
@@ -177,6 +184,7 @@ public class EmbedFieldStrategy
             setNullIndicatorColumn(sm, row);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         OpenJPAStateManager em = store.getContext().getStateManager
@@ -232,6 +240,7 @@ public class EmbedFieldStrategy
             setNullIndicatorColumn(sm, row);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         OpenJPAStateManager em = null;
@@ -279,6 +288,7 @@ public class EmbedFieldStrategy
             row.setObject(col, val);
     }
 
+    @Override
     public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store) {
         OpenJPAStateManager em = sm.getContext().getStateManager(sm.fetchObject
             (field.getIndex()));
@@ -288,6 +298,7 @@ public class EmbedFieldStrategy
         return custom;
     }
 
+    @Override
     public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store) {
         OpenJPAStateManager em = sm.getContext().getStateManager(sm.fetchObject
             (field.getIndex()));
@@ -297,6 +308,7 @@ public class EmbedFieldStrategy
         return custom;
     }
 
+    @Override
     public Boolean isCustomDelete(OpenJPAStateManager sm, JDBCStore store) {
         OpenJPAStateManager em = sm.getContext().getStateManager(sm.fetchObject
             (field.getIndex()));
@@ -339,6 +351,7 @@ public class EmbedFieldStrategy
         return (hasCustom) ? Boolean.TRUE : Boolean.FALSE;
     }
 
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         OpenJPAStateManager em = store.getContext().getStateManager
@@ -351,6 +364,7 @@ public class EmbedFieldStrategy
                 fields[i].customInsert(em, store);
     }
 
+    @Override
     public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         OpenJPAStateManager em = store.getContext().getStateManager
@@ -365,6 +379,7 @@ public class EmbedFieldStrategy
                 fields[i].customUpdate(em, store);
     }
 
+    @Override
     public void customDelete(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         OpenJPAStateManager em = store.getContext().getStateManager
@@ -377,6 +392,7 @@ public class EmbedFieldStrategy
                 fields[i].customDelete(em, store);
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         if (type == Select.TYPE_JOINLESS && sel.isSelected(field.getTable()))
@@ -384,6 +400,7 @@ public class EmbedFieldStrategy
         return 0;
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
         Joins joins = field.join(sel);
@@ -392,12 +409,13 @@ public class EmbedFieldStrategy
         // limit eager mode to join b/c at this point the select has been
         // modified and an attempt to clone it for a to-many eager select can
         // result in a clone that produces invalid SQL
-        eagerMode = Math.min(eagerMode, JDBCFetchConfiguration.EAGER_JOIN);
-        sel.select(field.getEmbeddedMapping(), sel.SUBS_EXACT, store,
+        eagerMode = Math.min(eagerMode, EagerFetchModes.EAGER_JOIN);
+        sel.select(field.getEmbeddedMapping(), Select.SUBS_EXACT, store,
             fetch, eagerMode, joins);
         return 1;
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
@@ -432,7 +450,7 @@ public class EmbedFieldStrategy
         // configured fields if anything is missing.
         if (needsLoad &&
             fetch.requiresFetch(field.getFieldMetaData()) ==
-                JDBCFetchConfiguration.FETCH_LOAD) {
+                FetchConfiguration.FETCH_LOAD) {
           em.load(fetch);
         }
     }
@@ -548,15 +566,18 @@ public class EmbedFieldStrategy
         return Boolean.FALSE;
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         ClassMapping type = field.getTypeMapping();
         return type.toDataStoreValue(val, type.getPrimaryKeyColumns(), store);
     }
 
+    @Override
     public void appendIsNull(SQLBuffer sql, Select sel, Joins joins) {
         appendTestNull(sql, sel, joins, true);
     }
 
+    @Override
     public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins) {
         appendTestNull(sql, sel, joins, false);
     }
@@ -597,6 +618,7 @@ public class EmbedFieldStrategy
         sql.appendValue(val, cols[0]);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, false);
     }
@@ -604,6 +626,7 @@ public class EmbedFieldStrategy
     /**
      * Loading embed object without instantiating owner entity
      */
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
@@ -624,7 +647,7 @@ public class EmbedFieldStrategy
         // configured fields if anything is missing.
         if (needsLoad &&
             fetch.requiresFetch(field.getFieldMetaData()) ==
-                JDBCFetchConfiguration.FETCH_LOAD) {
+                FetchConfiguration.FETCH_LOAD) {
           em.load(fetch);
         }
 
@@ -635,27 +658,33 @@ public class EmbedFieldStrategy
     // Embeddable implementation
     /////////////////////////////
 
+    @Override
     public Column[] getColumns() {
         return field.getColumns();
     }
 
+    @Override
     public ColumnIO getColumnIO() {
         return field.getColumnIO();
     }
 
+    @Override
     public Object[] getResultArguments() {
         return null;
     }
 
+    @Override
     public Object toEmbeddedDataStoreValue(Object val, JDBCStore store) {
         return toDataStoreValue(val, store);
     }
 
+    @Override
     public Object toEmbeddedObjectValue(Object val) {
         //return UNSUPPORTED;
         return null;
     }
 
+    @Override
     public void loadEmbedded(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object val)
         throws SQLException {
@@ -696,86 +725,107 @@ public class EmbedFieldStrategy
             _vmd = vmd;
         }
 
+        @Override
         public void initialize(Class forType, PCState state) {
             throw new InternalException();
         }
 
+        @Override
         public void load(FetchConfiguration fetch) {
             throw new InternalException();
         }
 
+        @Override
         public boolean assignObjectId(boolean flush) {
             throw new InternalException();
         }
 
+        @Override
         public Object getManagedInstance() {
             return null;
         }
 
+        @Override
         public PersistenceCapable getPersistenceCapable() {
             return null;
         }
 
+        @Override
         public ClassMetaData getMetaData() {
             return _vmd.getEmbeddedMetaData();
         }
 
+        @Override
         public OpenJPAStateManager getOwner() {
             return _owner;
         }
 
+        @Override
         public int getOwnerIndex() {
             return _vmd.getFieldMetaData().getIndex();
         }
 
+        @Override
         public boolean isEmbedded() {
             return true;
         }
 
+        @Override
         public boolean isTransactional() {
             return true;
         }
 
+        @Override
         public boolean isPersistent() {
             return true;
         }
 
+        @Override
         public boolean isNew() {
             return _owner.isNew();
         }
 
+        @Override
         public boolean isDeleted() {
             return _owner.isDeleted();
         }
 
+        @Override
         public boolean isDetached() {
             return _owner.isDetached();
         }
 
+        @Override
         public boolean isVersionUpdateRequired() {
             return _owner.isVersionUpdateRequired();
         }
 
+        @Override
         public boolean isVersionCheckRequired() {
             return _owner.isVersionCheckRequired();
         }
 
+        @Override
         public boolean isDirty() {
             return true;
         }
 
+        @Override
         public boolean isFlushed() {
             return _owner.isFlushed();
         }
 
+        @Override
         public boolean isFlushedDirty() {
             return isFlushed();
         }
 
+        @Override
         public boolean isProvisional() {
             return _owner.isProvisional();
         }
 
+        @Override
         public BitSet getLoaded() {
             // consider everything loaded
             if (_full == null) {
@@ -787,6 +837,7 @@ public class EmbedFieldStrategy
             return _full;
         }
 
+        @Override
         public BitSet getDirty() {
             // consider everything dirty
             if (_full == null) {
@@ -798,290 +849,362 @@ public class EmbedFieldStrategy
             return _full;
         }
 
+        @Override
         public BitSet getFlushed() {
             return EMPTY_BITSET;
         }
 
+        @Override
         public BitSet getUnloaded(FetchConfiguration fetch) {
             throw new InternalException();
         }
 
+        @Override
         public Object newProxy(int field) {
             throw new InternalException();
         }
 
+        @Override
         public Object newFieldProxy(int field) {
             throw new InternalException();
         }
 
+        @Override
         public boolean isDefaultValue(int field) {
             return true;
         }
 
+        @Override
         public StoreContext getContext() {
             return _owner.getContext();
         }
 
+        @Override
         public Object getId() {
             return _owner.getId();
         }
 
+        @Override
         public Object getObjectId() {
             return _owner.getObjectId();
         }
 
+        @Override
         public void setObjectId(Object oid) {
             throw new InternalException();
         }
 
+        @Override
         public Object getLock() {
             return null;
         }
 
+        @Override
         public void setLock(Object lock) {
             throw new InternalException();
         }
 
+        @Override
         public Object getVersion() {
             return null;
         }
 
+        @Override
         public void setVersion(Object version) {
             throw new InternalException();
         }
 
+        @Override
         public void setNextVersion(Object version) {
             throw new InternalException();
         }
 
+        @Override
         public PCState getPCState() {
             return (_owner.isDeleted()) ? PCState.EDELETED : PCState.ECOPY;
         }
 
+        @Override
         public Object getImplData() {
             return null;
         }
 
+        @Override
         public Object setImplData(Object data, boolean cacheable) {
             throw new InternalException();
         }
 
+        @Override
         public boolean isImplDataCacheable() {
             return false;
         }
 
+        @Override
         public Object getImplData(int field) {
             return null;
         }
 
+        @Override
         public Object setImplData(int field, Object data) {
             throw new InternalException();
         }
 
+        @Override
         public boolean isImplDataCacheable(int field) {
             return false;
         }
 
+        @Override
         public Object getIntermediate(int field) {
             return null;
         }
 
+        @Override
         public void setIntermediate(int field, Object value) {
             throw new InternalException();
         }
 
+        @Override
         public boolean fetchBooleanField(int field) {
             return false;
         }
 
+        @Override
         public byte fetchByteField(int field) {
             return (byte) 0;
         }
 
+        @Override
         public char fetchCharField(int field) {
             return (char) 0;
         }
 
+        @Override
         public double fetchDoubleField(int field) {
             return 0D;
         }
 
+        @Override
         public float fetchFloatField(int field) {
             return 0F;
         }
 
+        @Override
         public int fetchIntField(int field) {
             return 0;
         }
 
+        @Override
         public long fetchLongField(int field) {
             return 0L;
         }
 
+        @Override
         public Object fetchObjectField(int field) {
             return null;
         }
 
+        @Override
         public short fetchShortField(int field) {
             return (short) 0;
         }
 
+        @Override
         public String fetchStringField(int field) {
             return null;
         }
 
+        @Override
         public Object fetchField(int field, boolean transitions) {
             return null;
         }
 
+        @Override
         public void storeBooleanField(int field, boolean externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeByteField(int field, byte externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeCharField(int field, char externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeDoubleField(int field, double externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeFloatField(int field, float externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeIntField(int field, int externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeLongField(int field, long externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeObjectField(int field, Object externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeShortField(int field, short externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeStringField(int field, String externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeField(int field, Object value) {
             throw new InternalException();
         }
 
+        @Override
         public boolean fetchBoolean(int field) {
             return false;
         }
 
+        @Override
         public byte fetchByte(int field) {
             return (byte) 0;
         }
 
+        @Override
         public char fetchChar(int field) {
             return (char) 0;
         }
 
+        @Override
         public double fetchDouble(int field) {
             return 0D;
         }
 
+        @Override
         public float fetchFloat(int field) {
             return 0F;
         }
 
+        @Override
         public int fetchInt(int field) {
             return 0;
         }
 
+        @Override
         public long fetchLong(int field) {
             return 0L;
         }
 
+        @Override
         public Object fetchObject(int field) {
             return null;
         }
 
+        @Override
         public short fetchShort(int field) {
             return (short) 0;
         }
 
+        @Override
         public String fetchString(int field) {
             return null;
         }
 
+        @Override
         public Object fetch(int field) {
             return null;
         }
 
+        @Override
         public void storeBoolean(int field, boolean externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeByte(int field, byte externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeChar(int field, char externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeDouble(int field, double externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeFloat(int field, float externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeInt(int field, int externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeLong(int field, long externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeObject(int field, Object externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeShort(int field, short externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void storeString(int field, String externalVal) {
             throw new InternalException();
         }
 
+        @Override
         public void store(int field, Object value) {
             throw new InternalException();
         }
 
+        @Override
         public Object fetchInitialField(int field) {
             throw new InternalException();
         }
 
+        @Override
         public void dirty(int field) {
             throw new InternalException();
         }
 
+        @Override
         public void removed(int field, Object removed, boolean key) {
             throw new InternalException();
         }
 
+        @Override
         public boolean beforeRefresh(boolean refreshAll) {
             throw new InternalException();
         }
 
+        @Override
         public void setRemote(int field, Object value) {
             throw new InternalException();
         }
@@ -1090,177 +1213,216 @@ public class EmbedFieldStrategy
         // StateManager implementation
         ///////////////////////////////
 
+        @Override
         public Object getPCPrimaryKey(Object oid, int field) {
             throw new InternalException();
         }
 
+        @Override
         public StateManager replaceStateManager(StateManager sm) {
             throw new InternalException();
         }
 
+        @Override
         public Object getGenericContext() {
             return getContext();
         }
 
+        @Override
         public void dirty(String field) {
             throw new InternalException();
         }
 
+        @Override
         public Object fetchObjectId() {
             return getObjectId();
         }
 
+        @Override
         public void accessingField(int field) {
         }
 
+        @Override
         public boolean serializing() {
             throw new InternalException();
         }
 
+        @Override
         public boolean writeDetached(ObjectOutput out) {
             throw new InternalException();
         }
 
+        @Override
         public void proxyDetachedDeserialized(int idx) {
             throw new InternalException();
         }
 
+        @Override
         public void settingBooleanField(PersistenceCapable pc, int field,
             boolean val1, boolean val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingCharField(PersistenceCapable pc, int field,
             char val1, char val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingByteField(PersistenceCapable pc, int field,
             byte val1, byte val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingShortField(PersistenceCapable pc, int field,
             short val1, short val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingIntField(PersistenceCapable pc, int field,
             int val1, int val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingLongField(PersistenceCapable pc, int field,
             long val1, long val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingFloatField(PersistenceCapable pc, int field,
             float val1, float val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingDoubleField(PersistenceCapable pc, int field,
             double val1, double val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingStringField(PersistenceCapable pc, int field,
             String val1, String val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void settingObjectField(PersistenceCapable pc, int field,
             Object val1, Object val2, int set) {
             throw new InternalException();
         }
 
+        @Override
         public void providedBooleanField(PersistenceCapable pc, int field,
             boolean val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedCharField(PersistenceCapable pc, int field,
             char val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedByteField(PersistenceCapable pc, int field,
             byte val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedShortField(PersistenceCapable pc, int field,
             short val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedIntField(PersistenceCapable pc, int field,
             int val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedLongField(PersistenceCapable pc, int field,
             long val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedFloatField(PersistenceCapable pc, int field,
             float val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedDoubleField(PersistenceCapable pc, int field,
             double val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedStringField(PersistenceCapable pc, int field,
             String val) {
             throw new InternalException();
         }
 
+        @Override
         public void providedObjectField(PersistenceCapable pc, int field,
             Object val) {
             throw new InternalException();
         }
 
+        @Override
         public boolean replaceBooleanField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public char replaceCharField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public byte replaceByteField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public short replaceShortField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public int replaceIntField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public long replaceLongField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public float replaceFloatField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public double replaceDoubleField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public String replaceStringField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
 
+        @Override
         public Object replaceObjectField(PersistenceCapable pc, int field) {
             throw new InternalException();
         }
@@ -1327,6 +1489,7 @@ public class EmbedFieldStrategy
             throw new InternalException();
         }
 
+        @Override
         public Row getRow(Table table, int action, OpenJPAStateManager sm,
             boolean create) {
             while (sm != null && sm.getOwner() != null)
@@ -1337,19 +1500,23 @@ public class EmbedFieldStrategy
             return new EmbeddedRow(_rm.getRow(table, action, sm, create));
         }
 
+        @Override
         public Row getSecondaryRow(Table table, int action) {
             return new EmbeddedRow(_rm.getSecondaryRow(table, action));
         }
 
+        @Override
         public void flushSecondaryRow(Row row)
             throws SQLException {
             _rm.flushSecondaryRow(((EmbeddedRow) row).getDelegate());
         }
 
+        @Override
         public Row getAllRows(Table table, int action) {
             return new EmbeddedRow(_rm.getAllRows(table, action));
         }
 
+        @Override
         public void flushAllRows(Row row)
             throws SQLException {
             _rm.flushAllRows(((EmbeddedRow) row).getDelegate());
@@ -1372,45 +1539,54 @@ public class EmbedFieldStrategy
             return _row;
         }
 
+        @Override
         public boolean isValid() {
             return _row.isValid();
         }
 
+        @Override
         public void setValid(boolean valid) {
             _row.setValid(valid);
         }
 
+        @Override
         public void setPrimaryKey(OpenJPAStateManager sm)
             throws SQLException {
             _row.setPrimaryKey(getOwner(sm));
         }
 
+        @Override
         public void setPrimaryKey(ColumnIO io, OpenJPAStateManager sm)
             throws SQLException {
             _row.setPrimaryKey(io, getOwner(sm));
         }
 
+        @Override
         public void wherePrimaryKey(OpenJPAStateManager sm)
             throws SQLException {
             _row.wherePrimaryKey(getOwner(sm));
         }
 
+        @Override
         public void setForeignKey(ForeignKey fk, OpenJPAStateManager sm)
             throws SQLException {
             _row.setForeignKey(fk, getOwner(sm));
         }
 
+        @Override
         public void setForeignKey(ForeignKey fk, ColumnIO io,
             OpenJPAStateManager sm)
             throws SQLException {
             _row.setForeignKey(fk, io, getOwner(sm));
         }
 
+        @Override
         public void whereForeignKey(ForeignKey fk, OpenJPAStateManager sm)
             throws SQLException {
             _row.whereForeignKey(fk, getOwner(sm));
         }
 
+        @Override
         public void setRelationId(Column col, OpenJPAStateManager sm,
             RelationId rel)
             throws SQLException {
@@ -1427,306 +1603,368 @@ public class EmbedFieldStrategy
         // Pass-through methods
         ////////////////////////
 
+        @Override
         public Table getTable() {
             return _row.getTable();
         }
 
+        @Override
         public int getAction() {
             return _row.getAction();
         }
 
+        @Override
         public Object getFailedObject() {
             return _row.getFailedObject();
         }
 
+        @Override
         public void setFailedObject(Object failed) {
             _row.setFailedObject(failed);
         }
 
+        @Override
         public OpenJPAStateManager getPrimaryKey() {
             return _row.getPrimaryKey();
         }
 
+        @Override
         public void setArray(Column col, Array val)
             throws SQLException {
             _row.setArray(col, val);
         }
 
+        @Override
         public void setAsciiStream(Column col, InputStream val, int length)
             throws SQLException {
             _row.setAsciiStream(col, val, length);
         }
 
+        @Override
         public void setBigDecimal(Column col, BigDecimal val)
             throws SQLException {
             _row.setBigDecimal(col, val);
         }
 
+        @Override
         public void setBigInteger(Column col, BigInteger val)
             throws SQLException {
             _row.setBigInteger(col, val);
         }
 
+        @Override
         public void setBinaryStream(Column col, InputStream val, int length)
             throws SQLException {
             _row.setBinaryStream(col, val, length);
         }
 
+        @Override
         public void setBlob(Column col, Blob val)
             throws SQLException {
             _row.setBlob(col, val);
         }
 
+        @Override
         public void setBoolean(Column col, boolean val)
             throws SQLException {
             _row.setBoolean(col, val);
         }
 
+        @Override
         public void setByte(Column col, byte val)
             throws SQLException {
             _row.setByte(col, val);
         }
 
+        @Override
         public void setBytes(Column col, byte[] val)
             throws SQLException {
             _row.setBytes(col, val);
         }
 
+        @Override
         public void setCalendar(Column col, Calendar val)
             throws SQLException {
             _row.setCalendar(col, val);
         }
 
+        @Override
         public void setChar(Column col, char val)
             throws SQLException {
             _row.setChar(col, val);
         }
 
+        @Override
         public void setCharacterStream(Column col, Reader val, int length)
             throws SQLException {
             _row.setCharacterStream(col, val, length);
         }
 
+        @Override
         public void setClob(Column col, Clob val)
             throws SQLException {
             _row.setClob(col, val);
         }
 
+        @Override
         public void setDate(Column col, Date val)
             throws SQLException {
             _row.setDate(col, val);
         }
 
+        @Override
         public void setDate(Column col, java.sql.Date val, Calendar cal)
             throws SQLException {
             _row.setDate(col, val, cal);
         }
 
+        @Override
         public void setDouble(Column col, double val)
             throws SQLException {
             _row.setDouble(col, val);
         }
 
+        @Override
         public void setFloat(Column col, float val)
             throws SQLException {
             _row.setFloat(col, val);
         }
 
+        @Override
         public void setInt(Column col, int val)
             throws SQLException {
             _row.setInt(col, val);
         }
 
+        @Override
         public void setLong(Column col, long val)
             throws SQLException {
             _row.setLong(col, val);
         }
 
+        @Override
         public void setLocale(Column col, Locale val)
             throws SQLException {
             _row.setLocale(col, val);
         }
 
+        @Override
         public void setNull(Column col)
             throws SQLException {
             _row.setNull(col);
         }
 
+        @Override
         public void setNull(Column col, boolean overrideDefault)
             throws SQLException {
             _row.setNull(col, overrideDefault);
         }
 
+        @Override
         public void setNumber(Column col, Number val)
             throws SQLException {
             _row.setNumber(col, val);
         }
 
+        @Override
         public void setObject(Column col, Object val)
             throws SQLException {
             _row.setObject(col, val);
         }
 
+        @Override
         public void setRaw(Column col, String val)
             throws SQLException {
             _row.setRaw(col, val);
         }
 
+        @Override
         public void setShort(Column col, short val)
             throws SQLException {
             _row.setShort(col, val);
         }
 
+        @Override
         public void setString(Column col, String val)
             throws SQLException {
             _row.setString(col, val);
         }
 
+        @Override
         public void setTime(Column col, Time val, Calendar cal)
             throws SQLException {
             _row.setTime(col, val, cal);
         }
 
+        @Override
         public void setTimestamp(Column col, Timestamp val, Calendar cal)
             throws SQLException {
             _row.setTimestamp(col, val, cal);
         }
 
+        @Override
         public void whereArray(Column col, Array val)
             throws SQLException {
             _row.whereArray(col, val);
         }
 
+        @Override
         public void whereAsciiStream(Column col, InputStream val, int length)
             throws SQLException {
             _row.whereAsciiStream(col, val, length);
         }
 
+        @Override
         public void whereBigDecimal(Column col, BigDecimal val)
             throws SQLException {
             _row.whereBigDecimal(col, val);
         }
 
+        @Override
         public void whereBigInteger(Column col, BigInteger val)
             throws SQLException {
             _row.whereBigInteger(col, val);
         }
 
+        @Override
         public void whereBinaryStream(Column col, InputStream val, int length)
             throws SQLException {
             _row.whereBinaryStream(col, val, length);
         }
 
+        @Override
         public void whereBlob(Column col, Blob val)
             throws SQLException {
             _row.whereBlob(col, val);
         }
 
+        @Override
         public void whereBoolean(Column col, boolean val)
             throws SQLException {
             _row.whereBoolean(col, val);
         }
 
+        @Override
         public void whereByte(Column col, byte val)
             throws SQLException {
             _row.whereByte(col, val);
         }
 
+        @Override
         public void whereBytes(Column col, byte[] val)
             throws SQLException {
             _row.whereBytes(col, val);
         }
 
+        @Override
         public void whereCalendar(Column col, Calendar val)
             throws SQLException {
             _row.whereCalendar(col, val);
         }
 
+        @Override
         public void whereChar(Column col, char val)
             throws SQLException {
             _row.whereChar(col, val);
         }
 
+        @Override
         public void whereCharacterStream(Column col, Reader val, int length)
             throws SQLException {
             _row.whereCharacterStream(col, val, length);
         }
 
+        @Override
         public void whereClob(Column col, Clob val)
             throws SQLException {
             _row.whereClob(col, val);
         }
 
+        @Override
         public void whereDate(Column col, Date val)
             throws SQLException {
             _row.whereDate(col, val);
         }
 
+        @Override
         public void whereDate(Column col, java.sql.Date val, Calendar cal)
             throws SQLException {
             _row.whereDate(col, val, cal);
         }
 
+        @Override
         public void whereDouble(Column col, double val)
             throws SQLException {
             _row.whereDouble(col, val);
         }
 
+        @Override
         public void whereFloat(Column col, float val)
             throws SQLException {
             _row.whereFloat(col, val);
         }
 
+        @Override
         public void whereInt(Column col, int val)
             throws SQLException {
             _row.whereInt(col, val);
         }
 
+        @Override
         public void whereLong(Column col, long val)
             throws SQLException {
             _row.whereLong(col, val);
         }
 
+        @Override
         public void whereLocale(Column col, Locale val)
             throws SQLException {
             _row.whereLocale(col, val);
         }
 
+        @Override
         public void whereNull(Column col)
             throws SQLException {
             _row.whereNull(col);
         }
 
+        @Override
         public void whereNumber(Column col, Number val)
             throws SQLException {
             _row.whereNumber(col, val);
         }
 
+        @Override
         public void whereObject(Column col, Object val)
             throws SQLException {
             _row.whereObject(col, val);
         }
 
+        @Override
         public void whereRaw(Column col, String val)
             throws SQLException {
             _row.whereRaw(col, val);
         }
 
+        @Override
         public void whereShort(Column col, short val)
             throws SQLException {
             _row.whereShort(col, val);
         }
 
+        @Override
         public void whereString(Column col, String val)
             throws SQLException {
             _row.whereString(col, val);
         }
 
+        @Override
         public void whereTime(Column col, Time val, Calendar cal)
             throws SQLException {
             _row.whereTime(col, val, cal);
         }
 
+        @Override
         public void whereTimestamp(Column col, Timestamp val, Calendar cal)
             throws SQLException {
             _row.whereTimestamp(col, val, cal);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java
index 72e6d27bf..b49043b86 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java
@@ -39,6 +39,8 @@ import org.apache.openjpa.kernel.ObjectIdStateManager;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StateManagerImpl;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.util.MetaDataException;
 
 /**
@@ -50,6 +52,8 @@ import org.apache.openjpa.util.MetaDataException;
 public abstract class EmbedValueHandler
     extends AbstractValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (EmbedValueHandler.class);
 
@@ -57,6 +61,7 @@ public abstract class EmbedValueHandler
      * Maps embedded value and gathers columns and arguments into given lists.
      * @deprecated
      */
+    @Deprecated
     protected void map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt, List cols, List args) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -70,7 +75,7 @@ public abstract class EmbedValueHandler
     protected void map(ValueMapping vm, DBIdentifier name, ColumnIO io,
         boolean adapt, List cols, List args) {
         // have to resolve embedded value to collect its columns
-        vm.getEmbeddedMapping().resolve(vm.MODE_META | vm.MODE_MAPPING);
+        vm.getEmbeddedMapping().resolve(MetaDataModes.MODE_META | MetaDataModes.MODE_MAPPING);
 
         // gather columns and result arguments
         FieldMapping[] fms = vm.getEmbeddedMapping().getFieldMappings();
@@ -78,7 +83,7 @@ public abstract class EmbedValueHandler
         Object[] curArgs;
         ColumnIO curIO;
         for (int i = 0; i < fms.length; i++) {
-            if (fms[i].getManagement() != FieldMapping.MANAGE_PERSISTENT)
+            if (fms[i].getManagement() != FieldMetaData.MANAGE_PERSISTENT)
                 continue;
             FieldStrategy strat = fms[i].getStrategy();
 
@@ -149,7 +154,7 @@ public abstract class EmbedValueHandler
         Column[] ecols;
         Embeddable embed;
         for (int i = 0; i < fms.length; i++) {
-            if (fms[i].getManagement() != FieldMapping.MANAGE_PERSISTENT)
+            if (fms[i].getManagement() != FieldMetaData.MANAGE_PERSISTENT)
                 continue;
 
             // This recursive code is mainly to deal with situations
@@ -231,7 +236,7 @@ public abstract class EmbedValueHandler
         Object cval;
         Column[] ecols;
         for (int i = 0; i < fms.length; i++) {
-            if (fms[i].getManagement() != FieldMapping.MANAGE_PERSISTENT)
+            if (fms[i].getManagement() != FieldMetaData.MANAGE_PERSISTENT)
                 continue;
 
             ValueMapping vm1 = fms[i].getValueMapping();
@@ -281,7 +286,7 @@ public abstract class EmbedValueHandler
         return idx;
     }
     private Column[] getColumns(FieldMapping fm) {
-        List<Column> colList = new ArrayList<Column>();
+        List<Column> colList = new ArrayList<>();
         getEmbeddedIdCols(fm, colList);
         Column[] cols = new Column[colList.size()];
         int i = 0;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbeddedClassStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbeddedClassStrategy.java
index 82d11d92f..82dc3ca2b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbeddedClassStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbeddedClassStrategy.java
@@ -35,9 +35,12 @@ import org.apache.openjpa.util.MetaDataException;
 public class EmbeddedClassStrategy
     extends AbstractClassStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (EmbeddedClassStrategy.class);
 
+    @Override
     public void map(boolean adapt) {
         ValueMapping vm = cls.getEmbeddingMapping();
         if (vm == null || vm.getType() != cls.getDescribedType())
@@ -91,6 +94,7 @@ public class EmbeddedClassStrategy
         return false;
     }
 
+    @Override
     public boolean isPrimaryKeyObjectId(boolean hasAll) {
         return cls.getEmbeddingMapping().getFieldMapping().
             getDefiningMapping().isPrimaryKeyObjectId(hasAll);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EnumValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EnumValueHandler.java
index 931ac8600..8a4df243f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EnumValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EnumValueHandler.java
@@ -35,10 +35,8 @@ import org.apache.openjpa.util.MetaDataException;
  * Value handler for JDK1.5 enum field types.
  *
  */
-@SuppressWarnings("serial")
-public class EnumValueHandler
-    extends AbstractValueHandler {
-
+public class EnumValueHandler extends AbstractValueHandler {
+    private static final long serialVersionUID = 1L;
     private Enum<?>[] _vals = null;
     private boolean _ordinal = false;
     private static final Localizer _loc = Localizer.forPackage(EnumValueHandler.class);
@@ -60,6 +58,8 @@ public class EnumValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -101,6 +101,7 @@ public class EnumValueHandler
         return true;
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val, JDBCStore store) {
         if (val == null)
             return null;
@@ -109,6 +110,7 @@ public class EnumValueHandler
         return ((Enum) val).name();
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val) {
         if (val == null)
             return null;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FlatClassStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FlatClassStrategy.java
index 5a41e40f9..5a31da5eb 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FlatClassStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FlatClassStrategy.java
@@ -33,15 +33,20 @@ import org.apache.openjpa.util.MetaDataException;
 public class FlatClassStrategy
     extends AbstractClassStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "flat";
 
     private static final Localizer _loc = Localizer.forPackage
         (FlatClassStrategy.class);
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void map(boolean adapt) {
         ClassMapping sup = cls.getMappedPCSuperclassMapping();
         if (sup == null || cls.getEmbeddingMetaData() != null)
@@ -63,6 +68,7 @@ public class FlatClassStrategy
         cls.setColumnIO(sup.getColumnIO());
     }
 
+    @Override
     public boolean isPrimaryKeyObjectId(boolean hasAll) {
         return cls.getMappedPCSuperclassMapping().isPrimaryKeyObjectId(hasAll);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java
index f377b01e2..873805b85 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java
@@ -34,6 +34,7 @@ import org.apache.openjpa.jdbc.sql.RowManager;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.ValueStrategies;
 import org.apache.openjpa.util.MetaDataException;
@@ -46,15 +47,20 @@ import org.apache.openjpa.util.MetaDataException;
 public class FullClassStrategy
     extends AbstractClassStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "full";
 
     private static final Localizer _loc = Localizer.forPackage
         (FullClassStrategy.class);
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void map(boolean adapt) {
         if (cls.getEmbeddingMetaData() != null)
             throw new MetaDataException(_loc.get("not-full", cls));
@@ -74,7 +80,7 @@ public class FullClassStrategy
 
         // find primary key column
         Column[] pkCols = null;
-        if (cls.getIdentityType() == cls.ID_DATASTORE) {
+        if (cls.getIdentityType() == ClassMetaData.ID_DATASTORE) {
             Column id = new Column();
             DBDictionary dict = cls.getMappingRepository().getDBDictionary();
             DBIdentifier idName = DBIdentifier.newColumn("id", dict != null ? dict.delimitAll() : false);
@@ -105,23 +111,26 @@ public class FullClassStrategy
         }
 
         // set joinable
-        if (cls.getIdentityType() == ClassMapping.ID_DATASTORE)
+        if (cls.getIdentityType() == ClassMetaData.ID_DATASTORE)
             cls.setJoinable(cls.getPrimaryKeyColumns()[0],
                 new IdentityJoinable(cls));
     }
 
+    @Override
     public boolean supportsEagerSelect(Select sel, OpenJPAStateManager sm,
         JDBCStore store, ClassMapping base, JDBCFetchConfiguration fetch) {
         return false;
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getRow(cls.getTable(), Row.ACTION_INSERT, sm, true);
-        if (cls.getIdentityType() == cls.ID_DATASTORE)
+        if (cls.getIdentityType() == ClassMetaData.ID_DATASTORE)
             row.setPrimaryKey(cls.getColumnIO(), sm);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getRow(cls.getTable(), Row.ACTION_UPDATE, sm, false);
@@ -129,12 +138,14 @@ public class FullClassStrategy
             row.wherePrimaryKey(sm);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getRow(cls.getTable(), Row.ACTION_DELETE, sm, true);
         row.wherePrimaryKey(sm);
     }
 
+    @Override
     public boolean isPrimaryKeyObjectId(boolean hasAll) {
         return true;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java
index f221c4513..7119b0db0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java
@@ -18,18 +18,38 @@
  */
 package org.apache.openjpa.jdbc.meta.strats;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
-import org.apache.openjpa.lib.util.*;
-
-import org.apache.openjpa.kernel.*;
-import org.apache.openjpa.util.*;
-import org.apache.openjpa.meta.*;
-import org.apache.openjpa.jdbc.meta.*;
-import org.apache.openjpa.jdbc.kernel.*;
-import org.apache.openjpa.jdbc.schema.*;
-import org.apache.openjpa.jdbc.sql.*;
+import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.jdbc.meta.FieldMappingInfo;
+import org.apache.openjpa.jdbc.meta.ValueHandler;
+import org.apache.openjpa.jdbc.meta.ValueMapping;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.ColumnIO;
+import org.apache.openjpa.jdbc.schema.ForeignKey;
+import org.apache.openjpa.jdbc.sql.Joins;
+import org.apache.openjpa.jdbc.sql.Result;
+import org.apache.openjpa.jdbc.sql.Row;
+import org.apache.openjpa.jdbc.sql.RowManager;
+import org.apache.openjpa.jdbc.sql.Select;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.kernel.StateManagerImpl;
+import org.apache.openjpa.kernel.StoreContext;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.util.ChangeTracker;
+import org.apache.openjpa.util.MetaDataException;
+import org.apache.openjpa.util.Proxies;
+import org.apache.openjpa.util.Proxy;
 
 /**
  * <p>Mapping for a collection of values in a separate table controlled by a
@@ -42,6 +62,9 @@ public class HandlerCollectionTableFieldStrategy
     extends StoreCollectionFieldStrategy
     implements LRSCollectionFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (HandlerCollectionTableFieldStrategy.class);
 
@@ -51,27 +74,33 @@ public class HandlerCollectionTableFieldStrategy
     private boolean _lob = false;
     private boolean _embed = false;
 
+    @Override
     public FieldMapping getFieldMapping() {
         return field;
     }
 
+    @Override
     public ClassMapping[] getIndependentElementMappings(boolean traverse) {
         return ClassMapping.EMPTY_MAPPINGS;
     }
 
+    @Override
     public Column[] getElementColumns(ClassMapping elem) {
         return _cols;
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(ClassMapping elem) {
         return field.getJoinForeignKey();
     }
 
+    @Override
     public void selectElement(Select sel, ClassMapping elem, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode, Joins joins) {
         sel.select(_cols, joins);
     }
 
+    @Override
     public Object loadElement(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -79,18 +108,22 @@ public class HandlerCollectionTableFieldStrategy
             sm, store, fetch, res, joins, _cols, _load);
     }
 
+    @Override
     protected Joins join(Joins joins, ClassMapping elem) {
         return join(joins, false);
     }
 
+    @Override
     public Joins joinElementRelation(Joins joins, ClassMapping elem) {
         return joinRelation(joins, false, false);
     }
 
+    @Override
     protected Proxy newLRSProxy() {
         return new LRSProxyCollection(this);
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.COLLECTION
             && field.getTypeCode() != JavaTypes.ARRAY)
@@ -116,6 +149,7 @@ public class HandlerCollectionTableFieldStrategy
         field.mapPrimaryKey(adapt);
     }
 
+    @Override
     public void initialize() {
         for (int i = 0; !_lob && i < _cols.length; i++)
             _lob = _cols[i].isLob();
@@ -125,6 +159,7 @@ public class HandlerCollectionTableFieldStrategy
         _load = elem.getHandler().objectValueRequiresLoad(elem);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         insert(sm, store, rm, sm.fetchObject(field.getIndex()));
@@ -161,7 +196,7 @@ public class HandlerCollectionTableFieldStrategy
                 Collection rels = new ArrayList();
                 if (isEmbedded) {
                     getRelations(esm, rels, ctx);
-                    Map<ClassMapping,Integer> targets = new HashMap<ClassMapping,Integer>();
+                    Map<ClassMapping,Integer> targets = new HashMap<>();
                     for (Object rel : rels) {
                         StateManagerImpl relSm = (StateManagerImpl)rel;
                         ClassMapping cm =(ClassMapping) relSm.getMetaData();
@@ -196,6 +231,7 @@ public class HandlerCollectionTableFieldStrategy
         }
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Object obj = sm.fetchObject(field.getIndex());
@@ -254,6 +290,7 @@ public class HandlerCollectionTableFieldStrategy
         }
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getAllRows(field.getTable(), Row.ACTION_DELETE);
@@ -261,6 +298,7 @@ public class HandlerCollectionTableFieldStrategy
         rm.flushAllRows(row);
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         // can't do any combined select with lobs, since they don't allow
@@ -272,15 +310,18 @@ public class HandlerCollectionTableFieldStrategy
         return super.supportsSelect(sel, type, sm, store, fetch);
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return HandlerStrategies.toDataStoreValue(field.getElementMapping(),
             val, _cols, store);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, true);
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         if (traverse)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerFieldStrategy.java
index 8e5935d15..908a5514b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerFieldStrategy.java
@@ -20,10 +20,10 @@ package org.apache.openjpa.jdbc.meta.strats;
 
 import java.sql.SQLException;
 
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.Embeddable;
-import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.meta.Joinable;
 import org.apache.openjpa.jdbc.meta.ValueHandler;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -39,6 +39,7 @@ import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.ValueStrategies;
 import org.apache.openjpa.util.InternalException;
@@ -55,6 +56,9 @@ public class HandlerFieldStrategy
     extends AbstractFieldStrategy
     implements Joinable, Embeddable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Object NULL = new Object();
 
     private static final Localizer _loc = Localizer.forPackage
@@ -66,6 +70,7 @@ public class HandlerFieldStrategy
     protected boolean _load = false;
     protected boolean _lob = false;
 
+    @Override
     public void map(boolean adapt) {
         if (field.getHandler() == null)
             throw new MetaDataException(_loc.get("no-handler", field));
@@ -105,6 +110,7 @@ public class HandlerFieldStrategy
                 field.getDefiningMapping().setJoinable(_cols[i], this);
     }
 
+    @Override
     public void initialize() {
         _load = field.getHandler().objectValueRequiresLoad(field);
         if (_load)
@@ -121,6 +127,7 @@ public class HandlerFieldStrategy
             _args = (Object[]) args;
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getColumnIO().isInsertable(0, false)) {
@@ -128,7 +135,7 @@ public class HandlerFieldStrategy
             if (row != null) {
                 Object value = sm.fetch(field.getIndex());
                 if (!HandlerStrategies.set(field, value, store, row, _cols,
-                    _io, field.getNullValue() == FieldMapping.NULL_NONE))
+                    _io, field.getNullValue() == FieldMetaData.NULL_NONE))
                     if (field.getValueStrategy() != ValueStrategies.AUTOASSIGN)
                         throw new UserException(_loc.get("cant-set-value", row
                             .getFailedObject(), field, value));
@@ -136,6 +143,7 @@ public class HandlerFieldStrategy
         }
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getColumnIO().isUpdatable(0, false)) {
@@ -143,7 +151,7 @@ public class HandlerFieldStrategy
             if (row != null) {
                 Object value = sm.fetch(field.getIndex());
                 if (!HandlerStrategies.set(field, value, store, row, _cols,
-                    _io, field.getNullValue() == FieldMapping.NULL_NONE))
+                    _io, field.getNullValue() == FieldMetaData.NULL_NONE))
                     if (field.getValueStrategy() != ValueStrategies.AUTOASSIGN)
                         throw new UserException(_loc.get("cant-set-value", row
                             .getFailedObject(), field, value));
@@ -151,11 +159,13 @@ public class HandlerFieldStrategy
         }
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         field.deleteRow(sm, store, rm);
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         if ((type == Select.TYPE_JOINLESS && sel.isSelected(field.getTable()))
@@ -164,6 +174,7 @@ public class HandlerFieldStrategy
         return 0;
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
         if (_cols.length == 0)
@@ -172,12 +183,13 @@ public class HandlerFieldStrategy
         if (sm != null && sm.getIntermediate(field.getIndex()) != null)
             return -1;
         if (_lob && !field.isPrimaryKey() && (sel.isDistinct() ||
-                eagerMode == JDBCFetchConfiguration.EAGER_NONE))
+                eagerMode == EagerFetchModes.EAGER_NONE))
             return -1;
         sel.select(_cols, field.join(sel));
         return 1;
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
@@ -195,6 +207,7 @@ public class HandlerFieldStrategy
         }
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException {
@@ -237,10 +250,12 @@ public class HandlerFieldStrategy
         loadEmbedded(sm, store, fetch, val);
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return HandlerStrategies.toDataStoreValue(field, val, _cols, store);
     }
 
+    @Override
     public void appendIsNull(SQLBuffer sql, Select sel, Joins joins) {
         joins = join(joins, false);
         for (int i = 0; i < _cols.length; i++) {
@@ -253,6 +268,7 @@ public class HandlerFieldStrategy
         }
     }
 
+    @Override
     public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins) {
         joins = join(joins, false);
         if (_cols.length > 1) {
@@ -270,10 +286,12 @@ public class HandlerFieldStrategy
             sql.append(")");
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, false);
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         if (traverse)
@@ -281,6 +299,7 @@ public class HandlerFieldStrategy
         return joins;
     }
 
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
@@ -288,11 +307,13 @@ public class HandlerFieldStrategy
             joins, _cols, _load);
     }
 
+    @Override
     public boolean isVersionable() {
         return !_lob && !field.isJoinOuter()
             && field.getHandler().isVersionable(field);
     }
 
+    @Override
     public void where(OpenJPAStateManager sm, JDBCStore store, RowManager rm,
         Object prevValue)
         throws SQLException {
@@ -305,10 +326,12 @@ public class HandlerFieldStrategy
     // Joinable implementation
     ///////////////////////////
 
+    @Override
     public int getFieldIndex() {
         return field.getIndex();
     }
 
+    @Override
     public Object getPrimaryKeyValue(Result res, Column[] cols, ForeignKey fk,
         JDBCStore store, Joins joins)
         throws SQLException {
@@ -343,14 +366,17 @@ public class HandlerFieldStrategy
         return field.getHandler().toObjectValue(field, val);
     }
 
+    @Override
     public Column[] getColumns() {
         return _cols;
     }
 
+    @Override
     public Object[] getResultArguments() {
         return _args;
     }
 
+    @Override
     public Object getJoinValue(Object fieldVal, Column col, JDBCStore store) {
         Object val = HandlerStrategies.toDataStoreValue(field, fieldVal,
             _cols, store);
@@ -363,11 +389,13 @@ public class HandlerFieldStrategy
         throw new InternalException();
     }
 
+    @Override
     public Object getJoinValue(OpenJPAStateManager sm, Column col,
         JDBCStore store) {
         return getJoinValue(sm.fetch(field.getIndex()), col, store);
     }
 
+    @Override
     public void setAutoAssignedValue(OpenJPAStateManager sm, JDBCStore store,
         Column col, Object autoInc) {
         Object data;
@@ -397,10 +425,12 @@ public class HandlerFieldStrategy
     // Embeddable implementation
     /////////////////////////////
 
+    @Override
     public ColumnIO getColumnIO() {
         return _io;
     }
 
+    @Override
     public Object toEmbeddedDataStoreValue(Object val, JDBCStore store) {
         // don't use HandlerStrategies.toDataStoreValue b/c we want relation ids
         // to be represented by state managers, not the serialized id value
@@ -410,12 +440,14 @@ public class HandlerFieldStrategy
         return val;
     }
 
+    @Override
     public Object toEmbeddedObjectValue(Object val) {
         if (!_load)
             return field.getHandler().toObjectValue(field, val);
         return UNSUPPORTED;
     }
 
+    @Override
     public void loadEmbedded(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object val)
         throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java
index 67fae4df1..5348ee0b0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java
@@ -18,17 +18,32 @@
  */
 package org.apache.openjpa.jdbc.meta.strats;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.kernel.*;
-import org.apache.openjpa.jdbc.meta.*;
-import org.apache.openjpa.jdbc.schema.*;
-import org.apache.openjpa.jdbc.sql.*;
-import org.apache.openjpa.kernel.*;
-import org.apache.openjpa.lib.util.*;
-import org.apache.openjpa.util.*;
+import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.ValueHandler;
+import org.apache.openjpa.jdbc.meta.ValueMapping;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.ColumnIO;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.Joins;
+import org.apache.openjpa.jdbc.sql.Result;
+import org.apache.openjpa.jdbc.sql.Row;
+import org.apache.openjpa.jdbc.sql.RowManager;
+import org.apache.openjpa.jdbc.sql.Select;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.util.ChangeTracker;
+import org.apache.openjpa.util.MetaDataException;
+import org.apache.openjpa.util.Proxies;
+import org.apache.openjpa.util.Proxy;
 
 /**
  * Mapping for a map of keys and values both controlled by
@@ -40,6 +55,9 @@ import org.apache.openjpa.util.*;
 public class HandlerHandlerMapTableFieldStrategy
     extends MapTableFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (HandlerHandlerMapTableFieldStrategy.class);
 
@@ -50,25 +68,30 @@ public class HandlerHandlerMapTableFieldStrategy
     private ColumnIO _vio = null;
     private boolean _vload = false;
 
+    @Override
     public Column[] getKeyColumns(ClassMapping cls) {
         return _kcols;
     }
 
+    @Override
     public Column[] getValueColumns(ClassMapping cls) {
         return _vcols;
     }
 
+    @Override
     public void selectKey(Select sel, ClassMapping cls, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, Joins joins) {
         sel.select(_kcols, joins);
     }
 
+    @Override
     public void selectValue(Select sel, ClassMapping cls,
         OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, Joins joins) {
         sel.select(_vcols, joins);
     }
 
+    @Override
     public Result[] getResults(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode, Joins[] joins, boolean lrs)
         throws SQLException {
@@ -82,6 +105,7 @@ public class HandlerHandlerMapTableFieldStrategy
         return new Result[]{ res, res };
     }
 
+    @Override
     public Object loadKey(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -89,6 +113,7 @@ public class HandlerHandlerMapTableFieldStrategy
             sm, store, fetch, res, joins, _kcols, _kload);
     }
 
+    @Override
     public Object loadValue(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -96,6 +121,7 @@ public class HandlerHandlerMapTableFieldStrategy
             sm, store, fetch, res, joins, _vcols, _vload);
     }
 
+    @Override
     public void map(boolean adapt) {
         super.map(adapt);
 
@@ -119,6 +145,7 @@ public class HandlerHandlerMapTableFieldStrategy
         field.mapPrimaryKey(adapt);
     }
 
+    @Override
     public void initialize() {
         _kload = field.getKeyMapping().getHandler().
             objectValueRequiresLoad(field.getKeyMapping());
@@ -126,6 +153,7 @@ public class HandlerHandlerMapTableFieldStrategy
             objectValueRequiresLoad(field.getElementMapping());
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         insert(sm, store, rm, (Map) sm.fetchObject(field.getIndex()));
@@ -154,6 +182,7 @@ public class HandlerHandlerMapTableFieldStrategy
         }
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Map map = (Map) sm.fetchObject(field.getIndex());
@@ -222,16 +251,19 @@ public class HandlerHandlerMapTableFieldStrategy
         }
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return HandlerStrategies.toDataStoreValue(field.getElementMapping(),
             val, _vcols, store);
     }
 
+    @Override
     public Object toKeyDataStoreValue(Object val, JDBCStore store) {
         return HandlerStrategies.toDataStoreValue(field.getKeyMapping(), val,
             _kcols, store);
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         if (traverse)
@@ -239,6 +271,7 @@ public class HandlerHandlerMapTableFieldStrategy
         return joins;
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         if (traverse)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerRelationMapTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerRelationMapTableFieldStrategy.java
index 46ea02d3a..d96bdd827 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerRelationMapTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerRelationMapTableFieldStrategy.java
@@ -18,19 +18,41 @@
  */
 package org.apache.openjpa.jdbc.meta.strats;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
-import org.apache.openjpa.lib.util.*;
-import org.apache.openjpa.meta.*;
-import org.apache.openjpa.kernel.*;
-import org.apache.openjpa.util.*;
 import org.apache.openjpa.enhance.PersistenceCapable;
-import org.apache.openjpa.jdbc.meta.*;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.kernel.*;
-import org.apache.openjpa.jdbc.schema.*;
-import org.apache.openjpa.jdbc.sql.*;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
+import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.jdbc.meta.ValueHandler;
+import org.apache.openjpa.jdbc.meta.ValueMapping;
+import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.ColumnIO;
+import org.apache.openjpa.jdbc.schema.ForeignKey;
+import org.apache.openjpa.jdbc.schema.Table;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.Joins;
+import org.apache.openjpa.jdbc.sql.Result;
+import org.apache.openjpa.jdbc.sql.Row;
+import org.apache.openjpa.jdbc.sql.RowManager;
+import org.apache.openjpa.jdbc.sql.Select;
+import org.apache.openjpa.jdbc.sql.Union;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.kernel.StoreContext;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.util.ChangeTracker;
+import org.apache.openjpa.util.MetaDataException;
+import org.apache.openjpa.util.Proxies;
+import org.apache.openjpa.util.Proxy;
 
 /**
  * <p>Mapping for a map whose keys are controlled by a {@link ValueHandler}
@@ -42,6 +64,9 @@ import org.apache.openjpa.jdbc.sql.*;
 public class HandlerRelationMapTableFieldStrategy
     extends MapTableFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (HandlerRelationMapTableFieldStrategy.class);
 
@@ -49,6 +74,7 @@ public class HandlerRelationMapTableFieldStrategy
     private ColumnIO _kio = null;
     private boolean _kload = false;
 
+    @Override
     public Column[] getKeyColumns(ClassMapping cls) {
         return _kcols;
     }
@@ -57,22 +83,26 @@ public class HandlerRelationMapTableFieldStrategy
         return _kio;
     }
 
+    @Override
     public Column[] getValueColumns(ClassMapping cls) {
         return field.getElementMapping().getColumns();
     }
 
+    @Override
     public void selectKey(Select sel, ClassMapping key, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, Joins joins) {
         sel.select(_kcols, joins);
     }
 
+    @Override
     public void selectValue(Select sel, ClassMapping val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch,
         Joins joins) {
         sel.select(val, field.getElementMapping().getSelectSubclasses(),
-            store, fetch, JDBCFetchConfiguration.EAGER_NONE, joins);
+            store, fetch, EagerFetchModes.EAGER_NONE, joins);
     }
 
+    @Override
     public Result[] getResults(final OpenJPAStateManager sm,
         final JDBCStore store, final JDBCFetchConfiguration fetch,
         final int eagerMode, final Joins[] resJoins, boolean lrs)
@@ -81,10 +111,11 @@ public class HandlerRelationMapTableFieldStrategy
         final ClassMapping[] vals = elem.getIndependentTypeMappings();
         Union union = store.getSQLFactory().newUnion(vals.length);
         if (fetch.getSubclassFetchMode(elem.getTypeMapping())
-            != JDBCFetchConfiguration.EAGER_JOIN)
+            != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.setLRS(lrs);
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 sel.select(_kcols);
                 if (field.isUni1ToMFK()) {
@@ -110,6 +141,7 @@ public class HandlerRelationMapTableFieldStrategy
         return new Result[]{ res, res };
     }
 
+    @Override
     public Object loadKey(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -117,6 +149,7 @@ public class HandlerRelationMapTableFieldStrategy
             sm, store, fetch, res, joins, _kcols, _kload);
     }
 
+    @Override
     public Object loadValue(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -126,6 +159,7 @@ public class HandlerRelationMapTableFieldStrategy
         return res.load(val, store, fetch, joins);
     }
 
+    @Override
     public Joins joinValueRelation(Joins joins, ClassMapping val) {
         ValueMapping vm = field.getElementMapping();
         ForeignKey fk = vm.getForeignKey(val);
@@ -135,6 +169,7 @@ public class HandlerRelationMapTableFieldStrategy
             vm.getSelectSubclasses(), false, false);
     }
 
+    @Override
     public void map(boolean adapt) {
         super.map(adapt);
 
@@ -170,11 +205,13 @@ public class HandlerRelationMapTableFieldStrategy
         field.mapPrimaryKey(adapt);
     }
 
+    @Override
     public void initialize() {
         _kload = field.getKeyMapping().getHandler().
             objectValueRequiresLoad(field.getKeyMapping());
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         insert(sm, store, rm, (Map) sm.fetchObject(field.getIndex()));
@@ -236,6 +273,7 @@ public class HandlerRelationMapTableFieldStrategy
             _kio, true);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() != null && !field.isBiMTo1JT())
@@ -373,6 +411,7 @@ public class HandlerRelationMapTableFieldStrategy
         }
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         ValueMapping val = field.getElementMapping();
@@ -394,6 +433,7 @@ public class HandlerRelationMapTableFieldStrategy
             false, false);
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         if (traverse)
@@ -401,16 +441,19 @@ public class HandlerRelationMapTableFieldStrategy
         return joins;
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return RelationStrategies.toDataStoreValue(field.getElementMapping(),
             val, store);
     }
 
+    @Override
     public Object toKeyDataStoreValue(Object val, JDBCStore store) {
         return HandlerStrategies.toDataStoreValue(field.getKeyMapping(), val,
             _kcols, store);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if ((field.getMappedBy() != null && !field.isBiMTo1JT()))
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java
index d0fba4772..47138397d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/IdentityJoinable.java
@@ -38,6 +38,8 @@ import org.apache.openjpa.util.Id;
 class IdentityJoinable
     implements Joinable {
 
+    
+    private static final long serialVersionUID = 1L;
     private final ClassMapping mapping;
 
     /**
@@ -47,10 +49,12 @@ class IdentityJoinable
         this.mapping = mapping;
     }
 
+    @Override
     public int getFieldIndex() {
         return -1;
     }
 
+    @Override
     public Object getPrimaryKeyValue(Result res, Column[] cols, ForeignKey fk,
         JDBCStore store, Joins joins)
         throws SQLException {
@@ -63,20 +67,24 @@ class IdentityJoinable
         return id;
     }
 
+    @Override
     public Column[] getColumns() {
         return mapping.getPrimaryKeyColumns();
     }
 
+    @Override
     public Object getJoinValue(Object val, Column col, JDBCStore store) {
         return val;
     }
 
+    @Override
     public Object getJoinValue(OpenJPAStateManager sm, Column col,
         JDBCStore store) {
         Id id = (Id) sm.getObjectId();
         return (id == null) ? null : id.getIdObject();
     }
 
+    @Override
     public void setAutoAssignedValue(OpenJPAStateManager sm, JDBCStore store,
         Column col, Object autogen) {
         long id = ((Number) autogen).longValue();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ImmutableValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ImmutableValueHandler.java
index d0e67e507..f5d97a690 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ImmutableValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ImmutableValueHandler.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.jdbc.meta.ValueMapping;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ColumnIO;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 
 /**
@@ -35,6 +36,8 @@ import org.apache.openjpa.meta.JavaTypes;
 public class ImmutableValueHandler
     extends AbstractValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final ImmutableValueHandler _instance =
         new ImmutableValueHandler();
 
@@ -48,6 +51,8 @@ public class ImmutableValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -66,6 +71,7 @@ public class ImmutableValueHandler
         return new Column[]{ col };
     }
 
+    @Override
     public boolean isVersionable(ValueMapping vm) {
         switch (vm.getTypeCode()) {
             case JavaTypes.BOOLEAN:
@@ -90,13 +96,14 @@ public class ImmutableValueHandler
         }
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         if (val != null)
             return val;
 
         FieldMapping field = vm.getFieldMapping();
-        if (field.getNullValue() != FieldMapping.NULL_DEFAULT)
+        if (field.getNullValue() != FieldMetaData.NULL_DEFAULT)
             return null;
 
         Column[] cols = vm.getColumns();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/InValueDiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/InValueDiscriminatorStrategy.java
index 48b915606..0b28c679c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/InValueDiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/InValueDiscriminatorStrategy.java
@@ -48,6 +48,8 @@ import org.apache.openjpa.util.MetaDataException;
 public abstract class InValueDiscriminatorStrategy
     extends AbstractDiscriminatorStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (InValueDiscriminatorStrategy.class);
 
@@ -68,6 +70,7 @@ public abstract class InValueDiscriminatorStrategy
     protected abstract Class getClass(Object val, JDBCStore store)
         throws ClassNotFoundException;
 
+    @Override
     public void map(boolean adapt) {
         ClassMapping cls = disc.getClassMapping();
         if (cls.getJoinablePCSuperclassMapping() != null
@@ -93,6 +96,7 @@ public abstract class InValueDiscriminatorStrategy
         disc.setIndex(idx);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getRow(disc.getClassMapping().getTable(),
@@ -102,6 +106,7 @@ public abstract class InValueDiscriminatorStrategy
             row.setObject(disc.getColumns()[0], cls);
     }
 
+    @Override
     public boolean select(Select sel, ClassMapping mapping) {
         if (isFinal)
             return false;
@@ -109,6 +114,7 @@ public abstract class InValueDiscriminatorStrategy
         return true;
     }
 
+    @Override
     public Class getClass(JDBCStore store, ClassMapping base, Result res)
         throws SQLException, ClassNotFoundException {
         if (isFinal
@@ -132,6 +138,7 @@ public abstract class InValueDiscriminatorStrategy
         return res.contains(disc.getColumns()[0]);
     }
 
+    @Override
     public boolean hasClassConditions(ClassMapping base, boolean subclasses) {
         // if selecting the first mapped class and all subclasses, no need
         // to limit the query
@@ -147,6 +154,7 @@ public abstract class InValueDiscriminatorStrategy
         return true;
     }
 
+    @Override
     public SQLBuffer getClassConditions(Select sel, Joins joins,
         ClassMapping base, boolean subclasses) {
         Column col = disc.getColumns()[0];
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSCollectionFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSCollectionFieldStrategy.java
index 68ffa9b21..23dba272f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSCollectionFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSCollectionFieldStrategy.java
@@ -45,7 +45,7 @@ public interface LRSCollectionFieldStrategy
     /**
      * The owning field mapping.
      */
-    public FieldMapping getFieldMapping();
+    FieldMapping getFieldMapping();
 
     /**
      * Return all independent mappings to which this strategy must join in
@@ -55,20 +55,20 @@ public interface LRSCollectionFieldStrategy
      * @see ValueMapping#getIndependentTypeMappings
      * @see ClassMapping#EMPTY_MAPPINGS
      */
-    public ClassMapping[] getIndependentElementMappings(boolean traverse);
+    ClassMapping[] getIndependentElementMappings(boolean traverse);
 
     /**
      * Return the foreign key used to join to the owning field for the given
      * element mapping from {@link #getIndependentElementMappings} (or null).
      */
-    public ForeignKey getJoinForeignKey(ClassMapping elem);
+    ForeignKey getJoinForeignKey(ClassMapping elem);
 
     /**
      * Return the columns holding the data for a collection element for the
      * given element mapping from {@link #getIndependentElementMappings}
      * (or null).
      */
-    public Column[] getElementColumns(ClassMapping elem);
+    Column[] getElementColumns(ClassMapping elem);
 
     /**
      * Implement this method to select the elements of this field for the
@@ -76,7 +76,7 @@ public interface LRSCollectionFieldStrategy
      * (or null). Elements of the result will be loaded with
      * {@link #loadElement}.
      */
-    public void selectElement(Select sel, ClassMapping elem,
+    void selectElement(Select sel, ClassMapping elem,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode,
         Joins joins);
 
@@ -85,7 +85,7 @@ public interface LRSCollectionFieldStrategy
      * null if the load is for a projection or for processing eager parallel
      * results.
      */
-    public Object loadElement(OpenJPAStateManager sm, JDBCStore store,
+    Object loadElement(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException;
 
@@ -95,5 +95,5 @@ public interface LRSCollectionFieldStrategy
      *
      * @see FieldMapping#joinRelation
      */
-    public Joins joinElementRelation(Joins joins, ClassMapping elem);
+    Joins joinElementRelation(Joins joins, ClassMapping elem);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSMapFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSMapFieldStrategy.java
index 0f21423d9..952efba56 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSMapFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSMapFieldStrategy.java
@@ -45,7 +45,7 @@ public interface LRSMapFieldStrategy
     /**
      * The owning field mapping.
      */
-    public FieldMapping getFieldMapping();
+    FieldMapping getFieldMapping();
 
     /**
      * Return all independent mappings to which this strategy must join in
@@ -54,7 +54,7 @@ public interface LRSMapFieldStrategy
      * @see ValueMapping#getIndependentTypeMappings
      * @see ClassMapping#EMPTY_MAPPINGS
      */
-    public ClassMapping[] getIndependentKeyMappings(boolean traverse);
+    ClassMapping[] getIndependentKeyMappings(boolean traverse);
 
     /**
      * Return all independent mappings to which this strategy must join in
@@ -63,67 +63,67 @@ public interface LRSMapFieldStrategy
      * @see ValueMapping#getIndependentTypeMappings
      * @see ClassMapping#EMPTY_MAPPINGS
      */
-    public ClassMapping[] getIndependentValueMappings(boolean traverse);
+    ClassMapping[] getIndependentValueMappings(boolean traverse);
 
     /**
      * Return the foreign key used to join to the owning field for the given
      * mapping from either {@link #getIndependentKeyMappings} or
      * {@link #getIndependentValueMappings} (or null).
      */
-    public ForeignKey getJoinForeignKey(ClassMapping cls);
+    ForeignKey getJoinForeignKey(ClassMapping cls);
 
     /**
      * Return the columns holding data for a map key for the given key mapping
      * from {@link #getIndependentKeyMappings} or
      * {@link #getIndependentValueMappings} (or null).
      */
-    public Column[] getKeyColumns(ClassMapping cls);
+    Column[] getKeyColumns(ClassMapping cls);
 
     /**
      * Return the columns holding data for a map value for the given value
      * mapping from {@link #getIndependentKeyMappings} or
      * {@link #getIndependentValueMappings} (or null).
      */
-    public Column[] getValueColumns(ClassMapping cls);
+    Column[] getValueColumns(ClassMapping cls);
 
     /**
      * Implement this method to select the keys of this field.
      * Elements of the result will be loaded with {@link #loadKey}.
      * This method is only used if the key is not derived from the value.
      */
-    public void selectKey(Select sel, ClassMapping key, OpenJPAStateManager sm,
+    void selectKey(Select sel, ClassMapping key, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, Joins joins);
 
     /**
      * Load a key from the given result.
      * This method is only used if the key is not derived from the value.
      */
-    public Object loadKey(OpenJPAStateManager sm, JDBCStore store,
+    Object loadKey(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException;
 
     /**
      * Some mapping derive keys from map values. Other mappings may return null.
      */
-    public Object deriveKey(JDBCStore store, Object value);
+    Object deriveKey(JDBCStore store, Object value);
 
     /**
      * Some mapping derive values from map keys. Other mappings may return null.
      */
-    public Object deriveValue(JDBCStore store, Object key);
+    Object deriveValue(JDBCStore store, Object key);
 
     /**
      * Implement this method to select the values of this field.
      * Elements of the result will be loaded with {@link #loadValue}.
      */
-    public void selectValue(Select sel, ClassMapping val,
+    void selectValue(Select sel, ClassMapping val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch,
         Joins joins);
 
     /**
      * Load a value from the given result.
      */
-    public Object loadValue(OpenJPAStateManager sm, JDBCStore store,
+    Object loadValue(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException;
 
@@ -134,7 +134,7 @@ public interface LRSMapFieldStrategy
      * The results will be loaded with the {@link #loadKey} or
      * {@link #deriveKey} and {@link #loadValue} methods.
      */
-    public Result[] getResults(OpenJPAStateManager sm, JDBCStore store,
+    Result[] getResults(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode, Joins[] joins, boolean lrs)
         throws SQLException;
 
@@ -142,11 +142,11 @@ public interface LRSMapFieldStrategy
      * Join this value's table to the table for the given key mapping
      * from {@link #getIndependentKeyMappings} (or null).
      */
-    public Joins joinKeyRelation(Joins joins, ClassMapping key);
+    Joins joinKeyRelation(Joins joins, ClassMapping key);
 
     /**
      * Join this value's table to the table for the given value mapping
      * from {@link #getIndependentValueMappings} (or null).
      */
-    public Joins joinValueRelation(Joins joins, ClassMapping val);
+    Joins joinValueRelation(Joins joins, ClassMapping val);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSProxyCollection.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSProxyCollection.java
index 0e9a818b1..296520087 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSProxyCollection.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSProxyCollection.java
@@ -22,6 +22,7 @@ import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -58,6 +59,7 @@ public class LRSProxyCollection
         _strat = strat;
     }
 
+    @Override
     protected int count() {
         final ClassMapping[] elems = _strat.getIndependentElementMappings
             (false);
@@ -66,6 +68,7 @@ public class LRSProxyCollection
         Union union = store.getSQLFactory().newUnion
             (Math.max(1, elems.length));
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ClassMapping elem = (elems.length == 0) ? null : elems[idx];
                 sel.whereForeignKey(_strat.getJoinForeignKey(elem),
@@ -81,6 +84,7 @@ public class LRSProxyCollection
         }
     }
 
+    @Override
     protected boolean has(final Object obj) {
         final ClassMapping[] elems = _strat.getIndependentElementMappings
             (false);
@@ -89,6 +93,7 @@ public class LRSProxyCollection
         Union union = store.getSQLFactory().newUnion
             (Math.max(1, elems.length));
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ClassMapping elem = (elems.length == 0) ? null : elems[idx];
                 sel.whereForeignKey(_strat.getJoinForeignKey(elem),
@@ -122,6 +127,7 @@ public class LRSProxyCollection
         }
     }
 
+    @Override
     protected Iterator itr() {
         final ClassMapping[] elems = _strat.getIndependentElementMappings(true);
         final OpenJPAStateManager sm = assertOwner();
@@ -133,10 +139,11 @@ public class LRSProxyCollection
         Union union = store.getSQLFactory().newUnion
             (Math.max(1, elems.length));
         if (fetch.getSubclassFetchMode(fm.getElementMapping().
-            getTypeMapping()) != fetch.EAGER_JOIN)
+            getTypeMapping()) != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.setLRS(true);
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ClassMapping elem = (elems.length == 0) ? null : elems[idx];
                 sel.whereForeignKey(_strat.getJoinForeignKey(elem),
@@ -148,7 +155,7 @@ public class LRSProxyCollection
                 resJoins[idx] = _strat.joinElementRelation(sel.newJoins(),
                     elem);
                 fm.orderRelation(sel, elem, resJoins[idx]);
-                _strat.selectElement(sel, elem, store, fetch, fetch.EAGER_JOIN,
+                _strat.selectElement(sel, elem, store, fetch, EagerFetchModes.EAGER_JOIN,
                     resJoins[idx]);
             }
         });
@@ -196,6 +203,7 @@ public class LRSProxyCollection
             _joins = joins;
         }
 
+        @Override
         public boolean hasNext() {
             if (_next == null) {
                 try {
@@ -207,6 +215,7 @@ public class LRSProxyCollection
             return _next.booleanValue();
         }
 
+        @Override
         public Object next() {
             if (!hasNext())
                 throw new NoSuchElementException();
@@ -219,10 +228,12 @@ public class LRSProxyCollection
             }
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void close() {
             _next = Boolean.FALSE;
             _res.close();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSProxyMap.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSProxyMap.java
index 43f02292e..6528a6009 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSProxyMap.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LRSProxyMap.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -61,6 +62,7 @@ class LRSProxyMap
         _strat = strat;
     }
 
+    @Override
     protected synchronized int count() {
         boolean derivedVal = _strat.getFieldMapping().getElement().
             getValueMappedBy() != null;
@@ -72,6 +74,7 @@ class LRSProxyMap
         Union union = store.getSQLFactory().newUnion
             (Math.max(1, clss.length));
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ClassMapping cls = (clss.length == 0) ? null : clss[idx];
                 sel.whereForeignKey(_strat.getJoinForeignKey(cls),
@@ -87,10 +90,12 @@ class LRSProxyMap
         }
     }
 
+    @Override
     protected boolean hasKey(Object key) {
         return has(key, true);
     }
 
+    @Override
     protected boolean hasValue(Object value) {
         return has(value, false);
     }
@@ -110,6 +115,7 @@ class LRSProxyMap
         Union union = store.getSQLFactory().newUnion
             (Math.max(1, clss.length));
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ClassMapping cls = (clss.length == 0) ? null : clss[idx];
                 sel.whereForeignKey(_strat.getJoinForeignKey(cls),
@@ -155,6 +161,7 @@ class LRSProxyMap
         }
     }
 
+    @Override
     protected Collection keys(final Object obj) {
         final OpenJPAStateManager sm = assertOwner();
         final JDBCStore store = getStore();
@@ -172,9 +179,10 @@ class LRSProxyMap
         Union union = store.getSQLFactory().newUnion
             (Math.max(1, clss.length));
         if (fetch.getSubclassFetchMode(_strat.getFieldMapping().
-            getKeyMapping().getTypeMapping()) != fetch.EAGER_JOIN)
+            getKeyMapping().getTypeMapping()) != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ClassMapping cls = (clss.length == 0) ? null : clss[idx];
                 sel.whereForeignKey(_strat.getJoinForeignKey(cls),
@@ -226,6 +234,7 @@ class LRSProxyMap
         }
     }
 
+    @Override
     protected Object value(final Object obj) {
         final OpenJPAStateManager sm = assertOwner();
         final JDBCStore store = getStore();
@@ -243,9 +252,10 @@ class LRSProxyMap
         union.setExpectedResultCount(1, false);
         if (fetch.getSubclassFetchMode(_strat.getFieldMapping().
             getElementMapping().getTypeMapping())
-            != JDBCFetchConfiguration.EAGER_JOIN)
+            != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ClassMapping cls = (clss.length == 0) ? null : clss[idx];
                 sel.whereForeignKey(_strat.getJoinForeignKey(cls),
@@ -296,13 +306,14 @@ class LRSProxyMap
         }
     }
 
+    @Override
     protected Iterator itr() {
         OpenJPAStateManager sm = assertOwner();
         JDBCStore store = getStore();
         JDBCFetchConfiguration fetch = store.getFetchConfiguration();
         try {
             Joins[] joins = new Joins[2];
-            Result[] res = _strat.getResults(sm, store, fetch, fetch.EAGER_JOIN,
+            Result[] res = _strat.getResults(sm, store, fetch, EagerFetchModes.EAGER_JOIN,
                 joins, true);
             return new ResultIterator(sm, store, fetch, res, joins);
         } catch (SQLException se) {
@@ -345,6 +356,7 @@ class LRSProxyMap
             _joins = joins;
         }
 
+        @Override
         public boolean hasNext() {
             if (_next == null) {
                 try {
@@ -358,6 +370,7 @@ class LRSProxyMap
             return _next.booleanValue();
         }
 
+        @Override
         public Object next() {
             if (!hasNext())
                 throw new NoSuchElementException();
@@ -386,10 +399,12 @@ class LRSProxyMap
             }
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void close() {
             _next = Boolean.FALSE;
             _res[0].close();
@@ -407,14 +422,17 @@ class LRSProxyMap
         public Object key;
         public Object val;
 
+        @Override
         public Object getKey() {
             return key;
         }
 
+        @Override
         public Object getValue() {
             return val;
         }
 
+        @Override
         public Object setValue(Object val) {
             throw new UnsupportedOperationException();
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java
index e9df88aed..33e821639 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java
@@ -46,9 +46,12 @@ import org.apache.openjpa.meta.JavaTypes;
  */
 public class LobFieldStrategy extends AbstractFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private int fieldType;
     private boolean isBlob;
 
+    @Override
     public void map(boolean adapt) {
         assertNotMappedBy();
         field.mapJoin(adapt, false);
@@ -79,16 +82,19 @@ public class LobFieldStrategy extends AbstractFieldStrategy {
         field.mapPrimaryKey(adapt);
     }
 
+    @Override
     public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store) {
         return null;
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Select sel = createSelect(sm, store);
         store.getDBDictionary().deleteStream(store, sel);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Object ob = toDataStoreValue(sm.fetchObjectField
@@ -106,6 +112,7 @@ public class LobFieldStrategy extends AbstractFieldStrategy {
         }
     }
 
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         Object ob = toDataStoreValue(sm.fetchObjectField
@@ -124,10 +131,12 @@ public class LobFieldStrategy extends AbstractFieldStrategy {
         }
     }
 
+    @Override
     public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store) {
         return null;
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Object ob = toDataStoreValue(sm.fetchObjectField
@@ -145,6 +154,7 @@ public class LobFieldStrategy extends AbstractFieldStrategy {
         }
     }
 
+    @Override
     public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         Object ob = toDataStoreValue(sm.fetchObjectField
@@ -163,6 +173,7 @@ public class LobFieldStrategy extends AbstractFieldStrategy {
         }
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         if (type == Select.TYPE_JOINLESS && sel.isSelected(field.getTable()))
@@ -170,12 +181,14 @@ public class LobFieldStrategy extends AbstractFieldStrategy {
         return 0;
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
         sel.select(field.getColumns()[0], field.join(sel));
         return 1;
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res) throws SQLException {
         Column col = field.getColumns()[0];
@@ -188,11 +201,13 @@ public class LobFieldStrategy extends AbstractFieldStrategy {
         }
     }
 
+    @Override
     protected void assertNotMappedBy() {
         if (field != null && field.getMappedBy() != null)
             throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setFieldMapping(FieldMapping owner) {
         field = owner;
         if (owner.getElementMapping().getMappingRepository().getDBDictionary()
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java
index 3c54c5c68..d28aba420 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.ReflectingPersistenceCapable;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -45,6 +46,7 @@ import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.util.MetaDataException;
 
 /**
@@ -62,31 +64,39 @@ public abstract class MapTableFieldStrategy
     extends ContainerFieldStrategy
     implements LRSMapFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (MapTableFieldStrategy.class);
 
+    @Override
     public FieldMapping getFieldMapping() {
         return field;
     }
 
+    @Override
     public ClassMapping[] getIndependentKeyMappings(boolean traverse) {
         return (traverse) ? field.getKeyMapping().getIndependentTypeMappings()
             : ClassMapping.EMPTY_MAPPINGS;
     }
 
+    @Override
     public ClassMapping[] getIndependentValueMappings(boolean traverse) {
         return (traverse) ? field.getElementMapping().
             getIndependentTypeMappings() : ClassMapping.EMPTY_MAPPINGS;
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(ClassMapping cls) {
         return field.getJoinForeignKey();
     }
 
+    @Override
     public Object deriveKey(JDBCStore store, Object value) {
         return null;
     }
 
+    @Override
     public Object deriveValue(JDBCStore store, Object key) {
         return null;
     }
@@ -94,6 +104,7 @@ public abstract class MapTableFieldStrategy
     /**
      * Invokes {@link FieldStrategy#joinKeyRelation} by default.
      */
+    @Override
     public Joins joinKeyRelation(Joins joins, ClassMapping key) {
         return joinKeyRelation(joins, false, false);
     }
@@ -101,10 +112,12 @@ public abstract class MapTableFieldStrategy
     /**
      * Invokes {@link FieldStrategy#joinRelation} by default.
      */
+    @Override
     public Joins joinValueRelation(Joins joins, ClassMapping val) {
         return joinRelation(joins, false, false);
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.MAP)
             throw new MetaDataException(_loc.get("not-map", field));
@@ -119,6 +132,7 @@ public abstract class MapTableFieldStrategy
         field.getValueInfo().assertNoSchemaComponents(field, !adapt);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getAllRows(field.getTable(), Row.ACTION_DELETE);
@@ -126,11 +140,13 @@ public abstract class MapTableFieldStrategy
         rm.flushAllRows(row);
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         return 0;
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException {
@@ -142,7 +158,7 @@ public abstract class MapTableFieldStrategy
         // select all and load into a normal proxy
         Joins[] joins = new Joins[2];
         Result[] res = getResults(sm, store, fetch,
-            JDBCFetchConfiguration.EAGER_PARALLEL, joins, false);
+            EagerFetchModes.EAGER_PARALLEL, joins, false);
         try {
             Map map = (Map) sm.newProxy(field.getIndex());
             Object key, val;
@@ -162,30 +178,36 @@ public abstract class MapTableFieldStrategy
         }
     }
 
+    @Override
     public Object loadKeyProjection(JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
         return loadKey(null, store, fetch, res, joins);
     }
 
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
         return loadValue(null, store, fetch, res, joins);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, true);
     }
 
+    @Override
     public Joins joinKey(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, true);
     }
 
+    @Override
     public ForeignKey getJoinForeignKey() {
         return field.getJoinForeignKey();
     }
 
+    @Override
     protected ClassMapping[] getIndependentElementMappings(boolean traverse) {
         return ClassMapping.EMPTY_MAPPINGS;
     }
@@ -196,15 +218,15 @@ public abstract class MapTableFieldStrategy
         FieldMapping mapped = field.getMappedByMapping();
         if (mapped != null) {
             field.getValueInfo().assertNoSchemaComponents(field, !adapt);
-            mapped.resolve(mapped.MODE_META | mapped.MODE_MAPPING);
+            mapped.resolve(MetaDataModes.MODE_META | MetaDataModes.MODE_MAPPING);
 
             if (!mapped.isMapped() || mapped.isSerialized())
                 throw new MetaDataException(_loc.get("mapped-by-unmapped",
                     field, mapped));
 
             if (mapped.getTypeCode() == JavaTypes.PC) {
-                if (mapped.getJoinDirection() == mapped.JOIN_FORWARD) {
-                    field.setJoinDirection(field.JOIN_INVERSE);
+                if (mapped.getJoinDirection() == ValueMapping.JOIN_FORWARD) {
+                    field.setJoinDirection(ValueMapping.JOIN_INVERSE);
                     field.setColumns(mapped.getDefiningMapping().
                         getPrimaryKeyColumns());
                 } else if (isTypeUnjoinedSubclass(mapped))
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedBlobFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedBlobFieldStrategy.java
index f43bc4123..4ac93f9c0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedBlobFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedBlobFieldStrategy.java
@@ -41,15 +41,20 @@ import org.apache.openjpa.util.MetaDataException;
 public class MaxEmbeddedBlobFieldStrategy
     extends MaxEmbeddedLobFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (MaxEmbeddedBlobFieldStrategy.class);
 
     private int _maxSize = 0;
 
+    @Override
     protected int getExpectedJavaType() {
         return JavaTypes.OBJECT;
     }
 
+    @Override
     protected void update(OpenJPAStateManager sm, Row row)
         throws SQLException {
         byte[] b = (byte[]) sm.getImplData(field.getIndex());
@@ -63,6 +68,7 @@ public class MaxEmbeddedBlobFieldStrategy
         }
     }
 
+    @Override
     protected Boolean isCustom(OpenJPAStateManager sm, JDBCStore store) {
         // have we already stored our serialized data?
         byte[] b = (byte[]) sm.getImplData(field.getIndex());
@@ -85,6 +91,7 @@ public class MaxEmbeddedBlobFieldStrategy
         return (b.length > _maxSize) ? null : Boolean.FALSE;
     }
 
+    @Override
     protected void putData(OpenJPAStateManager sm, ResultSet rs,
         DBDictionary dict)
         throws SQLException {
@@ -93,18 +100,21 @@ public class MaxEmbeddedBlobFieldStrategy
         dict.putBytes(blob, b);
     }
 
+    @Override
     public void map(boolean adapt) {
         if (!field.isSerialized())
             throw new MetaDataException(_loc.get("not-serialized", field));
         super.map(adapt);
     }
 
+    @Override
     public void initialize() {
         DBDictionary dict = field.getMappingRepository().getDBDictionary();
         _maxSize = dict.maxEmbeddedBlobSize;
         field.setUsesImplData(Boolean.TRUE);
     }
 
+    @Override
     protected Object getValue(OpenJPAStateManager sm) {
         byte[] b = (byte[]) sm.getImplData(field.getIndex());
         if (b == null || (b.length > _maxSize && !field.getColumns()[0].isNotNull()))
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedByteArrayFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedByteArrayFieldStrategy.java
index 81003257d..c1b0b97a6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedByteArrayFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedByteArrayFieldStrategy.java
@@ -44,15 +44,20 @@ import org.apache.openjpa.util.MetaDataException;
 public class MaxEmbeddedByteArrayFieldStrategy
     extends MaxEmbeddedLobFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (MaxEmbeddedByteArrayFieldStrategy.class);
 
     private int _maxSize = 0;
 
+    @Override
     protected int getExpectedJavaType() {
         return JavaSQLTypes.BYTES;
     }
 
+    @Override
     protected void update(OpenJPAStateManager sm, Row row)
         throws SQLException {
         byte[] b = (byte[]) getValue(sm);
@@ -62,12 +67,14 @@ public class MaxEmbeddedByteArrayFieldStrategy
             row.setBytes(field.getColumns()[0], b);
     }
 
+    @Override
     protected Boolean isCustom(OpenJPAStateManager sm, JDBCStore store) {
         Object val = sm.fetchObject(field.getIndex());
         return (val != null && Array.getLength(val) > _maxSize) ? null
             : Boolean.FALSE;
     }
 
+    @Override
     protected void putData(OpenJPAStateManager sm, ResultSet rs,
         DBDictionary dict)
         throws SQLException {
@@ -76,23 +83,27 @@ public class MaxEmbeddedByteArrayFieldStrategy
             (field.getIndex())));
     }
 
+    @Override
     protected Object load(Column col, Result res, Joins joins)
         throws SQLException {
         return PrimitiveWrapperArrays.toObjectValue(field,
             res.getBytes(col, joins));
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getType() != byte[].class && field.getType() != Byte[].class)
             throw new MetaDataException(_loc.get("not-bytes", field));
         super.map(adapt);
     }
 
+    @Override
     public void initialize() {
         DBDictionary dict = field.getMappingRepository().getDBDictionary();
         _maxSize = dict.maxEmbeddedBlobSize;
     }
 
+    @Override
     protected Object getValue(OpenJPAStateManager sm) {
         byte[] b = PrimitiveWrapperArrays.toByteArray(sm.fetchObject
                 (field.getIndex()));
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedCharArrayFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedCharArrayFieldStrategy.java
index b27ee0890..311ff504e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedCharArrayFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedCharArrayFieldStrategy.java
@@ -48,15 +48,20 @@ import org.apache.openjpa.util.MetaDataException;
 public class MaxEmbeddedCharArrayFieldStrategy
     extends MaxEmbeddedLobFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (MaxEmbeddedCharArrayFieldStrategy.class);
 
     private int _maxSize = 0;
 
+    @Override
     protected int getExpectedJavaType() {
         return JavaSQLTypes.CHAR_STREAM;
     }
 
+    @Override
     protected void update(OpenJPAStateManager sm, Row row)
         throws SQLException {
         char[] c = PrimitiveWrapperArrays.
@@ -68,12 +73,14 @@ public class MaxEmbeddedCharArrayFieldStrategy
                 new CharArrayReader(c), c.length);
     }
 
+    @Override
     protected Boolean isCustom(OpenJPAStateManager sm, JDBCStore store) {
         Object val = sm.fetchObject(field.getIndex());
         return (val != null && Array.getLength(val) > _maxSize) ? null
             : Boolean.FALSE;
     }
 
+    @Override
     protected void putData(OpenJPAStateManager sm, ResultSet rs,
         DBDictionary dict)
         throws SQLException {
@@ -82,6 +89,7 @@ public class MaxEmbeddedCharArrayFieldStrategy
             toCharArray(sm.fetchObject(field.getIndex())));
     }
 
+    @Override
     protected Object load(Column col, Result res, Joins joins)
         throws SQLException {
         Reader reader = res.getCharacterStream(col, joins);
@@ -99,6 +107,7 @@ public class MaxEmbeddedCharArrayFieldStrategy
         }
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getType() != char[].class
             && field.getType() != Character[].class)
@@ -106,11 +115,13 @@ public class MaxEmbeddedCharArrayFieldStrategy
         super.map(adapt);
     }
 
+    @Override
     public void initialize() {
         DBDictionary dict = field.getMappingRepository().getDBDictionary();
         _maxSize = dict.maxEmbeddedClobSize;
     }
 
+    @Override
     protected Object getValue(OpenJPAStateManager sm) {
         char[] c = PrimitiveWrapperArrays.
         toCharArray(sm.fetchObject(field.getIndex()));
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedClobFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedClobFieldStrategy.java
index 170f4d853..bb19cc3fa 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedClobFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedClobFieldStrategy.java
@@ -40,15 +40,20 @@ import org.apache.openjpa.util.MetaDataException;
 public class MaxEmbeddedClobFieldStrategy
     extends MaxEmbeddedLobFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (MaxEmbeddedClobFieldStrategy.class);
 
     private int _maxSize = 0;
 
+    @Override
     protected int getExpectedJavaType() {
         return JavaTypes.STRING;
     }
 
+    @Override
     protected void update(OpenJPAStateManager sm, Row row)
         throws SQLException {
         String s = (String) getValue(sm);
@@ -58,11 +63,13 @@ public class MaxEmbeddedClobFieldStrategy
             row.setString(field.getColumns()[0], s);
     }
 
+    @Override
     protected Boolean isCustom(OpenJPAStateManager sm, JDBCStore store) {
         String s = sm.fetchString(field.getIndex());
         return (s != null && s.length() > _maxSize) ? null : Boolean.FALSE;
     }
 
+    @Override
     protected void putData(OpenJPAStateManager sm, ResultSet rs,
         DBDictionary dict)
         throws SQLException {
@@ -70,17 +77,20 @@ public class MaxEmbeddedClobFieldStrategy
         dict.putString(clob, sm.fetchString(field.getIndex()));
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.STRING)
             throw new MetaDataException(_loc.get("not-clobstring", field));
         super.map(adapt);
     }
 
+    @Override
     public void initialize() {
         DBDictionary dict = field.getMappingRepository().getDBDictionary();
         _maxSize = dict.maxEmbeddedClobSize;
     }
 
+    @Override
     protected Object getValue(OpenJPAStateManager sm) {
         String s = sm.fetchString(field.getIndex());
         if (s == null || (s.length() > _maxSize && !field.getColumns()[0].isNotNull())) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedLobFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedLobFieldStrategy.java
index 814bc9b2e..ccd265c72 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedLobFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MaxEmbeddedLobFieldStrategy.java
@@ -24,6 +24,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
@@ -48,6 +49,9 @@ import org.apache.openjpa.meta.JavaTypes;
 abstract class MaxEmbeddedLobFieldStrategy
     extends HandlerFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Return the expected type of the field from {@link JavaTypes} or
      * {@link JavaSQLTypes}.
@@ -73,6 +77,7 @@ abstract class MaxEmbeddedLobFieldStrategy
         DBDictionary dict)
         throws SQLException;
 
+    @Override
     public void map(boolean adapt) {
         assertNotMappedBy();
 
@@ -106,18 +111,21 @@ abstract class MaxEmbeddedLobFieldStrategy
         field.mapPrimaryKey(adapt);
     }
 
+    @Override
     public Boolean isCustomInsert(OpenJPAStateManager sm, JDBCStore store) {
         if (!field.getColumnIO().isInsertable(0, false))
             return Boolean.FALSE;
         return isCustom(sm, store);
     }
 
+    @Override
     public Boolean isCustomUpdate(OpenJPAStateManager sm, JDBCStore store) {
         if (!field.getColumnIO().isUpdatable(0, false))
             return Boolean.FALSE;
         return isCustom(sm, store);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (!field.getColumnIO().isInsertable(0, false))
@@ -127,6 +135,7 @@ abstract class MaxEmbeddedLobFieldStrategy
             update(sm, row);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (!field.getColumnIO().isUpdatable(0, false))
@@ -136,16 +145,19 @@ abstract class MaxEmbeddedLobFieldStrategy
             update(sm, row);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         field.deleteRow(sm, store, rm);
     }
 
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         customUpdate(sm, store);
     }
 
+    @Override
     public void customUpdate(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         JDBCFetchConfiguration fetch = store.getFetchConfiguration();
@@ -187,6 +199,7 @@ abstract class MaxEmbeddedLobFieldStrategy
         }
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         if (type == Select.TYPE_JOINLESS && sel.isSelected(field.getTable()))
@@ -194,15 +207,17 @@ abstract class MaxEmbeddedLobFieldStrategy
         return 0;
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
         if (sel.isDistinct() ||
-            eagerMode == JDBCFetchConfiguration.EAGER_NONE)
+            eagerMode == EagerFetchModes.EAGER_NONE)
             return -1;
         sel.select(field.getColumns()[0], field.join(sel));
         return 1;
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
@@ -211,6 +226,7 @@ abstract class MaxEmbeddedLobFieldStrategy
             sm.store(field.getIndex(), load(col, res, null));
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException {
@@ -238,20 +254,24 @@ abstract class MaxEmbeddedLobFieldStrategy
         return res.getObject(col, null, joins);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, false);
     }
 
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
         return load(field.getColumns()[0], res, joins);
     }
 
+    @Override
     public boolean isVersionable() {
         return false;
     }
 
+    @Override
     public void where(OpenJPAStateManager sm, JDBCStore store, RowManager rm,
         Object prevValue)
         throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java
index 0268475de..d913fb4c3 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java
@@ -18,9 +18,9 @@
  */
 package org.apache.openjpa.jdbc.meta.strats;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.Schemas;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 
 
@@ -34,6 +34,9 @@ import org.apache.openjpa.meta.JavaTypes;
  */
 public class MultiColumnVersionStrategy extends NumberVersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "version-numbers";
 
     private Number[] _initials = null;
@@ -67,14 +70,17 @@ public class MultiColumnVersionStrategy extends NumberVersionStrategy {
     	return _initials;
     }
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     protected int getJavaType() {
         return JavaTypes.ARRAY;
     }
 
+    @Override
     protected int getJavaType(int i) {
     	if (_javaTypes == null) {
             _javaTypes = new Integer[vers.getMappingInfo().getColumns().size()];
@@ -92,6 +98,7 @@ public class MultiColumnVersionStrategy extends NumberVersionStrategy {
     	return _javaTypes[i];
     }
 
+    @Override
     protected Object nextVersion(Object version) {
         if (version == null)
             return _initials;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NanoPrecisionTimestampVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NanoPrecisionTimestampVersionStrategy.java
index ff4a91ead..7ee91fc9b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NanoPrecisionTimestampVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NanoPrecisionTimestampVersionStrategy.java
@@ -29,12 +29,16 @@ import org.apache.openjpa.lib.util.TimestampHelper;
 public class NanoPrecisionTimestampVersionStrategy
     extends TimestampVersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String ALIAS = "nano-timestamp";
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     protected Object nextVersion(Object version) {
         return TimestampHelper.getNanoPrecisionTimestamp();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneClassStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneClassStrategy.java
index ad2e3b4fb..052f5d1d0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneClassStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneClassStrategy.java
@@ -35,6 +35,9 @@ import org.apache.openjpa.util.InvalidStateException;
 public class NoneClassStrategy
     extends AbstractClassStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "none";
 
     private static final NoneClassStrategy _instance = new NoneClassStrategy();
@@ -55,23 +58,28 @@ public class NoneClassStrategy
     private NoneClassStrategy() {
     }
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void setClassMapping(ClassMapping owner) {
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         throwFlushException(sm);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         throwFlushException(sm);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         throwFlushException(sm);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneDiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneDiscriminatorStrategy.java
index cc5893152..9c3760199 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneDiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneDiscriminatorStrategy.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.jdbc.meta.Discriminator;
 public class NoneDiscriminatorStrategy
     extends AbstractDiscriminatorStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "none";
 
     private static final NoneDiscriminatorStrategy _instance =
@@ -46,10 +49,12 @@ public class NoneDiscriminatorStrategy
     private NoneDiscriminatorStrategy() {
     }
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void setDiscriminator(Discriminator owner) {
         // mark subs loaded immediately since we know there's nothing to do
         // to load them
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneFieldStrategy.java
index 1e7cbb39b..10cf92cda 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneFieldStrategy.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.jdbc.meta.FieldMapping;
 public class NoneFieldStrategy
     extends AbstractFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "none";
 
     private static final NoneFieldStrategy _instance = new NoneFieldStrategy();
@@ -45,10 +48,12 @@ public class NoneFieldStrategy
     private NoneFieldStrategy() {
     }
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void setFieldMapping(FieldMapping owner) {
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneVersionStrategy.java
index 014066eab..e3aed721b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NoneVersionStrategy.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.jdbc.meta.Version;
 public class NoneVersionStrategy
     extends AbstractVersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "none";
 
     private static final NoneVersionStrategy _instance =
@@ -46,10 +49,12 @@ public class NoneVersionStrategy
     private NoneVersionStrategy() {
     }
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void setVersion(Version owner) {
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java
index cc8ee5d65..860c74f70 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java
@@ -32,6 +32,9 @@ import org.apache.openjpa.meta.JavaTypes;
 public class NumberVersionStrategy
     extends ColumnVersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "version-number";
 
     private Number _initial = 1;
@@ -51,10 +54,12 @@ public class NumberVersionStrategy
         return _initial.intValue();
     }
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     protected int getJavaType() {
         if (_javaType == null && vers.getClassMapping().getVersionFieldMapping() != null) {
             _javaType = Integer.valueOf(vers.getClassMapping().getVersionFieldMapping().getTypeCode());
@@ -65,15 +70,17 @@ public class NumberVersionStrategy
         return _javaType;
     }
 
+    @Override
     protected Object nextVersion(Object version) {
         if (version == null)
             return _initial;
         return ((Number) version).intValue() + 1;
     }
 
+    @Override
     public Map<Column,String> getBulkUpdateValues() {
         Column[] cols = vers.getColumns();
-        Map<Column,String> map = new HashMap<Column,String>(cols.length);
+        Map<Column,String> map = new HashMap<>(cols.length);
         for (int i = 0; i < cols.length; i++)
             map.put(cols[i], cols[i].getName() + " + 1");
         return map;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ObjectIdClassStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ObjectIdClassStrategy.java
index b3e475dfa..ecef9c0c1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ObjectIdClassStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ObjectIdClassStrategy.java
@@ -32,9 +32,12 @@ import org.apache.openjpa.util.MetaDataException;
 public class ObjectIdClassStrategy
     extends AbstractClassStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (ObjectIdClassStrategy.class);
 
+    @Override
     public void map(boolean adapt) {
         ValueMapping vm = cls.getEmbeddingMapping();
         if (vm == null || vm.getType() != cls.getDescribedType()
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ObjectIdValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ObjectIdValueHandler.java
index a8d706981..fb22f4c0c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ObjectIdValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ObjectIdValueHandler.java
@@ -43,11 +43,15 @@ import org.apache.openjpa.util.InternalException;
 public class ObjectIdValueHandler
     extends EmbedValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object[] _args = null;
 
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -146,10 +150,12 @@ public class ObjectIdValueHandler
         return false;
     }
 
+    @Override
     public Object getResultArgument(ValueMapping vm) {
         return _args;
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         OpenJPAStateManager sm = (val == null) ? null
@@ -161,6 +167,7 @@ public class ObjectIdValueHandler
         return super.toDataStoreValue(sm, vm, store, cols, rval, 0);
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val) {
         if (val == null)
             return null;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/PrimitiveFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/PrimitiveFieldStrategy.java
index 59050e04f..1d05a3305 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/PrimitiveFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/PrimitiveFieldStrategy.java
@@ -54,6 +54,9 @@ public class PrimitiveFieldStrategy
     extends AbstractFieldStrategy
     implements Joinable, Embeddable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Object NULL = new Object();
 
     private static final Localizer _loc = Localizer.forPackage
@@ -61,6 +64,7 @@ public class PrimitiveFieldStrategy
 
     private boolean _stateImage = false;
 
+    @Override
     public void map(boolean adapt) {
         if (field.isSerialized() || !field.getType().isPrimitive())
             throw new MetaDataException(_loc.get("not-primitive", field));
@@ -106,6 +110,7 @@ public class PrimitiveFieldStrategy
         field.getDefiningMapping().setJoinable(field.getColumns()[0], this);
     }
 
+    @Override
     public void initialize() {
         // record whether we're using a state image indicator, which requires
         // that we do special null checks when loading primitives
@@ -115,6 +120,7 @@ public class PrimitiveFieldStrategy
             field.setUsesImplData(null);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (!field.getColumnIO().isInsertable(0, false))
@@ -124,6 +130,7 @@ public class PrimitiveFieldStrategy
             update(sm, row);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (!field.getColumnIO().isUpdatable(0, false))
@@ -133,6 +140,7 @@ public class PrimitiveFieldStrategy
             update(sm, row);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         field.deleteRow(sm, store, rm);
@@ -174,6 +182,7 @@ public class PrimitiveFieldStrategy
         }
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         if (type == Select.TYPE_JOINLESS && sel.isSelected(field.getTable()))
@@ -181,12 +190,14 @@ public class PrimitiveFieldStrategy
         return 0;
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
         sel.select(field.getColumns()[0], field.join(sel));
         return 1;
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
@@ -233,28 +244,33 @@ public class PrimitiveFieldStrategy
             sm.setImplData(field.getIndex(), NULL);
     }
 
+    @Override
     public void appendIsNull(SQLBuffer sql, Select sel, Joins joins) {
         joins = join(joins, false);
         sql.append(sel.getColumnAlias(field.getColumns()[0], joins)).
             append(" IS ").appendValue(null, field.getColumns()[0]);
     }
 
+    @Override
     public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins) {
         joins = join(joins, false);
         sql.append(sel.getColumnAlias(field.getColumns()[0], joins)).
             append(" IS NOT ").appendValue(null, field.getColumns()[0]);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, false);
     }
 
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
         return res.getObject(field.getColumns()[0], null, joins);
     }
 
+    @Override
     public boolean isVersionable() {
         if (field.isJoinOuter())
             return false;
@@ -271,6 +287,7 @@ public class PrimitiveFieldStrategy
         }
     }
 
+    @Override
     public void where(OpenJPAStateManager sm, JDBCStore store, RowManager rm,
         Object prevValue)
         throws SQLException {
@@ -292,10 +309,12 @@ public class PrimitiveFieldStrategy
     // Joinable implementation
     ///////////////////////////
 
+    @Override
     public int getFieldIndex() {
         return field.getIndex();
     }
 
+    @Override
     public Object getPrimaryKeyValue(Result res, Column[] cols, ForeignKey fk,
         JDBCStore store, Joins joins)
         throws SQLException {
@@ -306,19 +325,23 @@ public class PrimitiveFieldStrategy
             field.getTypeCode());
     }
 
+    @Override
     public Column[] getColumns() {
         return field.getColumns();
     }
 
+    @Override
     public Object getJoinValue(Object fieldVal, Column col, JDBCStore store) {
         return fieldVal;
     }
 
+    @Override
     public Object getJoinValue(OpenJPAStateManager sm, Column col,
         JDBCStore store) {
         return sm.fetch(field.getIndex());
     }
 
+    @Override
     public void setAutoAssignedValue(OpenJPAStateManager sm, JDBCStore store,
         Column col, Object autoInc) {
         int idx = field.getIndex();
@@ -386,22 +409,27 @@ public class PrimitiveFieldStrategy
     // Embeddable implementation
     /////////////////////////////
 
+    @Override
     public ColumnIO getColumnIO() {
         return field.getColumnIO();
     }
 
+    @Override
     public Object[] getResultArguments() {
         return null;
     }
 
+    @Override
     public Object toEmbeddedObjectValue(Object val) {
         return val;
     }
 
+    @Override
     public Object toEmbeddedDataStoreValue(Object val, JDBCStore store) {
         return toDataStoreValue(val, store);
     }
 
+    @Override
     public void loadEmbedded(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object val)
         throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionInverseKeyFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionInverseKeyFieldStrategy.java
index 168adf3e7..096e6ad5b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionInverseKeyFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionInverseKeyFieldStrategy.java
@@ -45,48 +45,60 @@ public class RelationCollectionInverseKeyFieldStrategy
     extends RelationToManyInverseKeyFieldStrategy
     implements LRSCollectionFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (RelationCollectionInverseKeyFieldStrategy.class);
 
+    @Override
     public FieldMapping getFieldMapping() {
         return field;
     }
 
+    @Override
     public ClassMapping[] getIndependentElementMappings(boolean traverse) {
         return super.getIndependentElementMappings(traverse);
     }
 
+    @Override
     public Column[] getElementColumns(ClassMapping elem) {
         return elem.getPrimaryKeyColumns();
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(ClassMapping elem) {
         return super.getJoinForeignKey(elem);
     }
 
+    @Override
     public void selectElement(Select sel, ClassMapping elem, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode, Joins joins) {
         super.selectElement(sel, elem, store, fetch, eagerMode, joins);
     }
 
+    @Override
     public Object loadElement(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
         return super.loadElement(sm, store, fetch, res, joins);
     }
 
+    @Override
     public Joins join(Joins joins, ClassMapping elem) {
         return super.join(joins, elem);
     }
 
+    @Override
     public Joins joinElementRelation(Joins joins, ClassMapping elem) {
         return super.joinElementRelation(joins, elem);
     }
 
+    @Override
     protected Proxy newLRSProxy() {
         return new LRSProxyCollection(this);
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.COLLECTION
             && field.getTypeCode() != JavaTypes.ARRAY)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionTableFieldStrategy.java
index 9ed5bf9bb..754eae991 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionTableFieldStrategy.java
@@ -45,48 +45,60 @@ public class RelationCollectionTableFieldStrategy
     extends RelationToManyTableFieldStrategy
     implements LRSCollectionFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (RelationCollectionTableFieldStrategy.class);
 
+    @Override
     public FieldMapping getFieldMapping() {
         return field;
     }
 
+    @Override
     public ClassMapping[] getIndependentElementMappings(boolean traverse) {
         return super.getIndependentElementMappings(traverse);
     }
 
+    @Override
     public Column[] getElementColumns(ClassMapping elem) {
         return field.getElementMapping().getColumns();
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(ClassMapping elem) {
         return super.getJoinForeignKey(elem);
     }
 
+    @Override
     public void selectElement(Select sel, ClassMapping elem, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode, Joins joins) {
         super.selectElement(sel, elem, store, fetch, eagerMode, joins);
     }
 
+    @Override
     public Object loadElement(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
         return super.loadElement(sm, store, fetch, res, joins);
     }
 
+    @Override
     public Joins join(Joins joins, ClassMapping elem) {
         return super.join(joins, elem);
     }
 
+    @Override
     public Joins joinElementRelation(Joins joins, ClassMapping elem) {
         return super.joinElementRelation(joins, elem);
     }
 
+    @Override
     protected Proxy newLRSProxy() {
         return new LRSProxyCollection(this);
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.COLLECTION
             && field.getTypeCode() != JavaTypes.ARRAY)
@@ -94,18 +106,21 @@ public class RelationCollectionTableFieldStrategy
         super.map(adapt);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
     	if (!field.isBidirectionalJoinTableMappingOwner())
     		super.insert(sm, store, rm);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
     	if (!field.isBidirectionalJoinTableMappingOwner())
     		super.update(sm, store, rm);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
     	if (!field.isBidirectionalJoinTableMappingOwner())
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
index 8c06ffe7a..fa9ad26ad 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
@@ -29,6 +29,7 @@ import java.util.Set;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.ReflectingPersistenceCapable;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -61,6 +62,7 @@ import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.util.ApplicationIds;
 import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.InternalException;
@@ -80,11 +82,15 @@ public class RelationFieldStrategy
     extends AbstractFieldStrategy
     implements Joinable, Embeddable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (RelationFieldStrategy.class);
 
     private Boolean _fkOid = null;
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.PC || field.isEmbeddedPC())
             throw new MetaDataException(_loc.get("not-relation", field));
@@ -101,15 +107,15 @@ public class RelationFieldStrategy
         if (mapped != null) {
             field.getMappingInfo().assertNoSchemaComponents(field, !adapt);
             field.getValueInfo().assertNoSchemaComponents(field, !adapt);
-            mapped.resolve(mapped.MODE_META | mapped.MODE_MAPPING);
+            mapped.resolve(MetaDataModes.MODE_META | MetaDataModes.MODE_MAPPING);
 
             if (!mapped.isMapped() || mapped.isSerialized())
                 throw new MetaDataException(_loc.get("mapped-by-unmapped",
                     field, mapped));
 
             if (mapped.getTypeCode() == JavaTypes.PC) {
-                if (mapped.getJoinDirection() == mapped.JOIN_FORWARD) {
-                    field.setJoinDirection(field.JOIN_INVERSE);
+                if (mapped.getJoinDirection() == ValueMapping.JOIN_FORWARD) {
+                    field.setJoinDirection(ValueMapping.JOIN_INVERSE);
                     field.setColumns(mapped.getDefiningMapping().
                         getPrimaryKeyColumns());
                 } else if (isTypeUnjoinedSubclass(mapped))
@@ -168,8 +174,8 @@ public class RelationFieldStrategy
                 field.setForeignKey(fk);
             }
             field.setColumnIO(vinfo.getColumnIO());
-            if (vinfo.getJoinDirection() == vinfo.JOIN_INVERSE)
-                field.setJoinDirection(field.JOIN_INVERSE);
+            if (vinfo.getJoinDirection() == MappingInfo.JOIN_INVERSE)
+                field.setJoinDirection(ValueMapping.JOIN_INVERSE);
         } else
             RelationStrategies.mapRelationToUnmappedPC(field, field.getName(),
                 adapt);
@@ -253,16 +259,18 @@ public class RelationFieldStrategy
         return true;
     }
 
+    @Override
     public void initialize() {
         field.setUsesIntermediate(true);
 
         ForeignKey fk = field.getForeignKey();
         if (fk == null)
             _fkOid = Boolean.TRUE;
-        else if (field.getJoinDirection() != FieldMapping.JOIN_INVERSE)
+        else if (field.getJoinDirection() != ValueMapping.JOIN_INVERSE)
             _fkOid = field.getTypeMapping().isForeignKeyObjectId(fk);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() != null)
@@ -283,7 +291,7 @@ public class RelationFieldStrategy
 	        	if (row != null) return;
 	        }
         }
-        if (field.getJoinDirection() == FieldMapping.JOIN_INVERSE)
+        if (field.getJoinDirection() == ValueMapping.JOIN_INVERSE)
             updateInverse(sm, rel, store, rm);
         else {
             if (row == null) row =  field.getRow(sm, store, rm, Row.ACTION_INSERT);
@@ -359,6 +367,7 @@ public class RelationFieldStrategy
         return null;
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() != null)
@@ -367,7 +376,7 @@ public class RelationFieldStrategy
         OpenJPAStateManager rel = RelationStrategies.getStateManager
             (sm.fetchObjectField(field.getIndex()), store.getContext());
 
-        if (field.getJoinDirection() == field.JOIN_INVERSE) {
+        if (field.getJoinDirection() == ValueMapping.JOIN_INVERSE) {
             nullInverse(sm, rm);
             updateInverse(sm, rel, store, rm);
         } else {
@@ -399,12 +408,13 @@ public class RelationFieldStrategy
         }
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() != null)
             return;
 
-        if (field.getJoinDirection() == field.JOIN_INVERSE) {
+        if (field.getJoinDirection() == ValueMapping.JOIN_INVERSE) {
             if (sm.getLoaded().get(field.getIndex())) {
                 OpenJPAStateManager rel = RelationStrategies.getStateManager(sm.
                     fetchObjectField(field.getIndex()), store.getContext());
@@ -517,10 +527,11 @@ public class RelationFieldStrategy
         row.setForeignKey(fk, io, sm);
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         if (type == Select.TYPE_JOINLESS)
-            return (field.getJoinDirection() != field.JOIN_INVERSE
+            return (field.getJoinDirection() != ValueMapping.JOIN_INVERSE
                 && sel.isSelected(field.getTable())) ? 1 : 0;
         if (type == Select.TYPE_TWO_PART)
             return 1;
@@ -547,6 +558,7 @@ public class RelationFieldStrategy
         }
     }
 
+    @Override
     public void selectEagerParallel(SelectExecutor sel,
         final OpenJPAStateManager sm, final JDBCStore store,
         final JDBCFetchConfiguration fetch, final int eagerMode) {
@@ -556,9 +568,10 @@ public class RelationFieldStrategy
         else {
             Union union = (Union) sel;
             if (fetch.getSubclassFetchMode (field.getTypeMapping())
-                != JDBCFetchConfiguration.EAGER_JOIN)
+                != EagerFetchModes.EAGER_JOIN)
                 union.abortUnion();
             union.select(new Union.Selector() {
+                @Override
                 public void select(Select sel, int idx) {
                     selectEagerParallel(sel, clss[idx], store, fetch,
                         eagerMode);
@@ -585,6 +598,7 @@ public class RelationFieldStrategy
             joins);
     }
 
+    @Override
     public void selectEagerJoin(Select sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode) {
         if (field.isBiMTo1JT())
@@ -598,7 +612,7 @@ public class RelationFieldStrategy
         boolean forceInner = fetch.hasFetchInnerJoin(field.getFullName(false)) ?
                 true : false;
         sel.select(cls, field.getSelectSubclasses(), store, fetch,
-            JDBCFetchConfiguration.EAGER_JOIN,
+            EagerFetchModes.EAGER_JOIN,
             eagerJoin(sel.newJoins(), cls, forceInner));
     }
 
@@ -606,7 +620,7 @@ public class RelationFieldStrategy
      * Add the joins needed to select/load eager data.
      */
     private Joins eagerJoin(Joins joins, ClassMapping cls, boolean forceInner) {
-        boolean inverse = field.getJoinDirection() == field.JOIN_INVERSE;
+        boolean inverse = field.getJoinDirection() == ValueMapping.JOIN_INVERSE;
         if (!inverse) {
             joins = join(joins, false);
             joins = setEmbeddedVariable(joins);
@@ -614,7 +628,7 @@ public class RelationFieldStrategy
 
         // and join into relation
         ForeignKey fk = field.getForeignKey(cls);
-        if (!forceInner && field.getNullValue() != FieldMapping.NULL_EXCEPTION)
+        if (!forceInner && field.getNullValue() != FieldMetaData.NULL_EXCEPTION)
             return joins.outerJoinRelation(field.getName(), fk, field.
                 getTypeMapping(), field.getSelectSubclasses(), inverse, false);
         return joins.joinRelation(field.getName(), fk, field.getTypeMapping(),
@@ -632,9 +646,10 @@ public class RelationFieldStrategy
             getEmbeddingMetaData().getFieldMetaData().getName());
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
-        if (field.getJoinDirection() == field.JOIN_INVERSE)
+        if (field.getJoinDirection() == ValueMapping.JOIN_INVERSE)
             return -1;
         // already cached oid?
         if (sm != null && sm.getIntermediate(field.getIndex()) != null)
@@ -645,6 +660,7 @@ public class RelationFieldStrategy
         return 0;
     }
 
+    @Override
     public Object loadEagerParallel(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object res)
         throws SQLException {
@@ -689,6 +705,7 @@ public class RelationFieldStrategy
         return rels;
     }
 
+    @Override
     public void loadEagerJoin(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
@@ -732,10 +749,11 @@ public class RelationFieldStrategy
         res.setMappedByValue(null);
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
-        if (field.getJoinDirection() == field.JOIN_INVERSE)
+        if (field.getJoinDirection() == ValueMapping.JOIN_INVERSE)
             return;
         // cached oid?
         if (sm != null && sm.getIntermediate(field.getIndex()) != null)
@@ -753,7 +771,7 @@ public class RelationFieldStrategy
                     field.getPolymorphic() != ValueMapping.POLY_FALSE, null);
         } else {
             Column[] cols = field.getColumns();
-            if (relMapping.getIdentityType() == ClassMapping.ID_DATASTORE) {
+            if (relMapping.getIdentityType() == ClassMetaData.ID_DATASTORE) {
                 long id = res.getLong(cols[0]);
                 if (!res.wasNull())
                     oid = store.newDataStoreId(id, relMapping, true);
@@ -783,6 +801,7 @@ public class RelationFieldStrategy
             sm.setIntermediate(field.getIndex(), oid);
     }
 
+    @Override
     public void load(final OpenJPAStateManager sm, final JDBCStore store,
         final JDBCFetchConfiguration fetch)
         throws SQLException {
@@ -806,11 +825,12 @@ public class RelationFieldStrategy
         Union union = store.getSQLFactory().newUnion(rels.length);
         union.setExpectedResultCount(1, false);
         if (fetch.getSubclassFetchMode(field.getTypeMapping())
-            != JDBCFetchConfiguration.EAGER_JOIN)
+            != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
-                if (field.getJoinDirection() == field.JOIN_INVERSE)
+                if (field.getJoinDirection() == ValueMapping.JOIN_INVERSE)
                     sel.whereForeignKey(field.getForeignKey(rels[idx]),
                         sm.getObjectId(), field.getDefiningMapping(), store);
                 else {
@@ -827,7 +847,7 @@ public class RelationFieldStrategy
                             field.getDefiningMapping(), store);
                     }
                 }
-                sel.select(rels[idx], subs, store, fetch, fetch.EAGER_JOIN,
+                sel.select(rels[idx], subs, store, fetch, EagerFetchModes.EAGER_JOIN,
                     resJoins[idx]);
             }
         });
@@ -844,16 +864,18 @@ public class RelationFieldStrategy
         }
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return RelationStrategies.toDataStoreValue(field, val, store);
     }
 
+    @Override
     public void appendIsNull(SQLBuffer sql, Select sel, Joins joins) {
         // if no inverse, just join to mapping's table (usually a no-op
         // because it'll be in the primary table) and see if fk cols are null;
         // if inverse, then we have to do a sub-select to see if any inverse
         // objects point back to this field's owner
-        if (field.getJoinDirection() != field.JOIN_INVERSE) {
+        if (field.getJoinDirection() != ValueMapping.JOIN_INVERSE) {
             //### probably need some sort of subselect here on fk constants
             joins = join(joins, false);
             Column[] cols = field.getColumns();
@@ -866,12 +888,13 @@ public class RelationFieldStrategy
             testInverseNull(sql, sel, joins, true);
     }
 
+    @Override
     public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins) {
         // if no inverse, just join to mapping's table (usually a no-op
         // because it'll be in the primary table) and see if fk cols aren't
         // null; if inverse, then we have to do a sub-select to see if any
         // inverse objects point back to this field's owner
-        if (field.getJoinDirection() != field.JOIN_INVERSE) {
+        if (field.getJoinDirection() != ValueMapping.JOIN_INVERSE) {
             //### probably need some sort of subselect here on fk constants
             joins = join(joins, false);
             Column[] cols = field.getColumns();
@@ -906,10 +929,11 @@ public class RelationFieldStrategy
             fk);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         // if we're not in an inverse object table join normally, otherwise
         // already traversed the relation; just join back to owner table
-        if (field.getJoinDirection() != field.JOIN_INVERSE)
+        if (field.getJoinDirection() != ValueMapping.JOIN_INVERSE)
             return field.join(joins, forceOuter, false);
         ClassMapping[] clss = field.getIndependentTypeMappings();
         if (clss.length != 1)
@@ -922,10 +946,11 @@ public class RelationFieldStrategy
             clss[0], field.getSelectSubclasses(), true, false);
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         // if this is an inverse mapping it's already joined to the relation
-        if (field.getJoinDirection() == field.JOIN_INVERSE)
+        if (field.getJoinDirection() == ValueMapping.JOIN_INVERSE)
             return joins;
         ClassMapping[] clss = field.getIndependentTypeMappings();
         if (clss.length != 1) {
@@ -947,15 +972,17 @@ public class RelationFieldStrategy
     // Joinable implementation
     ///////////////////////////
 
+    @Override
     public int getFieldIndex() {
         return field.getIndex();
     }
 
+    @Override
     public Object getPrimaryKeyValue(Result res, Column[] cols, ForeignKey fk,
         JDBCStore store, Joins joins)
         throws SQLException {
         ClassMapping relmapping = field.getTypeMapping();
-        if (relmapping.getIdentityType() == ClassMapping.ID_DATASTORE) {
+        if (relmapping.getIdentityType() == ClassMetaData.ID_DATASTORE) {
             Column col = cols[0];
             if (fk != null)
                 col = fk.getColumn(col);
@@ -1000,6 +1027,7 @@ public class RelationFieldStrategy
         return tfk;
     }
 
+    @Override
     public Object getJoinValue(Object fieldVal, Column col, JDBCStore store) {
         Object o = field.getForeignKey().getConstant(col);
         if (o != null)
@@ -1030,11 +1058,13 @@ public class RelationFieldStrategy
         return j.getJoinValue(fieldVal, col, store);
     }
 
+    @Override
     public Object getJoinValue(OpenJPAStateManager sm, Column col,
         JDBCStore store) {
         return getJoinValue(sm.fetch(field.getIndex()), col, store);
     }
 
+    @Override
     public void setAutoAssignedValue(OpenJPAStateManager sm, JDBCStore store,
         Column col, Object autoInc) {
         throw new UnsupportedException();
@@ -1044,26 +1074,32 @@ public class RelationFieldStrategy
     // Embeddable implementation
     /////////////////////////////
 
+    @Override
     public Column[] getColumns() {
         return field.getColumns();
     }
 
+    @Override
     public ColumnIO getColumnIO() {
         return field.getColumnIO();
     }
 
+    @Override
     public Object[] getResultArguments() {
         return null;
     }
 
+    @Override
     public Object toEmbeddedDataStoreValue(Object val, JDBCStore store) {
         return toDataStoreValue(val, store);
     }
 
+    @Override
     public Object toEmbeddedObjectValue(Object val) {
         return UNSUPPORTED;
     }
 
+    @Override
     public void loadEmbedded(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object val)
         throws SQLException {
@@ -1071,7 +1107,7 @@ public class RelationFieldStrategy
         Object oid;
         if (val == null)
             oid = null;
-        else if (relMapping.getIdentityType() == ClassMapping.ID_DATASTORE)
+        else if (relMapping.getIdentityType() == ClassMetaData.ID_DATASTORE)
             oid = store.newDataStoreId(((Number) val).longValue(), relMapping,
                 field.getPolymorphic() != ValueMapping.POLY_FALSE);
         else {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationHandlerMapTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationHandlerMapTableFieldStrategy.java
index fc36e26df..b21f62ce1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationHandlerMapTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationHandlerMapTableFieldStrategy.java
@@ -18,17 +18,35 @@
  */
 package org.apache.openjpa.jdbc.meta.strats;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
 
-import org.apache.openjpa.lib.util.*;
-import org.apache.openjpa.meta.*;
-import org.apache.openjpa.kernel.*;
-import org.apache.openjpa.util.*;
-import org.apache.openjpa.jdbc.meta.*;
-import org.apache.openjpa.jdbc.kernel.*;
-import org.apache.openjpa.jdbc.schema.*;
-import org.apache.openjpa.jdbc.sql.*;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
+import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.ValueHandler;
+import org.apache.openjpa.jdbc.meta.ValueMapping;
+import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.ColumnIO;
+import org.apache.openjpa.jdbc.schema.ForeignKey;
+import org.apache.openjpa.jdbc.sql.Joins;
+import org.apache.openjpa.jdbc.sql.Result;
+import org.apache.openjpa.jdbc.sql.Row;
+import org.apache.openjpa.jdbc.sql.RowManager;
+import org.apache.openjpa.jdbc.sql.Select;
+import org.apache.openjpa.jdbc.sql.Union;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.kernel.StoreContext;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.util.ChangeTracker;
+import org.apache.openjpa.util.MetaDataException;
+import org.apache.openjpa.util.Proxies;
+import org.apache.openjpa.util.Proxy;
 
 /**
  * <p>Mapping for a map whose keys are relations to other persistent objects
@@ -40,6 +58,9 @@ import org.apache.openjpa.jdbc.sql.*;
 public class RelationHandlerMapTableFieldStrategy
     extends MapTableFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (RelationHandlerMapTableFieldStrategy.class);
 
@@ -47,26 +68,31 @@ public class RelationHandlerMapTableFieldStrategy
     private ColumnIO _vio = null;
     private boolean _vload = false;
 
+    @Override
     public Column[] getKeyColumns(ClassMapping cls) {
         return field.getKeyMapping().getColumns();
     }
 
+    @Override
     public Column[] getValueColumns(ClassMapping cls) {
         return _vcols;
     }
 
+    @Override
     public void selectKey(Select sel, ClassMapping key, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, Joins joins) {
         sel.select(key, field.getKeyMapping().getSelectSubclasses(),
-            store, fetch, JDBCFetchConfiguration.EAGER_NONE, joins);
+            store, fetch, EagerFetchModes.EAGER_NONE, joins);
     }
 
+    @Override
     public void selectValue(Select sel, ClassMapping val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch,
         Joins joins) {
         sel.select(_vcols, joins);
     }
 
+    @Override
     public Result[] getResults(final OpenJPAStateManager sm,
         final JDBCStore store, final JDBCFetchConfiguration fetch,
         final int eagerMode, final Joins[] resJoins, boolean lrs)
@@ -75,10 +101,11 @@ public class RelationHandlerMapTableFieldStrategy
         final ClassMapping[] keys = key.getIndependentTypeMappings();
         Union union = store.getSQLFactory().newUnion(keys.length);
         if (fetch.getSubclassFetchMode(key.getTypeMapping())
-            != JDBCFetchConfiguration.EAGER_JOIN)
+            != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.setLRS(lrs);
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 sel.select(_vcols);
                 sel.whereForeignKey(field.getJoinForeignKey(),
@@ -98,6 +125,7 @@ public class RelationHandlerMapTableFieldStrategy
         return new Result[]{ res, res };
     }
 
+    @Override
     public Object loadKey(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -107,6 +135,7 @@ public class RelationHandlerMapTableFieldStrategy
         return res.load(key, store, fetch, joins);
     }
 
+    @Override
     public Object loadValue(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -114,12 +143,14 @@ public class RelationHandlerMapTableFieldStrategy
             sm, store, fetch, res, joins, _vcols, _vload);
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, ClassMapping key) {
         ValueMapping vm = field.getKeyMapping();
         return joins.joinRelation(field.getName(), vm.getForeignKey(key), key,
             vm.getSelectSubclasses(), false, false);
     }
 
+    @Override
     public void map(boolean adapt) {
         super.map(adapt);
 
@@ -147,11 +178,13 @@ public class RelationHandlerMapTableFieldStrategy
         field.mapPrimaryKey(adapt);
     }
 
+    @Override
     public void initialize() {
         _vload = field.getElementMapping().getHandler().
             objectValueRequiresLoad(field.getElementMapping());
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         insert(sm, store, rm, (Map) sm.fetchObject(field.getIndex()));
@@ -182,6 +215,7 @@ public class RelationHandlerMapTableFieldStrategy
         }
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Map map = (Map) sm.fetchObject(field.getIndex());
@@ -253,6 +287,7 @@ public class RelationHandlerMapTableFieldStrategy
         }
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         if (traverse)
@@ -260,6 +295,7 @@ public class RelationHandlerMapTableFieldStrategy
         return joins;
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         ValueMapping key = field.getKeyMapping();
@@ -278,11 +314,13 @@ public class RelationHandlerMapTableFieldStrategy
             false, false);
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return HandlerStrategies.toDataStoreValue(field.getElementMapping(),
             val, _vcols, store);
     }
 
+    @Override
     public Object toKeyDataStoreValue(Object val, JDBCStore store) {
         return RelationStrategies.toDataStoreValue(field.getKeyMapping(), val,
             store);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapInverseKeyFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapInverseKeyFieldStrategy.java
index c8ddaba20..87a16d5e1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapInverseKeyFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapInverseKeyFieldStrategy.java
@@ -22,6 +22,7 @@ import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -50,44 +51,54 @@ public class RelationMapInverseKeyFieldStrategy
     extends RelationToManyInverseKeyFieldStrategy
     implements LRSMapFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (RelationMapInverseKeyFieldStrategy.class);
 
+    @Override
     public FieldMapping getFieldMapping() {
         return field;
     }
 
+    @Override
     public ClassMapping[] getIndependentKeyMappings(boolean traverse) {
         return ClassMapping.EMPTY_MAPPINGS;
     }
 
+    @Override
     public ClassMapping[] getIndependentValueMappings(boolean traverse) {
         return getIndependentElementMappings(traverse);
     }
 
+    @Override
     public Column[] getKeyColumns(ClassMapping cls) {
         return cls.getFieldMapping(field.getKey().
             getValueMappedByMetaData().getIndex()).getColumns();
     }
 
+    @Override
     public Column[] getValueColumns(ClassMapping cls) {
         return cls.getPrimaryKeyColumns();
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(ClassMapping cls) {
         return super.getJoinForeignKey(cls);
     }
 
+    @Override
     public void selectKey(Select sel, ClassMapping key, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, Joins joins) {
         ValueMapping vm = field.getKeyMapping();
         if (vm.isEmbedded())
             sel.select(key, field.getKeyMapping().getSelectSubclasses(),
-                store, fetch, JDBCFetchConfiguration.EAGER_NONE, joins);
+                store, fetch, EagerFetchModes.EAGER_NONE, joins);
         else
             throw new InternalException();
     }
 
+    @Override
     public Object loadKey(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -99,6 +110,7 @@ public class RelationMapInverseKeyFieldStrategy
             throw new InternalException();
     }
 
+    @Override
     public Object deriveKey(JDBCStore store, Object value) {
         OpenJPAStateManager sm = RelationStrategies.getStateManager(value,
             store.getContext());
@@ -106,23 +118,27 @@ public class RelationMapInverseKeyFieldStrategy
             getValueMappedByMetaData().getIndex(), false);
     }
 
+    @Override
     public Object deriveValue(JDBCStore store, Object key) {
         return null;
     }
 
+    @Override
     public void selectValue(Select sel, ClassMapping val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch,
         Joins joins) {
-        selectElement(sel, val, store, fetch, JDBCFetchConfiguration.EAGER_NONE,
+        selectElement(sel, val, store, fetch, EagerFetchModes.EAGER_NONE,
             joins);
     }
 
+    @Override
     public Object loadValue(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
         return loadElement(sm, store, fetch, res, joins);
     }
 
+    @Override
     public Result[] getResults(final OpenJPAStateManager sm,
         final JDBCStore store, final JDBCFetchConfiguration fetch,
         final int eagerMode, final Joins[] joins, boolean lrs)
@@ -131,10 +147,11 @@ public class RelationMapInverseKeyFieldStrategy
         final ClassMapping[] vals = val.getIndependentTypeMappings();
         Union union = store.getSQLFactory().newUnion(vals.length);
         if (fetch.getSubclassFetchMode(val.getTypeMapping())
-            != JDBCFetchConfiguration.EAGER_JOIN)
+            != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.setLRS(lrs);
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 joins[1] = selectAll(sel, vals[idx], sm, store, fetch,
                     eagerMode);
@@ -144,10 +161,12 @@ public class RelationMapInverseKeyFieldStrategy
         return new Result[]{ res, res };
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, ClassMapping key) {
         return joins;
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         ValueMapping key = field.getKeyMapping();
@@ -169,23 +188,28 @@ public class RelationMapInverseKeyFieldStrategy
             false, false);
     }
 
+    @Override
     public Joins joinValueRelation(Joins joins, ClassMapping val) {
         return joinElementRelation(joins, val);
     }
 
+    @Override
     protected Proxy newLRSProxy() {
         return new LRSProxyMap(this);
     }
 
+    @Override
     protected void add(JDBCStore store, Object coll, Object obj) {
         if (obj != null)
             ((Map) coll).put(deriveKey(store, obj), obj);
     }
 
+    @Override
     protected Collection toCollection(Object val) {
         return (val == null) ? null : ((Map) val).values();
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.MAP)
             throw new MetaDataException(_loc.get("not-map", field));
@@ -194,6 +218,7 @@ public class RelationMapInverseKeyFieldStrategy
         super.map(adapt);
     }
 
+    @Override
     public Joins joinKey(Joins joins, boolean forceOuter) {
         return joinRelation(join(joins, forceOuter), forceOuter, false);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapTableFieldStrategy.java
index b039161a8..1b5751b98 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapTableFieldStrategy.java
@@ -22,6 +22,7 @@ import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -50,44 +51,54 @@ public class RelationMapTableFieldStrategy
     extends RelationToManyTableFieldStrategy
     implements LRSMapFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (RelationMapTableFieldStrategy.class);
 
+    @Override
     public FieldMapping getFieldMapping() {
         return field;
     }
 
+    @Override
     public ClassMapping[] getIndependentKeyMappings(boolean traverse) {
         return ClassMapping.EMPTY_MAPPINGS;
     }
 
+    @Override
     public ClassMapping[] getIndependentValueMappings(boolean traverse) {
         return getIndependentElementMappings(traverse);
     }
 
+    @Override
     public ForeignKey getJoinForeignKey(ClassMapping cls) {
         return super.getJoinForeignKey(cls);
     }
 
+    @Override
     public Column[] getKeyColumns(ClassMapping cls) {
         return cls.getFieldMapping(field.getKey().
             getValueMappedByMetaData().getIndex()).getColumns();
     }
 
+    @Override
     public Column[] getValueColumns(ClassMapping cls) {
         return field.getElementMapping().getColumns();
     }
 
+    @Override
     public void selectKey(Select sel, ClassMapping key, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, Joins joins) {
         ValueMapping vm = field.getKeyMapping();
         if (vm.isEmbedded())
             sel.select(key, field.getKeyMapping().getSelectSubclasses(),
-                store, fetch, JDBCFetchConfiguration.EAGER_NONE, joins);
+                store, fetch, EagerFetchModes.EAGER_NONE, joins);
         else
             throw new InternalException();
     }
 
+    @Override
     public Object loadKey(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -99,6 +110,7 @@ public class RelationMapTableFieldStrategy
             throw new InternalException();
     }
 
+    @Override
     public Object deriveKey(JDBCStore store, Object value) {
         OpenJPAStateManager sm = RelationStrategies.getStateManager(value,
             store.getContext());
@@ -106,23 +118,27 @@ public class RelationMapTableFieldStrategy
             getValueMappedByMetaData().getIndex(), false);
     }
 
+    @Override
     public Object deriveValue(JDBCStore store, Object key) {
         return null;
     }
 
+    @Override
     public void selectValue(Select sel, ClassMapping val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch,
         Joins joins) {
-        selectElement(sel, val, store, fetch, JDBCFetchConfiguration.EAGER_NONE,
+        selectElement(sel, val, store, fetch, EagerFetchModes.EAGER_NONE,
             joins);
     }
 
+    @Override
     public Object loadValue(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
         return loadElement(sm, store, fetch, res, joins);
     }
 
+    @Override
     public Result[] getResults(final OpenJPAStateManager sm,
         final JDBCStore store, final JDBCFetchConfiguration fetch,
         final int eagerMode, final Joins[] joins, boolean lrs)
@@ -131,10 +147,11 @@ public class RelationMapTableFieldStrategy
         final ClassMapping[] vals = val.getIndependentTypeMappings();
         Union union = store.getSQLFactory().newUnion(vals.length);
         if (fetch.getSubclassFetchMode(val.getTypeMapping())
-            != JDBCFetchConfiguration.EAGER_JOIN)
+            != EagerFetchModes.EAGER_JOIN)
             union.abortUnion();
         union.setLRS(lrs);
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 joins[1] = selectAll(sel, vals[idx], sm, store, fetch,
                     eagerMode);
@@ -144,10 +161,12 @@ public class RelationMapTableFieldStrategy
         return new Result[]{ res, res };
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, ClassMapping key) {
         return joins;
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         ValueMapping key = field.getKeyMapping();
@@ -169,23 +188,28 @@ public class RelationMapTableFieldStrategy
             false, false);
     }
 
+    @Override
     public Joins joinValueRelation(Joins joins, ClassMapping val) {
         return joinElementRelation(joins, val);
     }
 
+    @Override
     protected Proxy newLRSProxy() {
         return new LRSProxyMap(this);
     }
 
+    @Override
     protected void add(JDBCStore store, Object coll, Object obj) {
         if (obj != null)
             ((Map) coll).put(deriveKey(store, obj), obj);
     }
 
+    @Override
     protected Collection toCollection(Object val) {
         return (val == null) ? null : ((Map) val).values();
     }
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.MAP)
             throw new MetaDataException(_loc.get("not-map", field));
@@ -194,6 +218,7 @@ public class RelationMapTableFieldStrategy
         super.map(adapt);
     }
 
+    @Override
     public Joins joinKey(Joins joins, boolean forceOuter) {
         return joinRelation(join(joins, forceOuter), forceOuter, false);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationRelationMapTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationRelationMapTableFieldStrategy.java
index bdbf512c6..6eca7f28a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationRelationMapTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationRelationMapTableFieldStrategy.java
@@ -18,19 +18,39 @@
  */
 package org.apache.openjpa.jdbc.meta.strats;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
-import org.apache.openjpa.lib.util.*;
-import org.apache.openjpa.meta.*;
-import org.apache.openjpa.kernel.*;
-import org.apache.openjpa.util.*;
 import org.apache.openjpa.enhance.PersistenceCapable;
-import org.apache.openjpa.jdbc.meta.*;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.kernel.*;
-import org.apache.openjpa.jdbc.schema.*;
-import org.apache.openjpa.jdbc.sql.*;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
+import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.jdbc.meta.ValueMapping;
+import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.ForeignKey;
+import org.apache.openjpa.jdbc.schema.Table;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.Joins;
+import org.apache.openjpa.jdbc.sql.Result;
+import org.apache.openjpa.jdbc.sql.Row;
+import org.apache.openjpa.jdbc.sql.RowManager;
+import org.apache.openjpa.jdbc.sql.Select;
+import org.apache.openjpa.jdbc.sql.Union;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.kernel.StoreContext;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.util.ChangeTracker;
+import org.apache.openjpa.util.MetaDataException;
+import org.apache.openjpa.util.Proxies;
+import org.apache.openjpa.util.Proxy;
 
 /**
  * <p>Mapping for a map whose keys and values are both relations to other
@@ -42,32 +62,40 @@ import org.apache.openjpa.jdbc.sql.*;
 public class RelationRelationMapTableFieldStrategy
     extends MapTableFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (RelationRelationMapTableFieldStrategy.class);
 
     private String _keyRelationName = null;
 
+    @Override
     public Column[] getKeyColumns(ClassMapping cls) {
         return field.getKeyMapping().getColumns();
     }
 
+    @Override
     public Column[] getValueColumns(ClassMapping cls) {
         return field.getElementMapping().getColumns();
     }
 
+    @Override
     public void selectKey(Select sel, ClassMapping key, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, Joins joins) {
         sel.select(key, field.getKeyMapping().getSelectSubclasses(),
-            store, fetch, JDBCFetchConfiguration.EAGER_NONE, joins);
+            store, fetch, EagerFetchModes.EAGER_NONE, joins);
     }
 
+    @Override
     public void selectValue(Select sel, ClassMapping val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch,
         Joins joins) {
         sel.select(val, field.getElementMapping().getSelectSubclasses(),
-            store, fetch, JDBCFetchConfiguration.EAGER_NONE, joins);
+            store, fetch, EagerFetchModes.EAGER_NONE, joins);
     }
 
+    @Override
     public Result[] getResults(final OpenJPAStateManager sm,
         final JDBCStore store, final JDBCFetchConfiguration fetch,
         final int eagerMode, final Joins[] resJoins, boolean lrs)
@@ -76,10 +104,11 @@ public class RelationRelationMapTableFieldStrategy
         final ClassMapping[] keys = key.getIndependentTypeMappings();
         Union kunion = store.getSQLFactory().newUnion(keys.length);
         if (fetch.getSubclassFetchMode(key.getTypeMapping())
-            != JDBCFetchConfiguration.EAGER_JOIN)
+            != EagerFetchModes.EAGER_JOIN)
             kunion.abortUnion();
         kunion.setLRS(lrs);
         kunion.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ForeignKey joinFK = null;
                 if (field.isUni1ToMFK()) {
@@ -112,10 +141,11 @@ public class RelationRelationMapTableFieldStrategy
         final ClassMapping[] vals = val.getIndependentTypeMappings();
         Union vunion = store.getSQLFactory().newUnion(vals.length);
         if (fetch.getSubclassFetchMode(val.getTypeMapping())
-            != JDBCFetchConfiguration.EAGER_JOIN)
+            != EagerFetchModes.EAGER_JOIN)
             vunion.abortUnion();
         vunion.setLRS(lrs);
         vunion.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 if (field.isUni1ToMFK()) {
                     sel.orderBy(field.getKeyMapping().getColumns(), true, true);
@@ -158,6 +188,7 @@ public class RelationRelationMapTableFieldStrategy
         }
     }
 
+    @Override
     public Object loadKey(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -167,6 +198,7 @@ public class RelationRelationMapTableFieldStrategy
         return res.load(key, store, fetch, joins);
     }
 
+    @Override
     public Object loadValue(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -176,12 +208,14 @@ public class RelationRelationMapTableFieldStrategy
         return res.load(val, store, fetch, joins);
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, ClassMapping key) {
         ValueMapping vm = field.getKeyMapping();
         return joins.joinRelation(_keyRelationName, vm.getForeignKey(key), key,
             vm.getSelectSubclasses(), false, false);
     }
 
+    @Override
     public Joins joinValueRelation(Joins joins, ClassMapping val) {
         ValueMapping vm = field.getElementMapping();
         ForeignKey fk = vm.getForeignKey(val);
@@ -191,6 +225,7 @@ public class RelationRelationMapTableFieldStrategy
             vm.getSelectSubclasses(), false, false);
     }
 
+    @Override
     public void map(boolean adapt) {
         super.map(adapt);
 
@@ -230,10 +265,12 @@ public class RelationRelationMapTableFieldStrategy
         vm.mapConstraints(name, adapt);
     }
 
+    @Override
     public void initialize() {
         _keyRelationName = field.getName() + ":key";
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         insert(sm, rm, (Map) sm.fetchObject(field.getIndex()), store);
@@ -286,6 +323,7 @@ public class RelationRelationMapTableFieldStrategy
         }
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() != null && !field.isBiMTo1JT())
@@ -452,6 +490,7 @@ public class RelationRelationMapTableFieldStrategy
         }
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         ValueMapping val = field.getElementMapping();
@@ -473,6 +512,7 @@ public class RelationRelationMapTableFieldStrategy
             false, false);
     }
 
+    @Override
     public Joins joinKeyRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         ValueMapping key = field.getKeyMapping();
@@ -491,16 +531,19 @@ public class RelationRelationMapTableFieldStrategy
             false, false);
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return RelationStrategies.toDataStoreValue(field.getElementMapping(),
             val, store);
     }
 
+    @Override
     public Object toKeyDataStoreValue(Object val, JDBCStore store) {
         return RelationStrategies.toDataStoreValue(field.getKeyMapping(),
             val, store);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.isUni1ToMFK()) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationStrategies.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationStrategies.java
index f60da1e8b..d1ba8204e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationStrategies.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationStrategies.java
@@ -35,6 +35,7 @@ import org.apache.openjpa.kernel.DetachedValueStateManager;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.MetaDataException;
 import org.apache.openjpa.util.UserException;
@@ -112,7 +113,7 @@ public class RelationStrategies {
 
     public static void mapRelationToUnmappedPC(ValueMapping vm,
         DBIdentifier name, boolean adapt) {
-        if (vm.getTypeMapping().getIdentityType() == ClassMapping.ID_UNKNOWN)
+        if (vm.getTypeMapping().getIdentityType() == ClassMetaData.ID_UNKNOWN)
             throw new MetaDataException(_loc.get("rel-to-unknownid", vm));
 
         ValueMappingInfo vinfo = vm.getValueInfo();
@@ -129,7 +130,7 @@ public class RelationStrategies {
     private static Column[] newUnmappedPCTemplateColumns(ValueMapping vm,
         DBIdentifier name) {
         ClassMapping rel = vm.getTypeMapping();
-        if (rel.getIdentityType() == ClassMapping.ID_DATASTORE) {
+        if (rel.getIdentityType() == ClassMetaData.ID_DATASTORE) {
             Column col = new Column();
             col.setIdentifier(name);
             col.setJavaType(JavaTypes.LONG);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java
index 66930ed9c..0b988f0c7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyInverseKeyFieldStrategy.java
@@ -44,6 +44,7 @@ import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.util.ChangeTracker;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
@@ -59,6 +60,9 @@ import org.apache.openjpa.util.Proxy;
 public abstract class RelationToManyInverseKeyFieldStrategy
     extends StoreCollectionFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (RelationToManyInverseKeyFieldStrategy.class);
 
@@ -66,14 +70,17 @@ public abstract class RelationToManyInverseKeyFieldStrategy
     private boolean _orderUpdate = false;
     private boolean _uni1MFK = false;
 
+    @Override
     protected ClassMapping[] getIndependentElementMappings(boolean traverse) {
         return field.getElementMapping().getIndependentTypeMappings();
     }
 
+    @Override
     protected ForeignKey getJoinForeignKey(ClassMapping elem) {
         return field.getElementMapping().getForeignKey(elem);
     }
 
+    @Override
     protected void selectElement(Select sel, ClassMapping elem,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode,
         Joins joins) {
@@ -81,6 +88,7 @@ public abstract class RelationToManyInverseKeyFieldStrategy
             store, fetch, eagerMode, joins);
     }
 
+    @Override
     protected Object loadElement(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -90,6 +98,7 @@ public abstract class RelationToManyInverseKeyFieldStrategy
         return res.load(elem, store, fetch, joins);
     }
 
+    @Override
     protected Joins join(Joins joins, ClassMapping elem) {
         ValueMapping vm = field.getElementMapping();
         ForeignKey fk = vm.getForeignKey(elem);
@@ -104,10 +113,12 @@ public abstract class RelationToManyInverseKeyFieldStrategy
             vm.getSelectSubclasses(), true, true);
     }
 
+    @Override
     protected Joins joinElementRelation(Joins joins, ClassMapping elem) {
         return joinRelation(joins, false, false);
     }
 
+    @Override
     public void map(boolean adapt) {
         OpenJPAConfiguration conf = field.getRepository().getConfiguration();
         boolean isNonDefaultMappingAllowed = field.getRepository().
@@ -132,7 +143,7 @@ public abstract class RelationToManyInverseKeyFieldStrategy
         ValueMappingInfo vinfo = elem.getValueInfo();
         boolean criteria = vinfo.getUseClassCriteria();
         if (mapped != null) {
-            mapped.resolve(mapped.MODE_META | mapped.MODE_MAPPING);
+            mapped.resolve(MetaDataModes.MODE_META | MetaDataModes.MODE_MAPPING);
             if (!(mapped.getStrategy() instanceof RelationFieldStrategy
                || mapped.getHandler() instanceof UntypedPCValueHandler))
                 throw new MetaDataException(_loc.get("not-inv-relation",
@@ -182,6 +193,7 @@ public abstract class RelationToManyInverseKeyFieldStrategy
         field.setOrderColumnIO(finfo.getColumnIO());
     }
 
+    @Override
     public void initialize() {
         Column order = field.getOrderColumn();
         _orderInsert = field.getOrderColumnIO().isInsertable(order, false);
@@ -197,6 +209,7 @@ public abstract class RelationToManyInverseKeyFieldStrategy
         }
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() == null || _orderInsert || _orderUpdate)
@@ -217,6 +230,7 @@ public abstract class RelationToManyInverseKeyFieldStrategy
             updateInverse(sm.getContext(), itr.next(), rel, rm, sm, idx);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() != null && !_orderInsert && !_orderUpdate)
@@ -259,6 +273,7 @@ public abstract class RelationToManyInverseKeyFieldStrategy
             ct.setNextSequence(seq);
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() != null)
@@ -357,11 +372,13 @@ public abstract class RelationToManyInverseKeyFieldStrategy
             row.setInt(order, idx);
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         ClassMapping cm = field.getElementMapping().getTypeMapping();
         return cm.toDataStoreValue(val, cm.getPrimaryKeyColumns(), store);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         ValueMapping elem = field.getElementMapping();
         ClassMapping[] clss = elem.getIndependentTypeMappings();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java
index 2b2e0f6b1..efa4f8f34 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationToManyTableFieldStrategy.java
@@ -41,6 +41,7 @@ import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.util.ChangeTracker;
 import org.apache.openjpa.util.MetaDataException;
 import org.apache.openjpa.util.Proxies;
@@ -54,19 +55,24 @@ import org.apache.openjpa.util.Proxy;
 public abstract class RelationToManyTableFieldStrategy
     extends StoreCollectionFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (RelationToManyTableFieldStrategy.class);
 
+    @Override
     protected ClassMapping[] getIndependentElementMappings(boolean traverse) {
         return (traverse)
             ? field.getElementMapping().getIndependentTypeMappings()
             : ClassMapping.EMPTY_MAPPINGS;
     }
 
+    @Override
     protected ForeignKey getJoinForeignKey(ClassMapping elem) {
         return field.getJoinForeignKey();
     }
 
+    @Override
     protected void selectElement(Select sel, ClassMapping elem,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode,
         Joins joins) {
@@ -74,6 +80,7 @@ public abstract class RelationToManyTableFieldStrategy
             store, fetch, eagerMode, joins);
     }
 
+    @Override
     protected Object loadElement(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res, Joins joins)
         throws SQLException {
@@ -83,16 +90,19 @@ public abstract class RelationToManyTableFieldStrategy
         return res.load(elem, store, fetch, joins);
     }
 
+    @Override
     protected Joins join(Joins joins, ClassMapping elem) {
         return join(joins, false);
     }
 
+    @Override
     protected Joins joinElementRelation(Joins joins, ClassMapping elem) {
         ValueMapping vm = field.getElementMapping();
         return joins.joinRelation(field.getName(), vm.getForeignKey(elem),
             elem, vm.getSelectSubclasses(), false, false);
     }
 
+    @Override
     public void map(boolean adapt) {
         field.getValueInfo().assertNoSchemaComponents(field, !adapt);
         field.getKeyMapping().getValueInfo().assertNoSchemaComponents
@@ -121,7 +131,7 @@ public abstract class RelationToManyTableFieldStrategy
                 field.getMappingInfo().assertNoSchemaComponents(field, !adapt);
                 vinfo.assertNoSchemaComponents(elem, !adapt);
 
-                mapped.resolve(mapped.MODE_META | mapped.MODE_MAPPING);
+                mapped.resolve(MetaDataModes.MODE_META | MetaDataModes.MODE_MAPPING);
                 if (!mapped.isMapped() || mapped.isSerialized())
                     throw new MetaDataException(_loc.get("mapped-by-unmapped",
                             field, mapped));
@@ -155,6 +165,7 @@ public abstract class RelationToManyTableFieldStrategy
         }
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() == null || field.isBiMTo1JT())
@@ -186,6 +197,7 @@ public abstract class RelationToManyTableFieldStrategy
         }
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         if (field.getMappedBy() != null && !field.isBiMTo1JT())
@@ -251,6 +263,7 @@ public abstract class RelationToManyTableFieldStrategy
         }
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getAllRows(field.getTable(), Row.ACTION_DELETE);
@@ -258,15 +271,18 @@ public abstract class RelationToManyTableFieldStrategy
         rm.flushAllRows(row);
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         return RelationStrategies.toDataStoreValue(field.getElementMapping(),
             val, store);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, true);
     }
 
+    @Override
     public Joins joinRelation(Joins joins, boolean forceOuter,
         boolean traverse) {
         ValueMapping elem = field.getElementMapping();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StateComparisonVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StateComparisonVersionStrategy.java
index 909c90b70..db58fd742 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StateComparisonVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StateComparisonVersionStrategy.java
@@ -46,15 +46,20 @@ import org.apache.openjpa.util.MetaDataException;
 public class StateComparisonVersionStrategy
     extends AbstractVersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "state-comparison";
 
     private static final Localizer _loc = Localizer.forPackage
         (StateComparisonVersionStrategy.class);
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void map(boolean adapt) {
         ClassMapping cls = vers.getClassMapping();
         if (cls.getJoinablePCSuperclassMapping() != null
@@ -64,6 +69,7 @@ public class StateComparisonVersionStrategy
         vers.getMappingInfo().assertNoSchemaComponents(vers, true);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         FieldMapping[] fields = (FieldMapping[]) sm.getMetaData().getFields();
@@ -84,11 +90,13 @@ public class StateComparisonVersionStrategy
      * This method is for class mappings that take over the insert
      * process, but still want to use this indicator for optimistic locking.
      */
+    @Override
     public void customInsert(OpenJPAStateManager sm, JDBCStore store)
         throws SQLException {
         insert(sm, store, null);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         // if there is no recorded state (for example, modification made to
@@ -181,6 +189,7 @@ public class StateComparisonVersionStrategy
         return custom;
     }
 
+    @Override
     public void afterLoad(OpenJPAStateManager sm, JDBCStore store) {
         FieldMapping[] fields = (FieldMapping[]) sm.getMetaData().getFields();
 
@@ -203,6 +212,7 @@ public class StateComparisonVersionStrategy
         sm.setVersion(state);
     }
 
+    @Override
     public boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
         boolean updateVersion)
         throws SQLException {
@@ -211,6 +221,7 @@ public class StateComparisonVersionStrategy
         return !updateVersion;
     }
 
+    @Override
     public int compareVersion(Object v1, Object v2) {
         return (ArrayStateImage.sameVersion((Object[]) v1, (Object[]) v2))
             ? StoreManager.VERSION_SAME : StoreManager.VERSION_DIFFERENT;
@@ -239,6 +250,7 @@ public class StateComparisonVersionStrategy
          * WHERE clause of an UPDATE to test whether the current database
          * record matches our stored version.
          */
+        @Override
         public String getSQL(DBDictionary dict) {
             Column[] cols = getTable().getColumns();
             StringBuilder buf = new StringBuilder();
@@ -260,6 +272,7 @@ public class StateComparisonVersionStrategy
             return buf.toString();
         }
 
+        @Override
         protected RowImpl newInstance(Column[] cols, int action) {
             return new CustomUpdate(cols);
         }
@@ -300,6 +313,7 @@ public class StateComparisonVersionStrategy
             throw new InternalException();
         }
 
+        @Override
         public Row getRow(Table table, int action, OpenJPAStateManager sm,
             boolean create) {
             // verionable mappings will never want to create rows, so we
@@ -309,20 +323,25 @@ public class StateComparisonVersionStrategy
             return this;
         }
 
+        @Override
         public Row getSecondaryRow(Table table, int action) {
             throw new InternalException();
         }
 
+        @Override
         public void flushSecondaryRow(Row row) {
         }
 
+        @Override
         public Row getAllRows(Table table, int action) {
             throw new InternalException();
         }
 
+        @Override
         public void flushAllRows(Row row) {
         }
 
+        @Override
         public void setObject(Column col, Object val)
             throws SQLException {
             throw new InternalException();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java
index 3e425007c..a60a8a2a1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java
@@ -26,6 +26,7 @@ import java.util.Map;
 
 import org.apache.openjpa.enhance.FieldManager;
 import org.apache.openjpa.enhance.PersistenceCapable;
+import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
@@ -43,12 +44,13 @@ import org.apache.openjpa.jdbc.sql.Union;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StateManagerImpl;
 import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.ChangeTracker;
+import org.apache.openjpa.util.DelayedProxy;
 import org.apache.openjpa.util.Id;
 import org.apache.openjpa.util.OpenJPAId;
 import org.apache.openjpa.util.Proxy;
-import org.apache.openjpa.util.DelayedProxy;
 
 /**
  * Base class for strategies that are stored as a collection, even if
@@ -63,6 +65,9 @@ import org.apache.openjpa.util.DelayedProxy;
 public abstract class StoreCollectionFieldStrategy
     extends ContainerFieldStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Return the foreign key used to join to the owning field for the given
      * element mapping from {@link #getIndependentElementMappings} (or null).
@@ -134,6 +139,7 @@ public abstract class StoreCollectionFieldStrategy
         return (elems.length == 0) ? null : elems[0];
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         if (field.isLRS())
@@ -149,6 +155,7 @@ public abstract class StoreCollectionFieldStrategy
                 (getDefaultElementMapping(false)))) ? 1 : 0;
     }
 
+    @Override
     public void selectEagerParallel(SelectExecutor sel,
         final OpenJPAStateManager sm, final JDBCStore store,
         final JDBCFetchConfiguration fetch, final int eagerMode) {
@@ -159,9 +166,10 @@ public abstract class StoreCollectionFieldStrategy
             final ClassMapping[] elems = getIndependentElementMappings(true);
             Union union = (Union) sel;
             if (fetch.getSubclassFetchMode(field.getElementMapping().
-                getTypeMapping()) != fetch.EAGER_JOIN)
+                getTypeMapping()) != EagerFetchModes.EAGER_JOIN)
                 union.abortUnion();
             union.select(new Union.Selector() {
+                @Override
                 public void select(Select sel, int idx) {
                     selectEager(sel, elems[idx], sm, store, fetch, eagerMode,
                         true, false);
@@ -170,20 +178,22 @@ public abstract class StoreCollectionFieldStrategy
         }
     }
 
+    @Override
     public void selectEagerJoin(Select sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode) {
         // we limit further eager fetches to joins, because after this point
         // the select has been modified such that parallel clones may produce
         // invalid sql
-        boolean outer = field.getNullValue() != FieldMapping.NULL_EXCEPTION;
+        boolean outer = field.getNullValue() != FieldMetaData.NULL_EXCEPTION;
         // force inner join for inner join fetch
         if (fetch.hasFetchInnerJoin(field.getFullName(false)))
             outer = false;
         selectEager(sel, getDefaultElementMapping(true), sm, store, fetch,
-            JDBCFetchConfiguration.EAGER_JOIN, false,
+            EagerFetchModes.EAGER_JOIN, false,
             outer);
     }
 
+    @Override
     public boolean isEagerSelectToMany() {
         return true;
     }
@@ -197,7 +207,7 @@ public abstract class StoreCollectionFieldStrategy
         // force distinct if there was a to-many join to avoid dups, but
         // if this is a parallel select don't make distinct based on the
         // eager joins alone if the original wasn't distinct
-        if (eagerMode == JDBCFetchConfiguration.EAGER_PARALLEL) {
+        if (eagerMode == EagerFetchModes.EAGER_PARALLEL) {
             if (sel.hasJoin(true))
                 sel.setDistinct(true);
             else if (!sel.isDistinct())
@@ -233,6 +243,7 @@ public abstract class StoreCollectionFieldStrategy
         selectElement(sel, elem, store, fetch, eagerMode, joins);
     }
 
+    @Override
     public Object loadEagerParallel(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object res)
         throws SQLException {
@@ -381,7 +392,7 @@ public abstract class StoreCollectionFieldStrategy
         throws SQLException {
         // if this is a datastore id class we can avoid creating a new oid
         // object for the common case
-        if (oid != null && owner.getIdentityType() == ClassMapping.ID_DATASTORE
+        if (oid != null && owner.getIdentityType() == ClassMetaData.ID_DATASTORE
             && owner.isPrimaryKeyObjectId(true)) {
             long nid = res.getLong(owner.getPrimaryKeyColumns()[0]);
             long id = ((Id) oid).getId();
@@ -394,6 +405,7 @@ public abstract class StoreCollectionFieldStrategy
         return (noid.equals(oid)) ? oid : noid;
     }
 
+    @Override
     public void loadEagerJoin(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
@@ -484,6 +496,7 @@ public abstract class StoreCollectionFieldStrategy
         return refs;
     }
 
+    @Override
     public void load(final OpenJPAStateManager sm, final JDBCStore store,
         final JDBCFetchConfiguration fetch)
         throws SQLException {
@@ -538,10 +551,11 @@ public abstract class StoreCollectionFieldStrategy
         Union union = store.getSQLFactory().newUnion
             (Math.max(1, elems.length));
         union.select(new Union.Selector() {
+            @Override
             public void select(Select sel, int idx) {
                 ClassMapping elem = (elems.length == 0) ? null : elems[idx];
                 resJoins[idx] = selectAll(sel, elem, sm, store, fetch,
-                    JDBCFetchConfiguration.EAGER_PARALLEL);
+                    EagerFetchModes.EAGER_PARALLEL);
             }
         });
 
@@ -615,12 +629,14 @@ public abstract class StoreCollectionFieldStrategy
         return joins;
     }
 
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
         return loadElement(null, store, fetch, res, joins);
     }
 
+    @Override
     public ForeignKey getJoinForeignKey() {
         return getJoinForeignKey(getDefaultElementMapping(false));
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StringFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StringFieldStrategy.java
index b7d8ac7b5..2ad103a9b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StringFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StringFieldStrategy.java
@@ -24,7 +24,6 @@ import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.Embeddable;
-import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.meta.Joinable;
 import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -40,6 +39,7 @@ import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.ValueStrategies;
 import org.apache.openjpa.util.MetaDataException;
@@ -54,9 +54,12 @@ public class StringFieldStrategy
     extends AbstractFieldStrategy
     implements Joinable, Embeddable {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (StringFieldStrategy.class);
 
+    @Override
     public void map(boolean adapt) {
         if (field.getTypeCode() != JavaTypes.STRING)
             throw new MetaDataException(_loc.get("not-string", field));
@@ -100,6 +103,7 @@ public class StringFieldStrategy
         field.getDefiningMapping().setJoinable(field.getColumns()[0], this);
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         String str = (String) toDataStoreValue(sm.fetchString
@@ -111,6 +115,7 @@ public class StringFieldStrategy
         }
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         String str = (String) toDataStoreValue(sm.fetchString
@@ -122,16 +127,18 @@ public class StringFieldStrategy
         }
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         field.deleteRow(sm, store, rm);
     }
 
+    @Override
     public Object toDataStoreValue(Object val, JDBCStore store) {
         if (val != null)
             return val;
 
-        if (field.getNullValue() != FieldMapping.NULL_DEFAULT)
+        if (field.getNullValue() != FieldMetaData.NULL_DEFAULT)
             return null;
         if (field.getColumns()[0].getDefaultString() != null)
             return null;
@@ -139,6 +146,7 @@ public class StringFieldStrategy
         return "";
     }
 
+    @Override
     public int supportsSelect(Select sel, int type, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch) {
         if (type == Select.TYPE_JOINLESS && sel.isSelected(field.getTable()))
@@ -146,12 +154,14 @@ public class StringFieldStrategy
         return 0;
     }
 
+    @Override
     public int select(Select sel, OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, int eagerMode) {
         sel.select(field.getColumns()[0], field.join(sel));
         return 1;
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Result res)
         throws SQLException {
@@ -160,32 +170,38 @@ public class StringFieldStrategy
             sm.storeString(field.getIndex(), res.getString(col));
     }
 
+    @Override
     public void appendIsNull(SQLBuffer sql, Select sel, Joins joins) {
         joins = join(joins, false);
         sql.append(sel.getColumnAlias(field.getColumns()[0], joins)).
             append(" IS ").appendValue(null, field.getColumns()[0]);
     }
 
+    @Override
     public void appendIsNotNull(SQLBuffer sql, Select sel, Joins joins) {
         joins = join(joins, false);
         sql.append(sel.getColumnAlias(field.getColumns()[0], joins)).
             append(" IS NOT ").appendValue(null, field.getColumns()[0]);
     }
 
+    @Override
     public Joins join(Joins joins, boolean forceOuter) {
         return field.join(joins, forceOuter, false);
     }
 
+    @Override
     public Object loadProjection(JDBCStore store, JDBCFetchConfiguration fetch,
         Result res, Joins joins)
         throws SQLException {
         return res.getString(field.getColumns()[0], joins);
     }
 
+    @Override
     public boolean isVersionable() {
         return true;
     }
 
+    @Override
     public void where(OpenJPAStateManager sm, JDBCStore store, RowManager rm,
         Object prevValue)
         throws SQLException {
@@ -204,10 +220,12 @@ public class StringFieldStrategy
     // Joinable implementation
     ///////////////////////////
 
+    @Override
     public int getFieldIndex() {
         return field.getIndex();
     }
 
+    @Override
     public Object getPrimaryKeyValue(Result res, Column[] cols, ForeignKey fk,
         JDBCStore store, Joins joins)
         throws SQLException {
@@ -217,19 +235,23 @@ public class StringFieldStrategy
         return res.getString(col, joins);
     }
 
+    @Override
     public Column[] getColumns() {
         return field.getColumns();
     }
 
+    @Override
     public Object getJoinValue(Object fieldVal, Column col, JDBCStore store) {
         return fieldVal;
     }
 
+    @Override
     public Object getJoinValue(OpenJPAStateManager sm, Column col,
         JDBCStore store) {
         return sm.fetch(field.getIndex());
     }
 
+    @Override
     public void setAutoAssignedValue(OpenJPAStateManager sm, JDBCStore store,
         Column col, Object autoInc) {
         String str = (autoInc == null) ? null : autoInc.toString();
@@ -240,22 +262,27 @@ public class StringFieldStrategy
     // Embeddable implementation
     /////////////////////////////
 
+    @Override
     public ColumnIO getColumnIO() {
         return field.getColumnIO();
     }
 
+    @Override
     public Object[] getResultArguments() {
         return null;
     }
 
+    @Override
     public Object toEmbeddedDataStoreValue(Object val, JDBCStore store) {
         return toDataStoreValue(val, store);
     }
 
+    @Override
     public Object toEmbeddedObjectValue(Object val) {
         return val;
     }
 
+    @Override
     public void loadEmbedded(OpenJPAStateManager sm, JDBCStore store,
         JDBCFetchConfiguration fetch, Object val)
         throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SubclassJoinDiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SubclassJoinDiscriminatorStrategy.java
index 47b396354..43611720d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SubclassJoinDiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SubclassJoinDiscriminatorStrategy.java
@@ -43,15 +43,20 @@ import org.apache.openjpa.util.MetaDataException;
 public class SubclassJoinDiscriminatorStrategy
     extends AbstractDiscriminatorStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "subclass-join";
 
     private static final Localizer _loc = Localizer.forPackage
         (SubclassJoinDiscriminatorStrategy.class);
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void map(boolean adapt) {
         ClassMapping cls = disc.getClassMapping();
         if (cls.getJoinablePCSuperclassMapping() != null
@@ -67,6 +72,7 @@ public class SubclassJoinDiscriminatorStrategy
             throw new MetaDataException(_loc.get("outer-join-support", cls));
     }
 
+    @Override
     public boolean select(Select sel, ClassMapping mapping) {
         if (isFinal)
             return false;
@@ -103,6 +109,7 @@ public class SubclassJoinDiscriminatorStrategy
         return seld;
     }
 
+    @Override
     public Class getClass(JDBCStore store, ClassMapping base, Result res)
         throws SQLException, ClassNotFoundException {
         if (isFinal)
@@ -133,6 +140,7 @@ public class SubclassJoinDiscriminatorStrategy
         return derived;
     }
 
+    @Override
     public boolean hasClassConditions(ClassMapping base, boolean subclasses) {
         if (isFinal || subclasses)
             return false;
@@ -142,6 +150,7 @@ public class SubclassJoinDiscriminatorStrategy
         return true;
     }
 
+    @Override
     public SQLBuffer getClassConditions(Select sel, Joins joins,
         ClassMapping base, boolean subclasses) {
         // add conditions making sure no subclass tables have records for
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SuperclassDiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SuperclassDiscriminatorStrategy.java
index b4e47b8e8..f17e4b59d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SuperclassDiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SuperclassDiscriminatorStrategy.java
@@ -35,6 +35,10 @@ import org.apache.openjpa.jdbc.sql.Select;
 public class SuperclassDiscriminatorStrategy
     extends AbstractDiscriminatorStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public void map(boolean adapt) {
         // if a superclass maps the discriminator value, so should we.
         // otherwise assume it's calculated
@@ -50,6 +54,7 @@ public class SuperclassDiscriminatorStrategy
         }
     }
 
+    @Override
     public void loadSubclasses(JDBCStore store)
         throws SQLException, ClassNotFoundException {
         disc.getClassMapping().getPCSuperclassMapping().
@@ -57,17 +62,20 @@ public class SuperclassDiscriminatorStrategy
         disc.setSubclassesLoaded(true);
     }
 
+    @Override
     public Class getClass(JDBCStore store, ClassMapping base, Result res)
         throws SQLException, ClassNotFoundException {
         return disc.getClassMapping().getPCSuperclassMapping().
             getDiscriminator().getClass(store, base, res);
     }
 
+    @Override
     public boolean hasClassConditions(ClassMapping base, boolean subclasses) {
         return disc.getClassMapping().getPCSuperclassMapping().
             getDiscriminator().hasClassConditions(base, subclasses);
     }
 
+    @Override
     public SQLBuffer getClassConditions(Select sel, Joins joins,
         ClassMapping base, boolean subclasses) {
         return disc.getClassMapping().getPCSuperclassMapping().
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SuperclassVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SuperclassVersionStrategy.java
index 7279a7f64..ef5a1e7d1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SuperclassVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/SuperclassVersionStrategy.java
@@ -32,11 +32,16 @@ import org.apache.openjpa.kernel.OpenJPAStateManager;
 public class SuperclassVersionStrategy
     extends AbstractVersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public void afterLoad(OpenJPAStateManager sm, JDBCStore store) {
         vers.getClassMapping().getPCSuperclassMapping().getVersion().
             afterLoad(sm, store);
     }
 
+    @Override
     public boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
         boolean updateVersion)
         throws SQLException {
@@ -44,11 +49,13 @@ public class SuperclassVersionStrategy
             checkVersion(sm, store, updateVersion);
     }
 
+    @Override
     public int compareVersion(Object v1, Object v2) {
         return vers.getClassMapping().getPCSuperclassMapping().getVersion().
             compareVersion(v1, v2);
     }
 
+    @Override
     public Map getBulkUpdateValues() {
         return vers.getClassMapping().getPCSuperclassMapping().getVersion()
             .getBulkUpdateValues();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java
index 18ea49bf8..c5e5dd9d6 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.jdbc.meta.strats;
 
 import java.sql.Timestamp;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -33,20 +33,26 @@ import org.apache.openjpa.jdbc.schema.Column;
 public class TimestampVersionStrategy
     extends ColumnVersionStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String ALIAS = "timestamp";
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     protected int getJavaType() {
         return JavaSQLTypes.TIMESTAMP;
     }
 
+    @Override
     protected Object nextVersion(Object version) {
         return new Timestamp(System.currentTimeMillis());
     }
 
+    @Override
     public Map getBulkUpdateValues() {
         Column[] cols = vers.getColumns();
         Map map = new HashMap(cols.length);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/UntypedPCValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/UntypedPCValueHandler.java
index 680beb16b..8bad5ba66 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/UntypedPCValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/UntypedPCValueHandler.java
@@ -33,8 +33,8 @@ import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.JavaTypes;
-import org.apache.openjpa.util.StoreException;
 import org.apache.openjpa.util.ImplHelper;
+import org.apache.openjpa.util.StoreException;
 
 /**
  * Handler for unknown persistence-capable object fields that stores
@@ -45,6 +45,8 @@ public class UntypedPCValueHandler
     extends AbstractValueHandler
     implements RelationId {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (UntypedPCValueHandler.class);
     private static final UntypedPCValueHandler _instance =
@@ -60,6 +62,8 @@ public class UntypedPCValueHandler
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -76,14 +80,17 @@ public class UntypedPCValueHandler
         return new Column[]{ col };
     }
 
+    @Override
     public boolean isVersionable(ValueMapping vm) {
         return true;
     }
 
+    @Override
     public boolean objectValueRequiresLoad(ValueMapping vm) {
         return true;
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         // in the past we've been lenient about being able to translate objects
@@ -98,6 +105,7 @@ public class UntypedPCValueHandler
         return RelationStrategies.getStateManager(val, store.getContext());
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val,
         OpenJPAStateManager sm, JDBCStore store, JDBCFetchConfiguration fetch)
         throws SQLException {
@@ -126,6 +134,7 @@ public class UntypedPCValueHandler
         return store.find(oid, vm, fetch);
     }
 
+    @Override
     public Object toRelationDataStoreValue(OpenJPAStateManager sm, Column col) {
         if (sm == null || sm.getObjectId() == null)
             return null;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ValueMapDiscriminatorStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ValueMapDiscriminatorStrategy.java
index 7b03c3652..cedfa851d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ValueMapDiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ValueMapDiscriminatorStrategy.java
@@ -43,6 +43,9 @@ import org.apache.openjpa.util.MetaDataException;
 public class ValueMapDiscriminatorStrategy
     extends InValueDiscriminatorStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "value-map";
 
     private static final Localizer _loc = Localizer.forPackage
@@ -50,10 +53,12 @@ public class ValueMapDiscriminatorStrategy
 
     private Map _vals = null;
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     protected int getJavaType() {
         Object val = disc.getValue();
         if (val != null && val != Discriminator.NULL)
@@ -74,11 +79,13 @@ public class ValueMapDiscriminatorStrategy
         return JavaTypes.STRING;
     }
 
+    @Override
     protected Object getDiscriminatorValue(ClassMapping cls) {
         Object val = cls.getDiscriminator().getValue();
         return (val == Discriminator.NULL) ? null : val;
     }
 
+    @Override
     protected Class getClass(Object val, JDBCStore store)
         throws ClassNotFoundException {
         if (_vals == null) {
@@ -118,6 +125,7 @@ public class ValueMapDiscriminatorStrategy
         map.put(str, cls.getDescribedType());
     }
 
+    @Override
     public void map(boolean adapt) {
         Object val = disc.getMappingInfo().getValue(disc, adapt);
         if (val == null && !Modifier.isAbstract(disc.getClassMapping().
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/VerticalClassStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/VerticalClassStrategy.java
index 592b0d3d2..6713f1caa 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/VerticalClassStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/VerticalClassStrategy.java
@@ -47,6 +47,9 @@ import org.apache.openjpa.util.MetaDataException;
 public class VerticalClassStrategy
     extends AbstractClassStrategy {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String ALIAS = "vertical";
 
     private static final Localizer _loc = Localizer.forPackage
@@ -54,10 +57,12 @@ public class VerticalClassStrategy
 
     private Boolean _fkOid = null;
 
+    @Override
     public String getAlias() {
         return ALIAS;
     }
 
+    @Override
     public void map(boolean adapt) {
         ClassMapping sup = cls.getMappedPCSuperclassMapping();
         if (sup == null)
@@ -108,12 +113,14 @@ public class VerticalClassStrategy
         }
     }
 
+    @Override
     public void initialize() {
         // this requires all fields to be resolved, so delay it until init
         ClassMapping sup = cls.getMappedPCSuperclassMapping();
         _fkOid = sup.isForeignKeyObjectId(cls.getJoinForeignKey());
     }
 
+    @Override
     public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getRow(cls.getTable(), Row.ACTION_INSERT, sm, true);
@@ -121,6 +128,7 @@ public class VerticalClassStrategy
         row.setForeignKey(cls.getJoinForeignKey(), cls.getColumnIO(), sm);
     }
 
+    @Override
     public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getRow(cls.getTable(), Row.ACTION_UPDATE, sm, false);
@@ -130,6 +138,7 @@ public class VerticalClassStrategy
         }
     }
 
+    @Override
     public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
         throws SQLException {
         Row row = rm.getRow(cls.getTable(), Row.ACTION_DELETE, sm, true);
@@ -137,16 +146,19 @@ public class VerticalClassStrategy
         row.whereForeignKey(cls.getJoinForeignKey(), sm);
     }
 
+    @Override
     public boolean isPrimaryKeyObjectId(boolean hasAll) {
         return Boolean.TRUE.equals(_fkOid) || (!hasAll && _fkOid == null);
     }
 
+    @Override
     public Joins joinSuperclass(Joins joins, boolean toThis) {
         if (toThis)
             return joins.outerJoin(cls.getJoinForeignKey(), true, false);
         return joins.join(cls.getJoinForeignKey(), false, false);
     }
 
+    @Override
     public boolean supportsEagerSelect(Select sel, OpenJPAStateManager sm,
         JDBCStore store, ClassMapping base, JDBCFetchConfiguration fetch) {
         return store.getDBDictionary().canOuterJoin(sel.getJoinSyntax(),
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java
index 11ea69c84..6a75a1c52 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java
@@ -45,11 +45,15 @@ import org.apache.openjpa.util.InternalException;
  */
 public class XMLValueHandler
     extends AbstractValueHandler {
+    
+    private static final long serialVersionUID = 1L;
     private static final String PROXY_SUFFIX = "$proxy";
 
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         DBDictionary dict = vm.getMappingRepository().getDBDictionary();
@@ -69,6 +73,7 @@ public class XMLValueHandler
         return new Column[]{ col };
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         // check for null value.
@@ -93,6 +98,7 @@ public class XMLValueHandler
         }
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val) {
         // check for null value.
         if (val == null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
index adb9a81cf..65ac62d48 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
@@ -28,12 +28,12 @@ import java.sql.Types;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
 import org.apache.openjpa.jdbc.meta.VersionStrategy;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 
 /**
@@ -43,10 +43,8 @@ import org.apache.openjpa.meta.JavaTypes;
  * @author Abe White
  * @author Stephen Kim
  */
-@SuppressWarnings("serial")
-public class Column
-    extends ReferenceCounter {
-
+public class Column extends ReferenceCounter {
+    private static final long serialVersionUID = 1L;
     public static final int FLAG_UNINSERTABLE = 2 << 0;
     public static final int FLAG_UNUPDATABLE = 2 << 1;
     public static final int FLAG_DIRECT_INSERT = 2 << 2;
@@ -84,7 +82,7 @@ public class Column
     private String _comment = null;
     private boolean _XML = false;
     private boolean _isUni1MFK = false;
-    private Set<Constraint> _constraints = new HashSet<Constraint>();
+    private Set<Constraint> _constraints = new HashSet<>();
 
     /**
      * Default constructor.
@@ -99,6 +97,7 @@ public class Column
      * @param table the column's table
      * @deprecated
      */
+    @Deprecated
     public Column(String name, Table table) {
         this(DBIdentifier.newColumn(name), table);
     }
@@ -185,6 +184,7 @@ public class Column
      * The column's table name.
      * @deprecated
      */
+    @Deprecated
     public String getTableName() {
         return getTableIdentifier().getName();
     }
@@ -198,6 +198,7 @@ public class Column
      * whose table object is not set.
      * @deprecated
      */
+    @Deprecated
     public void setTableName(String name) {
         setTableIdentifier(DBIdentifier.newTable(name));
     }
@@ -214,6 +215,7 @@ public class Column
      * includes the schema name
      * @deprecated
      */
+    @Deprecated
     public void resetTableName(String name) {
         _tableName = DBIdentifier.newTable(name);
     }
@@ -226,6 +228,7 @@ public class Column
      * The column's schema name.
      * @deprecated
      */
+    @Deprecated
     public String getSchemaName() {
         return getSchemaIdentifier().getName();
     }
@@ -239,6 +242,7 @@ public class Column
      * whose table object is not set.
      * @deprecated use setSchemaIdentifier(DBIdentifier name)
      */
+    @Deprecated
     public void setSchemaName(String name) {
         setSchemaIdentifier(DBIdentifier.newSchema(name));
     }
@@ -253,6 +257,7 @@ public class Column
      * Return the column's name.
      * @deprecated use getIdentifier()
      */
+    @Deprecated
     public String getName() {
         return getIdentifier().getName();
     }
@@ -267,6 +272,7 @@ public class Column
      * whose table object is not set.
      * @deprecated use setIdentifier(DBIdentifier name)
      */
+    @Deprecated
     public void setName(String name) {
         setIdentifier(DBIdentifier.newColumn(name));
     }
@@ -282,6 +288,7 @@ public class Column
      * Return the column's full name, in the form &lt;table&gt;.&lt;name&gt;.
      * @deprecated use getFullDBIdentifier()
      */
+    @Deprecated
     public String getFullName() {
         return getFullDBIdentifier().getName();
     }
@@ -317,6 +324,7 @@ public class Column
      * The database-specific SQL type of this column.
      * @deprecated
      */
+    @Deprecated
     public String getTypeName() {
         return getTypeIdentifier().getName();
     }
@@ -329,6 +337,7 @@ public class Column
      * The database-specific SQL type of this column.
      * @deprecated
      */
+    @Deprecated
     public void setTypeName(String typeName) {
         setTypeIdentifier(DBIdentifier.newColumnDefinition(typeName));
     }
@@ -574,6 +583,7 @@ public class Column
      * The name of the column this column joins to, if any. Used for mapping.
      * @deprecated use getTargetIdentifier()
      */
+    @Deprecated
     public String getTarget() {
         return getTargetIdentifier().getName();
     }
@@ -586,6 +596,7 @@ public class Column
      * The name of the column this column joins to, if any. Used for mapping.
      * @deprecated use setTargetIdentifier(DBIdentifier target)
      */
+    @Deprecated
     public void setTarget(String target) {
         setTargetIdentifier(DBIdentifier.newColumn(StringUtil.trimToNull(target)));
     }
@@ -775,6 +786,7 @@ public class Column
     /**
      * Returns the column name.
      */
+    @Override
     public String toString() {
         return getIdentifier().getName();
     }
@@ -974,7 +986,7 @@ public class Column
      * Gets all constrains of the given type attached to this column.
      */
     public <T extends Constraint> Set<T> getConstraints(Class<T> type) {
-        Set<T> result = new HashSet<T>();
+        Set<T> result = new HashSet<>();
         for (Constraint c : _constraints) {
             if (c.getClass() == type) {
                 result.add((T)c);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ColumnIO.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ColumnIO.java
index 747a6e761..dcd30dae5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ColumnIO.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ColumnIO.java
@@ -27,23 +27,28 @@ import java.io.Serializable;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class ColumnIO
-    implements Serializable {
+public class ColumnIO implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     public static final ColumnIO UNRESTRICTED = new ColumnIO() {
+        private static final long serialVersionUID = 1L;
+
+        @Override
         public void setInsertable(int col, boolean insertable) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void setUpdatable(int col, boolean updatable) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void setNullInsertable(int col, boolean insertable) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void setNullUpdatable(int col, boolean insertable) {
             throw new UnsupportedOperationException();
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java
index bdce66226..f1c700912 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Constraint.java
@@ -27,10 +27,8 @@ import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public abstract class Constraint
-    extends ReferenceCounter {
-
+public abstract class Constraint extends ReferenceCounter {
+    private static final long serialVersionUID = 1L;
     private DBIdentifier _name = DBIdentifier.NULL;
     private QualifiedDBIdentifier _fullPath = null;
     private Table _table = null;
@@ -52,6 +50,7 @@ public abstract class Constraint
      * @param table the local table of the constraint
      * @deprecated
      */
+    @Deprecated
     Constraint(String name, Table table) {
         this(DBIdentifier.newConstant(name), table);
     }
@@ -84,6 +83,7 @@ public abstract class Constraint
      * Return the column's table name.
      * @deprecated
      */
+    @Deprecated
     public String getTableName() {
         return getTableIdentifier().getName();
     }
@@ -97,6 +97,7 @@ public abstract class Constraint
      * columns whose table object is not set.
      * @deprecated
      */
+    @Deprecated
     public void setTableName(String name) {
         setTableIdentifier(DBIdentifier.newTable(name));
     }
@@ -113,6 +114,7 @@ public abstract class Constraint
      * Return the column table's schema name.
      * @deprecated
      */
+    @Deprecated
     public String getSchemaName() {
         return getSchemaIdentifier().getName();
     }
@@ -126,6 +128,7 @@ public abstract class Constraint
      * columns whose table object is not set.
      * @deprecated
      */
+    @Deprecated
     public void setSchemaName(String schema) {
         setSchemaIdentifier(DBIdentifier.newSchema(schema));
     }
@@ -140,6 +143,7 @@ public abstract class Constraint
      * Return the column's name.
      * @deprecated
      */
+    @Deprecated
     public String getColumnName() {
         return getColumnIdentifier().getName();
     }
@@ -153,6 +157,7 @@ public abstract class Constraint
      * columns whose table object is not set.
      * @deprecated
      */
+    @Deprecated
     public void setColumnName(String name) {
         setColumnIdentifier(DBIdentifier.newColumn(name));
     }
@@ -167,6 +172,7 @@ public abstract class Constraint
      * Return the name of the constraint.
      * @deprecated
      */
+    @Deprecated
     public String getName() {
         return getIdentifier().getName();
     }
@@ -181,6 +187,7 @@ public abstract class Constraint
      * constraint already belongs to a table.
      * @deprecated
      */
+    @Deprecated
     public void setName(String name) {
         setIdentifier(DBIdentifier.newConstraint(name));
     }
@@ -196,6 +203,7 @@ public abstract class Constraint
      * Return the full name of the constraint.
      * @deprecated
      */
+    @Deprecated
     public String getFullName() {
         return getFullIdentifier().getName();
     }
@@ -232,6 +240,7 @@ public abstract class Constraint
         _deferred = deferred;
     }
 
+    @Override
     public String toString() {
         if (!getIdentifier().isNull())
             return getIdentifier().getName();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
index 36c930f58..c2d28e442 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
@@ -55,6 +55,7 @@ extends SimpleDriverDataSource implements Configurable, Closeable {
         return getDBCPConnection(props);
     }
 
+    @Override
     public void close() throws SQLException {
         try {
             if (_ds != null) {
@@ -287,15 +288,18 @@ extends SimpleDriverDataSource implements Configurable, Closeable {
     }
 
     // Configurable interface methods
+    @Override
     public void setConfiguration(Configuration conf) {
         if (conf instanceof JDBCConfiguration)
             this.conf = (JDBCConfiguration)conf;
     }
 
+    @Override
     public void startConfiguration() {
         // no-op
     }
 
+    @Override
     public void endConfiguration() {
         // no-op
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
index 3251b195e..faae13fc7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
@@ -29,7 +29,6 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.conf.Configurations;
@@ -44,6 +43,7 @@ import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.UserException;
@@ -140,7 +140,7 @@ public class DataSourceFactory {
         DecoratingDataSource dds = new DecoratingDataSource(ds);
         try {
             // add user-defined decorators
-            List<ConnectionDecorator> decorators = new ArrayList<ConnectionDecorator>();
+            List<ConnectionDecorator> decorators = new ArrayList<>();
             decorators.addAll(Arrays.asList(conf.
                 getConnectionDecoratorInstances()));
 
@@ -316,11 +316,13 @@ public class DataSourceFactory {
             _pass = pass;
         }
 
+        @Override
         public Connection getConnection()
             throws SQLException {
             return super.getConnection(_user, _pass);
         }
 
+        @Override
         public Connection getConnection(String user, String pass)
             throws SQLException {
             return super.getConnection(user, pass);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DriverDataSource.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DriverDataSource.java
index 391d4cd5c..46a47819e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DriverDataSource.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DriverDataSource.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.jdbc.schema;
 
 import java.util.List;
 import java.util.Properties;
+
 import javax.sql.DataSource;
 
 import org.apache.openjpa.jdbc.sql.DBDictionary;
@@ -37,76 +38,76 @@ public interface DriverDataSource
     /**
      * JDBC URL.
      */
-    public void setConnectionURL(String connectionURL);
+    void setConnectionURL(String connectionURL);
 
     /**
      * JDBC URL.
      */
-    public String getConnectionURL();
+    String getConnectionURL();
 
     /**
      * Driver class name.
      */
-    public void setConnectionDriverName(String connectionDriverName);
+    void setConnectionDriverName(String connectionDriverName);
 
     /**
      * Driver class name.
      */
-    public String getConnectionDriverName();
+    String getConnectionDriverName();
 
     /**
      * JDBC user name.
      */
-    public void setConnectionUserName(String connectionUserName);
+    void setConnectionUserName(String connectionUserName);
 
     /**
      * JDBC user name.
      */
-    public String getConnectionUserName();
+    String getConnectionUserName();
 
     /**
      * JDBC password.
      */
-    public void setConnectionPassword(String connectionPassword);
+    void setConnectionPassword(String connectionPassword);
 
     /**
      * JDBC password.
      */
-    public void setClassLoader(ClassLoader classLoader);
+    void setClassLoader(ClassLoader classLoader);
 
     /**
      * Classloader for loading driver class, etc.
      */
-    public ClassLoader getClassLoader();
+    ClassLoader getClassLoader();
 
     /**
      * Configuration of datasource properties.
      */
-    public void setConnectionFactoryProperties(Properties props);
+    void setConnectionFactoryProperties(Properties props);
 
     /**
      * Configuration of datasource properties.
      */
-    public Properties getConnectionFactoryProperties();
+    Properties getConnectionFactoryProperties();
 
     /**
      * Configuration of connection.
      */
-    public void setConnectionProperties(Properties props);
+    void setConnectionProperties(Properties props);
 
     /**
      * Configuration of connection.
      */
-    public Properties getConnectionProperties();
+    Properties getConnectionProperties();
 
     /**
      * Provide any built-in decorators; may be null.
      */
-    public List<ConnectionDecorator> createConnectionDecorators();
+    List<ConnectionDecorator> createConnectionDecorators();
 
     /**
      * Initialize self and dictionary once available.
      */
-    public void initDBDictionary(DBDictionary dict);
+    void initDBDictionary(DBDictionary dict);
 }
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DynamicSchemaFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DynamicSchemaFactory.java
index b395d23c9..f6b3c92a4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DynamicSchemaFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DynamicSchemaFactory.java
@@ -36,46 +36,55 @@ import org.apache.openjpa.lib.conf.Configuration;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class DynamicSchemaFactory
     extends SchemaGroup
     implements SchemaFactory, Configurable {
 
+    private static final long serialVersionUID = 1L;
     private transient DBDictionary _dict = null;
     private DBIdentifier _schema = DBIdentifier.NULL;
 
+    @Override
     public void setConfiguration(Configuration conf) {
         JDBCConfiguration jconf = (JDBCConfiguration) conf;
         _dict = jconf.getDBDictionaryInstance();
         _schema = DBIdentifier.newSchema(jconf.getSchema());
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public SchemaGroup readSchema() {
         return this;
     }
 
+    @Override
     public void storeSchema(SchemaGroup schema) {
         // nothing to do
     }
 
+    @Override
     public boolean isKnownTable(Table table) {
         return super.findTable(table) != null;
     }
 
+    @Override
     public boolean isKnownTable(String name) {
         return super.findTable(name) != null;
     }
 
+    @Override
     public boolean isKnownTable(QualifiedDBIdentifier path) {
         return super.findTable(path) != null;
     }
 
+    @Override
     public Table findTable(String name) {
         return super.findTable(name);
     }
@@ -88,6 +97,7 @@ public class DynamicSchemaFactory
         return findTable(path);
     }
 
+    @Override
     public Table findTable(QualifiedDBIdentifier path) {
         if (DBIdentifier.isNull(path))
             return null;
@@ -124,6 +134,7 @@ public class DynamicSchemaFactory
 //        return new DynamicTable(name, schema);
 //    }
 
+    @Override
     protected Table newTable(DBIdentifier name, Schema schema) {
         return new DynamicTable(name, schema);
     }
@@ -132,6 +143,7 @@ public class DynamicSchemaFactory
 //        return new DynamicColumn(name, table);
 //    }
 
+    @Override
     protected Column newColumn(DBIdentifier name, Table table) {
         return new DynamicColumn(name, table);
     }
@@ -142,6 +154,9 @@ public class DynamicSchemaFactory
     private class DynamicTable
         extends Table {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public DynamicTable(String name, Schema schema) {
             super(name, schema);
         }
@@ -153,14 +168,18 @@ public class DynamicSchemaFactory
         /**
          * @deprecated
          */
+        @Deprecated
+        @Override
         public Column getColumn(String name) {
             return getColumn(name, null);
         }
 
+        @Override
         public Column getColumn(DBIdentifier name, boolean create) {
             return getColumn(name, null, create);
         }
 
+        @Override
         public Column getColumn(DBIdentifier name) {
             return getColumn(name, null);
         }
@@ -168,6 +187,7 @@ public class DynamicSchemaFactory
         /**
          * @deprecated
          */
+        @Deprecated
         public Column getColumn(String name, DBDictionary dict) {
             if (name == null)
                 return null;
@@ -204,9 +224,13 @@ public class DynamicSchemaFactory
     private class DynamicColumn
         extends Column {
 
+        
+        private static final long serialVersionUID = 1L;
+
         /**
          * @deprecated
          */
+        @Deprecated
         public DynamicColumn(String name, Table table) {
             super(name, table);
         }
@@ -215,6 +239,7 @@ public class DynamicSchemaFactory
             super(name, table);
         }
 
+        @Override
         public boolean isCompatible(int type, String typeName, int size,
             int decimals) {
             if (getType() != Types.OTHER)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/FileSchemaFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/FileSchemaFactory.java
index c620b9ede..cde61c873 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/FileSchemaFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/FileSchemaFactory.java
@@ -26,6 +26,7 @@ import java.security.AccessController;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.lib.conf.Configurable;
 import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.lib.meta.MetaDataSerializer;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.util.GeneralException;
@@ -62,22 +63,27 @@ public class FileSchemaFactory
      * @deprecated Use {@link #setFile}. Retained for
      * backwards-compatible auto-configuration.
      */
+    @Deprecated
     public void setFileName(String name) {
         setFile(name);
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (JDBCConfiguration) conf;
         _loader = _conf.getClassResolverInstance().
             getClassLoader(getClass(), null);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public SchemaGroup readSchema() {
         URL url = AccessController.doPrivileged(
             J2DoPrivHelper.getResourceAction(_loader, _fileName));
@@ -93,12 +99,13 @@ public class FileSchemaFactory
         return parser.getSchemaGroup();
     }
 
+    @Override
     public void storeSchema(SchemaGroup schema) {
         File file = Files.getFile(_fileName, _loader);
         XMLSchemaSerializer ser = new XMLSchemaSerializer(_conf);
         ser.addAll(schema);
         try {
-            ser.serialize(file, ser.PRETTY);
+            ser.serialize(file, MetaDataSerializer.PRETTY);
         } catch (IOException ioe) {
             throw new GeneralException(ioe);
         }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java
index fa788d459..376a23580 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java
@@ -40,9 +40,8 @@ import org.apache.openjpa.util.InvalidStateException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class ForeignKey
-    extends Constraint {
+public class ForeignKey extends Constraint {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Logical foreign key; links columns, but does not perform any action
@@ -163,6 +162,7 @@ public class ForeignKey
      * @param table the local table of the foreign key
      * @deprecated
      */
+    @Deprecated
     public ForeignKey(String name, Table table) {
         super(name, table);
     }
@@ -171,6 +171,7 @@ public class ForeignKey
         super(name, table);
     }
 
+    @Override
     public boolean isLogical() {
         return _delAction == ACTION_NONE;
     }
@@ -235,6 +236,7 @@ public class ForeignKey
      * The name of the primary key table.
      * @deprecated
      */
+    @Deprecated
     public String getPrimaryKeyTableName() {
         return getPrimaryKeyTableIdentifier().getName();
     }
@@ -251,6 +253,7 @@ public class ForeignKey
      * key table name on foreign keys that have not already been joined.
      * @deprecated
      */
+    @Deprecated
     public void setPrimaryKeyTableName(String pkTableName) {
         setPrimaryKeyTableIdentifier(DBIdentifier.newTable(pkTableName));
     }
@@ -265,6 +268,7 @@ public class ForeignKey
      * The name of the primary key table's schema.
      * @deprecated
      */
+    @Deprecated
     public String getPrimaryKeySchemaName() {
         return getPrimaryKeySchemaIdentifier().getName();
     }
@@ -282,6 +286,7 @@ public class ForeignKey
      * joined.
      * @deprecated
      */
+    @Deprecated
     public void setPrimaryKeySchemaName(String pkSchemaName) {
         setPrimaryKeySchemaIdentifier(DBIdentifier.newSchema(pkSchemaName));
     }
@@ -296,6 +301,7 @@ public class ForeignKey
      * The name of the primary key column.
      * @deprecated
      */
+    @Deprecated
     public String getPrimaryKeyColumnName() {
         return getPrimaryKeyColumnIdentifier().getName();
     }
@@ -310,6 +316,7 @@ public class ForeignKey
      * joined.
      * @deprecated
      */
+    @Deprecated
     public void setPrimaryKeyColumnName(String pkColumnName) {
         setPrimaryKeyColumnIdentifier(DBIdentifier.newColumn(pkColumnName));
     }
@@ -785,6 +792,7 @@ public class ForeignKey
      * Return the name of the foreignkey constraint as defined in the database.
      * @deprecated
      */
+    @Deprecated
     public String loadNameFromDB(DBDictionary dbdict, Connection conn) {
         return loadIdentifierFromDB(dbdict, conn).getName();
     }
@@ -920,10 +928,12 @@ public class ForeignKey
             return _fk;
         }
 
+        @Override
         public int hashCode() {
             return getFk().getIdentifier() != null ? getFk().getIdentifier().hashCode() : getFk().hashCode();
         }
 
+        @Override
         public boolean equals(Object fkObj) {
             if (fkObj == this) {
                 return true;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Index.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Index.java
index 388ea542f..8e00493c4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Index.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Index.java
@@ -27,10 +27,8 @@ import org.apache.openjpa.jdbc.identifier.DBIdentifier;
  * @author Abe White
  * @author Stephen Kim
  */
-@SuppressWarnings("serial")
-public class Index
-    extends LocalConstraint {
-
+public class Index extends LocalConstraint {
+    private static final long serialVersionUID = 1L;
     private boolean _unique = false;
 
     /**
@@ -46,6 +44,7 @@ public class Index
      * @param table the table of the index
      * @deprecated
      */
+    @Deprecated
     public Index(String name, Table table) {
         super(name, table);
     }
@@ -68,6 +67,7 @@ public class Index
         _unique = unique;
     }
 
+    @Override
     public boolean isLogical() {
         return false;
     }
@@ -75,10 +75,13 @@ public class Index
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public String getFullName() {
         return getFullIdentifier().getName();
     }
 
+    @Override
     public DBIdentifier getFullIdentifier() {
         return getQualifiedPath().getIdentifier();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LazySchemaFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LazySchemaFactory.java
index 455448d94..64683e847 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LazySchemaFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LazySchemaFactory.java
@@ -37,11 +37,11 @@ import org.apache.openjpa.lib.conf.Configuration;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class LazySchemaFactory
     extends SchemaGroup
     implements SchemaFactory, Configurable {
 
+    private static final long serialVersionUID = 1L;
     private transient JDBCConfiguration _conf = null;
     private transient Connection _conn = null;
     private transient DatabaseMetaData _meta = null;
@@ -75,10 +75,12 @@ public class LazySchemaFactory
         _indexes = idx;
     }
 
+    @Override
     public SchemaGroup readSchema() {
         return this;
     }
 
+    @Override
     public void storeSchema(SchemaGroup schema) {
         // nothing to do
     }
@@ -86,6 +88,8 @@ public class LazySchemaFactory
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Table findTable(String name) {
         if (name == null)
             return null;
@@ -98,6 +102,7 @@ public class LazySchemaFactory
         return findTable(QualifiedDBIdentifier.getPath(name));
     }
 
+    @Override
     public Table findTable(QualifiedDBIdentifier path) {
         if (path == null)
             return null;
@@ -113,18 +118,22 @@ public class LazySchemaFactory
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public Sequence findSequence(String name) {
         if (name == null)
             return null;
         return findSequence(DBIdentifier.newSequence(name));
     }
 
+    @Override
     public Sequence findSequence(DBIdentifier name) {
         if (name == null)
             return null;
         return findSequence(QualifiedDBIdentifier.getPath(name));
     }
 
+    @Override
     public Sequence findSequence(QualifiedDBIdentifier name) {
         if (name == null)
             return null;
@@ -199,15 +208,18 @@ public class LazySchemaFactory
         }
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (JDBCConfiguration) conf;
         _gen = new SchemaGenerator(_conf);
         _gen.setSchemaGroup(this);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java
index 12796583f..32635d5fb 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LocalConstraint.java
@@ -32,9 +32,8 @@ import org.apache.openjpa.util.InvalidStateException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public abstract class LocalConstraint
-    extends Constraint {
+public abstract class LocalConstraint extends Constraint {
+    private static final long serialVersionUID = 1L;
 
     private static final Localizer _loc = Localizer.forPackage
         (LocalConstraint.class);
@@ -55,6 +54,7 @@ public abstract class LocalConstraint
      * @param table the table of the constraint
      * @deprecated
      */
+    @Deprecated
     public LocalConstraint(String name, Table table) {
         super(name, table);
     }
@@ -65,6 +65,7 @@ public abstract class LocalConstraint
 /**
      * Called when the constraint is removed from its table.
      */
+    @Override
     void remove() {
         // remove all columns
         for (Column c : _cols) {
@@ -107,7 +108,7 @@ public abstract class LocalConstraint
                 col == null ? null : getTable()));
 
         if (_colList == null)
-            _colList = new ArrayList<Column>(3);
+            _colList = new ArrayList<>(3);
         else if (_colList.contains(col))
             return;
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java
index dcbc05c35..f76117fe1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/NameSet.java
@@ -22,10 +22,10 @@ import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Name sets track what names have been taken, ignoring case.
@@ -34,9 +34,8 @@ import org.apache.openjpa.lib.util.Localizer;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class NameSet
-    implements Serializable {
+public class NameSet implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private static final Localizer _loc = Localizer.forPackage(NameSet.class);
 
@@ -46,6 +45,7 @@ public class NameSet
      * Return true if the given name is in use already.
      * @deprecated
      */
+    @Deprecated
     public boolean isNameTaken(String name) {
         return isNameTaken(DBIdentifier.toUpper(DBIdentifier.newDefault(name)));
     }
@@ -64,6 +64,7 @@ public class NameSet
     /**
      * @deprecated
      */
+    @Deprecated
     protected void addName(String name, boolean validate) {
         addName(DBIdentifier.newIdentifier(name, DBIdentifierType.DEFAULT, true), validate);
     }
@@ -85,7 +86,7 @@ public class NameSet
         // DBs use different namespaces for components, and it would be
         // difficult to find a scheme that fits all and is still useful
         if (_names == null)
-            _names = new HashSet<DBIdentifier>();
+            _names = new HashSet<>();
         DBIdentifier sName = DBIdentifier.toUpper(name);
         _names.add(sName);
     }
@@ -93,6 +94,7 @@ public class NameSet
     /**
      * @deprecated
      */
+    @Deprecated
     protected void removeName(String name) {
         if (name != null && _names != null) {
             removeName(DBIdentifier.newIdentifier(name, DBIdentifierType.DEFAULT, true));
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/PrimaryKey.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/PrimaryKey.java
index c5fe4b2cb..1a0ebf160 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/PrimaryKey.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/PrimaryKey.java
@@ -27,10 +27,8 @@ import org.apache.openjpa.jdbc.identifier.DBIdentifier;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class PrimaryKey
-    extends LocalConstraint {
-
+public class PrimaryKey extends LocalConstraint {
+    private static final long serialVersionUID = 1L;
     private boolean _logical = false;
 
     /**
@@ -46,6 +44,7 @@ public class PrimaryKey
      * @param table the table of the primary key
      * @deprecated
      */
+    @Deprecated
     public PrimaryKey(String name, Table table) {
         super(name, table);
     }
@@ -54,6 +53,7 @@ public class PrimaryKey
         super(name, table);
     }
 
+    @Override
     public boolean isLogical() {
         return _logical;
     }
@@ -62,6 +62,7 @@ public class PrimaryKey
         _logical = logical;
     }
 
+    @Override
     void remove() {
         // check all foreign keys in the schema group, removing ones that
         // reference this primary key
@@ -76,6 +77,7 @@ public class PrimaryKey
         super.remove();
     }
 
+    @Override
     public void addColumn(Column col) {
         super.addColumn(col);
         col.setPrimaryKey(true);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ReferenceCounter.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ReferenceCounter.java
index 9c71bb67d..cb2080f6f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ReferenceCounter.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ReferenceCounter.java
@@ -29,6 +29,8 @@ import java.io.Serializable;
 class ReferenceCounter
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private int _count = 0;
 
     public int getRefCount() {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schema.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schema.java
index f693f7098..f7ba3ba5a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schema.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schema.java
@@ -30,10 +30,10 @@ import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class Schema
     implements Comparable<Schema>, Serializable {
 
+    private static final long serialVersionUID = 1L;
     private DBIdentifier _name = DBIdentifier.NULL;
     private SchemaGroup _group = null;
     private Map<DBIdentifier, Table> _tableMap = null;
@@ -56,6 +56,7 @@ public class Schema
      * @param group the schema's owning group
      * @deprecated
      */
+    @Deprecated
     public Schema(String name, SchemaGroup group) {
         this(DBIdentifier.newSchema(name), group);
     }
@@ -90,6 +91,7 @@ public class Schema
      * Return the name of the schema, or null if none.
      * @deprecated
      */
+    @Deprecated
     public String getName() {
         return getIdentifier().getName();
     }
@@ -103,6 +105,7 @@ public class Schema
      * not attached to a group.
      * @deprecated
      */
+    @Deprecated
     public void setName(String name) {
         setIdentifier(DBIdentifier.trimToNull(DBIdentifier.newSchema(name)));
     }
@@ -127,6 +130,7 @@ public class Schema
      * Return the table with the given name, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Table getTable(String name) {
         if (name == null || _tableMap == null)
             return null;
@@ -137,13 +141,14 @@ public class Schema
         if (DBIdentifier.isNull(name) || _tableMap == null)
             return null;
         DBIdentifier sName = DBIdentifier.toUpper(name);
-        return (Table) _tableMap.get(sName);
+        return _tableMap.get(sName);
     }
 
     /**
      * Add a table to the schema.
      * @deprecated
      */
+    @Deprecated
     public Table addTable(String name) {
         return addTable(DBIdentifier.newTable(name));
     }
@@ -158,7 +163,7 @@ public class Schema
         } else
             tab = new Table(name, this);
         if (_tableMap == null)
-            _tableMap = new TreeMap<DBIdentifier, Table>();
+            _tableMap = new TreeMap<>();
         DBIdentifier sName = DBIdentifier.toUpper(name);
         _tableMap.put(sName, tab);
         _tables = null;
@@ -170,6 +175,7 @@ public class Schema
      * Add a table with a shortened (i.e., validated) name to the schema
      * @deprecated
      */
+    @Deprecated
     public Table addTable(String name, String validName) {
         return addTable(DBIdentifier.newTable(name), DBIdentifier.newTable(validName));
     }
@@ -183,7 +189,7 @@ public class Schema
         } else
             tab = new Table(validName, this);
         if (_tableMap == null)
-            _tableMap = new TreeMap<DBIdentifier, Table>();
+            _tableMap = new TreeMap<>();
         DBIdentifier sName = DBIdentifier.toUpper(name);
         _tableMap.put(sName, tab);
         _tables = null;
@@ -200,7 +206,7 @@ public class Schema
             return false;
 
         DBIdentifier sName = DBIdentifier.toUpper(tab.getIdentifier());
-        Table cur = (Table) _tableMap.get(sName);
+        Table cur = _tableMap.get(sName);
         if (!cur.equals(tab))
             return false;
 
@@ -244,6 +250,7 @@ public class Schema
      * Return the sequence with the given name, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Sequence getSequence(String name) {
         if (name == null || _seqMap == null)
             return null;
@@ -255,7 +262,7 @@ public class Schema
             return null;
 
         DBIdentifier sName = DBIdentifier.toUpper(name);
-        Sequence seq = (Sequence) _seqMap.get(sName);
+        Sequence seq = _seqMap.get(sName);
         return seq;
     }
 
@@ -263,6 +270,7 @@ public class Schema
      * Add a sequence to the schema.
      * @deprecated
      */
+    @Deprecated
     public Sequence addSequence(String name) {
         return addSequence(DBIdentifier.newIdentifier(name, DBIdentifierType.SEQUENCE, true));
     }
@@ -276,7 +284,7 @@ public class Schema
         } else
             seq = new Sequence(name, this);
         if (_seqMap == null)
-            _seqMap = new TreeMap<DBIdentifier, Sequence>();
+            _seqMap = new TreeMap<>();
 
         DBIdentifier sName = DBIdentifier.toUpper(name);
         _seqMap.put(sName, seq);
@@ -294,7 +302,7 @@ public class Schema
             return false;
 
         DBIdentifier sName = DBIdentifier.toUpper(seq.getIdentifier());
-        Sequence cur = (Sequence) _seqMap.get(sName);
+        Sequence cur = _seqMap.get(sName);
         if (!cur.equals(seq))
             return false;
 
@@ -321,9 +329,10 @@ public class Schema
         return copy;
     }
 
+    @Override
     public int compareTo(Schema other) {
         DBIdentifier name = getIdentifier();
-        DBIdentifier otherName = ((Schema) other).getIdentifier();
+        DBIdentifier otherName = other.getIdentifier();
         if (DBIdentifier.isNull(name) && DBIdentifier.isNull(otherName)) {
             return 0;
         }
@@ -334,6 +343,7 @@ public class Schema
         return name.compareTo(otherName);
     }
 
+    @Override
     public String toString() {
         return getIdentifier().getName();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaFactory.java
index ce30c1599..a79bde4c2 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaFactory.java
@@ -31,12 +31,12 @@ public interface SchemaFactory {
     /**
      * Return the schema group for the current object model and database.
      */
-    public SchemaGroup readSchema();
+    SchemaGroup readSchema();
 
     /**
      * Record the schema group after changes may have been made.
      *
      * @param schema the schema definition for the entire system
      */
-    public void storeSchema(SchemaGroup schema);
+    void storeSchema(SchemaGroup schema);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java
index 70b175377..db21c982a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java
@@ -33,13 +33,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+
 import javax.sql.DataSource;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
+import org.apache.openjpa.jdbc.identifier.Normalizer;
+import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
@@ -101,7 +102,7 @@ public class SchemaGenerator {
             if (splitName.length == 1) {
                 names[i] = DBIdentifier.newSchema(schemaArray[i]);
             } else {
-                names[i] = QualifiedDBIdentifier.newTable(schemaArray[i]);
+                names[i] = DBIdentifier.newTable(schemaArray[i]);
             }
         }
         _allowed = parseSchemasList(names);
@@ -118,7 +119,7 @@ public class SchemaGenerator {
         if (args == null || args.length == 0)
             return null;
 
-        Map<DBIdentifier, Collection<DBIdentifier>> schemas = new HashMap<DBIdentifier, Collection<DBIdentifier>>();
+        Map<DBIdentifier, Collection<DBIdentifier>> schemas = new HashMap<>();
         DBIdentifier schema = DBIdentifier.NULL, table = DBIdentifier.NULL;
         Collection<DBIdentifier> tables = null;
         for (int i = 0; i < args.length; i++) {
@@ -132,7 +133,7 @@ public class SchemaGenerator {
             else if (!DBIdentifier.isNull(table)) {
                 tables = schemas.get(schema);
                 if (tables == null) {
-                    tables = new LinkedList<DBIdentifier>();
+                    tables = new LinkedList<>();
                     schemas.put(schema, tables);
                 }
                 tables.add(table);
@@ -257,6 +258,7 @@ public class SchemaGenerator {
     /**
      * @deprecated
      */
+    @Deprecated
     public void generateSchemas(String[] schemasAndTables)
         throws SQLException {
         generateSchemas(DBIdentifier.toArray(schemasAndTables, DBIdentifierType.TABLE));
@@ -334,6 +336,7 @@ public class SchemaGenerator {
      * @param tableNames
      * @deprecated
      */
+    @Deprecated
     public void generateSchema(String name, String[] tableNames)
         throws SQLException {
         generateSchema(DBIdentifier.newSchema(name),
@@ -384,6 +387,7 @@ public class SchemaGenerator {
      * for all schemas and/or tables.
      * @deprecated
      */
+    @Deprecated
     public void generatePrimaryKeys(String schemaName, String[] tableNames)
         throws SQLException {
         generatePrimaryKeys(DBIdentifier.newSchema(schemaName),
@@ -426,6 +430,7 @@ public class SchemaGenerator {
      * for all schemas and/or tables.
      * @deprecated
      */
+    @Deprecated
     public void generateIndexes(String schemaName, String[] tableNames)
         throws SQLException {
         generateIndexes(DBIdentifier.newSchema(schemaName),
@@ -467,6 +472,7 @@ public class SchemaGenerator {
      * for all schemas and/or tables.
      * @deprecated
      */
+    @Deprecated
     public void generateForeignKeys(String schemaName, String[] tableNames)
         throws SQLException {
         generateForeignKeys(DBIdentifier.newSchema(schemaName),
@@ -504,6 +510,7 @@ public class SchemaGenerator {
     /**
      * @deprecated
      */
+    @Deprecated
     public void generateTables(String schemaName, String tableName,
         Connection conn, DatabaseMetaData meta)
         throws SQLException {
@@ -534,7 +541,7 @@ public class SchemaGenerator {
         if (DBIdentifier.isNull(tableName) || "%".equals(tableName.getName())) {
             Table[] tables = _dict.getTables(meta, DBIdentifier.newCatalog(conn.getCatalog()),
                 schemaName, tableName, conn);
-            tableNames = new HashSet<DBIdentifier>();
+            tableNames = new HashSet<>();
             for (int i = 0; tables != null && i < tables.length; i++) {
                 if (cols == null) {
                     tableNames.add(tables[i].getIdentifier());
@@ -624,7 +631,7 @@ public class SchemaGenerator {
                     break;
                 continue;
             }
-            if (!schema.equals((DBIdentifier) _allowed[i][0]))
+            if (!schema.equals(_allowed[i][0]))
                 continue;
 
             if (table == null)
@@ -651,6 +658,7 @@ public class SchemaGenerator {
      * Generates table primary keys.
      * @deprecated
      */
+    @Deprecated
     public void generatePrimaryKeys(String schemaName, String tableName,
         Connection conn, DatabaseMetaData meta)
         throws SQLException {
@@ -681,7 +689,7 @@ public class SchemaGenerator {
         if (pks == null && tableName == null) {
             Collection<Table> tables = getTables(schemaName);
             for (Iterator<Table> itr = tables.iterator(); itr.hasNext();) {
-                table = (Table) itr.next();
+                table = itr.next();
                 generatePrimaryKeys(table.getSchemaIdentifier(),
                     table.getIdentifier(), conn, meta);
             }
@@ -717,6 +725,7 @@ public class SchemaGenerator {
      * Generates table indexes.
      * @deprecated
      */
+    @Deprecated
     public void generateIndexes(String schemaName, String tableName,
         Connection conn, DatabaseMetaData meta)
         throws SQLException {
@@ -907,7 +916,7 @@ public class SchemaGenerator {
                     if (_log.isWarnEnabled())
                         _log.warn(_loc.get("bad-join", iae.toString()));
                     if (invalids == null)
-                        invalids = new HashSet<ForeignKey>();
+                        invalids = new HashSet<>();
                     invalids.add(fk);
                 }
             }
@@ -926,6 +935,7 @@ public class SchemaGenerator {
      * Adds all sequences matching the given name pattern to the schema.
      * @deprecated
      */
+    @Deprecated
     public void generateSequences(String schemaName, String sequenceName,
         Connection conn, DatabaseMetaData meta)
         throws SQLException {
@@ -1001,7 +1011,7 @@ public class SchemaGenerator {
      */
     public void addListener(Listener l) {
         if (_listeners == null)
-            _listeners = new LinkedList<Listener>();
+            _listeners = new LinkedList<>();
         _listeners.add(l);
     }
 
@@ -1029,7 +1039,7 @@ public class SchemaGenerator {
         }
 
         Schema[] schemas = group.getSchemas();
-        Collection<Table> tables = new LinkedList<Table>();
+        Collection<Table> tables = new LinkedList<>();
         for (int i = 0; i < schemas.length; i++)
             tables.addAll(Arrays.asList(schemas[i].getTables()));
         return tables;
@@ -1038,7 +1048,7 @@ public class SchemaGenerator {
     /**
      * A listener for a potentially lengthy schema generation process.
      */
-    public static interface Listener {
+    public interface Listener {
 
         boolean schemaObjectGenerated(Event e);
     }
@@ -1046,10 +1056,8 @@ public class SchemaGenerator {
     /**
      * An event corresponding to the generation of a schema object.
      */
-    @SuppressWarnings("serial")
-    public static class Event
-        extends EventObject {
-
+    public static class Event extends EventObject {
+        private static final long serialVersionUID = 1L;
         private final int _total;
 
         public Event(Object ob, int total) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
index 0aa12514f..e3c641511 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
@@ -31,11 +31,12 @@ import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class SchemaGroup
     extends NameSet
     implements Cloneable {
 
+    private static final long serialVersionUID = 1L;
+
     private Map<DBIdentifier, Schema> _schemaMap = null;
 
     // cache
@@ -55,6 +56,7 @@ public class SchemaGroup
      * Return the schema with the given name, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Schema getSchema(String name) {
         if (_schemaMap == null)
             return null;
@@ -65,7 +67,7 @@ public class SchemaGroup
         if (_schemaMap == null)
             return null;
         DBIdentifier sName = DBIdentifier.toUpper(name);
-        Schema schema = (Schema) _schemaMap.get(sName);
+        Schema schema = _schemaMap.get(sName);
         return schema;
     }
 
@@ -84,7 +86,7 @@ public class SchemaGroup
         Schema schema = newSchema(name);
         DBIdentifier sName = DBIdentifier.toUpper(name);
         if (_schemaMap == null)
-            _schemaMap = new HashMap<DBIdentifier, Schema>();
+            _schemaMap = new HashMap<>();
         _schemaMap.put(sName, schema);
         _schemas = null;
         return schema;
@@ -94,6 +96,7 @@ public class SchemaGroup
      * @deprecated
      * @param name
      */
+    @Deprecated
     public Schema addSchema(String name) {
         return addSchema(DBIdentifier.newSchema(name));
     }
@@ -108,7 +111,7 @@ public class SchemaGroup
             return false;
 
         DBIdentifier name = DBIdentifier.toUpper(schema.getIdentifier());
-        Schema rem = (Schema) _schemaMap.get(name);
+        Schema rem = _schemaMap.get(name);
         if (schema.equals(rem)) {
             _schemaMap.remove(name);
             removeName(schema.getIdentifier());
@@ -164,6 +167,7 @@ public class SchemaGroup
      * added to this group or is known to exist in the database.
      * @deprecated
      */
+    @Deprecated
     public boolean isKnownTable(String name) {
         return findTable(name) != null;
     }
@@ -185,6 +189,7 @@ public class SchemaGroup
      * catalog separator. Returns null if no table found.
      * @deprecated
      */
+    @Deprecated
     public Table findTable(String name) {
         if (name == null)
             return null;
@@ -218,6 +223,7 @@ public class SchemaGroup
      * separator. Returns null if no table found.
      * @deprecated
      */
+    @Deprecated
     public Table findTable(Schema inSchema, String name) {
         if (name == null)
             return null;
@@ -288,6 +294,7 @@ public class SchemaGroup
      * added to this group or is known to exist in the database.
      * @deprecated
      */
+    @Deprecated
     public boolean isKnownSequence(String name) {
         return findSequence(name) != null;
     }
@@ -313,6 +320,7 @@ public class SchemaGroup
      * catalog separator. Returns null if no sequence found.
      * @deprecated
      */
+    @Deprecated
     public Sequence findSequence(String name) {
         if (name == null)
             return null;
@@ -350,6 +358,7 @@ public class SchemaGroup
      * catalog separator. Returns null if no sequence found.
      * @deprecated
      */
+    @Deprecated
     public Sequence findSequence(Schema inSchema, String name) {
         if (name == null)
             return null;
@@ -389,7 +398,7 @@ public class SchemaGroup
         Schema[] schemas = getSchemas();
         Table[] tabs;
         ForeignKey[] fks;
-        Collection<ForeignKey> exports = new LinkedList<ForeignKey>();
+        Collection<ForeignKey> exports = new LinkedList<>();
         for (int i = 0; i < schemas.length; i++) {
             tabs = schemas[i].getTables();
             for (int j = 0; j < tabs.length; j++) {
@@ -402,7 +411,7 @@ public class SchemaGroup
                 }
             }
         }
-        return (ForeignKey[]) exports.toArray(new ForeignKey[exports.size()]);
+        return exports.toArray(new ForeignKey[exports.size()]);
     }
 
     /**
@@ -447,6 +456,7 @@ public class SchemaGroup
         }
     }
 
+    @Override
     public Object clone() {
         SchemaGroup clone = newInstance();
         clone.copy(this);
@@ -486,6 +496,7 @@ public class SchemaGroup
      * Return a new schema with the given name.
      * @deprecated
      */
+    @Deprecated
     protected Schema newSchema(String name) {
         return new Schema(name, this);
     }
@@ -498,6 +509,7 @@ public class SchemaGroup
      * Return a new sequence with the given name and owner schema.
      * @deprecated
      */
+    @Deprecated
     protected Sequence newSequence(String name, Schema schema) {
         return new Sequence(name, schema);
     }
@@ -510,6 +522,7 @@ public class SchemaGroup
      * Return a new table with the given name and owner schema.
      * @deprecated
      */
+    @Deprecated
     protected Table newTable(String name, Schema schema) {
         return new Table(name, schema);
     }
@@ -522,6 +535,7 @@ public class SchemaGroup
      * Return a new column with the given name and owner table.
      * @deprecated
      */
+    @Deprecated
     protected Column newColumn(String name, Table table) {
         return new Column(name, table);
     }
@@ -534,6 +548,7 @@ public class SchemaGroup
      * Return a new primary key with the given name and owner table.
      * @deprecated
      */
+    @Deprecated
     protected PrimaryKey newPrimaryKey(String name, Table table) {
         return new PrimaryKey(name, table);
     }
@@ -546,6 +561,7 @@ public class SchemaGroup
      * Return a new index with the given name and owner table.
      * @deprecated
      */
+    @Deprecated
     protected Index newIndex(String name, Table table) {
         return new Index(name, table);
     }
@@ -558,6 +574,7 @@ public class SchemaGroup
      * Return a new unique constraint with the given name and owner table.
      * @deprecated
      */
+    @Deprecated
     protected Unique newUnique(String name, Table table) {
         return new Unique(name, table);
     }
@@ -570,6 +587,7 @@ public class SchemaGroup
      * Return a new foreign key with the given name and owner table.
      * @deprecated
      */
+    @Deprecated
     protected ForeignKey newForeignKey(String name, Table table) {
         return new ForeignKey(name, table);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaParser.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaParser.java
index a4b024884..7c5a9d59c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaParser.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaParser.java
@@ -37,7 +37,7 @@ public interface SchemaParser
      * multiple resources where a foreign key in one resource might refer
      * to a table in another.
      */
-    public boolean getDelayConstraintResolve();
+    boolean getDelayConstraintResolve();
 
     /**
      * Delay resolution of foreign key constraints until
@@ -45,20 +45,20 @@ public interface SchemaParser
      * multiple resources where a foreign key in one resource might refer
      * to a table in another.
      */
-    public void setDelayConstraintResolve(boolean delay);
+    void setDelayConstraintResolve(boolean delay);
 
     /**
      * Return the current schema group.
      */
-    public SchemaGroup getSchemaGroup();
+    SchemaGroup getSchemaGroup();
 
     /**
      * Set the current schema group; this clears all state from the last group.
      */
-    public void setSchemaGroup(SchemaGroup group);
+    void setSchemaGroup(SchemaGroup group);
 
     /**
      * If this parser is in delayed resolve mode, resolve all constraints.
      */
-    public void resolveConstraints();
+    void resolveConstraints();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaSerializer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaSerializer.java
index 4459b98f9..01541e47b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaSerializer.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaSerializer.java
@@ -32,38 +32,38 @@ public interface SchemaSerializer
     /**
      * Return the set of tables that will be serialized.
      */
-    public Table[] getTables();
+    Table[] getTables();
 
     /**
      * Add the given table to the set of tables that will be serialized.
      */
-    public void addTable(Table table);
+    void addTable(Table table);
 
     /**
      * Remove the given table from the set to be serialized.
      *
      * @return true if table was removed, false if not in set
      */
-    public boolean removeTable(Table table);
+    boolean removeTable(Table table);
 
     /**
      * Add the given schema's objects to the set of objects that will be
      * serialized.
      */
-    public void addAll(Schema schema);
+    void addAll(Schema schema);
 
     /**
      * Add all the objects in the given group to the set of objects that
      * will be serialized.
      */
-    public void addAll(SchemaGroup group);
+    void addAll(SchemaGroup group);
 
     /**
      * Remove the given schema's objects from the set to be serialized.
      *
      * @return true if any objects in schema removed, false if none in set
      */
-    public boolean removeAll(Schema schema);
+    boolean removeAll(Schema schema);
 
     /**
      * Remove all schemas in the given group from the set to be serialized.
@@ -71,10 +71,10 @@ public interface SchemaSerializer
      * @return true if any objects in the group were removed, false if
      * none in set
      */
-    public boolean removeAll(SchemaGroup group);
+    boolean removeAll(SchemaGroup group);
 
     /**
      * Clear the set of objects to be serialized.
      */
-    public void clear();
+    void clear();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
index a2758b6fe..a3c22be2a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
@@ -39,10 +39,9 @@ import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+
 import javax.sql.DataSource;
 
-import org.apache.openjpa.lib.util.J2DoPrivHelper;
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
@@ -54,8 +53,10 @@ import org.apache.openjpa.lib.jdbc.DelegatingDataSource;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.meta.MetaDataSerializer;
 import org.apache.openjpa.lib.util.Files;
+import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.util.InvalidStateException;
 
 /**
@@ -476,7 +477,7 @@ public class SchemaTool {
         throws SQLException {
         SchemaGroup group = getSchemaGroup();
         Schema[] schemas = group.getSchemas();
-        Collection<Table> tables = new LinkedHashSet<Table>();
+        Collection<Table> tables = new LinkedHashSet<>();
         for (int i = 0; i < schemas.length; i++) {
             Table[] ts = schemas[i].getTables();
             for (int j = 0; j < ts.length; j++)
@@ -515,7 +516,7 @@ public class SchemaTool {
         try {
             reader = new BufferedReader(new InputStreamReader(url.openStream()));
             String sql;
-            List<String> script = new ArrayList<String>();
+            List<String> script = new ArrayList<>();
             while ((sql = reader.readLine()) != null) {
                 sql = sql.trim();
                 if (sql.startsWith("--") || sql.startsWith("/*") || sql.startsWith("//")) {
@@ -645,7 +646,7 @@ public class SchemaTool {
         }
 
         // tables
-        Set<Table> newTables = new HashSet<Table>();
+        Set<Table> newTables = new HashSet<>();
         for (int i = 0; i < schemas.length; i++) {
             tabs = schemas[i].getTables();
             for (int j = 0; j < tabs.length; j++) {
@@ -847,7 +848,7 @@ public class SchemaTool {
         // columns
         Column[] cols;
         Column col;
-        Collection<Table> drops = new LinkedList<Table>();
+        Collection<Table> drops = new LinkedList<>();
         for (int i = 0; i < schemas.length; i++) {
             tabs = schemas[i].getTables();
             for (int j = 0; j < tabs.length; j++) {
@@ -924,7 +925,7 @@ public class SchemaTool {
         // calculate tables to drop; we can only drop tables if we're sure
         // the user listed the entire table definition in the stuff they want
         // dropped; else they might just want to drop a few columns
-        Collection<Table> drops = new LinkedList<Table>();
+        Collection<Table> drops = new LinkedList<>();
         Table[] tabs;
         Table dbTable;
         Column[] dbCols;
@@ -1294,7 +1295,7 @@ public class SchemaTool {
                 // group; some may not exist yet, which is OK; we just need
                 // to make sure we can detect the changes to the ones that
                 // do exist
-                Collection<DBIdentifier> tables = new LinkedList<DBIdentifier>();
+                Collection<DBIdentifier> tables = new LinkedList<>();
                 SchemaGroup group = assertSchemaGroup();
                 Schema[] schemas = group.getSchemas();
                 Table[] tabs;
@@ -1533,6 +1534,7 @@ public class SchemaTool {
         final String[] arguments = opts.setFromCmdLine(args);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws Exception {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
                 try {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schemas.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schemas.java
index 73f3c0e67..d0f5535d8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schemas.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Schemas.java
@@ -22,10 +22,10 @@ import java.sql.Types;
 import java.util.Date;
 import java.util.Locale;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.identifier.Normalizer;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Helper class to deal with schemas.
@@ -45,6 +45,7 @@ public class Schemas {
      * none.
      * @deprecated
      */
+    @Deprecated
     public static String getNewTableSchema(JDBCConfiguration conf) {
         return getNewTableSchemaIdentifier(conf).getName();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java
index e7de6b5c4..f3fed33b0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java
@@ -29,11 +29,11 @@ import org.apache.openjpa.lib.meta.SourceTracker;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class Sequence
     extends ReferenceCounter
     implements Comparable<Sequence>, SourceTracker {
 
+    private static final long serialVersionUID = 1L;
     private DBIdentifier _name = DBIdentifier.NULL;
     private Schema _schema = null;
     private DBIdentifier _schemaName = DBIdentifier.NULL;
@@ -61,6 +61,7 @@ public class Sequence
      * @param schema the sequence schema
      * @deprecated
      */
+    @Deprecated
     public Sequence(String name, Schema schema) {
         this(DBIdentifier.newSequence(name), schema);
     }
@@ -103,6 +104,7 @@ public class Sequence
      * whose schema object is not set.
      * @deprecated
      */
+    @Deprecated
     public void setSchemaName(String name) {
         setSchemaIdentifier(DBIdentifier.newSchema(name));
     }
@@ -118,6 +120,7 @@ public class Sequence
      * Return the name of the sequence.
      * @deprecated
      */
+    @Deprecated
     public String getName() {
         return getIdentifier().getName();
     }
@@ -131,6 +134,7 @@ public class Sequence
      * sequences that are not part of a schema.
      * @deprecated
      */
+    @Deprecated
     public void setName(String name) {
         setIdentifier(DBIdentifier.newSequence(name));
     }
@@ -147,6 +151,7 @@ public class Sequence
      * catalog separator.
      * @deprecated
      */
+    @Deprecated
     public String getFullName() {
         return getFullIdentifier().getName();
     }
@@ -204,14 +209,17 @@ public class Sequence
         _cache = cache;
     }
 
+    @Override
     public File getSourceFile() {
         return _source;
     }
 
+    @Override
     public Object getSourceScope() {
         return null;
     }
 
+    @Override
     public int getSourceType() {
         return _srcType;
     }
@@ -221,10 +229,12 @@ public class Sequence
         _srcType = srcType;
     }
 
+    @Override
     public String getResourceName() {
         return getFullIdentifier().getName();
     }
 
+    @Override
     public int compareTo(Sequence other) {
         DBIdentifier name = getIdentifier();
         DBIdentifier otherName = other.getIdentifier();
@@ -238,10 +248,12 @@ public class Sequence
         return name.compareTo(otherName);
     }
 
+    @Override
     public String toString() {
         return getFullIdentifier().getName();
     }
 
+    @Override
     public int getLineNumber() {
         return _lineNum;
     }
@@ -250,6 +262,7 @@ public class Sequence
         _lineNum = lineNum;
     }
 
+    @Override
     public int getColNumber() {
         return _colNum;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java
index bd81ea09e..6b1a3695f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java
@@ -55,11 +55,13 @@ public class SimpleDriverDataSource
     protected static Localizer _loc = Localizer.forPackage(SimpleDriverDataSource.class);
     protected static Localizer _eloc = Localizer.forPackage(DelegatingDataSource.class);
 
+    @Override
     public Connection getConnection()
         throws SQLException {
         return getConnection(null);
     }
 
+    @Override
     public Connection getConnection(String username, String password)
         throws SQLException {
         Properties props = new Properties();
@@ -96,39 +98,49 @@ public class SimpleDriverDataSource
         return con;
     }
 
+    @Override
     public int getLoginTimeout() {
         return 0;
     }
 
+    @Override
     public void setLoginTimeout(int seconds) {
     }
 
+    @Override
     public PrintWriter getLogWriter() {
         return DriverManager.getLogWriter();
     }
 
+    @Override
     public void setLogWriter(PrintWriter out) {
     }
 
+    @Override
     public void initDBDictionary(DBDictionary dict) {
     }
 
+    @Override
     public void setConnectionURL(String connectionURL) {
         _connectionURL = connectionURL;
     }
 
+    @Override
     public String getConnectionURL() {
         return _connectionURL;
     }
 
+    @Override
     public void setConnectionUserName(String connectionUserName) {
         _connectionUserName = connectionUserName;
     }
 
+    @Override
     public String getConnectionUserName() {
         return _connectionUserName;
     }
 
+    @Override
     public void setConnectionPassword(String connectionPassword) {
         _connectionPassword = connectionPassword;
     }
@@ -138,38 +150,47 @@ public class SimpleDriverDataSource
         return _connectionPassword;
     }
 
+    @Override
     public void setConnectionProperties(Properties props) {
         _connectionProperties = props;
     }
 
+    @Override
     public Properties getConnectionProperties() {
         return _connectionProperties;
     }
 
+    @Override
     public void setConnectionFactoryProperties(Properties props) {
         _connectionFactoryProperties = props;
     }
 
+    @Override
     public Properties getConnectionFactoryProperties() {
         return _connectionFactoryProperties;
     }
 
+    @Override
     public List<ConnectionDecorator> createConnectionDecorators() {
         return null;
     }
 
+    @Override
     public void setClassLoader(ClassLoader classLoader) {
         _classLoader = classLoader;
     }
 
+    @Override
     public ClassLoader getClassLoader() {
         return _classLoader;
     }
 
+    @Override
     public void setConnectionDriverName(String connectionDriverName) {
         _connectionDriverName = connectionDriverName;
     }
 
+    @Override
     public String getConnectionDriverName() {
         return _connectionDriverName;
     }
@@ -213,10 +234,12 @@ public class SimpleDriverDataSource
 
 
     // java.sql.Wrapper implementation (JDBC 4)
+    @Override
     public boolean isWrapperFor(Class<?> iface) {
         return iface.isAssignableFrom(SimpleDriverDataSource.class);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public Object unwrap(Class iface) {
         if (isWrapperFor(iface))
@@ -227,6 +250,7 @@ public class SimpleDriverDataSource
 
     // Java 7 methods follow
 
+    @Override
     public Logger getParentLogger() throws SQLFeatureNotSupportedException{
     	throw new SQLFeatureNotSupportedException();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
index 9a4329512..ab0007394 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
@@ -22,13 +22,13 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.LinkedHashMap;
 
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
+import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.meta.SourceTracker;
 
@@ -38,11 +38,11 @@ import org.apache.openjpa.lib.meta.SourceTracker;
  * @author Abe White
  * @author Stephen Kim
  */
-@SuppressWarnings("serial")
 public class Table
     extends NameSet
     implements Comparable<Object>, SourceTracker {
 
+    private static final long serialVersionUID = 1L;
     private DBIdentifier _name = DBIdentifier.NULL;
     private DBIdentifier _schemaName = DBIdentifier.NULL;
     private Map<DBIdentifier, Column> _colMap = null;
@@ -82,6 +82,7 @@ public class Table
      * @param schema the table schema
      * @deprecated
      */
+    @Deprecated
     public Table(String name, Schema schema) {
         this(DBIdentifier.newTable(name), schema);
     }
@@ -136,6 +137,7 @@ public class Table
      * The table's schema name.
      * @deprecated
      */
+    @Deprecated
     public String getSchemaName() {
         return getSchemaIdentifier().getName();
     }
@@ -149,6 +151,7 @@ public class Table
      * whose schema object is not set.
      * @deprecated
      */
+    @Deprecated
     public void setSchemaName(String name) {
         setSchemaIdentifier(DBIdentifier.newSchema(name));
     }
@@ -164,6 +167,7 @@ public class Table
      * Return the name of the table.
      * @deprecated
      */
+    @Deprecated
     public String getName() {
         return getIdentifier().getName();
     }
@@ -199,6 +203,7 @@ public class Table
      * catalog separator.
      * @deprecated
      */
+    @Deprecated
     public String getFullName() {
         return getFullIdentifier().getName();
     }
@@ -214,14 +219,17 @@ public class Table
         return getQualifiedPath().getIdentifier();
     }
 
+    @Override
     public File getSourceFile() {
         return _source;
     }
 
+    @Override
     public Object getSourceScope() {
         return null;
     }
 
+    @Override
     public int getSourceType() {
         return _srcType;
     }
@@ -231,6 +239,7 @@ public class Table
         _srcType = srcType;
     }
 
+    @Override
     public String getResourceName() {
         return getFullIdentifier().getName();
     }
@@ -246,7 +255,7 @@ public class Table
                 Column[] cols = new Column[_colMap.size()];
                 Iterator<Column> itr = _colMap.values().iterator();
                 for (int i = 0; itr.hasNext(); i++) {
-                    cols[i] = (Column) itr.next();
+                    cols[i] = itr.next();
                     cols[i].setIndex(i);
                 }
                 _cols = cols;
@@ -268,7 +277,7 @@ public class Table
                 for (int i = 0; i < cols.length; i++) {
                     if (cols[i].isAutoAssigned()) {
                         if (autos == null)
-                            autos = new ArrayList<Column>(3);
+                            autos = new ArrayList<>(3);
                         autos.add(cols[i]);
                     }
                 }
@@ -292,7 +301,7 @@ public class Table
                 for (int i = 0; i < cols.length; i++) {
                     if (cols[i].isRelationId()) {
                         if (rels == null)
-                            rels = new ArrayList<Column>(3);
+                            rels = new ArrayList<>(3);
                         rels.add(cols[i]);
                     }
                 }
@@ -307,7 +316,7 @@ public class Table
         if (_colMap == null) {
             return new String[0];
         }
-        DBIdentifier[] sNames = (DBIdentifier[])_colMap.keySet().toArray(new DBIdentifier[_colMap.size()]);
+        DBIdentifier[] sNames = _colMap.keySet().toArray(new DBIdentifier[_colMap.size()]);
         return DBIdentifier.toStringArray(sNames);
     }
 
@@ -315,6 +324,7 @@ public class Table
      * Return the column with the given name, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Column getColumn(String name) {
         return getColumn(DBIdentifier.newIdentifier(name, DBIdentifierType.COLUMN, true));
     }
@@ -336,6 +346,7 @@ public class Table
      * for dynamic table implementation.
      * @deprecated
      */
+    @Deprecated
     public boolean containsColumn(String name) {
         return containsColumn(DBIdentifier.newColumn(name), null);
     }
@@ -352,6 +363,7 @@ public class Table
      * for dynamic table implementation.
      * @deprecated
      */
+    @Deprecated
     public boolean containsColumn(String name, DBDictionary dict) {
         if (name == null || _colMap == null) {
             return false;
@@ -386,6 +398,7 @@ public class Table
      * Add a column to the table.
      * @deprecated
      */
+    @Deprecated
     public Column addColumn(String name) {
         return addColumn(DBIdentifier.newColumn(name));
     }
@@ -400,7 +413,7 @@ public class Table
             col = new Column(name, this);
         }
         if (_colMap == null)
-            _colMap = new LinkedHashMap<DBIdentifier, Column>();
+            _colMap = new LinkedHashMap<>();
         DBIdentifier sName = DBIdentifier.toUpper(name);
         _colMap.put(sName, col);
         _cols = null;
@@ -412,6 +425,7 @@ public class Table
      * Add a column with a shortened (i.e., validated) name to the table
      * @deprecated
      */
+    @Deprecated
     public Column addColumn(String name, String validName) {
         return addColumn(DBIdentifier.newColumn(name), DBIdentifier.newColumn(validName));
     }
@@ -425,7 +439,7 @@ public class Table
         else
             col = new Column(validName, this);
         if (_colMap == null)
-            _colMap = new LinkedHashMap<DBIdentifier, Column>();
+            _colMap = new LinkedHashMap<>();
         DBIdentifier sName = DBIdentifier.toUpper(name);
         _colMap.put(sName, col);
         _cols = null;
@@ -436,6 +450,7 @@ public class Table
      * Add a name to this NameSet
      * @deprecated
      */
+    @Deprecated
     public void addCorrectedColumnName(String name, boolean validate) {
         addName(DBIdentifier.newColumn(name), validate);
     }
@@ -455,7 +470,7 @@ public class Table
             return false;
 
         DBIdentifier sName = DBIdentifier.toUpper(col.getIdentifier());
-        Column cur = (Column) _colMap.get(sName);
+        Column cur = _colMap.get(sName);
         if (!col.equals(cur))
             return false;
 
@@ -508,6 +523,7 @@ public class Table
      * Set the primary key for the table.
      * @deprecated
      */
+    @Deprecated
     public PrimaryKey addPrimaryKey(String name) {
         return addPrimaryKey(DBIdentifier.newConstraint(name));
     }
@@ -559,6 +575,7 @@ public class Table
      * have the name, the first match is returned.
      * @deprecated
      */
+    @Deprecated
     public ForeignKey getForeignKey(String name) {
         return getForeignKey(DBIdentifier.newForeignKey(name));
     }
@@ -584,7 +601,7 @@ public class Table
                 ForeignKey[] fks = new ForeignKey[_fkList.size()];
                 Iterator<ForeignKey> itr = _fkList.iterator();
                 for (int i = 0; itr.hasNext(); i++) {
-                    fks[i] = (ForeignKey) itr.next();
+                    fks[i] = itr.next();
                     fks[i].setIndex(i);
                 }
                 _fks = fks;
@@ -604,6 +621,7 @@ public class Table
      * Add a foreign key to the table. Duplicate key names are not allowed.
      * @deprecated
      */
+    @Deprecated
     public ForeignKey addForeignKey(String name) {
         return addForeignKey(DBIdentifier.newForeignKey(name));
     }
@@ -617,7 +635,7 @@ public class Table
         } else
             fk = new ForeignKey(name, this);
         if (_fkList == null)
-            _fkList = new ArrayList<ForeignKey>(3);
+            _fkList = new ArrayList<>(3);
         _fkList.add(fk);
         _fks = null;
         return fk;
@@ -694,6 +712,7 @@ public class Table
      * Return the index with the given name, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Index getIndex(String name) {
         if (name == null || _idxMap == null)
             return null;
@@ -705,13 +724,14 @@ public class Table
             return null;
 
         DBIdentifier sName = DBIdentifier.toUpper(name);
-        return (Index) _idxMap.get(sName);
+        return _idxMap.get(sName);
     }
 
     /**
      * Add an index to the table.
      * @deprecated
      */
+    @Deprecated
     public Index addIndex(String name) {
         return addIndex(DBIdentifier.newIndex(name));
     }
@@ -725,7 +745,7 @@ public class Table
         } else
             idx = new Index(name, this);
         if (_idxMap == null)
-            _idxMap = new TreeMap<DBIdentifier, Index>();
+            _idxMap = new TreeMap<>();
         DBIdentifier sName = DBIdentifier.toUpper(name);
         _idxMap.put(sName, idx);
         _idxs = null;
@@ -742,7 +762,7 @@ public class Table
             return false;
 
         DBIdentifier sName = DBIdentifier.toUpper(idx.getIdentifier());
-        Index cur = (Index) _idxMap.get(sName);
+        Index cur = _idxMap.get(sName);
         if (!idx.equals(cur))
             return false;
 
@@ -785,6 +805,7 @@ public class Table
      * Return the unique constraint with the given name, or null if none.
      * @deprecated
      */
+    @Deprecated
     public Unique getUnique(String name) {
         return getUnique(DBIdentifier.newConstraint(name));
     }
@@ -801,6 +822,7 @@ public class Table
      * Add a unique constraint to the table.
      * @deprecated
      */
+    @Deprecated
     public Unique addUnique(String name) {
         return addUnique(DBIdentifier.newConstraint(name));
     }
@@ -814,7 +836,7 @@ public class Table
         } else
             unq = new Unique(name, this);
         if (_unqList == null)
-            _unqList = new ArrayList<Unique>(3);
+            _unqList = new ArrayList<>(3);
         _unqList.add(unq);
         _unqs = null;
         return unq;
@@ -886,6 +908,7 @@ public class Table
         _rels = null;
     }
 
+    @Override
     public int compareTo(Object other) {
         DBIdentifier name = getFullIdentifier();
         DBIdentifier otherName = ((Table) other).getFullIdentifier();
@@ -898,6 +921,7 @@ public class Table
         return name.compareTo(otherName);
     }
 
+    @Override
     public String toString() {
         return getFullIdentifier().getName();
     }
@@ -914,6 +938,7 @@ public class Table
         _comment = comment;
     }
 
+    @Override
     public int getLineNumber() {
         return _lineNum;
     }
@@ -922,6 +947,7 @@ public class Table
         _lineNum = lineNum;
     }
 
+    @Override
     public int getColNumber() {
         return _colNum;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
index 8e9f12e4e..e73d89fff 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
@@ -89,6 +89,7 @@ public class TableSchemaFactory
      * @deprecated Use {@link #setTable}. Retained for
      * backwards-compatible auto-configuration.
      */
+    @Deprecated
     public void setTableName(String name) {
         setTable(name);
     }
@@ -129,18 +130,22 @@ public class TableSchemaFactory
         return _conf;
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (JDBCConfiguration) conf;
         _log = _conf.getLog(JDBCConfiguration.LOG_SCHEMA);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
         buildTable();
     }
 
+    @Override
     public synchronized SchemaGroup readSchema() {
         String schema = null;
         try {
@@ -162,6 +167,7 @@ public class TableSchemaFactory
         return parser.getSchemaGroup();
     }
 
+    @Override
     public void storeSchema(SchemaGroup schema) {
         XMLSchemaSerializer ser = new XMLSchemaSerializer(_conf);
         ser.addAll(schema);
@@ -459,6 +465,7 @@ public class TableSchemaFactory
         final String[] arguments = opts.setFromCmdLine(args);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws Exception {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
                 try {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java
index 94dac3665..f223768cf 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Unique.java
@@ -26,11 +26,10 @@ import org.apache.openjpa.jdbc.identifier.DBIdentifier;
  * @author Abe White
  * @author Pinaki Poddar
  */
-@SuppressWarnings("serial")
-public class Unique
-    extends LocalConstraint {
+public class Unique extends LocalConstraint {
+    private static final long serialVersionUID = 1L;
 
-	public Unique() {
+    public Unique() {
 		super();
 	}
 
@@ -41,6 +40,7 @@ public class Unique
      * @param table the table of the constraint
      * @deprecated
      */
+    @Deprecated
     public Unique(String name, Table table) {
         super(name, table);
     }
@@ -49,6 +49,7 @@ public class Unique
         super(name, table);
     }
 
+    @Override
     public boolean isLogical() {
         return false;
     }
@@ -58,10 +59,13 @@ public class Unique
      * constraint already belongs to a table.
      * @deprecated
      */
+    @Deprecated
+    @Override
     public void setName(String name) {
         super.setName(name);
     }
 
+    @Override
     public void setIdentifier(DBIdentifier name) {
         super.setIdentifier(name);
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java
index d41a9b050..0dcb1ead1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java
@@ -25,9 +25,6 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.meta.SourceTracker;
@@ -35,6 +32,9 @@ import org.apache.openjpa.lib.meta.XMLMetaDataParser;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Localizer.Message;
 import org.apache.openjpa.util.UserException;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
 
 
 /**
@@ -114,10 +114,10 @@ public class XMLSchemaParser
     private boolean _delay = false;
 
     // used to collect info on schema elements before they're resolved
-    private final Collection<PrimaryKeyInfo> _pkInfos = new LinkedList<PrimaryKeyInfo>();
-    private final Collection<IndexInfo> _indexInfos = new LinkedList<IndexInfo>();
-    private final Collection<UniqueInfo> _unqInfos = new LinkedList<UniqueInfo>();
-    private final Collection<ForeignKeyInfo> _fkInfos = new LinkedList<ForeignKeyInfo>();
+    private final Collection<PrimaryKeyInfo> _pkInfos = new LinkedList<>();
+    private final Collection<IndexInfo> _indexInfos = new LinkedList<>();
+    private final Collection<UniqueInfo> _unqInfos = new LinkedList<>();
+    private final Collection<ForeignKeyInfo> _fkInfos = new LinkedList<>();
 
     /**
      * Constructor. Supply configuration.
@@ -129,14 +129,17 @@ public class XMLSchemaParser
         setSuffix(".schema");
     }
 
+    @Override
     public boolean getDelayConstraintResolve() {
         return _delay;
     }
 
+    @Override
     public void setDelayConstraintResolve(boolean delay) {
         _delay = delay;
     }
 
+    @Override
     public void resolveConstraints() {
         resolvePrimaryKeys();
         resolveIndexes();
@@ -155,12 +158,14 @@ public class XMLSchemaParser
         _unqInfos.clear();
     }
 
+    @Override
     public SchemaGroup getSchemaGroup() {
         if (_group == null)
             _group = new SchemaGroup();
         return _group;
     }
 
+    @Override
     public void setSchemaGroup(SchemaGroup group) {
         _group = group;
     }
@@ -169,6 +174,7 @@ public class XMLSchemaParser
      * Parse the schema relating to the given class. The schemas will
      * be added to the current schema group.
      */
+    @Override
     protected void finish() {
         // now resolve pk, idx, fk info
         super.finish();
@@ -311,6 +317,7 @@ public class XMLSchemaParser
         }
     }
 
+    @Override
     protected void reset() {
         _schema = null;
         _table = null;
@@ -322,12 +329,14 @@ public class XMLSchemaParser
             clearConstraintInfo();
     }
 
+    @Override
     protected Reader getDocType()
         throws IOException {
         return new InputStreamReader(XMLSchemaParser.class
             .getResourceAsStream("schemas-doctype.rsrc"));
     }
 
+    @Override
     protected boolean startElement(String name, Attributes attrs)
         throws SAXException {
         switch (name.charAt(0)) {
@@ -366,6 +375,7 @@ public class XMLSchemaParser
         }
     }
 
+    @Override
     protected void endElement(String name) {
         switch (name.charAt(0)) {
             case's':
@@ -579,7 +589,7 @@ public class XMLSchemaParser
     private static class PrimaryKeyInfo {
 
         public PrimaryKey pk = null;
-        public Collection<String> cols = new LinkedList<String>();
+        public Collection<String> cols = new LinkedList<>();
     }
 
     /**
@@ -588,7 +598,7 @@ public class XMLSchemaParser
     private static class IndexInfo {
 
         public Index index = null;
-        public Collection<String> cols = new LinkedList<String>();
+        public Collection<String> cols = new LinkedList<>();
     }
 
     /**
@@ -597,7 +607,7 @@ public class XMLSchemaParser
     public static class UniqueInfo {
 
         public Unique unq = null;
-        public Collection<String> cols = new LinkedList<String>();
+        public Collection<String> cols = new LinkedList<>();
     }
 
     /**
@@ -607,11 +617,11 @@ public class XMLSchemaParser
 
         public ForeignKey fk = null;
         public String toTable = null;
-        public Collection<String> cols = new LinkedList<String>();
-        public Collection<String> pks = new LinkedList<String>();
-        public Collection<Object> consts = new LinkedList<Object>();
-        public Collection<String> constCols = new LinkedList<String>();
-        public Collection<Object> constsPK = new LinkedList<Object>();
-        public Collection<String> constColsPK = new LinkedList<String>();
+        public Collection<String> cols = new LinkedList<>();
+        public Collection<String> pks = new LinkedList<>();
+        public Collection<Object> consts = new LinkedList<>();
+        public Collection<String> constCols = new LinkedList<>();
+        public Collection<Object> constsPK = new LinkedList<>();
+        public Collection<String> constColsPK = new LinkedList<>();
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java
index c42fd4d16..72dbea623 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaSerializer.java
@@ -27,10 +27,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeSet;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.lib.meta.XMLMetaDataSerializer;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.xml.sax.SAXException;
 
 /**
@@ -49,8 +49,8 @@ public class XMLSchemaSerializer
     private static final Localizer _loc = Localizer.forPackage
         (XMLSchemaSerializer.class);
 
-    private final Collection<Table> _tables = new TreeSet<Table>();
-    private final Collection<Sequence> _seqs = new TreeSet<Sequence>();
+    private final Collection<Table> _tables = new TreeSet<>();
+    private final Collection<Sequence> _seqs = new TreeSet<>();
 
     /**
      * Constructor. Supply configuration.
@@ -59,15 +59,18 @@ public class XMLSchemaSerializer
         setLog(conf.getLog(JDBCConfiguration.LOG_SCHEMA));
     }
 
+    @Override
     public Table[] getTables() {
         return (Table[]) _tables.toArray(new Table[_tables.size()]);
     }
 
+    @Override
     public void addTable(Table table) {
         if (table != null)
             _tables.add(table);
     }
 
+    @Override
     public boolean removeTable(Table table) {
         return _tables.remove(table);
     }
@@ -85,6 +88,7 @@ public class XMLSchemaSerializer
         return _seqs.remove(seq);
     }
 
+    @Override
     public void addAll(Schema schema) {
         if (schema == null)
             return;
@@ -96,6 +100,7 @@ public class XMLSchemaSerializer
             addSequence(seqs[i]);
     }
 
+    @Override
     public void addAll(SchemaGroup group) {
         if (group == null)
             return;
@@ -104,6 +109,7 @@ public class XMLSchemaSerializer
             addAll(schemas[i]);
     }
 
+    @Override
     public boolean removeAll(Schema schema) {
         if (schema == null)
             return false;
@@ -118,6 +124,7 @@ public class XMLSchemaSerializer
         return removed;
     }
 
+    @Override
     public boolean removeAll(SchemaGroup group) {
         if (group == null)
             return false;
@@ -129,22 +136,25 @@ public class XMLSchemaSerializer
         return removed;
     }
 
+    @Override
     public void clear() {
         _tables.clear();
         _seqs.clear();
     }
 
+    @Override
     protected Collection getObjects() {
         if (_seqs.isEmpty())
             return _tables;
         if (_tables.isEmpty())
             return _seqs;
-        List<Object> all = new ArrayList<Object>(_seqs.size() + _tables.size());
+        List<Object> all = new ArrayList<>(_seqs.size() + _tables.size());
         all.addAll(_seqs);
         all.addAll(_tables);
         return all;
     }
 
+    @Override
     protected void serialize(Collection objs)
         throws SAXException {
         // group the objects by schema
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
index 16267235d..d7f205044 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
@@ -71,6 +71,7 @@ public abstract class AbstractDB2Dictionary
         requiresConditionForCrossJoin = true;
     }
 
+    @Override
     public void indexOf(SQLBuffer buf, FilterValue str, FilterValue find,
         FilterValue start) {
         buf.append("LOCATE(CAST((");
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java
index 3135935a1..61f314384 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java
@@ -84,11 +84,13 @@ public abstract class AbstractResult
     private FieldMapping _mappedByFieldMapping = null;
     private Object _mappedByValue = null;
 
+    @Override
     public Object getEager(FieldMapping key) {
         Map map = getEagerMap(true);
         return (map == null) ? null : map.get(key);
     }
 
+    @Override
     public void putEager(FieldMapping key, Object res) {
         Map map = getEagerMap(false);
         if (map == null) {
@@ -119,6 +121,7 @@ public abstract class AbstractResult
     /**
      * Closes all eager results.
      */
+    @Override
     public void close() {
         closeEagerMap(_eager);
         _mappedByFieldMapping = null;
@@ -145,11 +148,13 @@ public abstract class AbstractResult
     /**
      * Returns false by default.
      */
+    @Override
     public boolean supportsRandomAccess()
         throws SQLException {
         return false;
     }
 
+    @Override
     public boolean absolute(int row)
         throws SQLException {
         _gotEager = false;
@@ -164,6 +169,7 @@ public abstract class AbstractResult
         throw new UnsupportedException();
     }
 
+    @Override
     public boolean next()
         throws SQLException {
         _gotEager = false;
@@ -181,6 +187,7 @@ public abstract class AbstractResult
     protected abstract boolean nextInternal()
         throws SQLException;
 
+    @Override
     public void pushBack()
         throws SQLException {
         _ignoreNext = true;
@@ -189,25 +196,30 @@ public abstract class AbstractResult
     /**
      * Returns a no-op joins object by default.
      */
+    @Override
     public Joins newJoins() {
         return JOINS;
     }
 
+    @Override
     public boolean contains(Object obj)
         throws SQLException {
         return containsInternal(obj, null);
     }
 
+    @Override
     public boolean containsAll(Object[] objs)
         throws SQLException {
         return containsAllInternal(objs, null);
     }
 
+    @Override
     public boolean contains(Column col, Joins joins)
         throws SQLException {
         return containsInternal(col, joins);
     }
 
+    @Override
     public boolean containsAll(Column[] cols, Joins joins)
         throws SQLException {
         return containsAllInternal(cols, joins);
@@ -233,32 +245,39 @@ public abstract class AbstractResult
         return true;
     }
 
+    @Override
     public ClassMapping getBaseMapping() {
         // if we've returned an eager result this call might be for that eager
         // result instead of our primary mapping, so return null
         return (_gotEager) ? null : _base;
     }
 
+    @Override
     public void setBaseMapping(ClassMapping base) {
         _base = base;
     }
 
+    @Override
     public FieldMapping getMappedByFieldMapping() {
         return _mappedByFieldMapping;
     }
 
+    @Override
     public void setMappedByFieldMapping(FieldMapping fieldMapping) {
         _mappedByFieldMapping = fieldMapping;
     }
 
+    @Override
     public Object getMappedByValue() {
         return _mappedByValue;
     }
 
+    @Override
     public void setMappedByValue(Object mappedByValue) {
         _mappedByValue = mappedByValue;
     }
 
+    @Override
     public int indexOf() {
         return _index;
     }
@@ -267,23 +286,27 @@ public abstract class AbstractResult
         _index = idx;
     }
 
+    @Override
     public Object load(ClassMapping mapping, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException {
         return load(mapping, store, fetch, null);
     }
 
+    @Override
     public Object load(ClassMapping mapping, JDBCStore store,
         JDBCFetchConfiguration fetch, Joins joins)
         throws SQLException {
         return ((JDBCStoreManager) store).load(mapping, fetch, null, this);
     }
 
+    @Override
     public Array getArray(Object obj)
         throws SQLException {
         return getArrayInternal(translate(obj, null), null);
     }
 
+    @Override
     public Array getArray(Column col, Joins joins)
         throws SQLException {
         return getArrayInternal(translate(col, joins), joins);
@@ -295,11 +318,13 @@ public abstract class AbstractResult
             JavaSQLTypes.SQL_ARRAY, null, joins));
     }
 
+    @Override
     public InputStream getAsciiStream(Object obj)
         throws SQLException {
         return getAsciiStreamInternal(translate(obj, null), null);
     }
 
+    @Override
     public InputStream getAsciiStream(Column col, Joins joins)
         throws SQLException {
         return getAsciiStreamInternal(translate(col, joins), joins);
@@ -311,11 +336,13 @@ public abstract class AbstractResult
             JavaSQLTypes.ASCII_STREAM, null, joins));
     }
 
+    @Override
     public BigDecimal getBigDecimal(Object obj)
         throws SQLException {
         return getBigDecimalInternal(translate(obj, null), null);
     }
 
+    @Override
     public BigDecimal getBigDecimal(Column col, Joins joins)
         throws SQLException {
         return getBigDecimalInternal(translate(col, joins), joins);
@@ -332,11 +359,13 @@ public abstract class AbstractResult
         return new BigDecimal(val.toString());
     }
 
+    @Override
     public BigInteger getBigInteger(Object obj)
         throws SQLException {
         return getBigIntegerInternal(translate(obj, null), null);
     }
 
+    @Override
     public BigInteger getBigInteger(Column col, Joins joins)
         throws SQLException {
         return getBigIntegerInternal(translate(col, joins), joins);
@@ -353,16 +382,19 @@ public abstract class AbstractResult
         return new BigInteger(val.toString());
     }
 
+    @Override
     public InputStream getBinaryStream(Object obj)
         throws SQLException {
         return getBinaryStreamInternal(translate(obj, null), null);
     }
 
+    @Override
     public InputStream getBinaryStream(Column col, Joins joins)
         throws SQLException {
         return getBinaryStreamInternal(translate(col, joins), joins);
     }
 
+    @Override
     public InputStream getLOBStream(JDBCStore store, Object obj)
         throws SQLException {
         return getLOBStreamInternal(store, translate(obj, null), null);
@@ -380,11 +412,13 @@ public abstract class AbstractResult
             JavaSQLTypes.BINARY_STREAM, null, joins));
     }
 
+    @Override
     public Blob getBlob(Object obj)
         throws SQLException {
         return getBlobInternal(translate(obj, null), null);
     }
 
+    @Override
     public Blob getBlob(Column col, Joins joins)
         throws SQLException {
         return getBlobInternal(translate(col, joins), joins);
@@ -396,11 +430,13 @@ public abstract class AbstractResult
             null, joins));
     }
 
+    @Override
     public boolean getBoolean(Object obj)
         throws SQLException {
         return getBooleanInternal(translate(obj, null), null);
     }
 
+    @Override
     public boolean getBoolean(Column col, Joins joins)
         throws SQLException {
         return getBooleanInternal(translate(col, joins), joins);
@@ -415,11 +451,13 @@ public abstract class AbstractResult
         return Boolean.valueOf(val.toString()).booleanValue();
     }
 
+    @Override
     public byte getByte(Object obj)
         throws SQLException {
         return getByteInternal(translate(obj, null), null);
     }
 
+    @Override
     public byte getByte(Column col, Joins joins)
         throws SQLException {
         return getByteInternal(translate(col, joins), joins);
@@ -432,11 +470,13 @@ public abstract class AbstractResult
         return (val == null) ? 0 : val.byteValue();
     }
 
+    @Override
     public byte[] getBytes(Object obj)
         throws SQLException {
         return getBytesInternal(translate(obj, null), null);
     }
 
+    @Override
     public byte[] getBytes(Column col, Joins joins)
         throws SQLException {
         return getBytesInternal(translate(col, joins), joins);
@@ -448,11 +488,13 @@ public abstract class AbstractResult
             JavaSQLTypes.BYTES, null, joins));
     }
 
+    @Override
     public Calendar getCalendar(Object obj)
         throws SQLException {
         return getCalendarInternal(translate(obj, null), null);
     }
 
+    @Override
     public Calendar getCalendar(Column col, Joins joins)
         throws SQLException {
         return getCalendarInternal(translate(col, joins), joins);
@@ -472,11 +514,13 @@ public abstract class AbstractResult
         return cal;
     }
 
+    @Override
     public char getChar(Object obj)
         throws SQLException {
         return getCharInternal(translate(obj, null), null);
     }
 
+    @Override
     public char getChar(Column col, Joins joins)
         throws SQLException {
         return getCharInternal(translate(col, joins), joins);
@@ -495,11 +539,13 @@ public abstract class AbstractResult
         return (str.length() == 0) ? 0 : str.charAt(0);
     }
 
+    @Override
     public Reader getCharacterStream(Object obj)
         throws SQLException {
         return getCharacterStreamInternal(translate(obj, null), null);
     }
 
+    @Override
     public Reader getCharacterStream(Column col, Joins joins)
         throws SQLException {
         return getCharacterStreamInternal(translate(col, joins), joins);
@@ -516,11 +562,13 @@ public abstract class AbstractResult
         return new StringReader(val.toString());
     }
 
+    @Override
     public Clob getClob(Object obj)
         throws SQLException {
         return getClobInternal(translate(obj, null), null);
     }
 
+    @Override
     public Clob getClob(Column col, Joins joins)
         throws SQLException {
         return getClobInternal(translate(col, joins), joins);
@@ -532,11 +580,13 @@ public abstract class AbstractResult
             null, joins));
     }
 
+    @Override
     public Date getDate(Object obj)
         throws SQLException {
         return getDateInternal(translate(obj, null), null);
     }
 
+    @Override
     public Date getDate(Column col, Joins joins)
         throws SQLException {
         return getDateInternal(translate(col, joins), joins);
@@ -553,11 +603,13 @@ public abstract class AbstractResult
         return new Date(val.toString());
     }
 
+    @Override
     public java.sql.Date getDate(Object obj, Calendar cal)
         throws SQLException {
         return getDateInternal(translate(obj, null), cal, null);
     }
 
+    @Override
     public java.sql.Date getDate(Column col, Calendar cal, Joins joins)
         throws SQLException {
         return getDateInternal(translate(col, joins), cal, joins);
@@ -570,11 +622,13 @@ public abstract class AbstractResult
             JavaSQLTypes.SQL_DATE, cal, joins));
     }
 
+    @Override
     public double getDouble(Object obj)
         throws SQLException {
         return getDoubleInternal(translate(obj, null), null);
     }
 
+    @Override
     public double getDouble(Column col, Joins joins)
         throws SQLException {
         return getDoubleInternal(translate(col, joins), joins);
@@ -587,11 +641,13 @@ public abstract class AbstractResult
         return (val == null) ? 0 : val.doubleValue();
     }
 
+    @Override
     public float getFloat(Object obj)
         throws SQLException {
         return getFloatInternal(translate(obj, null), null);
     }
 
+    @Override
     public float getFloat(Column col, Joins joins)
         throws SQLException {
         return getFloatInternal(translate(col, joins), joins);
@@ -604,11 +660,13 @@ public abstract class AbstractResult
         return (val == null) ? 0 : val.floatValue();
     }
 
+    @Override
     public int getInt(Object obj)
         throws SQLException {
         return getIntInternal(translate(obj, null), null);
     }
 
+    @Override
     public int getInt(Column col, Joins joins)
         throws SQLException {
         return getIntInternal(translate(col, joins), joins);
@@ -621,11 +679,13 @@ public abstract class AbstractResult
         return (val == null) ? 0 : val.intValue();
     }
 
+    @Override
     public Locale getLocale(Object obj)
         throws SQLException {
         return getLocaleInternal(translate(obj, null), null);
     }
 
+    @Override
     public Locale getLocale(Column col, Joins joins)
         throws SQLException {
         return getLocaleInternal(translate(col, joins), joins);
@@ -647,11 +707,13 @@ public abstract class AbstractResult
         return new Locale(vals[0], vals[1], vals[2]);
     }
 
+    @Override
     public long getLong(Object obj)
         throws SQLException {
         return getLongInternal(translate(obj, null), null);
     }
 
+    @Override
     public long getLong(Column col, Joins joins)
         throws SQLException {
         return getLongInternal(translate(col, joins), joins);
@@ -664,11 +726,13 @@ public abstract class AbstractResult
         return (val == null) ? 0 : val.longValue();
     }
 
+    @Override
     public Number getNumber(Object obj)
         throws SQLException {
         return getNumberInternal(translate(obj, null), null);
     }
 
+    @Override
     public Number getNumber(Column col, Joins joins)
         throws SQLException {
         return getNumberInternal(translate(col, joins), joins);
@@ -685,11 +749,13 @@ public abstract class AbstractResult
         return new BigDecimal(val.toString());
     }
 
+    @Override
     public Object getObject(Object obj, int metaType, Object arg)
         throws SQLException {
         return getObjectInternal(obj, metaType, arg, null);
     }
 
+    @Override
     public Object getObject(Column col, Object arg, Joins joins)
         throws SQLException {
         return getObjectInternal(col, col.getJavaType(),
@@ -706,11 +772,13 @@ public abstract class AbstractResult
     protected abstract Object getStreamInternal(JDBCStore store, Object obj,
             int metaType, Object arg, Joins joins) throws SQLException;
 
+    @Override
     public Object getSQLObject(Object obj, Map map)
         throws SQLException {
         return getSQLObjectInternal(translate(obj, null), map, null);
     }
 
+    @Override
     public Object getSQLObject(Column col, Map map, Joins joins)
         throws SQLException {
         return getSQLObjectInternal(translate(col, joins), map, joins);
@@ -722,11 +790,13 @@ public abstract class AbstractResult
             map, joins));
     }
 
+    @Override
     public Ref getRef(Object obj, Map map)
         throws SQLException {
         return getRefInternal(translate(obj, null), map, null);
     }
 
+    @Override
     public Ref getRef(Column col, Map map, Joins joins)
         throws SQLException {
         return getRefInternal(translate(col, joins), map, joins);
@@ -738,11 +808,13 @@ public abstract class AbstractResult
             map, joins));
     }
 
+    @Override
     public short getShort(Object obj)
         throws SQLException {
         return getShortInternal(translate(obj, null), null);
     }
 
+    @Override
     public short getShort(Column col, Joins joins)
         throws SQLException {
         return getShortInternal(translate(col, joins), joins);
@@ -755,12 +827,14 @@ public abstract class AbstractResult
         return (val == null) ? 0 : val.shortValue();
     }
 
+    @Override
     public String getString(Object obj)
         throws SQLException {
         return getStringInternal(translate(obj, null), null,
             obj instanceof Column && ((Column) obj).getType() == Types.CLOB);
     }
 
+    @Override
     public String getString(Column col, Joins joins)
         throws SQLException {
         return getStringInternal(translate(col, joins), joins,
@@ -774,11 +848,13 @@ public abstract class AbstractResult
         return (val == null) ? null : val.toString();
     }
 
+    @Override
     public Time getTime(Object obj, Calendar cal)
         throws SQLException {
         return getTimeInternal(translate(obj, null), cal, null);
     }
 
+    @Override
     public Time getTime(Column col, Calendar cal, Joins joins)
         throws SQLException {
         return getTimeInternal(translate(col, joins), cal, joins);
@@ -790,11 +866,13 @@ public abstract class AbstractResult
             cal, joins));
     }
 
+    @Override
     public Timestamp getTimestamp(Object obj, Calendar cal)
         throws SQLException {
         return getTimestampInternal(translate(obj, null), cal, null);
     }
 
+    @Override
     public Timestamp getTimestamp(Column col, Calendar cal, Joins joins)
         throws SQLException {
         return getTimestampInternal(translate(col, joins), cal, joins);
@@ -807,6 +885,7 @@ public abstract class AbstractResult
             JavaSQLTypes.TIMESTAMP, cal, joins));
     }
 
+    @Override
     public boolean wasNull()
         throws SQLException {
         return _wasNull;
@@ -817,17 +896,21 @@ public abstract class AbstractResult
         return val;
     }
 
+    @Override
     public void setLocking(boolean locking) {
         _locking = locking;
     }
 
+    @Override
     public boolean isLocking() {
         return _locking;
     }
 
+    @Override
     public void startDataRequest(Object mapping) {
     }
 
+    @Override
     public void endDataRequest() {
     }
 
@@ -848,44 +931,54 @@ public abstract class AbstractResult
     private static class NoOpJoins
         implements Joins {
 
+        @Override
         public boolean isEmpty() {
             return true;
         }
 
+        @Override
         public boolean isOuter() {
             return false;
         }
 
+        @Override
         public Joins crossJoin(Table localTable, Table foreignTable) {
             return this;
         }
 
+        @Override
         public Joins join(ForeignKey fk, boolean inverse, boolean toMany) {
             return this;
         }
 
+        @Override
         public Joins outerJoin(ForeignKey fk, boolean inverse, boolean toMany) {
             return this;
         }
 
+        @Override
         public Joins joinRelation(String name, ForeignKey fk,
             ClassMapping target, int subs, boolean inverse, boolean toMany) {
             return this;
         }
 
+        @Override
         public Joins outerJoinRelation(String name, ForeignKey fk,
             ClassMapping target, int subs, boolean inverse, boolean toMany) {
             return this;
         }
 
+        @Override
         public Joins setVariable(String var) {
             return this;
         }
 
+        @Override
         public Joins setSubselect(String alias) {
             return this;
         }
 
+        @Override
         public Joins setJoinContext(Context context) {
             return this;
         }
@@ -893,14 +986,17 @@ public abstract class AbstractResult
         public void appendTo(SQLBuffer buf) {
         }
 
+        @Override
         public Joins setCorrelatedVariable(String var) {
             return this;
         }
 
+        @Override
         public String getCorrelatedVariable() {
             return null;
         }
 
+        @Override
         public void moveJoinsToParent() {
         }
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
index b9716340c..583a28cae 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
@@ -84,6 +84,7 @@ public abstract class AbstractSQLServerDictionary
         }));
     }
 
+    @Override
     public Column[] getColumns(DatabaseMetaData meta, String catalog,
         String schemaName, String tableName, String colName, Connection conn)
         throws SQLException {
@@ -95,11 +96,13 @@ public abstract class AbstractSQLServerDictionary
         return cols;
     }
 
+    @Override
     public String getFullName(Index idx) {
         return toDBName(getNamingUtil().append(DBIdentifierType.INDEX,
             getFullIdentifier(idx.getTable(), false),idx.getIdentifier()));
     }
 
+    @Override
     public void setNull(PreparedStatement stmnt, int idx, int colType,
         Column col)
         throws SQLException {
@@ -112,6 +115,7 @@ public abstract class AbstractSQLServerDictionary
             super.setNull(stmnt, idx, colType, col);
     }
 
+    @Override
     protected void appendSelectRange(SQLBuffer buf, long start, long end,
         boolean subselect) {
         // cannot use a value here, since SQLServer does not support
@@ -119,6 +123,7 @@ public abstract class AbstractSQLServerDictionary
         buf.append(" TOP ").append(Long.toString(end));
     }
 
+    @Override
     public void substring(SQLBuffer buf, FilterValue str, FilterValue start,
         FilterValue length) {
         if (length != null)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AccessDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AccessDictionary.java
index 831a1bc8b..c845329a4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AccessDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AccessDictionary.java
@@ -73,6 +73,7 @@ public class AccessDictionary
     }
 
 
+    @Override
     public void setLong(PreparedStatement stmnt, int idx, long val, Column col)
         throws SQLException {
         // the access driver disallows setLong for some reason; use
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/BooleanRepresentation.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/BooleanRepresentation.java
index 987fc9088..57da81c72 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/BooleanRepresentation.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/BooleanRepresentation.java
@@ -81,17 +81,17 @@ public interface BooleanRepresentation<REPRESENTATION_TYPE> {
     /**
      * Set the boolean value into the statement
      */
-    public void setBoolean(PreparedStatement stmnt, int columnIndex, boolean val) throws SQLException;
+    void setBoolean(PreparedStatement stmnt, int columnIndex, boolean val) throws SQLException;
 
     /**
      * Read the boolean from the given ResultSet
      */
-    public boolean getBoolean(ResultSet rs, int columnIndex) throws SQLException;
+    boolean getBoolean(ResultSet rs, int columnIndex) throws SQLException;
 
 
     /**
      * @return return the representation for {@code true} and {@code false}
      */
-    public REPRESENTATION_TYPE getRepresentation(boolean bool);
+    REPRESENTATION_TYPE getRepresentation(boolean bool);
 
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/BooleanRepresentationFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/BooleanRepresentationFactory.java
index cdbdac83c..a2f793329 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/BooleanRepresentationFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/BooleanRepresentationFactory.java
@@ -43,7 +43,7 @@ public class BooleanRepresentationFactory {
     static final Map<String, BooleanRepresentation<?>> BUILTIN_BOOLEAN_REPRESENTATIONS;
 
     static {
-        BUILTIN_BOOLEAN_REPRESENTATIONS = new HashMap<String, BooleanRepresentation<?>>();
+        BUILTIN_BOOLEAN_REPRESENTATIONS = new HashMap<>();
 
         /**
          * Booleans are natively supported by this very database.
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
index 3bfec998f..dfd517f07 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
@@ -186,12 +186,14 @@ public class DB2Dictionary
         selectWordSet.add("WITH");
     }
 
+    @Override
     public boolean supportsRandomAccessResultSet(Select sel,
         boolean forUpdate) {
         return !forUpdate
             && super.supportsRandomAccessResultSet(sel, forUpdate);
     }
 
+    @Override
     protected void appendSelectRange(SQLBuffer buf, long start, long end,
         boolean subselect) {
         // appends the literal range string, since DB2 is unable to handle
@@ -202,6 +204,7 @@ public class DB2Dictionary
                 append(" ROWS ONLY");
     }
 
+    @Override
     protected void appendSelect(SQLBuffer selectSQL, Object alias, Select sel,
         int idx) {
         // if this is a literal value, add a cast...
@@ -256,6 +259,7 @@ public class DB2Dictionary
         return buf.toString();
     }
 
+    @Override
     public Connection decorate(Connection conn)
         throws SQLException {
         // some versions of the DB2 driver seem to default to
@@ -274,6 +278,7 @@ public class DB2Dictionary
         return conn;
     }
 
+    @Override
     public void connectedConfiguration(Connection conn) throws SQLException {
         super.connectedConfiguration(conn);
 
@@ -380,6 +385,7 @@ public class DB2Dictionary
     }
 
 
+    @Override
     public boolean supportsIsolationForUpdate() {
         return true;
     }
@@ -389,6 +395,7 @@ public class DB2Dictionary
      * isolationLevel hints if it is for update.
      * It also handles the UR hint when it is not for update.
      */
+    @Override
     protected String getForUpdateClause(JDBCFetchConfiguration fetch,
         boolean isForUpdate, Select sel) {
         int isolationLevel;
@@ -568,6 +575,7 @@ public class DB2Dictionary
         return "";
     }
 
+    @Override
     public OpenJPAException newStoreException(String msg, SQLException[] causes, Object failed) {
         if (appendExtendedExceptionText == true && causes != null && causes.length > 0) {
             msg = appendExtendedExceptionMsg(msg, causes[0]);
@@ -633,6 +641,7 @@ public class DB2Dictionary
         return db2ServerType;
     }
 
+    @Override
     protected void appendLength(SQLBuffer buf, int type) {
         if (type == Types.VARCHAR)
             buf.append("(").append(Integer.toString(characterColumnSize)).
@@ -650,6 +659,7 @@ public class DB2Dictionary
      * @param lhsxml indicates whether the left operand maps to xml
      * @param rhsxml indicates whether the right operand maps to xml
      */
+    @Override
     public void appendXmlComparison(SQLBuffer buf, String op, FilterValue lhs,
         FilterValue rhs, boolean lhsxml, boolean rhsxml) {
         super.appendXmlComparison(buf, op, lhs, rhs, lhsxml, rhsxml);
@@ -773,6 +783,7 @@ public class DB2Dictionary
      * @param val type
      * @return updated string (func)
      */
+    @Override
     public String addCastAsType(String func, Val val) {
         String fstring = null;
         String type = getTypeName(getJDBCType(JavaTypes.getTypeCode(val
@@ -787,6 +798,7 @@ public class DB2Dictionary
      * Return the batch limit. If the batchLimit is -1, change it to 100 for
      * best performance
      */
+    @Override
     public int getBatchLimit() {
         int limit = super.getBatchLimit();
         if (limit == UNLIMITED) {
@@ -804,6 +816,7 @@ public class DB2Dictionary
      * @param func original string
      * @return a String with the correct CAST function syntax
      */
+    @Override
     public String getCastFunction(Val val, String func) {
         if (val instanceof Lit || val instanceof Param) {
             if (func.indexOf("VARCHAR") == -1) {
@@ -821,6 +834,7 @@ public class DB2Dictionary
      * @param col database column
      * @return a String with the correct CAST function syntax
      */
+    @Override
     public String getCastFunction(Val val, String func, Column col) {
         boolean doCast = false;
         if (val instanceof Lit || val instanceof Param) {
@@ -838,6 +852,7 @@ public class DB2Dictionary
         return func;
     }
 
+    @Override
     public void indexOf(SQLBuffer buf, FilterValue str, FilterValue find,
             FilterValue start) {
         if (find.getValue() != null) { // non constants
@@ -917,12 +932,14 @@ public class DB2Dictionary
     /**
      * Create an index if necessary for some database tables
      */
+    @Override
     public void createIndexIfNecessary(Schema schema, String table,
         Column pkColumn) {
         createIndexIfNecessary(schema, DBIdentifier.newTable(table),
             pkColumn);
     }
 
+    @Override
     public void createIndexIfNecessary(Schema schema, DBIdentifier table,
             Column pkColumn) {
         if (db2ServerType == db2ZOSV8xOrLater) {
@@ -997,6 +1014,7 @@ public class DB2Dictionary
     /**
      * Set the given value as a parameter to the statement.
      */
+    @Override
     public void setBytes(PreparedStatement stmnt, int idx, byte[] val,
         Column col)
         throws SQLException {
@@ -1015,6 +1033,7 @@ public class DB2Dictionary
      * Convert the specified column of the SQL ResultSet to the proper
      * java type.
      */
+    @Override
     public byte[] getBytes(ResultSet rs, int column)
         throws SQLException {
         if (useGetBytesForBlobs) {
@@ -1092,6 +1111,7 @@ public class DB2Dictionary
     /**
      * Set the given date value as a parameter to the statement.
      */
+    @Override
     public void setDate(PreparedStatement stmnt, int idx, Date val, Column col)
         throws SQLException {
         // When column metadata is not available, DB2 on z/OS does not like the value produced
@@ -1113,6 +1133,7 @@ public class DB2Dictionary
         return getMinorVersion();
     }
 
+    @Override
     public String getDefaultSchemaName()  {
         if (defaultSchemaName == null) {
             Connection conn = null;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
index 424f12593..5b09b91c5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
@@ -67,10 +67,10 @@ import javax.sql.DataSource;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.ColumnDefIdentifierRule;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.identifier.DBIdentifierRule;
 import org.apache.openjpa.jdbc.identifier.DBIdentifierUtil;
 import org.apache.openjpa.jdbc.identifier.Normalizer;
-import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.kernel.exps.ExpContext;
@@ -84,6 +84,7 @@ import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.DataSourceFactory;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
+import org.apache.openjpa.jdbc.schema.ForeignKey.FKMapKey;
 import org.apache.openjpa.jdbc.schema.Index;
 import org.apache.openjpa.jdbc.schema.NameSet;
 import org.apache.openjpa.jdbc.schema.PrimaryKey;
@@ -92,7 +93,6 @@ import org.apache.openjpa.jdbc.schema.SchemaGroup;
 import org.apache.openjpa.jdbc.schema.Sequence;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.jdbc.schema.Unique;
-import org.apache.openjpa.jdbc.schema.ForeignKey.FKMapKey;
 import org.apache.openjpa.kernel.Filters;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.Seq;
@@ -421,14 +421,14 @@ public class DBDictionary
     protected boolean connected = false;
     protected boolean isJDBC3 = false;
     protected boolean isJDBC4 = false;
-    protected final Set<String> reservedWordSet = new HashSet<String>();
+    protected final Set<String> reservedWordSet = new HashSet<>();
     // reservedWordSet subset that CANNOT be used as valid column names
     // (i.e., without surrounding them with double-quotes)
-    protected Set<String> invalidColumnWordSet = new HashSet<String>();
-    protected final Set<String> systemSchemaSet = new HashSet<String>();
-    protected final Set<String> systemTableSet = new HashSet<String>();
-    protected final Set<String> fixedSizeTypeNameSet = new HashSet<String>();
-    protected final Set<String> typeModifierSet = new HashSet<String>();
+    protected Set<String> invalidColumnWordSet = new HashSet<>();
+    protected final Set<String> systemSchemaSet = new HashSet<>();
+    protected final Set<String> systemTableSet = new HashSet<>();
+    protected final Set<String> fixedSizeTypeNameSet = new HashSet<>();
+    protected final Set<String> typeModifierSet = new HashSet<>();
 
     // NamingConfiguration properties
     private boolean delimitIdentifiers = false;
@@ -443,14 +443,14 @@ public class DBDictionary
 
     // Naming utility and naming rules
     private DBIdentifierUtil namingUtil = null;
-    private Map<String, IdentifierRule> namingRules = new HashMap<String, IdentifierRule>();
+    private Map<String, IdentifierRule> namingRules = new HashMap<>();
     private IdentifierRule defaultNamingRule = null;  // cached for performance
 
     /**
      * If a native query begins with any of the values found here then it will
      * be treated as a select statement.
      */
-    protected final Set<String> selectWordSet = new HashSet<String>();
+    protected final Set<String> selectWordSet = new HashSet<>();
 
     // when we store values that lose precision, track the types so that the
     // first time it happens we can warn the user
@@ -463,7 +463,7 @@ public class DBDictionary
     public int batchLimit = NO_BATCH;
 
     public final Map<Integer,Set<String>> sqlStateCodes =
-        new HashMap<Integer, Set<String>>();
+        new HashMap<>();
 
     protected ProxyManager _proxyManager;
 
@@ -1589,7 +1589,7 @@ public class DBDictionary
         boolean warn;
         synchronized (this) {
             if (_precisionWarnedTypes == null)
-                _precisionWarnedTypes = new HashSet<Class<?>>();
+                _precisionWarnedTypes = new HashSet<>();
             warn = _precisionWarnedTypes.add(orig.getClass());
         }
 
@@ -2280,13 +2280,13 @@ public class DBDictionary
      * tables should override this method.
      */
     public String[] getDeleteTableContentsSQL(Table[] tables,Connection conn) {
-        Collection<String> sql = new ArrayList<String>();
+        Collection<String> sql = new ArrayList<>();
 
         // collect and drop non-deferred physical restrict constraints, and
         // collect the DELETE FROM statements
-        Collection<String> deleteSQL = new ArrayList<String>(tables.length);
+        Collection<String> deleteSQL = new ArrayList<>(tables.length);
         Collection<ForeignKey> restrictConstraints =
-            new LinkedHashSet<ForeignKey>();
+            new LinkedHashSet<>();
         for (int i = 0; i < tables.length; i++) {
             ForeignKey[] fks = tables[i].getForeignKeys();
             for (int j = 0; j < fks.length; j++) {
@@ -3169,6 +3169,7 @@ public class DBDictionary
      * the current DB.
      * @deprecated
      */
+    @Deprecated
     public String getValidTableName(String name, Schema schema) {
         return getValidTableName(DBIdentifier.newTable(name), schema).getName();
     }
@@ -3186,6 +3187,7 @@ public class DBDictionary
      * for the current DB.
      * @deprecated
      */
+    @Deprecated
     public String getValidSequenceName(String name, Schema schema) {
         return getValidSequenceName(DBIdentifier.newSequence(name), schema).getName();
     }
@@ -3204,6 +3206,7 @@ public class DBDictionary
      * specified table.
      * @deprecated
      */
+    @Deprecated
     public String getValidColumnName(String name, Table table) {
         return getValidColumnName(DBIdentifier.newColumn(name), table, true).getName();
     }
@@ -3223,6 +3226,7 @@ public class DBDictionary
      * be made unique for the specified table.
      * @deprecated
      */
+    @Deprecated
     public String getValidColumnName(String name, Table table,
         boolean checkForUniqueness) {
         return getValidColumnName(DBIdentifier.newColumn(name), table, checkForUniqueness).toString();
@@ -3255,6 +3259,7 @@ public class DBDictionary
      * valid for the current DB.
      * @deprecated
      */
+    @Deprecated
     public String getValidForeignKeyName(String name, Table table,
         Table toTable) {
         return getValidForeignKeyName(DBIdentifier.newForeignKey(name), table,
@@ -3275,6 +3280,7 @@ public class DBDictionary
      * for the current DB.
      * @deprecated
      */
+    @Deprecated
     public String getValidIndexName(String name, Table table) {
         return getValidIndexName(DBIdentifier.newIndex(name), table).getName();
     }
@@ -3292,6 +3298,7 @@ public class DBDictionary
      * it valid for the current DB.
      * @deprecated
      */
+    @Deprecated
     public String getValidUniqueName(String name, Table table) {
         return getValidUniqueName(DBIdentifier.newConstraint(name), table).getName();
     }
@@ -3353,6 +3360,7 @@ public class DBDictionary
      * incomplete.
      * @deprecated
      */
+    @Deprecated
     protected String makeNameValid(String name, NameSet set, int maxLen,
         int nameType) {
         return makeNameValid(name, set, maxLen, nameType, true);
@@ -3919,6 +3927,7 @@ public class DBDictionary
      * the user as one of his schemas
      * @deprecated
      */
+    @Deprecated
     public boolean isSystemTable(String name, String schema,
         boolean targetSchema) {
         return isSystemTable(DBIdentifier.newTable(name),
@@ -3957,6 +3966,7 @@ public class DBDictionary
      * @param table the index table
      * @deprecated
      */
+    @Deprecated
     public boolean isSystemIndex(String name, Table table) {
         return false;
     }
@@ -3985,6 +3995,7 @@ public class DBDictionary
      * the user as one of his schemas
      * @deprecated
      */
+    @Deprecated
     public boolean isSystemSequence(String name, String schema,
         boolean targetSchema) {
         return isSystemSequence(DBIdentifier.newSequence(name),
@@ -4029,6 +4040,7 @@ public class DBDictionary
      * Reflect on the schema to find tables matching the given name pattern.
      * @deprecated
      */
+    @Deprecated
     public Table[] getTables(DatabaseMetaData meta, String catalog,
         String schemaName, String tableName, Connection conn)
         throws SQLException {
@@ -4089,6 +4101,7 @@ public class DBDictionary
      * retrieve a list of sequences.
      * @deprecated
      */
+    @Deprecated
     public Sequence[] getSequences(DatabaseMetaData meta, String catalog,
         String schemaName, String sequenceName, Connection conn)
         throws SQLException {
@@ -4146,6 +4159,7 @@ public class DBDictionary
      * Return the SQL needed to select the list of sequences.
      * @deprecated
      */
+    @Deprecated
     protected String getSequencesSQL(String schemaName, String sequenceName) {
         return null;
     }
@@ -4159,6 +4173,7 @@ public class DBDictionary
      * column patterns.
      * @deprecated
      */
+    @Deprecated
     public Column[] getColumns(DatabaseMetaData meta, String catalog,
         String schemaName, String tableName, String columnName, Connection conn)
         throws SQLException {
@@ -4235,6 +4250,7 @@ public class DBDictionary
      * Reflect on the schema to find primary keys for the given table pattern.
      * @deprecated
      */
+    @Deprecated
     public PrimaryKey[] getPrimaryKeys(DatabaseMetaData meta,
         String catalog, String schemaName, String tableName, Connection conn)
         throws SQLException {
@@ -4259,6 +4275,7 @@ public class DBDictionary
      * Reflect on the schema to find primary keys for the given table pattern.
      * @deprecated
      */
+    @Deprecated
     protected PrimaryKey[] getPrimaryKeysFromGetPrimaryKeys
         (DatabaseMetaData meta, String catalog, String schemaName,
             String tableName, Connection conn)
@@ -4314,6 +4331,7 @@ public class DBDictionary
      * Reflect on the schema to find primary keys for the given table pattern.
      * @deprecated
      */
+    @Deprecated
     protected PrimaryKey[] getPrimaryKeysFromBestRowIdentifier
         (DatabaseMetaData meta, String catalog, String schemaName,
             String tableName, Connection conn) throws SQLException {
@@ -4360,6 +4378,7 @@ public class DBDictionary
      * Reflect on the schema to find indexes matching the given table pattern.
      * @deprecated
      */
+    @Deprecated
     public Index[] getIndexInfo(DatabaseMetaData meta, String catalog,
         String schemaName, String tableName, boolean unique,
         boolean approx, Connection conn)
@@ -4418,6 +4437,7 @@ public class DBDictionary
      * table pattern.
      * @deprecated
      */
+    @Deprecated
     public ForeignKey[] getImportedKeys(DatabaseMetaData meta, String catalog,
         String schemaName, String tableName, Connection conn)
         throws SQLException {
@@ -4439,6 +4459,7 @@ public class DBDictionary
      * table pattern.
      * @deprecated
      */
+    @Deprecated
     public ForeignKey[] getImportedKeys(DatabaseMetaData meta, String catalog,
         String schemaName, String tableName, Connection conn, boolean partialKeys)
         throws SQLException {
@@ -4465,8 +4486,8 @@ public class DBDictionary
                 getSchemaNameForMetadata(schemaName),
                 getTableNameForMetadata(tableName));
 
-            List<ForeignKey> importedKeyList = new ArrayList<ForeignKey>();
-            Map<FKMapKey, ForeignKey> fkMap = new HashMap<FKMapKey, ForeignKey>();
+            List<ForeignKey> importedKeyList = new ArrayList<>();
+            Map<FKMapKey, ForeignKey> fkMap = new HashMap<>();
 
             while (keys != null && keys.next()) {
                 ForeignKey nfk = newForeignKey(keys);
@@ -4632,6 +4653,7 @@ public class DBDictionary
     /**
      * Return DB specific schemaCase
      */
+    @Override
     public String getSchemaCase(){
         return schemaCase;
     }
@@ -4703,7 +4725,7 @@ public class DBDictionary
         return toDBName(namingUtil.getGeneratedKeySequenceName(col, maxAutoAssignNameLength));
     }
 
-    protected Map<String, StoredProcedure> _procs = new TreeMap<String, StoredProcedure>();
+    protected Map<String, StoredProcedure> _procs = new TreeMap<>();
 
     /**
      * Gets the metadata of the stored procedure by the given name either from the cached version or
@@ -4748,6 +4770,7 @@ public class DBDictionary
     // Configurable implementation
     ///////////////////////////////
 
+    @Override
     public void setConfiguration(Configuration conf) {
         this.conf = (JDBCConfiguration) conf;
         this.log = this.conf.getLog(JDBCConfiguration.LOG_JDBC);
@@ -4776,9 +4799,11 @@ public class DBDictionary
         return true;
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
         // initialize the set of reserved SQL92 words from resource
         InputStream in = DBDictionary.class.getResourceAsStream
@@ -4837,7 +4862,7 @@ public class DBDictionary
             return;
         Set<String> codes = sqlStateCodes.get(errorType);
         if (codes == null) {
-            codes = new HashSet<String>();
+            codes = new HashSet<>();
             codes.add(errorCode.trim());
             sqlStateCodes.put(errorType, codes);
         } else {
@@ -4947,6 +4972,7 @@ public class DBDictionary
      * {@link #initializationSQL} that has been set for the dictionary but
      * does not decorate the connection.
      */
+    @Override
     public Connection decorate(Connection conn)
         throws SQLException {
         if (!connected)
@@ -4983,6 +5009,7 @@ public class DBDictionary
      * @see LoggingConnectionDecorator#setWarningAction
      * @see LoggingConnectionDecorator#setWarningHandler
      */
+    @Override
     public void handleWarning(SQLWarning warning)
         throws SQLException {
     }
@@ -5063,7 +5090,7 @@ public class DBDictionary
             if (states.getValue().contains(errorState))
                 return states.getKey();
         }
-        return StoreException.GENERAL;
+        return ExceptionInfo.GENERAL;
     }
 
     /**
@@ -5260,6 +5287,7 @@ public class DBDictionary
      * Create an index if necessary for some database tables
      * @deprecated
      */
+    @Deprecated
     public void createIndexIfNecessary(Schema schema, String table,
             Column pkColumn) {
     }
@@ -5491,6 +5519,7 @@ public class DBDictionary
     /**
      * @return the supportsDelimitedIds
      */
+    @Override
     public boolean getSupportsDelimitedIdentifiers() {
         return (supportsDelimitedIdentifiers == null ? false : supportsDelimitedIdentifiers);
     }
@@ -5563,10 +5592,12 @@ public class DBDictionary
         return log;
     }
 
+    @Override
     public boolean delimitAll() {
         return delimitIdentifiers;
     }
 
+    @Override
     public String getLeadingDelimiter() {
         return leadingDelimiter;
     }
@@ -5575,14 +5606,17 @@ public class DBDictionary
         leadingDelimiter = delim;
     }
 
+    @Override
     public String getIdentifierDelimiter() {
         return catalogSeparator;
     }
 
+    @Override
     public String getIdentifierConcatenator() {
         return nameConcatenator;
     }
 
+    @Override
     public String getTrailingDelimiter() {
         return trailingDelimiter;
     }
@@ -5591,6 +5625,7 @@ public class DBDictionary
         trailingDelimiter = delim;
     }
 
+    @Override
     public IdentifierRule getDefaultIdentifierRule() {
         if (defaultNamingRule == null) {
             defaultNamingRule = namingRules.get(DBIdentifierType.DEFAULT.name());
@@ -5598,6 +5633,7 @@ public class DBDictionary
         return defaultNamingRule;
     }
 
+    @Override
     public <T> IdentifierRule getIdentifierRule(T t) {
         if (t.equals(DBIdentifierType.DEFAULT.name())) {
             return getDefaultIdentifierRule();
@@ -5609,6 +5645,7 @@ public class DBDictionary
         return nrule;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public Map<String, IdentifierRule> getIdentifierRules() {
         return namingRules;
@@ -5621,6 +5658,7 @@ public class DBDictionary
         return namingUtil;
     }
 
+    @Override
     public String getDelimitedCase() {
         return delimitedCase;
     }
@@ -5651,6 +5689,7 @@ public class DBDictionary
         return defaultSchemaName;
     }
 
+    @Override
     public String getConversionKey() {
         if (conversionKey == null) {
             conversionKey = getLeadingDelimiter() + getIdentifierDelimiter() +
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
index 03ad7c805..bdc302d1f 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
@@ -28,7 +28,6 @@ import java.util.Objects;
 
 import javax.sql.DataSource;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.lib.conf.Configurations;
@@ -36,6 +35,7 @@ import org.apache.openjpa.lib.conf.PluginValue;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.util.StoreException;
 import org.apache.openjpa.util.UserException;
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
index 284637944..c972992bb 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
@@ -146,6 +146,7 @@ public class DerbyDictionary
      * @param end number of rows to be fetched. {@code Long.MAX_VALUE} means no limit.
      * @param subselect flags if the buffer represents a SQL Subquery clause
      */
+    @Override
     protected void appendSelectRange(SQLBuffer buf, long start, long end, boolean subselect) {
         // do not generate FETCH FIRST clause for subselect
     	if (subselect)
@@ -162,6 +163,7 @@ public class DerbyDictionary
     	}
     }
 
+    @Override
     public void closeDataSource(DataSource dataSource) {
         super.closeDataSource(dataSource);
 
@@ -207,7 +209,8 @@ public class DerbyDictionary
 	 * @return
 	 */
 
-	public int applyRange(Select select, int count) {
+	@Override
+    public int applyRange(Select select, int count) {
 		long start = select.getStartIndex();
 		long end = select.getEndIndex();
 		if (supportsSelectStartIndex) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/EmpressDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/EmpressDictionary.java
index 1f7de3c3c..a371e9a9b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/EmpressDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/EmpressDictionary.java
@@ -101,10 +101,12 @@ public class EmpressDictionary
         }));
     }
 
+    @Override
     public boolean isSystemIndex(String name, Table table) {
         return name.toUpperCase(Locale.ENGLISH).startsWith("SYS_");
     }
 
+    @Override
     public SQLBuffer toSelect(SQLBuffer selects, JDBCFetchConfiguration fetch,
         SQLBuffer from, SQLBuffer where, SQLBuffer group,
         SQLBuffer having, SQLBuffer order,
@@ -132,6 +134,7 @@ public class EmpressDictionary
         return buf;
     }
 
+    @Override
     public String[] getDropColumnSQL(Column column) {
         // empress wants dropped columns in the form: ALTER TABLE foo
         // DELETE columnToDrop
@@ -140,6 +143,7 @@ public class EmpressDictionary
             getColumnDBName(column) };
     }
 
+    @Override
     public void setFloat(PreparedStatement stmnt, int idx, float val,
         Column col)
         throws SQLException {
@@ -157,6 +161,7 @@ public class EmpressDictionary
         super.setFloat(stmnt, idx, val, col);
     }
 
+    @Override
     public void setDouble(PreparedStatement stmnt, int idx, double val,
         Column col)
         throws SQLException {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/FirebirdDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/FirebirdDictionary.java
index aa116be3a..31493dfb0 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/FirebirdDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/FirebirdDictionary.java
@@ -39,7 +39,7 @@ import org.apache.openjpa.jdbc.schema.Sequence;
 import org.apache.openjpa.jdbc.schema.Unique;
 import org.apache.openjpa.lib.identifier.IdentifierUtil;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.util.StoreException;
+import org.apache.openjpa.util.ExceptionInfo;
 import org.apache.openjpa.util.UnsupportedException;
 
 /**
@@ -289,6 +289,7 @@ public class FirebirdDictionary
             getTableNameForMetadata(DBIdentifier.newTable(tableName));
     }
 
+    @Override
     protected String getTableNameForMetadata(DBIdentifier tableName) {
         if (DBIdentifier.isNull(tableName)) {
             return IdentifierUtil.PERCENT;
@@ -495,6 +496,6 @@ public class FirebirdDictionary
             if (states.getValue().contains(errorState))
                 return states.getKey();
         }
-        return StoreException.GENERAL;
+        return ExceptionInfo.GENERAL;
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java
index 8a9aabd81..af1871e8d 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java
@@ -25,13 +25,13 @@ import java.sql.Types;
 import java.util.Arrays;
 import java.util.Locale;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.PrimaryKey;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.jdbc.schema.Unique;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.StoreException;
 
@@ -164,10 +164,12 @@ public class H2Dictionary extends DBDictionary {
         return super.getPrimaryKeyConstraintSQL(pk);
     }
 
+    @Override
     public boolean isSystemIndex(String name, Table table) {
         return name.toUpperCase(Locale.ENGLISH).startsWith("SYSTEM_");
     }
 
+    @Override
     public boolean isSystemIndex(DBIdentifier name, Table table) {
         if (DBIdentifier.isNull(name)) {
             return false;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
index 5d914570c..136995791 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
@@ -28,13 +28,13 @@ import java.sql.Types;
 import java.util.Arrays;
 import java.util.Locale;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.PrimaryKey;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.jdbc.schema.Unique;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.ReferentialIntegrityException;
@@ -250,6 +250,7 @@ public class HSQLDictionary extends DBDictionary {
         return super.getPrimaryKeyConstraintSQL(pk);
     }
 
+    @Override
     public boolean isSystemIndex(String name, Table table) {
         return name.toUpperCase(Locale.ENGLISH).startsWith("SYS_");
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
index e804dcc17..f750f1fc2 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
@@ -432,6 +432,7 @@ public class InformixDictionary
      *
      * @return A constant indicating the category of error as defined in {@link StoreException}.
      */
+    @Override
     protected int matchErrorState(Map<Integer,Set<String>> errorStates, SQLException ex) {
         // Informix SQLState IX000 is a general SQLState that applies to many possible conditions
         // If the underlying cause is also an IX000 with error code:
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/IngresDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/IngresDictionary.java
index 7b88f061d..78672b1da 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/IngresDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/IngresDictionary.java
@@ -154,6 +154,7 @@ public class IngresDictionary extends DBDictionary {
     /* (non-Javadoc)
      * @see org.apache.openjpa.jdbc.sql.DBDictionary#connectedConfiguration(java.sql.Connection)
      */
+    @Override
     public void connectedConfiguration(Connection conn) throws SQLException {
         super.connectedConfiguration(conn);
 
@@ -191,6 +192,7 @@ public class IngresDictionary extends DBDictionary {
      * @param subselect
      *            - Is the SQL query part of a subselect statement?
      */
+    @Override
     protected void appendSelectRange(SQLBuffer buf, long start, long end,
         boolean subselect) {
         if (!supportsSelectStartIndex && start > 0)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Join.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Join.java
index e9d7d4267..459e9788c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Join.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Join.java
@@ -158,10 +158,12 @@ public class Join
         return join;
     }
 
+    @Override
     public int hashCode() {
         return _alias1 ^ _alias2;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -173,6 +175,7 @@ public class Join
             || (_alias1 == j._alias2 && _alias2 == j._alias1);
     }
 
+    @Override
     public String toString() {
         String typeString;
         if (_type == TYPE_CROSS)
@@ -187,6 +190,7 @@ public class Join
             + _alias1 + "->t" + _alias2 + " (" + typeString + ")";
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSet.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSet.java
index 1c24ab53e..93bc9c9c1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSet.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSet.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
-
 import java.util.Objects;
 
 /**
@@ -223,6 +222,7 @@ class JoinSet {
             private Node _next = null;
             private int _idx = -1;
 
+            @Override
             public boolean hasNext() {
                 if (_next != null)
                     return true;
@@ -237,6 +237,7 @@ class JoinSet {
                 return false;
             }
 
+            @Override
             public Object next() {
                 if (!hasNext())
                     throw new NoSuchElementException();
@@ -247,6 +248,7 @@ class JoinSet {
                 return j;
             }
 
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
@@ -332,6 +334,7 @@ class JoinSet {
         return _size;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -340,10 +343,12 @@ class JoinSet {
         return _graph.equals(((JoinSet) other)._graph);
     }
 
+    @Override
     public int hashCode() {
         return _graph.hashCode();
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
         buf.append("[");
@@ -370,6 +375,7 @@ class JoinSet {
             this.forward = forward;
         }
 
+        @Override
         public int hashCode() {
             int rs = 17;
             rs = 37 * rs + join.hashCode();
@@ -378,6 +384,7 @@ class JoinSet {
             return rs;
         }
 
+        @Override
         public boolean equals(Object other) {
             if (!(other instanceof Node))
                 return false;
@@ -386,6 +393,7 @@ class JoinSet {
                 && Objects.equals(next, node.next);
         }
 
+        @Override
         public Object clone() {
             try {
                 Node node = (Node) super.clone();
@@ -398,6 +406,7 @@ class JoinSet {
             }
         }
 
+        @Override
         public String toString() {
             return join + "(" + ((forward) ? "forward" : "backward") + ")"
                 + "; next: " + next;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSyntaxes.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSyntaxes.java
index 82fc8860b..708b4f415 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSyntaxes.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/JoinSyntaxes.java
@@ -28,15 +28,15 @@ public interface JoinSyntaxes {
     /**
      * ANSI SQL 92 join syntax; outer joins are supported.
      */
-    public static final int SYNTAX_SQL92 = 0;
+    int SYNTAX_SQL92 = 0;
 
     /**
      * Traditional join syntax; outer joins are not supported.
      */
-    public static final int SYNTAX_TRADITIONAL = 1;
+    int SYNTAX_TRADITIONAL = 1;
 
     /**
      * Native database join syntax; outer joins are supported.
      */
-    public static final int SYNTAX_DATABASE = 2;
+    int SYNTAX_DATABASE = 2;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Joins.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Joins.java
index 17390576b..915df35fe 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Joins.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Joins.java
@@ -33,72 +33,72 @@ public interface Joins {
     /**
      * Whether we have any joins.
      */
-    public boolean isEmpty();
+    boolean isEmpty();
 
     /**
      * Whether this joins path results in outer joins.
      */
-    public boolean isOuter();
+    boolean isOuter();
 
     /**
      * Perform a cross join on the given tables.
      */
-    public Joins crossJoin(Table localTable, Table foreignTable);
+    Joins crossJoin(Table localTable, Table foreignTable);
 
     /**
      * Join the columns of the given foreign key.
      */
-    public Joins join(ForeignKey fk, boolean inverse, boolean toMany);
+    Joins join(ForeignKey fk, boolean inverse, boolean toMany);
 
     /**
      * Join the columns of the given foreign key.
      */
-    public Joins outerJoin(ForeignKey fk, boolean inverse, boolean toMany);
+    Joins outerJoin(ForeignKey fk, boolean inverse, boolean toMany);
 
     /**
      * Join the columns of the given foreign key, which represents a relation
      * via the given field name.
      */
-    public Joins joinRelation(String name, ForeignKey fk, ClassMapping target,
+    Joins joinRelation(String name, ForeignKey fk, ClassMapping target,
         int subclasses, boolean inverse, boolean toMany);
 
     /**
      * Join the columns of the given foreign key, which represents a relation
      * via the given field name.
      */
-    public Joins outerJoinRelation(String name, ForeignKey fk,
+    Joins outerJoinRelation(String name, ForeignKey fk,
         ClassMapping target, int subclasses, boolean inverse, boolean toMany);
 
     /**
      * Set the variable name being traversed into with the next join.
      */
-    public Joins setVariable(String var);
+    Joins setVariable(String var);
 
     /**
      * Set the subquery alias.
      */
-    public Joins setSubselect(String alias);
+    Joins setSubselect(String alias);
 
     /**
      * Set subquery context when traversing into the next join is
      * in transition from parent context to subquery.
      * @param context
      */
-    public Joins setJoinContext(Context context);
+    Joins setJoinContext(Context context);
 
     /**
      * Set the correlated variable name being traversed into
      * with the next join.
      */
-    public Joins setCorrelatedVariable(String var);
+    Joins setCorrelatedVariable(String var);
 
     /**
      * Return correlated variable name
      */
-    public String getCorrelatedVariable();
+    String getCorrelatedVariable();
 
     /**
      * Move joins that belong to subquery's parent
      */
-    public void moveJoinsToParent();
+    void moveJoinsToParent();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/LogicalUnion.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/LogicalUnion.java
index d1bbf40d9..56bb2ecac 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/LogicalUnion.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/LogicalUnion.java
@@ -29,13 +29,13 @@ import java.util.List;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
-import org.apache.openjpa.kernel.exps.Value;
-import org.apache.openjpa.kernel.exps.Context;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
 import org.apache.openjpa.jdbc.schema.Table;
+import org.apache.openjpa.kernel.exps.Context;
+import org.apache.openjpa.kernel.exps.Value;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.UnsupportedException;
@@ -104,21 +104,26 @@ public class LogicalUnion
         return new UnionSelect(seed, pos);
     }
 
+    @Override
     public Select[] getSelects() {
         return sels;
     }
 
+    @Override
     public boolean isUnion() {
         return false;
     }
 
+    @Override
     public void abortUnion() {
     }
 
+    @Override
     public String getOrdering() {
         return null;
     }
 
+    @Override
     public JDBCConfiguration getConfiguration() {
         return sels[0].getConfiguration();
     }
@@ -127,69 +132,84 @@ public class LogicalUnion
         return dict;
     }
 
+    @Override
     public SQLBuffer toSelect(boolean forUpdate, JDBCFetchConfiguration fetch) {
         return dict.toSelect(sels[0], forUpdate, fetch);
     }
 
+    @Override
     public SQLBuffer getSQL() {
         return sels.length == 1 ? sels[0].getSQL() : null;
     }
 
+    @Override
     public SQLBuffer toSelectCount() {
         return dict.toSelectCount(sels[0]);
     }
 
+    @Override
     public boolean getAutoDistinct() {
         return sels[0].getAutoDistinct();
     }
 
+    @Override
     public void setAutoDistinct(boolean distinct) {
         for (int i = 0; i < sels.length; i++)
             sels[i].setAutoDistinct(distinct);
     }
 
+    @Override
     public boolean isDistinct() {
         return _distinct;
     }
 
+    @Override
     public void setDistinct(boolean distinct) {
         _distinct = distinct;
     }
 
+    @Override
     public boolean isLRS() {
         return sels[0].isLRS();
     }
 
+    @Override
     public void setLRS(boolean lrs) {
         for (int i = 0; i < sels.length; i++)
             sels[i].setLRS(lrs);
     }
 
+    @Override
     public int getExpectedResultCount() {
         return sels[0].getExpectedResultCount();
     }
 
+    @Override
     public void setExpectedResultCount(int expectedResultCount,
         boolean force) {
         for (int i = 0; i < sels.length; i++)
             sels[i].setExpectedResultCount(expectedResultCount, force);
     }
 
+    @Override
     public int getJoinSyntax() {
         return sels[0].getJoinSyntax();
     }
 
+    @Override
     public void setJoinSyntax(int syntax) {
         for (int i = 0; i < sels.length; i++)
             sels[i].setJoinSyntax(syntax);
     }
 
+    @Override
     public boolean supportsRandomAccess(boolean forUpdate) {
         if (sels.length == 1)
             return sels[0].supportsRandomAccess(forUpdate);
         return false;
     }
 
+    @Override
     public boolean supportsLocking() {
         if (sels.length == 1)
             return sels[0].supportsLocking();
@@ -199,12 +219,14 @@ public class LogicalUnion
         return true;
     }
 
+    @Override
     public boolean hasMultipleSelects() {
         if (sels != null && sels.length > 1)
             return true;
         return sels[0].hasMultipleSelects();
     }
 
+    @Override
     public int getCount(JDBCStore store)
         throws SQLException {
         int count = 0;
@@ -213,6 +235,7 @@ public class LogicalUnion
         return count;
     }
 
+    @Override
     public Result execute(JDBCStore store, JDBCFetchConfiguration fetch)
         throws SQLException {
         if (fetch == null)
@@ -220,6 +243,7 @@ public class LogicalUnion
         return execute(store, fetch, fetch.getReadLockLevel());
     }
 
+    @Override
     public Result execute(JDBCStore store, JDBCFetchConfiguration fetch,
         int lockLevel)
         throws SQLException {
@@ -292,11 +316,13 @@ public class LogicalUnion
         return new MergedResult(res, comp);
     }
 
+    @Override
     public void select(Union.Selector selector) {
         for (int i = 0; i < sels.length; i++)
             selector.select(sels[i], i);
     }
 
+    @Override
     public String toString() {
         return toSelect(false, null).getSQL();
     }
@@ -304,12 +330,12 @@ public class LogicalUnion
     /**
      * A callback used to create the selects in a SQL union.
      */
-    public static interface Selector {
+    public interface Selector {
 
         /**
          * Populate the <code>i</code>th select in the union.
          */
-        public void select(Select sel, int i);
+        void select(Select sel, int i);
     }
 
     /**
@@ -346,268 +372,333 @@ public class LogicalUnion
             return orderIdxs;
         }
 
+        @Override
         public JDBCConfiguration getConfiguration() {
             return sel.getConfiguration();
         }
 
+        @Override
         public int indexOf() {
             return pos;
         }
 
+        @Override
         public SQLBuffer toSelect(boolean forUpdate,
             JDBCFetchConfiguration fetch) {
             return sel.toSelect(forUpdate, fetch);
         }
 
+        @Override
         public SQLBuffer getSQL() {
             return sel.getSQL();
         }
 
+        @Override
         public SQLBuffer toSelectCount() {
             return sel.toSelectCount();
         }
 
+        @Override
         public boolean getAutoDistinct() {
             return sel.getAutoDistinct();
         }
 
+        @Override
         public void setAutoDistinct(boolean distinct) {
             sel.setAutoDistinct(distinct);
         }
 
+        @Override
         public boolean isDistinct() {
             return sel.isDistinct();
         }
 
+        @Override
         public void setDistinct(boolean distinct) {
             sel.setDistinct(distinct);
         }
 
+        @Override
         public boolean isLRS() {
             return sel.isLRS();
         }
 
+        @Override
         public void setLRS(boolean lrs) {
             sel.setLRS(lrs);
         }
 
+        @Override
         public int getJoinSyntax() {
             return sel.getJoinSyntax();
         }
 
+        @Override
         public void setJoinSyntax(int joinSyntax) {
             sel.setJoinSyntax(joinSyntax);
         }
 
+        @Override
         public boolean supportsRandomAccess(boolean forUpdate) {
             return sel.supportsRandomAccess(forUpdate);
         }
 
+        @Override
         public boolean supportsLocking() {
             return sel.supportsLocking();
         }
 
+        @Override
         public boolean hasMultipleSelects() {
             return sel.hasMultipleSelects();
         }
 
+        @Override
         public int getCount(JDBCStore store)
             throws SQLException {
             return sel.getCount(store);
         }
 
+        @Override
         public Result execute(JDBCStore store, JDBCFetchConfiguration fetch)
             throws SQLException {
             return sel.execute(store, fetch);
         }
 
+        @Override
         public Result execute(JDBCStore store, JDBCFetchConfiguration fetch,
             int lockLevel)
             throws SQLException {
             return sel.execute(store, fetch, lockLevel);
         }
 
+        @Override
         public List getSubselects() {
             return Collections.EMPTY_LIST;
         }
 
+        @Override
         public Select getParent() {
             return null;
         }
 
+        @Override
         public String getSubselectPath() {
             return null;
         }
 
+        @Override
         public void setParent(Select parent, String path) {
             throw new UnsupportedException(_loc.get("union-element"));
         }
 
+        @Override
         public void setHasSubselect(boolean hasSub) {
             sel.setHasSubselect(hasSub);
         }
 
+        @Override
         public boolean getHasSubselect() {
             return sel.getHasSubselect();
         }
 
+        @Override
         public Select getFromSelect() {
             return null;
         }
 
+        @Override
         public void setFromSelect(Select sel) {
             throw new UnsupportedException(_loc.get("union-element"));
         }
 
+        @Override
         public boolean hasEagerJoin(boolean toMany) {
             return sel.hasEagerJoin(toMany);
         }
 
+        @Override
         public boolean hasJoin(boolean toMany) {
             return sel.hasJoin(toMany);
         }
 
+        @Override
         public boolean isSelected(Table table) {
             return sel.isSelected(table);
         }
 
+        @Override
         public Collection getTableAliases() {
             return sel.getTableAliases();
         }
 
+        @Override
         public List getSelects() {
             return sel.getSelects();
         }
 
+        @Override
         public List getSelectAliases() {
             return sel.getSelectAliases();
         }
 
+        @Override
         public List getIdentifierAliases() {
             return sel.getIdentifierAliases();
         }
 
+        @Override
         public SQLBuffer getOrdering() {
             return sel.getOrdering();
         }
 
+        @Override
         public SQLBuffer getGrouping() {
             return sel.getGrouping();
         }
 
+        @Override
         public SQLBuffer getWhere() {
             return sel.getWhere();
         }
 
+        @Override
         public SQLBuffer getHaving() {
             return sel.getHaving();
         }
 
+        @Override
         public void addJoinClassConditions() {
             sel.addJoinClassConditions();
         }
 
+        @Override
         public Joins getJoins() {
             return sel.getJoins();
         }
 
+        @Override
         public Iterator getJoinIterator() {
             return sel.getJoinIterator();
         }
 
+        @Override
         public long getStartIndex() {
             return sel.getStartIndex();
         }
 
+        @Override
         public long getEndIndex() {
             return sel.getEndIndex();
         }
 
+        @Override
         public void setRange(long start, long end) {
             sel.setRange(start, end);
         }
 
+        @Override
         public String getColumnAlias(Column col) {
             return sel.getColumnAlias(col);
         }
 
+        @Override
         public String getColumnAlias(Column col, Joins joins) {
             return sel.getColumnAlias(col, joins);
         }
 
+        @Override
         public String getColumnAlias(Column col, Object alias) {
             return sel.getColumnAlias(col, alias);
         }
 
+        @Override
         public String getColumnAlias(String col, Table table) {
             return sel.getColumnAlias(col, table);
         }
 
+        @Override
         public String getColumnAlias(String col, Table table, Joins joins) {
             return sel.getColumnAlias(col, table, joins);
         }
 
+        @Override
         public boolean isAggregate() {
             return sel.isAggregate();
         }
 
+        @Override
         public void setAggregate(boolean agg) {
             sel.setAggregate(agg);
         }
 
+        @Override
         public boolean isLob() {
             return sel.isLob();
         }
 
+        @Override
         public void setLob(boolean lob) {
             sel.setLob(lob);
         }
 
+        @Override
         public void selectPlaceholder(String sql) {
             sel.selectPlaceholder(sql);
         }
 
+        @Override
         public void clearSelects() {
             sel.clearSelects();
         }
 
+        @Override
         public boolean select(SQLBuffer sql, Object id) {
             return sel.select(sql, id);
         }
 
+        @Override
         public boolean select(SQLBuffer sql, Object id, Joins joins) {
             return sel.select(sql, id, joins);
         }
 
+        @Override
         public boolean select(String sql, Object id) {
             return sel.select(sql, id);
         }
 
+        @Override
         public boolean select(String sql, Object id, Joins joins) {
             return sel.select(sql, id, joins);
         }
 
+        @Override
         public boolean select(Column col) {
             return sel.select(col);
         }
 
+        @Override
         public boolean select(Column col, Joins joins) {
             return sel.select(col, joins);
         }
 
+        @Override
         public int select(Column[] cols) {
             return sel.select(cols);
         }
 
+        @Override
         public int select(Column[] cols, Joins joins) {
             return sel.select(cols, joins);
         }
 
+        @Override
         public void select(ClassMapping mapping, int subclasses,
             JDBCStore store, JDBCFetchConfiguration fetch, int eager) {
             select(mapping, subclasses, store, fetch, eager, null, false);
         }
 
+        @Override
         public void select(ClassMapping mapping, int subclasses,
             JDBCStore store, JDBCFetchConfiguration fetch, int eager,
             Joins joins) {
@@ -627,46 +718,56 @@ public class LogicalUnion
                 joins, identifier);
         }
 
+        @Override
         public boolean selectIdentifier(Column col) {
             return sel.selectIdentifier(col);
         }
 
+        @Override
         public boolean selectIdentifier(Column col, Joins joins) {
             return sel.selectIdentifier(col, joins);
         }
 
+        @Override
         public int selectIdentifier(Column[] cols) {
             return sel.selectIdentifier(cols);
         }
 
+        @Override
         public int selectIdentifier(Column[] cols, Joins joins) {
             return sel.selectIdentifier(cols, joins);
         }
 
+        @Override
         public void selectIdentifier(ClassMapping mapping, int subclasses,
             JDBCStore store, JDBCFetchConfiguration fetch, int eager) {
             select(mapping, subclasses, store, fetch, eager, null, true);
         }
 
+        @Override
         public void selectIdentifier(ClassMapping mapping, int subclasses,
             JDBCStore store, JDBCFetchConfiguration fetch, int eager,
             Joins joins) {
             select(mapping, subclasses, store, fetch, eager, joins, true);
         }
 
+        @Override
         public int selectPrimaryKey(ClassMapping mapping) {
             return sel.selectPrimaryKey(mapping);
         }
 
+        @Override
         public int selectPrimaryKey(ClassMapping mapping, Joins joins) {
             return sel.selectPrimaryKey(mapping, joins);
         }
 
+        @Override
         public int orderByPrimaryKey(ClassMapping mapping, boolean asc,
             boolean select) {
             return orderByPrimaryKey(mapping, asc, null, select);
         }
 
+        @Override
         public int orderByPrimaryKey(ClassMapping mapping, boolean asc,
             Joins joins, boolean select) {
             ClassMapping pks = mapping;
@@ -701,233 +802,287 @@ public class LogicalUnion
                 recordOrder(cols[i], asc);
         }
 
+        @Override
         public boolean orderBy(Column col, boolean asc, boolean select) {
             return orderBy(col, asc, null, select);
         }
 
+        @Override
         public boolean orderBy(Column col, boolean asc, Joins joins,
             boolean select) {
             recordOrder(col, asc);
             return sel.orderBy(col, asc, joins, select, isUnion());
         }
 
+        @Override
         public int orderBy(Column[] cols, boolean asc, boolean select) {
             return orderBy(cols, asc, null, select);
         }
 
+        @Override
         public int orderBy(Column[] cols, boolean asc, Joins joins,
             boolean select) {
             recordOrderColumns(cols, asc);
             return sel.orderBy(cols, asc, joins, select, isUnion());
         }
 
+        @Override
         public boolean orderBy(SQLBuffer sql, boolean asc, boolean select,
             Value selAs) {
             return orderBy(sql, asc, null, select, selAs);
         }
 
+        @Override
         public boolean orderBy(SQLBuffer sql, boolean asc, Joins joins,
             boolean select, Value selAs) {
             recordOrder(sql.getSQL(false), asc);
             return sel.orderBy(sql, asc, joins, select, isUnion(), selAs);
         }
 
+        @Override
         public boolean orderBy(String sql, boolean asc, boolean select) {
             return orderBy(sql, asc, null, select);
         }
 
+        @Override
         public boolean orderBy(String sql, boolean asc, Joins joins,
             boolean select) {
             recordOrder(sql, asc);
             return sel.orderBy(sql, asc, joins, select, isUnion());
         }
 
+        @Override
         public void clearOrdering() {
             sel.clearOrdering();
         }
 
+        @Override
         public void wherePrimaryKey(Object oid, ClassMapping mapping,
             JDBCStore store) {
             sel.wherePrimaryKey(oid, mapping, store);
         }
 
+        @Override
         public void whereForeignKey(ForeignKey fk, Object oid,
             ClassMapping mapping, JDBCStore store) {
             sel.whereForeignKey(fk, oid, mapping, store);
         }
 
+        @Override
         public void where(Joins joins) {
             sel.where(joins);
         }
 
+        @Override
         public void where(SQLBuffer sql) {
             sel.where(sql);
         }
 
+        @Override
         public void where(SQLBuffer sql, Joins joins) {
             sel.where(sql, joins);
         }
 
+        @Override
         public void where(String sql) {
             sel.where(sql);
         }
 
+        @Override
         public void where(String sql, Joins joins) {
             sel.where(sql, joins);
         }
 
+        @Override
         public void having(SQLBuffer sql) {
             sel.having(sql);
         }
 
+        @Override
         public void having(SQLBuffer sql, Joins joins) {
             sel.having(sql, joins);
         }
 
+        @Override
         public void having(String sql) {
             sel.having(sql);
         }
 
+        @Override
         public void having(String sql, Joins joins) {
             sel.having(sql, joins);
         }
 
+        @Override
         public void groupBy(SQLBuffer sql) {
             sel.groupBy(sql);
         }
 
+        @Override
         public void groupBy(SQLBuffer sql, Joins joins) {
             sel.groupBy(sql, joins);
         }
 
+        @Override
         public void groupBy(String sql) {
             sel.groupBy(sql);
         }
 
+        @Override
         public void groupBy(String sql, Joins joins) {
             sel.groupBy(sql, joins);
         }
 
+        @Override
         public void groupBy(Column col) {
             sel.groupBy(col);
         }
 
+        @Override
         public void groupBy(Column col, Joins joins) {
             sel.groupBy(col, joins);
         }
 
+        @Override
         public void groupBy(Column[] cols) {
             sel.groupBy(cols);
         }
 
+        @Override
         public void groupBy(Column[] cols, Joins joins) {
             sel.groupBy(cols, joins);
         }
 
+        @Override
         public void groupBy(ClassMapping mapping, int subclasses,
             JDBCStore store, JDBCFetchConfiguration fetch) {
             sel.groupBy(mapping, subclasses, store, fetch);
         }
 
+        @Override
         public void groupBy(ClassMapping mapping, int subclasses,
             JDBCStore store, JDBCFetchConfiguration fetch, Joins joins) {
             sel.groupBy(mapping, subclasses, store, fetch, joins);
         }
 
+        @Override
         public SelectExecutor whereClone(int sels) {
             return sel.whereClone(sels);
         }
 
+        @Override
         public SelectExecutor fullClone(int sels) {
             return sel.fullClone(sels);
         }
 
+        @Override
         public SelectExecutor eagerClone(FieldMapping key, int eagerType,
             boolean toMany, int sels) {
             SelectExecutor ex = sel.eagerClone(key, eagerType, toMany, sels);
             return (ex == sel) ? this : ex;
         }
 
+        @Override
         public SelectExecutor getEager(FieldMapping key) {
             SelectExecutor ex = sel.getEager(key);
             return (ex == sel) ? this : ex;
         }
 
+        @Override
         public Joins newJoins() {
             return sel.newJoins();
         }
 
+        @Override
         public Joins newOuterJoins() {
             return sel.newOuterJoins();
         }
 
+        @Override
         public void append(SQLBuffer buf, Joins joins) {
             sel.append(buf, joins);
         }
 
+        @Override
         public Joins and(Joins joins1, Joins joins2) {
             return sel.and(joins1, joins2);
         }
 
+        @Override
         public Joins or(Joins joins1, Joins joins2) {
             return sel.or(joins1, joins2);
         }
 
+        @Override
         public Joins outer(Joins joins) {
             return sel.outer(joins);
         }
 
+        @Override
         public String toString() {
             return sel.toString();
         }
 
+        @Override
         public int getExpectedResultCount() {
             return sel.getExpectedResultCount();
         }
 
+        @Override
         public void setExpectedResultCount(int expectedResultCount,
             boolean force) {
             sel.setExpectedResultCount(expectedResultCount, force);
         }
 
+        @Override
         public void setContext(Context context) {
             sel.setContext(context);
         }
 
+        @Override
         public Context ctx() {
             return sel.ctx();
         }
 
+        @Override
         public void setSchemaAlias(String schemaAlias) {
             sel.setSchemaAlias(schemaAlias);
         }
 
+        @Override
         public void logEagerRelations() {
             sel.logEagerRelations();
         }
+        @Override
         public void setTablePerClassMeta(ClassMapping meta) {
         }
 
+        @Override
         public ClassMapping getTablePerClassMeta() {
             return sel.getTablePerClassMeta();
         }
 
+        @Override
         public void setJoinedTableClassMeta(List meta) {
             sel.setJoinedTableClassMeta(meta);
         }
 
+        @Override
         public List getJoinedTableClassMeta() {
             return sel.getJoinedTableClassMeta();
         }
 
+        @Override
         public void setExcludedJoinedTableClassMeta(List meta) {
             sel.setExcludedJoinedTableClassMeta(meta);
         }
 
+        @Override
         public List getExcludedJoinedTableClassMeta() {
             return sel.getExcludedJoinedTableClassMeta();
         }
 
+        @Override
         public DBDictionary getDictionary() {
             return dict;
         }
@@ -949,6 +1104,7 @@ public class LogicalUnion
             _dict = dict;
         }
 
+        @Override
         public Object getOrderingValue(Result res, int idx) {
             // if one value just return it
             ResultSet rs = ((ResultSetResult) res).getResultSet();
@@ -973,6 +1129,7 @@ public class LogicalUnion
             }
         }
 
+        @Override
         public int compare(Object o1, Object o2) {
             if (o1 == o2)
                 return 0;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MariaDBDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MariaDBDictionary.java
index 081bc2db2..be9b51d73 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MariaDBDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MariaDBDictionary.java
@@ -41,6 +41,7 @@ import org.apache.openjpa.jdbc.schema.Index;
 import org.apache.openjpa.jdbc.schema.PrimaryKey;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.util.ExceptionInfo;
 import org.apache.openjpa.util.StoreException;
 
 /*
@@ -421,7 +422,7 @@ public class MariaDBDictionary extends DBDictionary {
     protected int matchErrorState(Map<Integer,Set<String>> errorStates, SQLException ex) {
         int state = super.matchErrorState(errorStates, ex);
 
-        if (state == StoreException.GENERAL &&
+        if (state == ExceptionInfo.GENERAL &&
                 ex.getNextException() != null &&
                 "JZ0002".equalsIgnoreCase(ex.getNextException().getSQLState())) {
             if (conf != null && conf.getLockTimeout() != -1) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
index 774511d87..333439943 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
@@ -80,41 +80,50 @@ public class MergedResult
         _status = (comp == null) ? null : new byte[res.length];
     }
 
+    @Override
     public Object getEager(FieldMapping key) {
         return _res[_idx].getEager(key);
     }
 
+    @Override
     public void putEager(FieldMapping key, Object res) {
         _res[_idx].putEager(key, res);
     }
 
+    @Override
     public Joins newJoins() {
         return _res[_idx].newJoins();
     }
 
+    @Override
     public void close() {
         for (int i = 0; i < _res.length; i++)
             _res[i].close();
     }
 
+    @Override
     public void setLocking(boolean locking) {
         _res[_idx].setLocking(locking);
     }
 
+    @Override
     public boolean isLocking() {
         return _res[_idx].isLocking();
     }
 
+    @Override
     public boolean supportsRandomAccess()
         throws SQLException {
         return false;
     }
 
+    @Override
     public boolean absolute(int row)
         throws SQLException {
         throw new UnsupportedException();
     }
 
+    @Override
     public boolean next()
         throws SQLException {
         if (_pushedBack) {
@@ -174,11 +183,13 @@ public class MergedResult
         return true;
     }
 
+    @Override
     public void pushBack()
         throws SQLException {
         _pushedBack = true;
     }
 
+    @Override
     public int size()
         throws SQLException {
         int size = 0;
@@ -187,361 +198,434 @@ public class MergedResult
         return size;
     }
 
+    @Override
     public boolean contains(Object obj)
         throws SQLException {
         return _res[_idx].contains(obj);
     }
 
+    @Override
     public boolean containsAll(Object[] objs)
         throws SQLException {
         return _res[_idx].containsAll(objs);
     }
 
+    @Override
     public boolean contains(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].contains(col, joins);
     }
 
+    @Override
     public boolean containsAll(Column[] cols, Joins joins)
         throws SQLException {
         return _res[_idx].containsAll(cols, joins);
     }
 
+    @Override
     public ClassMapping getBaseMapping() {
         return _res[_idx].getBaseMapping();
     }
 
+    @Override
     public void setBaseMapping(ClassMapping mapping) {
         _res[_idx].setBaseMapping(mapping);
     }
 
+    @Override
     public FieldMapping getMappedByFieldMapping() {
         return _res[_idx].getMappedByFieldMapping();
     }
 
+    @Override
     public void setMappedByFieldMapping(FieldMapping fieldMapping) {
         _res[_idx].setMappedByFieldMapping(fieldMapping);
     }
 
+    @Override
     public Object getMappedByValue() {
         return _res[_idx].getMappedByValue();
     }
 
+    @Override
     public void setMappedByValue(Object mappedByValue) {
         _res[_idx].setMappedByValue(mappedByValue);
     }
 
+    @Override
     public int indexOf() {
         return _res[_idx].indexOf();
     }
 
+    @Override
     public Object load(ClassMapping mapping, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException {
         return _res[_idx].load(mapping, store, fetch);
     }
 
+    @Override
     public Object load(ClassMapping mapping, JDBCStore store,
         JDBCFetchConfiguration fetch, Joins joins)
         throws SQLException {
         return _res[_idx].load(mapping, store, fetch, joins);
     }
 
+    @Override
     public Array getArray(Object obj)
         throws SQLException {
         return _res[_idx].getArray(obj);
     }
 
+    @Override
     public InputStream getAsciiStream(Object obj)
         throws SQLException {
         return _res[_idx].getAsciiStream(obj);
     }
 
+    @Override
     public BigDecimal getBigDecimal(Object obj)
         throws SQLException {
         return _res[_idx].getBigDecimal(obj);
     }
 
+    @Override
     public BigInteger getBigInteger(Object obj)
         throws SQLException {
         return _res[_idx].getBigInteger(obj);
     }
 
+    @Override
     public InputStream getBinaryStream(Object obj)
         throws SQLException {
         return _res[_idx].getBinaryStream(obj);
     }
 
+    @Override
     public InputStream getLOBStream(JDBCStore store, Object obj)
         throws SQLException {
         return _res[_idx].getLOBStream(store, obj);
     }
 
+    @Override
     public Blob getBlob(Object obj)
         throws SQLException {
         return _res[_idx].getBlob(obj);
     }
 
+    @Override
     public boolean getBoolean(Object obj)
         throws SQLException {
         return _res[_idx].getBoolean(obj);
     }
 
+    @Override
     public byte getByte(Object obj)
         throws SQLException {
         return _res[_idx].getByte(obj);
     }
 
+    @Override
     public byte[] getBytes(Object obj)
         throws SQLException {
         return _res[_idx].getBytes(obj);
     }
 
+    @Override
     public Calendar getCalendar(Object obj)
         throws SQLException {
         return _res[_idx].getCalendar(obj);
     }
 
+    @Override
     public char getChar(Object obj)
         throws SQLException {
         return _res[_idx].getChar(obj);
     }
 
+    @Override
     public Reader getCharacterStream(Object obj)
         throws SQLException {
         return _res[_idx].getCharacterStream(obj);
     }
 
+    @Override
     public Clob getClob(Object obj)
         throws SQLException {
         return _res[_idx].getClob(obj);
     }
 
+    @Override
     public Date getDate(Object obj)
         throws SQLException {
         return _res[_idx].getDate(obj);
     }
 
+    @Override
     public java.sql.Date getDate(Object obj, Calendar cal)
         throws SQLException {
         return _res[_idx].getDate(obj, cal);
     }
 
+    @Override
     public double getDouble(Object obj)
         throws SQLException {
         return _res[_idx].getDouble(obj);
     }
 
+    @Override
     public float getFloat(Object obj)
         throws SQLException {
         return _res[_idx].getFloat(obj);
     }
 
+    @Override
     public int getInt(Object obj)
         throws SQLException {
         return _res[_idx].getInt(obj);
     }
 
+    @Override
     public Locale getLocale(Object obj)
         throws SQLException {
         return _res[_idx].getLocale(obj);
     }
 
+    @Override
     public long getLong(Object obj)
         throws SQLException {
         return _res[_idx].getLong(obj);
     }
 
+    @Override
     public Number getNumber(Object obj)
         throws SQLException {
         return _res[_idx].getNumber(obj);
     }
 
+    @Override
     public Object getObject(Object obj, int metaType, Object arg)
         throws SQLException {
         return _res[_idx].getObject(obj, metaType, arg);
     }
 
+    @Override
     public Object getSQLObject(Object obj, Map map)
         throws SQLException {
         return _res[_idx].getSQLObject(obj, map);
     }
 
+    @Override
     public Ref getRef(Object obj, Map map)
         throws SQLException {
         return _res[_idx].getRef(obj, map);
     }
 
+    @Override
     public short getShort(Object obj)
         throws SQLException {
         return _res[_idx].getShort(obj);
     }
 
+    @Override
     public String getString(Object obj)
         throws SQLException {
         return _res[_idx].getString(obj);
     }
 
+    @Override
     public Time getTime(Object obj, Calendar cal)
         throws SQLException {
         return _res[_idx].getTime(obj, cal);
     }
 
+    @Override
     public Timestamp getTimestamp(Object obj, Calendar cal)
         throws SQLException {
         return _res[_idx].getTimestamp(obj, cal);
     }
 
+    @Override
     public Array getArray(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getArray(col, joins);
     }
 
+    @Override
     public InputStream getAsciiStream(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getAsciiStream(col, joins);
     }
 
+    @Override
     public BigDecimal getBigDecimal(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getBigDecimal(col, joins);
     }
 
+    @Override
     public BigInteger getBigInteger(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getBigInteger(col, joins);
     }
 
+    @Override
     public InputStream getBinaryStream(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getBinaryStream(col, joins);
     }
 
+    @Override
     public Blob getBlob(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getBlob(col, joins);
     }
 
+    @Override
     public boolean getBoolean(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getBoolean(col, joins);
     }
 
+    @Override
     public byte getByte(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getByte(col, joins);
     }
 
+    @Override
     public byte[] getBytes(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getBytes(col, joins);
     }
 
+    @Override
     public Calendar getCalendar(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getCalendar(col, joins);
     }
 
+    @Override
     public char getChar(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getChar(col, joins);
     }
 
+    @Override
     public Reader getCharacterStream(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getCharacterStream(col, joins);
     }
 
+    @Override
     public Clob getClob(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getClob(col, joins);
     }
 
+    @Override
     public Date getDate(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getDate(col, joins);
     }
 
+    @Override
     public java.sql.Date getDate(Column col, Calendar cal, Joins joins)
         throws SQLException {
         return _res[_idx].getDate(col, cal, joins);
     }
 
+    @Override
     public double getDouble(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getDouble(col, joins);
     }
 
+    @Override
     public float getFloat(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getFloat(col, joins);
     }
 
+    @Override
     public int getInt(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getInt(col, joins);
     }
 
+    @Override
     public Locale getLocale(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getLocale(col, joins);
     }
 
+    @Override
     public long getLong(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getLong(col, joins);
     }
 
+    @Override
     public Number getNumber(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getNumber(col, joins);
     }
 
+    @Override
     public Object getObject(Column col, Object arg, Joins joins)
         throws SQLException {
         return _res[_idx].getObject(col, arg, joins);
     }
 
+    @Override
     public Object getSQLObject(Column col, Map map, Joins joins)
         throws SQLException {
         return _res[_idx].getSQLObject(col, map, joins);
     }
 
+    @Override
     public Ref getRef(Column col, Map map, Joins joins)
         throws SQLException {
         return _res[_idx].getRef(col, map, joins);
     }
 
+    @Override
     public short getShort(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getShort(col, joins);
     }
 
+    @Override
     public String getString(Column col, Joins joins)
         throws SQLException {
         return _res[_idx].getString(col, joins);
     }
 
+    @Override
     public Time getTime(Column col, Calendar cal, Joins joins)
         throws SQLException {
         return _res[_idx].getTime(col, cal, joins);
     }
 
+    @Override
     public Timestamp getTimestamp(Column col, Calendar cal, Joins joins)
         throws SQLException {
         return _res[_idx].getTimestamp(col, cal, joins);
     }
 
+    @Override
     public boolean wasNull()
         throws SQLException {
         return _res[_idx].wasNull();
     }
 
+    @Override
     public void startDataRequest(Object mapping) {
         for (int i = 0; i < _res.length; i++)
             _res[i].startDataRequest(mapping);
     }
 
+    @Override
     public void endDataRequest() {
         for (int i = 0; i < _res.length; i++)
             _res[i].endDataRequest();
@@ -550,12 +634,12 @@ public class MergedResult
     /**
      * Comparator for ordering result rows.
      */
-    public static interface ResultComparator
+    public interface ResultComparator
         extends Comparator {
 
         /**
          * Return the ordering value of the current row of the given result.
          */
-        public Object getOrderingValue(Result res, int idx);
+        Object getOrderingValue(Result res, int idx);
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java
index 84d160c67..43209f150 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java
@@ -41,6 +41,7 @@ import org.apache.openjpa.jdbc.schema.Index;
 import org.apache.openjpa.jdbc.schema.PrimaryKey;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.util.ExceptionInfo;
 import org.apache.openjpa.util.StoreException;
 
 /**
@@ -433,7 +434,7 @@ public class MySQLDictionary
     protected int matchErrorState(Map<Integer,Set<String>> errorStates, SQLException ex) {
         int state = super.matchErrorState(errorStates, ex);
         // OPENJPA-1616 - Special case for MySQL not returning a SQLState for timeouts
-        if (state == StoreException.GENERAL && ex.getErrorCode() == 0 && ex.getSQLState() == null) {
+        if (state == ExceptionInfo.GENERAL && ex.getErrorCode() == 0 && ex.getSQLState() == null) {
             // look at the nested MySQL exception for more details
             SQLException sqle = ex.getNextException();
             if (sqle != null && sqle.toString().startsWith("com.mysql.jdbc.exceptions.MySQLTimeoutException")) {
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
index 93827eb1d..79190cb79 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
@@ -50,10 +50,10 @@ import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
 import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
+import org.apache.openjpa.jdbc.schema.ForeignKey.FKMapKey;
 import org.apache.openjpa.jdbc.schema.Index;
 import org.apache.openjpa.jdbc.schema.PrimaryKey;
 import org.apache.openjpa.jdbc.schema.Table;
-import org.apache.openjpa.jdbc.schema.ForeignKey.FKMapKey;
 import org.apache.openjpa.lib.jdbc.DelegatingDatabaseMetaData;
 import org.apache.openjpa.lib.jdbc.DelegatingPreparedStatement;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
@@ -550,6 +550,7 @@ public class OracleDictionary
      * fetch configuration, and if so, append the Oracle hint after the
      * "SELECT" part of the query.
      */
+    @Override
     public String getSelectOperation(JDBCFetchConfiguration fetch) {
         Object hint = fetch == null ? null : fetch.getHint(SELECT_HINT);
         String select = "SELECT";
@@ -558,6 +559,7 @@ public class OracleDictionary
         return select;
     }
 
+    @Override
     public void setString(PreparedStatement stmnt, int idx, String val,
         Column col)
         throws SQLException {
@@ -776,6 +778,7 @@ public class OracleDictionary
         }
     }
 
+    @Override
     public Column[] getColumns(DatabaseMetaData meta, String catalog,
         String schemaName, String tableName, String columnName, Connection conn)
         throws SQLException {
@@ -786,6 +789,7 @@ public class OracleDictionary
             DBIdentifier.newColumn(columnName),conn);
     }
 
+    @Override
     public Column[] getColumns(DatabaseMetaData meta, DBIdentifier catalog,
         DBIdentifier schemaName, DBIdentifier tableName, DBIdentifier columnName, Connection conn)
         throws SQLException {
@@ -856,7 +860,7 @@ public class OracleDictionary
             }
             setTimeouts(stmnt, conf, false);
             rs = stmnt.executeQuery();
-            List<PrimaryKey> pkList = new ArrayList<PrimaryKey>();
+            List<PrimaryKey> pkList = new ArrayList<>();
             while (rs != null && rs.next()) {
                 pkList.add(newPrimaryKey(rs));
             }
@@ -950,11 +954,11 @@ public class OracleDictionary
         DBIdentifier schemaName, DBIdentifier tableName, Connection conn, boolean partialKeys)
         throws SQLException {
         StringBuilder delAction = new StringBuilder("DECODE(t1.DELETE_RULE").
-            append(", 'NO ACTION', ").append(meta.importedKeyNoAction).
-            append(", 'RESTRICT', ").append(meta.importedKeyRestrict).
-            append(", 'CASCADE', ").append(meta.importedKeyCascade).
-            append(", 'SET NULL', ").append(meta.importedKeySetNull).
-            append(", 'SET DEFAULT', ").append(meta.importedKeySetDefault).
+            append(", 'NO ACTION', ").append(DatabaseMetaData.importedKeyNoAction).
+            append(", 'RESTRICT', ").append(DatabaseMetaData.importedKeyRestrict).
+            append(", 'CASCADE', ").append(DatabaseMetaData.importedKeyCascade).
+            append(", 'SET NULL', ").append(DatabaseMetaData.importedKeySetNull).
+            append(", 'SET DEFAULT', ").append(DatabaseMetaData.importedKeySetDefault).
             append(")");
 
         StringBuilder buf = new StringBuilder();
@@ -968,9 +972,9 @@ public class OracleDictionary
             append(delAction).append(" AS DELETE_RULE, ").
             append("t0.CONSTRAINT_NAME AS FK_NAME, ").
             append("DECODE(t1.DEFERRED, 'DEFERRED', ").
-            append(meta.importedKeyInitiallyDeferred).
+            append(DatabaseMetaData.importedKeyInitiallyDeferred).
             append(", 'IMMEDIATE', ").
-            append(meta.importedKeyInitiallyImmediate).
+            append(DatabaseMetaData.importedKeyInitiallyImmediate).
             append(") AS DEFERRABILITY ").
             append("FROM ALL_CONS_COLUMNS t0, ALL_CONSTRAINTS t1, ").
             append("ALL_CONS_COLUMNS t2 ").
@@ -996,8 +1000,8 @@ public class OracleDictionary
                 setString(stmnt, idx++, convertSchemaCase(tableName), null);
             setTimeouts(stmnt, conf, false);
             rs = stmnt.executeQuery();
-            List<ForeignKey> fkList = new ArrayList<ForeignKey>();
-            Map<FKMapKey, ForeignKey> fkMap = new HashMap<FKMapKey, ForeignKey>();
+            List<ForeignKey> fkList = new ArrayList<>();
+            Map<FKMapKey, ForeignKey> fkMap = new HashMap<>();
 
             while (rs != null && rs.next()) {
                 ForeignKey nfk = newForeignKey(rs);
@@ -1105,6 +1109,7 @@ public class OracleDictionary
         return buf.toString();
     }
 
+    @Override
     public boolean isSystemSequence(String name, String schema,
         boolean targetSchema) {
         return isSystemSequence(DBIdentifier.newSequence(name),
@@ -1307,6 +1312,7 @@ public class OracleDictionary
      * @param lhs the left hand side of the comparison
      * @param rhs the right hand side of the comparison
      */
+    @Override
     public void appendXmlComparison(SQLBuffer buf, String op, FilterValue lhs,
         FilterValue rhs, boolean lhsxml, boolean rhsxml) {
         super.appendXmlComparison(buf, op, lhs, rhs, lhsxml, rhsxml);
@@ -1357,6 +1363,7 @@ public class OracleDictionary
         buf.append("')");
     }
 
+    @Override
     public void insertClobForStreamingLoad(Row row, Column col, Object ob)
         throws SQLException {
         if (ob == null) {
@@ -1367,6 +1374,7 @@ public class OracleDictionary
         }
     }
 
+    @Override
     public int getBatchUpdateCount(PreparedStatement ps) throws SQLException {
         int updateSuccessCnt = 0;
         if (batchLimit != 0 && ps != null) {
@@ -1406,6 +1414,7 @@ public class OracleDictionary
         }
     }
 
+    @Override
     public boolean isImplicitJoin() {
         return joinSyntax == SYNTAX_DATABASE;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PointbaseDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PointbaseDictionary.java
index 95968995e..a2a6b0f60 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PointbaseDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PointbaseDictionary.java
@@ -70,6 +70,7 @@ public class PointbaseDictionary
         reservedWordSet.add("NAME");
     }
 
+    @Override
     public int getPreferredType(int type) {
         switch (type) {
             case Types.LONGVARCHAR:
@@ -107,6 +108,7 @@ public class PointbaseDictionary
             getFullIdentifier(index.getTable(), false), index.getIdentifier()));
     }
 
+    @Override
     public void substring(SQLBuffer buf, FilterValue str, FilterValue start,
         FilterValue length) {
         // SUBSTRING in Pointbase is of the form:
@@ -122,6 +124,7 @@ public class PointbaseDictionary
         buf.append(")");
     }
 
+    @Override
     public void indexOf(SQLBuffer buf, FilterValue str, FilterValue find,
         FilterValue start) {
         buf.append("(POSITION(");
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
index d4a162240..82c3dce6e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
@@ -74,7 +74,7 @@ public class PostgresDictionary
     private Method dbcpGetDelegate;
     private Method connectionUnwrap;
 
-    protected Set<String> _timestampTypes = new HashSet<String>();
+    protected Set<String> _timestampTypes = new HashSet<>();
 
 
     /**
@@ -337,10 +337,12 @@ public class PostgresDictionary
         return false;
     }
 
+    @Override
     protected String getSequencesSQL(String schemaName, String sequenceName) {
         return getSequencesSQL(DBIdentifier.newSchema(schemaName), DBIdentifier.newSequence(sequenceName));
     }
 
+    @Override
     protected String getSequencesSQL(DBIdentifier schemaName, DBIdentifier sequenceName) {
         if (DBIdentifier.isNull(schemaName) && DBIdentifier.isNull(sequenceName))
             return allSequencesSQL;
@@ -352,16 +354,19 @@ public class PostgresDictionary
             return namedSequenceFromOneSchemaSQL;
     }
 
+    @Override
     public boolean isSystemSequence(String name, String schema,
         boolean targetSchema) {
         return isSystemSequence(DBIdentifier.newTable(name), DBIdentifier.newSchema(schema), targetSchema);
     }
 
+    @Override
     public boolean isSystemSequence(DBIdentifier name, DBIdentifier schema,
         boolean targetSchema) {
         return isSystemSequence(name, schema, targetSchema, null);
     }
 
+    @Override
     public boolean isSystemSequence(DBIdentifier name, DBIdentifier schema,
         boolean targetSchema, Connection conn) {
         if (super.isSystemSequence(name, schema, targetSchema))
@@ -538,11 +543,13 @@ public class PostgresDictionary
             && strName.toUpperCase(Locale.ENGLISH).endsWith("_SEQ");
     }
 
+    @Override
     public boolean isSystemTable(String name, String schema,
         boolean targetSchema) {
         return isSystemTable(DBIdentifier.newTable(name), DBIdentifier.newSchema(schema), targetSchema);
     }
 
+    @Override
     public boolean isSystemTable(DBIdentifier name, DBIdentifier schema,
         boolean targetSchema) {
         // names starting with "pg_" are reserved for Postgresql internal use
@@ -551,10 +558,12 @@ public class PostgresDictionary
             || (strName != null && strName.toLowerCase(Locale.ENGLISH).startsWith("pg_"));
     }
 
+    @Override
     public boolean isSystemIndex(String name, Table table) {
         return isSystemIndex(DBIdentifier.newIndex(name), table);
     }
 
+    @Override
     public boolean isSystemIndex(DBIdentifier name, Table table) {
         // names starting with "pg_" are reserved for Postgresql internal use
         String strName = DBIdentifier.isNull(name) ? null : name.getName();
@@ -562,11 +571,13 @@ public class PostgresDictionary
             || (strName != null && strName.toLowerCase(Locale.ENGLISH).startsWith("pg_"));
     }
 
+    @Override
     public Connection decorate(Connection conn)
         throws SQLException {
         return new PostgresConnection(super.decorate(conn), this);
     }
 
+    @Override
     public InputStream getLOBStream(JDBCStore store, ResultSet rs,
         int column) throws SQLException {
         DelegatingConnection conn = (DelegatingConnection)store
@@ -581,6 +592,7 @@ public class PostgresDictionary
         }
     }
 
+    @Override
     public void insertBlobForStreamingLoad(Row row, Column col,
         JDBCStore store, Object ob, Select sel) throws SQLException {
         if (row.getAction() == Row.ACTION_INSERT) {
@@ -673,11 +685,13 @@ public class PostgresDictionary
 
     }
 
+    @Override
     public void updateBlob(Select sel, JDBCStore store, InputStream is)
         throws SQLException {
         //Do nothing
     }
 
+    @Override
     public void deleteStream(JDBCStore store, Select sel) throws SQLException {
         JDBCFetchConfiguration fetch = store.getFetchConfiguration();
         SQLBuffer sql = sel.toSelect(true, fetch);
@@ -712,6 +726,7 @@ public class PostgresDictionary
     /**
      * Determine XML column support and backslash handling.
      */
+    @Override
     public void connectedConfiguration(Connection conn) throws SQLException {
         super.connectedConfiguration(conn);
 
@@ -750,6 +765,7 @@ public class PostgresDictionary
      * by using {@link PreparedStatement#setObject(int, Object, int)}
      * with {@link Types#OTHER} as the third argument.
      */
+    @Override
     public void setClobString(PreparedStatement stmnt, int idx, String val,
         Column col) throws SQLException {
         if (col != null && col.isXML())
@@ -769,6 +785,7 @@ public class PostgresDictionary
      *
      * @exception SQLException
      */
+    @Override
     public Object getObject(ResultSet rs, int column, Map map)
         throws SQLException {
         Object obj = super.getObject(rs, column, map);
@@ -810,6 +827,7 @@ public class PostgresDictionary
      * @param rhsxml
      *            indicates whether the right operand maps to XML
      */
+    @Override
     public void appendXmlComparison(SQLBuffer buf, String op, FilterValue lhs,
         FilterValue rhs, boolean lhsxml, boolean rhsxml) {
         super.appendXmlComparison(buf, op, lhs, rhs, lhsxml, rhsxml);
@@ -852,6 +870,7 @@ public class PostgresDictionary
     /**
      * Return a SQL string to act as a placeholder for the given column.
      */
+    @Override
     public String getPlaceholderValueString(Column col) {
         if (col.getType() == Types.BIT) {
             return "false";
@@ -955,11 +974,13 @@ public class PostgresDictionary
             _dict = dict;
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, boolean wrap)
             throws SQLException {
            return new PostgresPreparedStatement(super.prepareStatement(sql, false), PostgresConnection.this, _dict);
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, int rsType,
             int rsConcur, boolean wrap)
             throws SQLException {
@@ -983,6 +1004,7 @@ public class PostgresDictionary
             _dict = dict;
         }
 
+        @Override
         protected ResultSet executeQuery(boolean wrap)
             throws SQLException {
             try {
@@ -1004,6 +1026,7 @@ public class PostgresDictionary
             }
         }
 
+        @Override
         public void setFetchSize(int i)
             throws SQLException {
             // some postgres drivers do not support the setFetchSize method
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java
index 5638d9443..076699420 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.jdbc.sql;
 
 import java.sql.SQLException;
-
 import java.util.Objects;
+
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.RelationId;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -72,6 +72,7 @@ public class PrimaryRow
     /**
      * Mark this row as dependent on some other row.
      */
+    @Override
     public boolean isDependent() {
         return (flags & DEPENDENT) > 0;
     }
@@ -100,23 +101,28 @@ public class PrimaryRow
         _idx = idx;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public void setFailedObject(Object failed) {
         _failed = failed;
     }
 
+    @Override
     public OpenJPAStateManager getPrimaryKey() {
         return _pk;
     }
 
+    @Override
     public void setPrimaryKey(OpenJPAStateManager sm)
         throws SQLException {
         setPrimaryKey(null, sm);
     }
 
+    @Override
     public void setPrimaryKey(ColumnIO io, OpenJPAStateManager sm) {
         _pk = sm;
         flags |= PK_SET;
@@ -126,6 +132,7 @@ public class PrimaryRow
         setValid(true);
     }
 
+    @Override
     public void wherePrimaryKey(OpenJPAStateManager sm)
         throws SQLException {
         _pk = sm;
@@ -159,11 +166,13 @@ public class PrimaryRow
         return (_fkWhere == null) ? null : _fkWhere[fk.getIndex()];
     }
 
+    @Override
     public void setForeignKey(ForeignKey fk, OpenJPAStateManager sm)
         throws SQLException {
         setForeignKey(fk, null, sm);
     }
 
+    @Override
     public void setForeignKey(ForeignKey fk, ColumnIO io,
         OpenJPAStateManager sm)
         throws SQLException {
@@ -173,6 +182,7 @@ public class PrimaryRow
             recordForeignKey(fk, io, sm, true);
     }
 
+    @Override
     public void whereForeignKey(ForeignKey fk, OpenJPAStateManager sm)
         throws SQLException {
         if (!delayForeignKey(fk, sm, false))
@@ -181,6 +191,7 @@ public class PrimaryRow
             recordForeignKey(fk, null, sm, false);
     }
 
+    @Override
     public void clearForeignKey(ForeignKey fk)
         throws SQLException {
         super.clearForeignKey(fk);
@@ -271,6 +282,7 @@ public class PrimaryRow
             : _callbacks[getRelationIdIndex(col)];
     }
 
+    @Override
     public void setRelationId(Column col, OpenJPAStateManager sm,
         RelationId rel)
         throws SQLException {
@@ -289,6 +301,7 @@ public class PrimaryRow
         }
     }
 
+    @Override
     public void clearRelationId(Column col)
         throws SQLException {
         super.clearRelationId(col);
@@ -326,6 +339,7 @@ public class PrimaryRow
         return false;
     }
 
+    @Override
     protected void setObject(Column col, Object val, int metaType,
         boolean overrideDefault)
         throws SQLException {
@@ -388,6 +402,7 @@ public class PrimaryRow
             && ((Number) o1).doubleValue() == ((Number) o2).doubleValue();
     }
 
+    @Override
     protected String generateSQL(DBDictionary dict) {
         try {
             if ((flags & PK_SET) > 0)
@@ -423,10 +438,12 @@ public class PrimaryRow
         return super.generateSQL(dict);
     }
 
+    @Override
     protected RowImpl newInstance(Column[] cols, int action) {
         return new PrimaryRow(cols, action, _pk);
     }
 
+    @Override
     public void copyInto(RowImpl row, boolean whereOnly) {
         super.copyInto(row, whereOnly);
         if (!(row instanceof PrimaryRow))
@@ -466,6 +483,7 @@ public class PrimaryRow
         }
     }
 
+    @Override
     public String toString() {
     	StringBuilder buf = new StringBuilder();
     	buf.append("PrimaryRow[");
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Raw.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Raw.java
index 6379cf81d..67ec417eb 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Raw.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Raw.java
@@ -32,6 +32,7 @@ public class Raw {
         this.sql = sql;
     }
 
+    @Override
     public String toString() {
         return sql;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java
index 8b96ebb52..f803e42e5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java
@@ -60,39 +60,39 @@ public interface Result
     /**
      * The eager result for the given key, or null if none.
      */
-    public Object getEager(FieldMapping key);
+    Object getEager(FieldMapping key);
 
     /**
      * The eager result for the given key, or null if none.
      */
-    public void putEager(FieldMapping key, Object res);
+    void putEager(FieldMapping key, Object res);
 
     /**
      * Return a new joins instance to use for traversing to related data.
      */
-    public Joins newJoins();
+    Joins newJoins();
 
     /**
      * Free the resources used by this result; do <strong>not</strong>
      * close the SQL connection.
      */
-    public void close();
+    @Override void close();
 
     /**
      * Set to true if row locking has been issued for the row.
      */
-    public void setLocking(boolean locking);
+    void setLocking(boolean locking);
 
     /**
      * If true, then any results loaded from this Result
      * will be locked in the database.
      */
-    public boolean isLocking();
+    boolean isLocking();
 
     /**
      * Return true if the result supports random access.
      */
-    public boolean supportsRandomAccess()
+    boolean supportsRandomAccess()
         throws SQLException;
 
     /**
@@ -100,14 +100,14 @@ public interface Result
      * return false if the row does not exist. This method will only be
      * called if the result supports random access.
      */
-    public boolean absolute(int row)
+    boolean absolute(int row)
         throws SQLException;
 
     /**
      * Advance to the next row, or return false if there are no more rows
      * in the result.
      */
-    public boolean next()
+    boolean next()
         throws SQLException;
 
     /**
@@ -116,37 +116,37 @@ public interface Result
      * additional calls before a call to {@link #next} or {@link #absolute}
      * should have no further affect.
      */
-    public void pushBack()
+    void pushBack()
         throws SQLException;
 
     /**
      * Return the number of rows in this result.
      */
-    public int size()
+    int size()
         throws SQLException;
 
     /**
      * Return true if the given id or column is available in the result.
      */
-    public boolean contains(Object obj)
+    boolean contains(Object obj)
         throws SQLException;
 
     /**
      * Return true if all the given ids or columns are available in the result.
      */
-    public boolean containsAll(Object[] objs)
+    boolean containsAll(Object[] objs)
         throws SQLException;
 
     /**
      * Return true if the given column is available in the result.
      */
-    public boolean contains(Column col, Joins joins)
+    boolean contains(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return true if all the given columns are available in the result.
      */
-    public boolean containsAll(Column[] cols, Joins joins)
+    boolean containsAll(Column[] cols, Joins joins)
         throws SQLException;
 
     /**
@@ -155,7 +155,7 @@ public interface Result
      * This information is not available after getting any eager results
      * from the row.
      */
-    public ClassMapping getBaseMapping();
+    ClassMapping getBaseMapping();
 
     /**
      * If this is the result of a UNION used to select a hierarchy of
@@ -163,7 +163,7 @@ public interface Result
      * This information is not available after getting any eager results
      * from the row.
      */
-    public void setBaseMapping(ClassMapping mapping);
+    void setBaseMapping(ClassMapping mapping);
 
     /**
      * If this is the result used to select a toMany relationship,
@@ -171,7 +171,7 @@ public interface Result
      * the inverse relationship. This is to avoid unneeded
      * extra sql to retrieve the eager inverse field.
      */
-    public FieldMapping getMappedByFieldMapping();
+    FieldMapping getMappedByFieldMapping();
 
     /**
      * If this is the result used to select a toMany relationship,
@@ -179,39 +179,39 @@ public interface Result
      * the inverse relationship. This is to avoid unneeded
      * extra sql to retrieve the eager inverse field.
      */
-    public void setMappedByFieldMapping(FieldMapping fieldMapping);
+    void setMappedByFieldMapping(FieldMapping fieldMapping);
 
     /**
      * If this is the result used to select a toMany relationship,
      * the mappedByValue is value of the owner of the toMany relationship.
      * This is to avoid unneeded extra sql to retrieve the eager inverse field.
      */
-    public Object getMappedByValue();
+    Object getMappedByValue();
 
     /**
      * If this is the result used to select a toMany relationship,
      * the mappedByValue is value of the owner of the toMany relationship.
      * This is to avoid unneeded extra sql to retrieve the eager inverse field.
      */
-    public void setMappedByValue(Object mappedByValue);
+    void setMappedByValue(Object mappedByValue);
 
     /**
      * The index of the select within the UNION that the current row
      * corresponds to, or 0.
      */
-    public int indexOf();
+    int indexOf();
 
     /**
      * Load a pc object using the given store manager.
      */
-    public Object load(ClassMapping mapping, JDBCStore store,
+    Object load(ClassMapping mapping, JDBCStore store,
         JDBCFetchConfiguration fetch)
         throws SQLException;
 
     /**
      * Load a pc object using the given store manager.
      */
-    public Object load(ClassMapping mapping, JDBCStore store,
+    Object load(ClassMapping mapping, JDBCStore store,
         JDBCFetchConfiguration fetch, Joins joins)
         throws SQLException;
 
@@ -219,136 +219,136 @@ public interface Result
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Array getArray(Object obj)
+    Array getArray(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public InputStream getAsciiStream(Object obj)
+    InputStream getAsciiStream(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public BigDecimal getBigDecimal(Object obj)
+    BigDecimal getBigDecimal(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public BigInteger getBigInteger(Object obj)
+    BigInteger getBigInteger(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public InputStream getBinaryStream(Object obj)
+    InputStream getBinaryStream(Object obj)
         throws SQLException;
 
-    public InputStream getLOBStream(JDBCStore store, Object obj)
+    InputStream getLOBStream(JDBCStore store, Object obj)
         throws SQLException;
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Blob getBlob(Object obj)
+    Blob getBlob(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public boolean getBoolean(Object obj)
+    boolean getBoolean(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public byte getByte(Object obj)
+    byte getByte(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public byte[] getBytes(Object obj)
+    byte[] getBytes(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public Calendar getCalendar(Object obj)
+    Calendar getCalendar(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public char getChar(Object obj)
+    char getChar(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Reader getCharacterStream(Object obj)
+    Reader getCharacterStream(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Clob getClob(Object obj)
+    Clob getClob(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public Date getDate(Object obj)
+    Date getDate(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public java.sql.Date getDate(Object obj, Calendar cal)
+    java.sql.Date getDate(Object obj, Calendar cal)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public double getDouble(Object obj)
+    double getDouble(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public float getFloat(Object obj)
+    float getFloat(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public int getInt(Object obj)
+    int getInt(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public Locale getLocale(Object obj)
+    Locale getLocale(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public long getLong(Object obj)
+    long getLong(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public Number getNumber(Object obj)
+    Number getNumber(Object obj)
         throws SQLException;
 
     /**
@@ -362,181 +362,181 @@ public interface Result
      * @param arg some JDBC data access methods use an argument, such
      * as a {@link Calendar} or {@link Map}
      */
-    public Object getObject(Object obj, int metaType, Object arg)
+    Object getObject(Object obj, int metaType, Object arg)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Object getSQLObject(Object obj, Map map)
+    Object getSQLObject(Object obj, Map map)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Ref getRef(Object obj, Map map)
+    Ref getRef(Object obj, Map map)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public short getShort(Object obj)
+    short getShort(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id.
      */
-    public String getString(Object obj)
+    String getString(Object obj)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Time getTime(Object obj, Calendar cal)
+    Time getTime(Object obj, Calendar cal)
         throws SQLException;
 
     /**
      * Return the value stored in the given column or id; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Timestamp getTimestamp(Object obj, Calendar cal)
+    Timestamp getTimestamp(Object obj, Calendar cal)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Array getArray(Column col, Joins joins)
+    Array getArray(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public InputStream getAsciiStream(Column col, Joins joins)
+    InputStream getAsciiStream(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public BigDecimal getBigDecimal(Column col, Joins joins)
+    BigDecimal getBigDecimal(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public BigInteger getBigInteger(Column col, Joins joins)
+    BigInteger getBigInteger(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public InputStream getBinaryStream(Column col, Joins joins)
+    InputStream getBinaryStream(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Blob getBlob(Column col, Joins joins)
+    Blob getBlob(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public boolean getBoolean(Column col, Joins joins)
+    boolean getBoolean(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public byte getByte(Column col, Joins joins)
+    byte getByte(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public byte[] getBytes(Column col, Joins joins)
+    byte[] getBytes(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public Calendar getCalendar(Column col, Joins joins)
+    Calendar getCalendar(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public char getChar(Column col, Joins joins)
+    char getChar(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Reader getCharacterStream(Column col, Joins joins)
+    Reader getCharacterStream(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Clob getClob(Column col, Joins joins)
+    Clob getClob(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public Date getDate(Column col, Joins joins)
+    Date getDate(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public java.sql.Date getDate(Column col, Calendar cal, Joins joins)
+    java.sql.Date getDate(Column col, Calendar cal, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public double getDouble(Column col, Joins joins)
+    double getDouble(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public float getFloat(Column col, Joins joins)
+    float getFloat(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public int getInt(Column col, Joins joins)
+    int getInt(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public Locale getLocale(Column col, Joins joins)
+    Locale getLocale(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public long getLong(Column col, Joins joins)
+    long getLong(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public Number getNumber(Column col, Joins joins)
+    Number getNumber(Column col, Joins joins)
         throws SQLException;
 
     /**
@@ -546,60 +546,60 @@ public interface Result
      * @param arg some JDBC data access methods use an argument, such
      * as a {@link Calendar} or {@link Map}
      */
-    public Object getObject(Column col, Object arg, Joins joins)
+    Object getObject(Column col, Object arg, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Object getSQLObject(Column col, Map map, Joins joins)
+    Object getSQLObject(Column col, Map map, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Ref getRef(Column col, Map map, Joins joins)
+    Ref getRef(Column col, Map map, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public short getShort(Column col, Joins joins)
+    short getShort(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column.
      */
-    public String getString(Column col, Joins joins)
+    String getString(Column col, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Time getTime(Column col, Calendar cal, Joins joins)
+    Time getTime(Column col, Calendar cal, Joins joins)
         throws SQLException;
 
     /**
      * Return the value stored in the given column; may not be supported
      * by results that are not backed by a SQL result set.
      */
-    public Timestamp getTimestamp(Column col, Calendar cal, Joins joins)
+    Timestamp getTimestamp(Column col, Calendar cal, Joins joins)
         throws SQLException;
 
     /**
      * Return true if the last value fetched was null.
      */
-    public boolean wasNull()
+    boolean wasNull()
         throws SQLException;
 
     /**
      * Informs this receiver about the application element for which a
      * subsequent data request will be made.
      */
-    public void startDataRequest(Object mapping);
+    void startDataRequest(Object mapping);
 
     /**
      * Ends a data request. Must be called in conjunction with
@@ -608,5 +608,5 @@ public interface Result
      * getObject("COLUMN_Y"); endDataRequest (); endDataRequest ();
      * </pre>
      */
-    public void endDataRequest();
+    void endDataRequest();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java
index a85881760..9b5a1aa61 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java
@@ -183,6 +183,7 @@ public class ResultSetResult
         _closeStatement = closeStatement;
     }
 
+    @Override
     public void close() {
         super.close();
         try {
@@ -201,11 +202,13 @@ public class ResultSetResult
             }
     }
 
+    @Override
     public boolean supportsRandomAccess()
         throws SQLException {
         return _rs.getType() != ResultSet.TYPE_FORWARD_ONLY;
     }
 
+    @Override
     protected boolean absoluteInternal(int row)
         throws SQLException {
         if (row == ++_row)
@@ -221,12 +224,14 @@ public class ResultSetResult
         return true;
     }
 
+    @Override
     protected boolean nextInternal()
         throws SQLException {
         _row++;
         return _rs.next();
     }
 
+    @Override
     public int size()
         throws SQLException {
         if (_size == -1) {
@@ -240,122 +245,146 @@ public class ResultSetResult
         return _size;
     }
 
+    @Override
     protected boolean containsInternal(Object obj, Joins joins)
         throws SQLException {
         return ((Number) translate(obj, joins)).intValue() > 0;
     }
 
+    @Override
     protected Array getArrayInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getArray(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected InputStream getAsciiStreamInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getAsciiStream(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected BigDecimal getBigDecimalInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getBigDecimal(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Number getNumberInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getNumber(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected BigInteger getBigIntegerInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getBigInteger(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected InputStream getBinaryStreamInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getBinaryStream(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Blob getBlobInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getBlob(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected boolean getBooleanInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getBoolean(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected byte getByteInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getByte(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected byte[] getBytesInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getBytes(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Calendar getCalendarInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getCalendar(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected char getCharInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getChar(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Reader getCharacterStreamInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getCharacterStream(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Clob getClobInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getClob(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Date getDateInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getDate(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected java.sql.Date getDateInternal(Object obj, Calendar cal,
         Joins joins)
         throws SQLException {
         return _dict.getDate(_rs, ((Number) obj).intValue(), cal);
     }
 
+    @Override
     protected double getDoubleInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getDouble(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected float getFloatInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getFloat(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected int getIntInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getInt(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Locale getLocaleInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getLocale(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected long getLongInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getLong(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Object getStreamInternal(JDBCStore store, Object obj,
         int metaTypeCode, Object arg, Joins joins) throws SQLException {
         return getLOBStreamInternal(store, obj, joins);
     }
 
+    @Override
     protected Object getObjectInternal(Object obj, int metaTypeCode,
         Object arg, Joins joins)
         throws SQLException {
@@ -456,21 +485,25 @@ public class ResultSetResult
         return (_rs.wasNull()) ? null : val;
     }
 
+    @Override
     protected Object getSQLObjectInternal(Object obj, Map map, Joins joins)
         throws SQLException {
         return _dict.getObject(_rs, ((Number) obj).intValue(), map);
     }
 
+    @Override
     protected Ref getRefInternal(Object obj, Map map, Joins joins)
         throws SQLException {
         return _dict.getRef(_rs, ((Number) obj).intValue(), map);
     }
 
+    @Override
     protected short getShortInternal(Object obj, Joins joins)
         throws SQLException {
         return _dict.getShort(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected String getStringInternal(Object obj, Joins joins, boolean isClobString)
         throws SQLException {
         if (isClobString) {
@@ -479,22 +512,26 @@ public class ResultSetResult
         return _dict.getString(_rs, ((Number) obj).intValue());
     }
 
+    @Override
     protected Time getTimeInternal(Object obj, Calendar cal, Joins joins)
         throws SQLException {
         return _dict.getTime(_rs, ((Number) obj).intValue(), cal);
     }
 
+    @Override
     protected Timestamp getTimestampInternal(Object obj, Calendar cal,
         Joins joins)
         throws SQLException {
         return _dict.getTimestamp(_rs, ((Number) obj).intValue(), cal);
     }
 
+    @Override
     public boolean wasNull()
         throws SQLException {
         return _rs.wasNull();
     }
 
+    @Override
     protected Object translate(Object obj, Joins joins)
         throws SQLException {
         if (obj instanceof Number)
@@ -518,6 +555,7 @@ public class ResultSetResult
         }
     }
 
+    @Override
     protected InputStream getLOBStreamInternal(JDBCStore store, Object obj,
         Joins joins) throws SQLException {
         return _dict.getLOBStream(store, _rs, ((Number) obj).intValue());
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Row.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Row.java
index 1187e4ebb..329379942 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Row.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Row.java
@@ -52,54 +52,54 @@ public interface Row {
      * Symbolic constant reserved for situations when a row operation
      * is unknown.
      */
-    public static final int ACTION_UNKNOWN = -1;
+    int ACTION_UNKNOWN = -1;
 
     /**
      * Mark the row for update.
      */
-    public static final int ACTION_UPDATE = 0;
+    int ACTION_UPDATE = 0;
 
     /**
      * Mark the row for inserttion.
      */
-    public static final int ACTION_INSERT = 1;
+    int ACTION_INSERT = 1;
 
     /**
      * Mark the row for deletion.
      */
-    public static final int ACTION_DELETE = 2;
+    int ACTION_DELETE = 2;
 
     /**
      * Return the table for this row.
      */
-    public Table getTable();
+    Table getTable();
 
     /**
      * Return the action for this row.
      */
-    public int getAction();
+    int getAction();
 
     /**
      * Return the failed object to include in optimistic lock exceptions.
      */
-    public Object getFailedObject();
+    Object getFailedObject();
 
     /**
      * Set the failed object to include in the optimistic lock exception
      * that will be thrown if this update results in an update count of 0
      * when executed. Leave null to avoid checking the update count.
      */
-    public void setFailedObject(Object failed);
+    void setFailedObject(Object failed);
 
     /**
      * Whether this row has information set on it.
      */
-    public boolean isValid();
+    boolean isValid();
 
     /**
      * Whether this row has information set on it.
      */
-    public void setValid(boolean valid);
+    void setValid(boolean valid);
 
     /**
      * Return the instance that controls this row. The
@@ -107,12 +107,12 @@ public interface Row {
      * to know the owning instance, nor does this row's table have to have
      * an actual primary key.
      */
-    public OpenJPAStateManager getPrimaryKey();
+    OpenJPAStateManager getPrimaryKey();
 
     /**
      * Set the primary key to represent the given object.
      */
-    public void setPrimaryKey(OpenJPAStateManager sm)
+    void setPrimaryKey(OpenJPAStateManager sm)
         throws SQLException;
 
     /**
@@ -120,13 +120,13 @@ public interface Row {
      *
      * @param io information on which columns are settable; may be null
      */
-    public void setPrimaryKey(ColumnIO io, OpenJPAStateManager sm)
+    void setPrimaryKey(ColumnIO io, OpenJPAStateManager sm)
         throws SQLException;
 
     /**
      * Set the primary key equality criteria for this row.
      */
-    public void wherePrimaryKey(OpenJPAStateManager sm)
+    void wherePrimaryKey(OpenJPAStateManager sm)
         throws SQLException;
 
     /**
@@ -134,7 +134,7 @@ public interface Row {
      * If the related type uses table-per-class mappings, the foreign key may
      * be targeted at an independent superclass table.
      */
-    public void setForeignKey(ForeignKey fk, OpenJPAStateManager sm)
+    void setForeignKey(ForeignKey fk, OpenJPAStateManager sm)
         throws SQLException;
 
     /**
@@ -144,7 +144,7 @@ public interface Row {
      *
      * @param io information on which columns are settable; may be null
      */
-    public void setForeignKey(ForeignKey fk, ColumnIO io,
+    void setForeignKey(ForeignKey fk, ColumnIO io,
         OpenJPAStateManager sm)
         throws SQLException;
 
@@ -153,133 +153,133 @@ public interface Row {
      * If the related type uses table-per-class mappings, the foreign key may
      * be targeted at an independent superclass table.
      */
-    public void whereForeignKey(ForeignKey fk, OpenJPAStateManager sm)
+    void whereForeignKey(ForeignKey fk, OpenJPAStateManager sm)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setArray(Column col, Array val)
+    void setArray(Column col, Array val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setAsciiStream(Column col, InputStream val, int length)
+    void setAsciiStream(Column col, InputStream val, int length)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setBigDecimal(Column col, BigDecimal val)
+    void setBigDecimal(Column col, BigDecimal val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setBigInteger(Column col, BigInteger val)
+    void setBigInteger(Column col, BigInteger val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setBinaryStream(Column col, InputStream val, int length)
+    void setBinaryStream(Column col, InputStream val, int length)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setBlob(Column col, Blob val)
+    void setBlob(Column col, Blob val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setBoolean(Column col, boolean val)
+    void setBoolean(Column col, boolean val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setByte(Column col, byte val)
+    void setByte(Column col, byte val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setBytes(Column col, byte[] val)
+    void setBytes(Column col, byte[] val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setCalendar(Column col, Calendar val)
+    void setCalendar(Column col, Calendar val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setChar(Column col, char val)
+    void setChar(Column col, char val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setCharacterStream(Column col, Reader val, int length)
+    void setCharacterStream(Column col, Reader val, int length)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setClob(Column col, Clob val)
+    void setClob(Column col, Clob val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setDate(Column col, Date val)
+    void setDate(Column col, Date val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setDate(Column col, java.sql.Date val, Calendar cal)
+    void setDate(Column col, java.sql.Date val, Calendar cal)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setDouble(Column col, double val)
+    void setDouble(Column col, double val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setFloat(Column col, float val)
+    void setFloat(Column col, float val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setInt(Column col, int val)
+    void setInt(Column col, int val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setLong(Column col, long val)
+    void setLong(Column col, long val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setLocale(Column col, Locale val)
+    void setLocale(Column col, Locale val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setNull(Column col)
+    void setNull(Column col)
         throws SQLException;
 
     /**
@@ -288,13 +288,13 @@ public interface Row {
      * @param overrideDefault whether to set this column to null even if this
      * is an insert and the column has a default
      */
-    public void setNull(Column col, boolean overrideDefault)
+    void setNull(Column col, boolean overrideDefault)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setNumber(Column col, Number val)
+    void setNumber(Column col, Number val)
         throws SQLException;
 
     /**
@@ -303,14 +303,14 @@ public interface Row {
      * @param col the column being set
      * @param val the value for the column
      */
-    public void setObject(Column col, Object val)
+    void setObject(Column col, Object val)
         throws SQLException;
 
     /**
      * Set a DB understood value for the given column.
      * The value will not be parameterized and instead be inserted as raw SQL.
      */
-    public void setRaw(Column col, String value)
+    void setRaw(Column col, String value)
         throws SQLException;
 
     /**
@@ -321,164 +321,164 @@ public interface Row {
      * require an insert if the instance uses auto-increment) before it is
      * serialized.
      */
-    public void setRelationId(Column col, OpenJPAStateManager sm,
+    void setRelationId(Column col, OpenJPAStateManager sm,
         RelationId rel)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setShort(Column col, short val)
+    void setShort(Column col, short val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setString(Column col, String val)
+    void setString(Column col, String val)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setTime(Column col, Time val, Calendar cal)
+    void setTime(Column col, Time val, Calendar cal)
         throws SQLException;
 
     /**
      * Set the value of the given column in this row.
      */
-    public void setTimestamp(Column col, Timestamp val, Calendar cal)
+    void setTimestamp(Column col, Timestamp val, Calendar cal)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereArray(Column col, Array val)
+    void whereArray(Column col, Array val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereAsciiStream(Column col, InputStream val, int length)
+    void whereAsciiStream(Column col, InputStream val, int length)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereBigDecimal(Column col, BigDecimal val)
+    void whereBigDecimal(Column col, BigDecimal val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereBigInteger(Column col, BigInteger val)
+    void whereBigInteger(Column col, BigInteger val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereBinaryStream(Column col, InputStream val, int length)
+    void whereBinaryStream(Column col, InputStream val, int length)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereBlob(Column col, Blob val)
+    void whereBlob(Column col, Blob val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereBoolean(Column col, boolean val)
+    void whereBoolean(Column col, boolean val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereByte(Column col, byte val)
+    void whereByte(Column col, byte val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereBytes(Column col, byte[] val)
+    void whereBytes(Column col, byte[] val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereCalendar(Column col, Calendar val)
+    void whereCalendar(Column col, Calendar val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereChar(Column col, char val)
+    void whereChar(Column col, char val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereCharacterStream(Column col, Reader val, int length)
+    void whereCharacterStream(Column col, Reader val, int length)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereClob(Column col, Clob val)
+    void whereClob(Column col, Clob val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereDate(Column col, Date val)
+    void whereDate(Column col, Date val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereDate(Column col, java.sql.Date val, Calendar cal)
+    void whereDate(Column col, java.sql.Date val, Calendar cal)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereDouble(Column col, double val)
+    void whereDouble(Column col, double val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereFloat(Column col, float val)
+    void whereFloat(Column col, float val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereInt(Column col, int val)
+    void whereInt(Column col, int val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereLong(Column col, long val)
+    void whereLong(Column col, long val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereLocale(Column col, Locale val)
+    void whereLocale(Column col, Locale val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereNull(Column col)
+    void whereNull(Column col)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereNumber(Column col, Number val)
+    void whereNumber(Column col, Number val)
         throws SQLException;
 
     /**
@@ -487,37 +487,37 @@ public interface Row {
      * @param col the column being set
      * @param val the value for the column
      */
-    public void whereObject(Column col, Object val)
+    void whereObject(Column col, Object val)
         throws SQLException;
 
     /**
      * Set a DB understood where condition for the given column.
      * The value will not be parameterized and instead be inserted as raw SQL.
      */
-    public void whereRaw(Column col, String value)
+    void whereRaw(Column col, String value)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereShort(Column col, short val)
+    void whereShort(Column col, short val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereString(Column col, String val)
+    void whereString(Column col, String val)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereTime(Column col, Time val, Calendar cal)
+    void whereTime(Column col, Time val, Calendar cal)
         throws SQLException;
 
     /**
      * Set an equality condition on the value of the given column in this row.
      */
-    public void whereTimestamp(Column col, Timestamp val, Calendar cal)
+    void whereTimestamp(Column col, Timestamp val, Calendar cal)
         throws SQLException;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java
index c29fb999c..8fa87de52 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java
@@ -94,6 +94,7 @@ public class RowImpl
         _types = new int[len];
     }
 
+    @Override
     public Table getTable() {
         return _cols[0].getTable();
     }
@@ -102,14 +103,17 @@ public class RowImpl
         return _cols;
     }
 
+    @Override
     public int getAction() {
         return _action;
     }
 
+    @Override
     public boolean isValid() {
         return (flags & VALID) != 0;
     }
 
+    @Override
     public void setValid(boolean valid) {
         if (valid)
             flags |= VALID;
@@ -120,6 +124,7 @@ public class RowImpl
     /**
      * This implementation does not track primary keys.
      */
+    @Override
     public OpenJPAStateManager getPrimaryKey() {
         return null;
     }
@@ -127,6 +132,7 @@ public class RowImpl
     /**
      * This implementation does not track failed objects.
      */
+    @Override
     public Object getFailedObject() {
         return null;
     }
@@ -134,6 +140,7 @@ public class RowImpl
     /**
      * This implementation does not track failed objects.
      */
+    @Override
     public void setFailedObject(Object failed) {
         throw new InternalException();
     }
@@ -159,16 +166,19 @@ public class RowImpl
         return _vals[getWhereIndex(col)];
     }
 
+    @Override
     public void setPrimaryKey(OpenJPAStateManager sm)
         throws SQLException {
         setPrimaryKey(null, sm);
     }
 
+    @Override
     public void setPrimaryKey(ColumnIO io, OpenJPAStateManager sm)
         throws SQLException {
         flushPrimaryKey(sm, io, true);
     }
 
+    @Override
     public void wherePrimaryKey(OpenJPAStateManager sm)
         throws SQLException {
         flushPrimaryKey(sm, null, false);
@@ -188,17 +198,20 @@ public class RowImpl
         flushJoinValues(sm, oid, cols, cols, io, set);
     }
 
+    @Override
     public void setForeignKey(ForeignKey fk, OpenJPAStateManager sm)
         throws SQLException {
         setForeignKey(fk, null, sm);
     }
 
+    @Override
     public void setForeignKey(ForeignKey fk, ColumnIO io,
         OpenJPAStateManager sm)
         throws SQLException {
         flushForeignKey(fk, io, sm, true);
     }
 
+    @Override
     public void whereForeignKey(ForeignKey fk, OpenJPAStateManager sm)
         throws SQLException {
         flushForeignKey(fk, null, sm, false);
@@ -361,6 +374,7 @@ public class RowImpl
         return true;
     }
 
+    @Override
     public void setRelationId(Column col, OpenJPAStateManager sm,
         RelationId rel)
         throws SQLException {
@@ -377,80 +391,95 @@ public class RowImpl
         _vals[getSetIndex(col)] = null;
     }
 
+    @Override
     public void setArray(Column col, Array val)
         throws SQLException {
-        setObject(col, val, JavaSQLTypes.ARRAY, false);
+        setObject(col, val, JavaTypes.ARRAY, false);
     }
 
+    @Override
     public void setAsciiStream(Column col, InputStream val, int length)
         throws SQLException {
         setObject(col, (val == null) ? null : new Sized(val, length),
             JavaSQLTypes.ASCII_STREAM, false);
     }
 
+    @Override
     public void setBigDecimal(Column col, BigDecimal val)
         throws SQLException {
         setObject(col, val, JavaTypes.BIGDECIMAL, false);
     }
 
+    @Override
     public void setBigInteger(Column col, BigInteger val)
         throws SQLException {
         setObject(col, val, JavaTypes.BIGINTEGER, false);
     }
 
+    @Override
     public void setBinaryStream(Column col, InputStream val, int length)
         throws SQLException {
         setObject(col, (val == null) ? null : new Sized(val, length),
             JavaSQLTypes.BINARY_STREAM, false);
     }
 
+    @Override
     public void setBlob(Column col, Blob val)
         throws SQLException {
         setObject(col, val, JavaSQLTypes.BLOB, false);
     }
 
+    @Override
     public void setBoolean(Column col, boolean val)
         throws SQLException {
         setObject(col, ((val) ? Boolean.TRUE : Boolean.FALSE),
             JavaTypes.BOOLEAN, false);
     }
 
+    @Override
     public void setByte(Column col, byte val)
         throws SQLException {
         setObject(col, new Byte(val), JavaTypes.BYTE, false);
     }
 
+    @Override
     public void setBytes(Column col, byte[] val)
         throws SQLException {
         setObject(col, val, JavaSQLTypes.BYTES, false);
     }
 
+    @Override
     public void setCalendar(Column col, Calendar val)
         throws SQLException {
         setObject(col, val, JavaTypes.CALENDAR, false);
     }
 
+    @Override
     public void setChar(Column col, char val)
         throws SQLException {
         setObject(col, new Character(val), JavaTypes.CHAR, false);
     }
 
+    @Override
     public void setCharacterStream(Column col, Reader val, int length)
         throws SQLException {
         setObject(col, (val == null) ? null : new Sized(val, length),
             JavaSQLTypes.CHAR_STREAM, false);
     }
 
+    @Override
     public void setClob(Column col, Clob val)
         throws SQLException {
         setObject(col, val, JavaSQLTypes.CLOB, false);
     }
 
+    @Override
     public void setDate(Column col, Date val)
         throws SQLException {
         setObject(col, val, JavaTypes.DATE, false);
     }
 
+    @Override
     public void setDate(Column col, java.sql.Date val, Calendar cal)
         throws SQLException {
         Object obj;
@@ -461,61 +490,73 @@ public class RowImpl
         setObject(col, obj, JavaSQLTypes.SQL_DATE, false);
     }
 
+    @Override
     public void setDouble(Column col, double val)
         throws SQLException {
         setObject(col, new Double(val), JavaTypes.DOUBLE, false);
     }
 
+    @Override
     public void setFloat(Column col, float val)
         throws SQLException {
         setObject(col, new Float(val), JavaTypes.FLOAT, false);
     }
 
+    @Override
     public void setInt(Column col, int val)
         throws SQLException {
         setObject(col, val, JavaTypes.INT, false);
     }
 
+    @Override
     public void setLong(Column col, long val)
         throws SQLException {
         setObject(col, val, JavaTypes.LONG, false);
     }
 
+    @Override
     public void setLocale(Column col, Locale val)
         throws SQLException {
         setObject(col, val, JavaTypes.LOCALE, false);
     }
 
+    @Override
     public void setNull(Column col)
         throws SQLException {
         setNull(col, false);
     }
 
+    @Override
     public void setNull(Column col, boolean overrideDefault)
         throws SQLException {
         setObject(col, null, col.getJavaType(), overrideDefault);
     }
 
+    @Override
     public void setNumber(Column col, Number val)
         throws SQLException {
         setObject(col, val, JavaTypes.NUMBER, false);
     }
 
+    @Override
     public void setRaw(Column col, String val)
         throws SQLException {
         setObject(col, val, RAW, false);
     }
 
+    @Override
     public void setShort(Column col, short val)
         throws SQLException {
         setObject(col, new Short(val), JavaTypes.SHORT, false);
     }
 
+    @Override
     public void setString(Column col, String val)
         throws SQLException {
         setObject(col, val, JavaTypes.STRING, false);
     }
 
+    @Override
     public void setTime(Column col, Time val, Calendar cal)
         throws SQLException {
         Object obj;
@@ -526,6 +567,7 @@ public class RowImpl
         setObject(col, obj, JavaSQLTypes.TIME, false);
     }
 
+    @Override
     public void setTimestamp(Column col, Timestamp val, Calendar cal)
         throws SQLException {
         Object obj;
@@ -536,6 +578,7 @@ public class RowImpl
         setObject(col, obj, JavaSQLTypes.TIMESTAMP, false);
     }
 
+    @Override
     public void setObject(Column col, Object val)
         throws SQLException {
         if (val instanceof Raw)
@@ -544,80 +587,95 @@ public class RowImpl
             setObject(col, val, col.getJavaType(), false);
     }
 
+    @Override
     public void whereArray(Column col, Array val)
         throws SQLException {
         whereObject(col, val, JavaSQLTypes.SQL_ARRAY);
     }
 
+    @Override
     public void whereAsciiStream(Column col, InputStream val, int length)
         throws SQLException {
         whereObject(col, (val == null) ? null : new Sized(val, length),
             JavaSQLTypes.ASCII_STREAM);
     }
 
+    @Override
     public void whereBigDecimal(Column col, BigDecimal val)
         throws SQLException {
         whereObject(col, val, JavaTypes.BIGDECIMAL);
     }
 
+    @Override
     public void whereBigInteger(Column col, BigInteger val)
         throws SQLException {
         whereObject(col, val, JavaTypes.BIGINTEGER);
     }
 
+    @Override
     public void whereBinaryStream(Column col, InputStream val, int length)
         throws SQLException {
         whereObject(col, (val == null) ? null : new Sized(val, length),
             JavaSQLTypes.BINARY_STREAM);
     }
 
+    @Override
     public void whereBlob(Column col, Blob val)
         throws SQLException {
         whereObject(col, val, JavaSQLTypes.BLOB);
     }
 
+    @Override
     public void whereBoolean(Column col, boolean val)
         throws SQLException {
         whereObject(col, ((val) ? Boolean.TRUE : Boolean.FALSE),
             JavaTypes.BOOLEAN);
     }
 
+    @Override
     public void whereByte(Column col, byte val)
         throws SQLException {
         whereObject(col, new Byte(val), JavaTypes.BYTE);
     }
 
+    @Override
     public void whereBytes(Column col, byte[] val)
         throws SQLException {
         whereObject(col, val, JavaSQLTypes.BYTES);
     }
 
+    @Override
     public void whereCalendar(Column col, Calendar val)
         throws SQLException {
         whereObject(col, val, JavaTypes.CALENDAR);
     }
 
+    @Override
     public void whereChar(Column col, char val)
         throws SQLException {
         whereObject(col, new Character(val), JavaTypes.CHAR);
     }
 
+    @Override
     public void whereCharacterStream(Column col, Reader val, int length)
         throws SQLException {
         whereObject(col, (val == null) ? null : new Sized(val, length),
             JavaSQLTypes.CHAR_STREAM);
     }
 
+    @Override
     public void whereClob(Column col, Clob val)
         throws SQLException {
         whereObject(col, val, JavaSQLTypes.CLOB);
     }
 
+    @Override
     public void whereDate(Column col, Date val)
         throws SQLException {
         whereObject(col, val, JavaTypes.DATE);
     }
 
+    @Override
     public void whereDate(Column col, java.sql.Date val, Calendar cal)
         throws SQLException {
         Object obj;
@@ -628,56 +686,67 @@ public class RowImpl
         whereObject(col, obj, JavaSQLTypes.SQL_DATE);
     }
 
+    @Override
     public void whereDouble(Column col, double val)
         throws SQLException {
         whereObject(col, new Double(val), JavaTypes.DOUBLE);
     }
 
+    @Override
     public void whereFloat(Column col, float val)
         throws SQLException {
         whereObject(col, new Float(val), JavaTypes.FLOAT);
     }
 
+    @Override
     public void whereInt(Column col, int val)
         throws SQLException {
         whereObject(col, val, JavaTypes.INT);
     }
 
+    @Override
     public void whereLong(Column col, long val)
         throws SQLException {
         whereObject(col, val, JavaTypes.LONG);
     }
 
+    @Override
     public void whereLocale(Column col, Locale val)
         throws SQLException {
         whereObject(col, val, JavaTypes.LOCALE);
     }
 
+    @Override
     public void whereNull(Column col)
         throws SQLException {
         whereObject(col, null, col.getJavaType());
     }
 
+    @Override
     public void whereNumber(Column col, Number val)
         throws SQLException {
         whereObject(col, val, JavaTypes.NUMBER);
     }
 
+    @Override
     public void whereRaw(Column col, String val)
         throws SQLException {
         whereObject(col, val, RAW);
     }
 
+    @Override
     public void whereShort(Column col, short val)
         throws SQLException {
         whereObject(col, new Short(val), JavaTypes.SHORT);
     }
 
+    @Override
     public void whereString(Column col, String val)
         throws SQLException {
         whereObject(col, val, JavaTypes.STRING);
     }
 
+    @Override
     public void whereTime(Column col, Time val, Calendar cal)
         throws SQLException {
         Object obj;
@@ -688,6 +757,7 @@ public class RowImpl
         whereObject(col, obj, JavaSQLTypes.TIME);
     }
 
+    @Override
     public void whereTimestamp(Column col, Timestamp val, Calendar cal)
         throws SQLException {
         Object obj;
@@ -698,6 +768,7 @@ public class RowImpl
         whereObject(col, obj, JavaSQLTypes.TIMESTAMP);
     }
 
+    @Override
     public void whereObject(Column col, Object val)
         throws SQLException {
         if (val instanceof Raw)
@@ -951,6 +1022,7 @@ public class RowImpl
     /**
      * Performs a proper deep clone.
      */
+    @Override
     public Object clone() {
         RowImpl clone = newInstance(getColumns(), getAction());
         copyInto(clone, false);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManager.java
index ee5956493..86a894c62 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManager.java
@@ -37,7 +37,7 @@ public interface RowManager {
      * The action must be one of {@link Row#ACTION_INSERT},
      * {@link Row#ACTION_UPDATE}, {@link Row#ACTION_DELETE}.
      */
-    public Row getRow(Table table, int action, OpenJPAStateManager sm,
+    Row getRow(Table table, int action, OpenJPAStateManager sm,
         boolean create);
 
     /**
@@ -50,13 +50,13 @@ public interface RowManager {
      * row does not have restrict-action foreign keys. Otherwise use both
      * a delete and then an insert to perform the update.
      */
-    public Row getSecondaryRow(Table table, int action);
+    Row getSecondaryRow(Table table, int action);
 
     /**
      * Flush the secondary row; after flushing the row is available for reuse.
      * It will retain all previously set values.
      */
-    public void flushSecondaryRow(Row row)
+    void flushSecondaryRow(Row row)
         throws SQLException;
 
     /**
@@ -64,11 +64,11 @@ public interface RowManager {
      * all rows of the given table. The action must be one of
      * {@link Row#ACTION_UPDATE}, {@link Row#ACTION_DELETE}.
      */
-    public Row getAllRows(Table table, int action);
+    Row getAllRows(Table table, int action);
 
     /**
      * Flush the logical row.
      */
-    public void flushAllRows(Row row)
+    void flushAllRows(Row row)
         throws SQLException;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java
index 7ab8caa54..c5f473885 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowManagerImpl.java
@@ -65,7 +65,7 @@ public class RowManagerImpl
      * @param order whether to keep track of the order in which rows are added
      */
     public RowManagerImpl(boolean order) {
-        _primaryOrder = (order) ? new ArrayList<PrimaryRow>() : null;
+        _primaryOrder = (order) ? new ArrayList<>() : null;
     }
 
     /**
@@ -173,10 +173,12 @@ public class RowManagerImpl
 
     }
 
+    @Override
     public Row getSecondaryRow(Table table, int action) {
         return new SecondaryRow(table, action);
     }
 
+    @Override
     public void flushSecondaryRow(Row row)
         throws SQLException {
         if (!row.isValid())
@@ -185,19 +187,21 @@ public class RowManagerImpl
         SecondaryRow srow = (SecondaryRow) row;
         if (srow.getAction() == Row.ACTION_DELETE) {
             if (_secondaryDeletes == null)
-                _secondaryDeletes = new ArrayList<SecondaryRow>();
+                _secondaryDeletes = new ArrayList<>();
             _secondaryDeletes.add((SecondaryRow) srow.clone());
         } else {
             if (_secondaryUpdates == null)
-                _secondaryUpdates = new ArrayList<SecondaryRow>();
+                _secondaryUpdates = new ArrayList<>();
             _secondaryUpdates.add((SecondaryRow) srow.clone());
         }
     }
 
+    @Override
     public Row getAllRows(Table table, int action) {
         return new RowImpl(table, action);
     }
 
+    @Override
     public void flushAllRows(Row row) {
         if (!row.isValid())
             return;
@@ -205,12 +209,12 @@ public class RowManagerImpl
         switch (row.getAction()) {
             case Row.ACTION_UPDATE:
                 if (_allRowUpdates == null)
-                    _allRowUpdates = new ArrayList<Row>();
+                    _allRowUpdates = new ArrayList<>();
                 _allRowUpdates.add(row);
                 break;
             case Row.ACTION_DELETE:
                 if (_allRowDeletes == null)
-                    _allRowDeletes = new ArrayList<Row>();
+                    _allRowDeletes = new ArrayList<>();
                 _allRowDeletes.add(row);
                 break;
             default:
@@ -218,6 +222,7 @@ public class RowManagerImpl
         }
     }
 
+    @Override
     public Row getRow(Table table, int action, OpenJPAStateManager sm,
         boolean create) {
         if (sm == null)
@@ -231,15 +236,15 @@ public class RowManagerImpl
         Map<Key, PrimaryRow> map;
         if (action == Row.ACTION_DELETE) {
             if (_deletes == null && create)
-                _deletes = new LinkedHashMap<Key, PrimaryRow>();
+                _deletes = new LinkedHashMap<>();
             map = _deletes;
         } else if (action == Row.ACTION_INSERT) {
             if (_inserts == null && create)
-                _inserts = new LinkedHashMap<Key, PrimaryRow>();
+                _inserts = new LinkedHashMap<>();
             map = _inserts;
         } else {
             if (_updates == null && create)
-                _updates = new LinkedHashMap<Key, PrimaryRow>();
+                _updates = new LinkedHashMap<>();
             map = _updates;
         }
         if (map == null)
@@ -278,10 +283,12 @@ public class RowManagerImpl
             this.sm = sm;
         }
 
+        @Override
         public int hashCode() {
             return ((table == null) ? 0  : table.hashCode()) + ((sm == null) ? 0  : sm.hashCode()) % Integer.MAX_VALUE;
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == null)
                 return false;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
index 115a17742..645145f27 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
@@ -28,8 +28,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-
 import java.util.Objects;
+
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.exps.CollectionParam;
@@ -57,6 +57,9 @@ import org.apache.openjpa.kernel.exps.Parameter;
 public final class SQLBuffer
     implements Serializable, Cloneable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final String PARAMETER_TOKEN = "?";
 
     private final DBDictionary _dict;
@@ -88,6 +91,7 @@ public final class SQLBuffer
     /**
      * Perform a shallow clone of this SQL Buffer.
      */
+    @Override
     public Object clone() {
         return new SQLBuffer(this);
     }
@@ -609,6 +613,7 @@ public final class SQLBuffer
         }
     }
 
+    @Override
     public int hashCode() {
         int hash = _sql.hashCode();
         return (_params == null) ? hash : hash ^ _params.hashCode();
@@ -622,6 +627,7 @@ public final class SQLBuffer
         return _sql.toString().equals(sql);
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java
index 40fe4074f..ae8217ea7 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java
@@ -27,11 +27,10 @@ import java.util.Map;
 
 import javax.xml.parsers.DocumentBuilder;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.xml.XMLFactory;
 import org.apache.openjpa.util.StoreException;
 import org.w3c.dom.Document;
@@ -51,7 +50,7 @@ public class SQLErrorCodeReader {
 	private Log log = null;
 	public static final String ERROR_CODE_DELIMITER = ",";
 	public static final Map<String, Integer> storeErrorTypes =
-		new HashMap<String, Integer>();
+		new HashMap<>();
 	static {
 		storeErrorTypes.put("lock", StoreException.LOCK);
         storeErrorTypes.put("object-exists", StoreException.OBJECT_EXISTS);
@@ -67,7 +66,7 @@ public class SQLErrorCodeReader {
 		Localizer.forPackage(SQLErrorCodeReader.class);
 
 	public List<String> getDictionaries(InputStream in) {
-		List<String> result = new ArrayList<String>();
+		List<String> result = new ArrayList<>();
 		DocumentBuilder builder = XMLFactory.getDOMParser(false, false);
 		try {
 			Document doc = builder.parse(in);
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLExceptions.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLExceptions.java
index dbbe0482f..a0101d171 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLExceptions.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLExceptions.java
@@ -147,7 +147,7 @@ public class SQLExceptions {
         if (se == null)
             return EMPTY_EXCEPS;
 
-        List<SQLException> errs = new LinkedList<SQLException>();
+        List<SQLException> errs = new LinkedList<>();
         while (se != null && !errs.contains(se)) {
             errs.add(se);
             se = se.getNextException();
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLFactory.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLFactory.java
index 2ca2af9e0..c51918a09 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLFactory.java
@@ -28,19 +28,19 @@ public interface SQLFactory {
     /**
      * Select factory.
      */
-    public Select newSelect();
+    Select newSelect();
 
     /**
      * Union factory.
      *
      * @param selects the number of selects in the union
      */
-    public Union newUnion(int selects);
+    Union newUnion(int selects);
 
     /**
      * Union factory.
      *
      * @param selects the members of the union
      */
-    public Union newUnion(Select[] selects);
+    Union newUnion(Select[] selects);
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLFactoryImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLFactoryImpl.java
index e935b7abb..c602b1908 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLFactoryImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLFactoryImpl.java
@@ -39,25 +39,31 @@ public class SQLFactoryImpl
         return _conf;
     }
 
+    @Override
     public Select newSelect() {
         return new SelectImpl(_conf);
     }
 
+    @Override
     public Union newUnion(int selects) {
         return new LogicalUnion(_conf, selects);
     }
 
+    @Override
     public Union newUnion(Select[] selects) {
         return new LogicalUnion(_conf, selects);
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (JDBCConfiguration) conf;
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java
index be3ca5293..ab7e47cfa 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java
@@ -65,6 +65,7 @@ public class SQLServerDictionary extends AbstractSQLServerDictionary {
         stringLengthFunction = "LEN({0})";
     }
 
+    @Override
     public void connectedConfiguration(Connection conn) throws SQLException {
         super.connectedConfiguration(conn);
         boolean requiresWarnings = true;
@@ -152,6 +153,7 @@ public class SQLServerDictionary extends AbstractSQLServerDictionary {
             log.warn(_loc.get("sqlserver-cachedstmnts"));
     }
 
+    @Override
     public Column[] getColumns(DatabaseMetaData meta, String catalog,
         String schemaName, String tableName, String columnName, Connection conn)
         throws SQLException {
@@ -162,6 +164,7 @@ public class SQLServerDictionary extends AbstractSQLServerDictionary {
             conn);
     }
 
+    @Override
     public Column[] getColumns(DatabaseMetaData meta, DBIdentifier catalog,
         DBIdentifier schemaName, DBIdentifier tableName, DBIdentifier columnName, Connection conn)
         throws SQLException {
@@ -191,6 +194,7 @@ public class SQLServerDictionary extends AbstractSQLServerDictionary {
         return cols;
     }
 
+    @Override
     protected void appendLength(SQLBuffer buf, int type) {
         if (type == Types.VARCHAR)
             buf.append("(").append(Integer.toString(characterColumnSize))
@@ -208,6 +212,7 @@ public class SQLServerDictionary extends AbstractSQLServerDictionary {
      * @param lhsxml indicates whether the left operand maps to xml
      * @param rhsxml indicates whether the right operand maps to xml
      */
+    @Override
     public void appendXmlComparison(SQLBuffer buf, String op, FilterValue lhs,
         FilterValue rhs, boolean lhsxml, boolean rhsxml) {
         super.appendXmlComparison(buf, op, lhs, rhs, lhsxml, rhsxml);
@@ -283,6 +288,7 @@ public class SQLServerDictionary extends AbstractSQLServerDictionary {
     /**
      * Return DB specific schemaCase
      */
+    @Override
     public String getSchemaCase() {
         return schemaCase;
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SecondaryRow.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SecondaryRow.java
index 5b02d6a59..47bf3aacc 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SecondaryRow.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SecondaryRow.java
@@ -52,11 +52,13 @@ public class SecondaryRow
         super(cols, action);
     }
 
+    @Override
     public void setForeignKey(ForeignKey fk, OpenJPAStateManager sm)
         throws SQLException {
         setForeignKey(fk, null, sm);
     }
 
+    @Override
     public void setForeignKey(ForeignKey fk, ColumnIO io,
         OpenJPAStateManager sm)
         throws SQLException {
@@ -97,6 +99,7 @@ public class SecondaryRow
             && sm != null && sm.isNew() && !sm.isFlushed();
     }
 
+    @Override
     public void setRelationId(Column col, OpenJPAStateManager sm,
         RelationId rel)
         throws SQLException {
@@ -142,6 +145,7 @@ public class SecondaryRow
         return false;
     }
 
+    @Override
     protected String generateSQL(DBDictionary dict) {
         try {
             if (_fks != null) {
@@ -167,10 +171,12 @@ public class SecondaryRow
         return super.generateSQL(dict);
     }
 
+    @Override
     protected RowImpl newInstance(Column[] cols, int action) {
         return new SecondaryRow(cols, action);
     }
 
+    @Override
     public void copyInto(RowImpl row, boolean whereOnly) {
         super.copyInto(row, whereOnly);
         if (_fks == null || whereOnly || row.getAction() == ACTION_DELETE
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Select.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Select.java
index 84587e991..c8c92be30 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Select.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Select.java
@@ -29,8 +29,8 @@ import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
 import org.apache.openjpa.jdbc.schema.Table;
-import org.apache.openjpa.kernel.exps.Value;
 import org.apache.openjpa.kernel.exps.Context;
+import org.apache.openjpa.kernel.exps.Value;
 
 /**
  * Abstraction of a SQL SELECT statement.
@@ -43,113 +43,113 @@ public interface Select
     /**
      * Constant indicating to batch the select using an inner join.
      */
-    public static final int EAGER_INNER = 0;
+    int EAGER_INNER = 0;
 
     /**
      * Constant indicating to batch the select using an outer join.
      */
-    public static final int EAGER_OUTER = 1;
+    int EAGER_OUTER = 1;
 
     /**
      * Constant indicating to use a separate select executed in parallel.
      */
-    public static final int EAGER_PARALLEL = 2;
+    int EAGER_PARALLEL = 2;
 
     /**
      * Constant indicating a select can be made without joins.
      */
-    public static final int TYPE_JOINLESS = 3;
+    int TYPE_JOINLESS = 3;
 
     /**
      * Constant indicating a two-part select and load.
      */
-    public static final int TYPE_TWO_PART = 4;
+    int TYPE_TWO_PART = 4;
 
     /**
      * Constant indicating to add conditions to the selcet to select this
      * class and joinable subclasses only.
      */
-    public static final int SUBS_JOINABLE = 1;
+    int SUBS_JOINABLE = 1;
 
     /**
      * Constant indicating to add conditions to the select to select this
      * class only.
      */
-    public static final int SUBS_NONE = 2;
+    int SUBS_NONE = 2;
 
     /**
      * Constant indicating to select subclasses but without adding any
      * class conditions to the select.
      */
-    public static final int SUBS_ANY_JOINABLE = 3;
+    int SUBS_ANY_JOINABLE = 3;
 
     /**
      * Constant indicating to select this class but without adding any
      * class conditions to the select.
      */
-    public static final int SUBS_EXACT = 4;
+    int SUBS_EXACT = 4;
 
     /**
      * The alias to use for the from select, if any.
      */
-    public static final String FROM_SELECT_ALIAS = "s";
+    String FROM_SELECT_ALIAS = "s";
 
     /**
      * The index of this select within the UNION, or 0.
      */
-    public int indexOf();
+    int indexOf();
 
     /**
      * Return this select's subselects, or empty collection if none.
      */
-    public List getSubselects();
+    List getSubselects();
 
     /**
      * Return the parent of this select, if it is a subselect.
      */
-    public Select getParent();
+    Select getParent();
 
     /**
      * Return the subselect path for this select, if it is a subselect.
      */
-    public String getSubselectPath();
+    String getSubselectPath();
 
     /**
      * Turn this select into a subselect of the given instance.
      */
-    public void setParent(Select parent, String path);
+    void setParent(Select parent, String path);
 
     /**
      * Another select instance that creates a temporary table from which
      * this select pulls data.
      */
-    public Select getFromSelect();
+    Select getFromSelect();
 
     /**
      * Another select instance that creates a temporary table from which
      * this select pulls data.
      */
-    public void setFromSelect(Select sel);
+    void setFromSelect(Select sel);
 
     /**
      * Whether this select has an eager join of the specified type.
      */
-    public boolean hasEagerJoin(boolean toMany);
+    boolean hasEagerJoin(boolean toMany);
 
     /**
      * Whether this select has a join of the specified type.
      */
-    public boolean hasJoin(boolean toMany);
+    boolean hasJoin(boolean toMany);
 
     /**
      * Return whether the given table is being used in this select.
      */
-    public boolean isSelected(Table table);
+    boolean isSelected(Table table);
 
     /**
      * Return the set of all used table aliases.
      */
-    public Collection getTableAliases();
+    Collection getTableAliases();
 
     /**
      * Return the actual {@link Val}s and {@link Column}s that were
@@ -157,14 +157,14 @@ public interface Select
      *
      * @since 1.1.0
      */
-    public List getSelects();
+    List getSelects();
 
     /**
      * Return the aliases of all selected columns and all selected buffers,
      * in the order they were selected. Each alias may be either a string
      * or a {@link SQLBuffer}.
      */
-    public List getSelectAliases();
+    List getSelectAliases();
 
     /**
      * Get the aliases for identifier columns that can be used in COUNT
@@ -172,109 +172,109 @@ public interface Select
      * string. If no identifier columns have been nominated, then all
      * column alises are returned.
      */
-    public List getIdentifierAliases();
+    List getIdentifierAliases();
 
     /**
      * Return the ordering SQL for this select.
      */
-    public SQLBuffer getOrdering();
+    SQLBuffer getOrdering();
 
     /**
      * Return the grouping SQL for this select.
      */
-    public SQLBuffer getGrouping();
+    SQLBuffer getGrouping();
 
     /**
      * Return the WHERE clause, minus any necessary end joins.
      */
-    public SQLBuffer getWhere();
+    SQLBuffer getWhere();
 
     /**
      * Return the HAVING clause, or null if none.
      */
-    public SQLBuffer getHaving();
+    SQLBuffer getHaving();
 
     /**
      * Apply class conditions from relation joins.  This may affect the return
      * values of {@link #getJoins}, {@link #getJoinIterator}, and
      * {@link #getWhere}.
      */
-    public void addJoinClassConditions();
+    void addJoinClassConditions();
 
     /**
      * Return the top-level joins for this select.
      */
-    public Joins getJoins();
+    Joins getJoins();
 
     /**
      * Return the top-level {@link Join} elements for this select.
      */
-    public Iterator getJoinIterator();
+    Iterator getJoinIterator();
 
     /**
      * The result start index.
      */
-    public long getStartIndex();
+    long getStartIndex();
 
     /**
      * The result end index.
      */
-    public long getEndIndex();
+    long getEndIndex();
 
     /**
      * Set the result range for this select.
      */
-    public void setRange(long start, long end);
+    void setRange(long start, long end);
 
     /**
      * Return the alias for the given column.
      */
-    public String getColumnAlias(Column col);
+    String getColumnAlias(Column col);
 
     /**
      * Return the alias for the given column.
      */
-    public String getColumnAlias(Column col, Joins joins);
+    String getColumnAlias(Column col, Joins joins);
 
     /**
      * Return the alias for the given column.
      */
-    public String getColumnAlias(String col, Table table);
+    String getColumnAlias(String col, Table table);
 
     /**
      * Return the alias for the given column.
      */
-    public String getColumnAlias(String col, Table table, Joins joins);
+    String getColumnAlias(String col, Table table, Joins joins);
 
     /**
      * Return true if this is an aggregate select.
      */
-    public boolean isAggregate();
+    boolean isAggregate();
 
     /**
      * Set to true for aggregate selects.
      */
-    public void setAggregate(boolean agg);
+    void setAggregate(boolean agg);
 
     /**
      * Return true if this select includes a LOB.
      */
-    public boolean isLob();
+    boolean isLob();
 
     /**
      * Set to true for selects that include LOB columns.
      */
-    public void setLob(boolean lob);
+    void setLob(boolean lob);
 
     /**
      * Clear the existing column selects.
      */
-    public void clearSelects();
+    void clearSelects();
 
     /**
      * Select the given SQL as a placeholder for a UNION element.
      */
-    public void selectPlaceholder(String sql);
+    void selectPlaceholder(String sql);
 
     /**
      * Select the given SQL; the given id object is an identifier
@@ -282,7 +282,7 @@ public interface Select
      *
      * @return true if selected
      */
-    public boolean select(SQLBuffer sql, Object id);
+    boolean select(SQLBuffer sql, Object id);
 
     /**
      * Select the given SQL; the given id object is an identifier
@@ -290,7 +290,7 @@ public interface Select
      *
      * @return true if selected
      */
-    public boolean select(SQLBuffer sql, Object id, Joins joins);
+    boolean select(SQLBuffer sql, Object id, Joins joins);
 
     /**
      * Select the given SQL; the given id object is an identifier
@@ -298,7 +298,7 @@ public interface Select
      *
      * @return true if selected
      */
-    public boolean select(String sql, Object id);
+    boolean select(String sql, Object id);
 
     /**
      * Select the given SQL; the given id object is an identifier
@@ -306,42 +306,42 @@ public interface Select
      *
      * @return true if selected
      */
-    public boolean select(String sql, Object id, Joins joins);
+    boolean select(String sql, Object id, Joins joins);
 
     /**
      * Select the given column.
      *
      * @return true if selected
      */
-    public boolean select(Column col);
+    boolean select(Column col);
 
     /**
      * Select the given column.
      *
      * @return true if selected
      */
-    public boolean select(Column col, Joins joins);
+    boolean select(Column col, Joins joins);
 
     /**
      * Select the given columns.
      *
      * @return bit set of indexes of columns that were selected
      */
-    public int select(Column[] cols);
+    int select(Column[] cols);
 
     /**
      * Select the given columns.
      *
      * @return bit set of indexes of columns that were selected
      */
-    public int select(Column[] cols, Joins joins);
+    int select(Column[] cols, Joins joins);
 
     /**
      * Select the columns of the given mapping, possibly including subclasses.
      * This method should be called after all where conditions are added in
      * case the given mapping batches other selects.
      */
-    public void select(ClassMapping mapping, int subclasses,
+    void select(ClassMapping mapping, int subclasses,
         JDBCStore store, JDBCFetchConfiguration fetch, int eager);
 
     /**
@@ -349,7 +349,7 @@ public interface Select
      * This method should be called after all where conditions are added in
      * case the given mapping batches other selects.
      */
-    public void select(ClassMapping mapping, int subclasses,
+    void select(ClassMapping mapping, int subclasses,
         JDBCStore store, JDBCFetchConfiguration fetch, int eager,
         Joins joins);
 
@@ -361,7 +361,7 @@ public interface Select
      *
      * @return true if selected
      */
-    public boolean selectIdentifier(Column col);
+    boolean selectIdentifier(Column col);
 
     /**
      * Select the given column as one that can be used to get a count of
@@ -371,7 +371,7 @@ public interface Select
      *
      * @return true if selected
      */
-    public boolean selectIdentifier(Column col, Joins joins);
+    boolean selectIdentifier(Column col, Joins joins);
 
     /**
      * Select the given columns as ones that can be used to get a count of
@@ -381,7 +381,7 @@ public interface Select
      *
      * @return bit set of indexes of columns that were selected
      */
-    public int selectIdentifier(Column[] cols);
+    int selectIdentifier(Column[] cols);
 
     /**
      * Select the given columns as ones that can be used to get a count of
@@ -391,7 +391,7 @@ public interface Select
      *
      * @return bit set of indexes of columns that were selected
      */
-    public int selectIdentifier(Column[] cols, Joins joins);
+    int selectIdentifier(Column[] cols, Joins joins);
 
     /**
      * Select the columns of the given mapping, possibly including subclasses.
@@ -402,7 +402,7 @@ public interface Select
      * when eagerly traversing the entire result of the select or when
      * not using an LRSSize setting of <code>count</code>.
      */
-    public void selectIdentifier(ClassMapping mapping, int subclasses,
+    void selectIdentifier(ClassMapping mapping, int subclasses,
         JDBCStore store, JDBCFetchConfiguration fetch, int eager);
 
     /**
@@ -414,7 +414,7 @@ public interface Select
      * when eagerly traversing the entire result of the select or when
      * not using an LRSSize setting of <code>count</code>.
      */
-    public void selectIdentifier(ClassMapping mapping, int subclasses,
+    void selectIdentifier(ClassMapping mapping, int subclasses,
         JDBCStore store, JDBCFetchConfiguration fetch, int eager,
         Joins joins);
 
@@ -425,7 +425,7 @@ public interface Select
      *
      * @return bit set of indexes of pk columns that were selected
      */
-    public int selectPrimaryKey(ClassMapping mapping);
+    int selectPrimaryKey(ClassMapping mapping);
 
     /**
      * Select the primary key columns of the given mapping, joining to
@@ -434,12 +434,12 @@ public interface Select
      *
      * @return bit set of indexes of pk columns that were selected
      */
-    public int selectPrimaryKey(ClassMapping mapping, Joins joins);
+    int selectPrimaryKey(ClassMapping mapping, Joins joins);
 
     /**
      * Clear odering conditions.
      */
-    public void clearOrdering();
+    void clearOrdering();
 
     /**
      * Order on the primary key columns of the given mapping,
@@ -447,7 +447,7 @@ public interface Select
      * construct an object id.
      * Optionally selects ordering data if not already selected.
      */
-    public int orderByPrimaryKey(ClassMapping mapping, boolean asc,
+    int orderByPrimaryKey(ClassMapping mapping, boolean asc,
         boolean sel);
 
     /**
@@ -456,59 +456,59 @@ public interface Select
      * construct an object id.
      * Optionally selects ordering data if not already selected.
      */
-    public int orderByPrimaryKey(ClassMapping mapping, boolean asc,
+    int orderByPrimaryKey(ClassMapping mapping, boolean asc,
         Joins joins, boolean sel);
 
     /**
      * Order by the given column.
      * Optionally selects ordering data if not already selected.
      */
-    public boolean orderBy(Column col, boolean asc, boolean sel);
+    boolean orderBy(Column col, boolean asc, boolean sel);
 
     /**
      * Order by the given column.
      * Optionally selects ordering data if not already selected.
      */
-    public boolean orderBy(Column col, boolean asc, Joins joins,
+    boolean orderBy(Column col, boolean asc, Joins joins,
         boolean sel);
 
     /**
      * Order by the given columns.
      * Optionally selects ordering data if not already selected.
      */
-    public int orderBy(Column[] cols, boolean asc, boolean sel);
+    int orderBy(Column[] cols, boolean asc, boolean sel);
 
     /**
      * Order by the given columns.
      * Optionally selects ordering data if not already selected.
      */
-    public int orderBy(Column[] cols, boolean asc, Joins joins, boolean sel);
+    int orderBy(Column[] cols, boolean asc, Joins joins, boolean sel);
 
     /**
      * Add an ORDER BY clause.
      * Optionally selects ordering data if not already selected.
      */
-    public boolean orderBy(SQLBuffer sql, boolean asc, boolean sel,
+    boolean orderBy(SQLBuffer sql, boolean asc, boolean sel,
             Value selAs);
 
     /**
      * Add an ORDER BY clause.
      * Optionally selects ordering data if not already selected.
      */
-    public boolean orderBy(SQLBuffer sql, boolean asc, Joins joins,
+    boolean orderBy(SQLBuffer sql, boolean asc, Joins joins,
         boolean sel, Value selAs);
 
     /**
      * Add an ORDER BY clause.
      * Optionally selects ordering data if not already selected.
      */
-    public boolean orderBy(String sql, boolean asc, boolean sel);
+    boolean orderBy(String sql, boolean asc, boolean sel);
 
     /**
      * Add an ORDER BY clause.
      * Optionally selects ordering data if not already selected.
      */
-    public boolean orderBy(String sql, boolean asc, Joins joins, boolean sel);
+    boolean orderBy(String sql, boolean asc, Joins joins, boolean sel);
 
     /**
      * Add where conditions setting the mapping's primary key to the given
@@ -516,7 +516,7 @@ public interface Select
      * primary key, we will recursively join to its superclass until we find
      * an ancestor that does.
      */
-    public void wherePrimaryKey(Object oid, ClassMapping mapping,
+    void wherePrimaryKey(Object oid, ClassMapping mapping,
         JDBCStore store);
 
     /**
@@ -525,106 +525,106 @@ public interface Select
      *
      * @see #wherePrimaryKey
      */
-    public void whereForeignKey(ForeignKey fk, Object oid,
+    void whereForeignKey(ForeignKey fk, Object oid,
         ClassMapping mapping, JDBCStore store);
 
     /**
      * Add the given where conditions.
      */
-    public void where(Joins joins);
+    void where(Joins joins);
 
     /**
      * Add the given where conditions.
      */
-    public void where(SQLBuffer sql);
+    void where(SQLBuffer sql);
 
     /**
      * Add the given where conditions.
      */
-    public void where(SQLBuffer sql, Joins joins);
+    void where(SQLBuffer sql, Joins joins);
 
     /**
      * Add the given where conditions.
      */
-    public void where(String sql);
+    void where(String sql);
 
     /**
      * Add the given where conditions.
      */
-    public void where(String sql, Joins joins);
+    void where(String sql, Joins joins);
 
     /**
      * Add the given having conditions.
      */
-    public void having(SQLBuffer sql);
+    void having(SQLBuffer sql);
 
     /**
      * Add the given having conditions.
      */
-    public void having(SQLBuffer sql, Joins joins);
+    void having(SQLBuffer sql, Joins joins);
 
     /**
      * Add the given having conditions.
      */
-    public void having(String sql);
+    void having(String sql);
 
     /**
      * Add the given having conditions.
      */
-    public void having(String sql, Joins joins);
+    void having(String sql, Joins joins);
 
     /**
      * Group by the given column.
      */
-    public void groupBy(Column col);
+    void groupBy(Column col);
 
     /**
      * Group by the given column.
      */
-    public void groupBy(Column col, Joins joins);
+    void groupBy(Column col, Joins joins);
 
     /**
      * Group by the given columns.
      */
-    public void groupBy(Column[] cols);
+    void groupBy(Column[] cols);
 
     /**
      * Group by the given columns.
      */
-    public void groupBy(Column[] cols, Joins joins);
+    void groupBy(Column[] cols, Joins joins);
 
     /**
      * Add a GROUP BY clause.
      */
-    public void groupBy(SQLBuffer sql);
+    void groupBy(SQLBuffer sql);
 
     /**
      * Add a GROUP BY clause.
      */
-    public void groupBy(SQLBuffer sql, Joins joins);
+    void groupBy(SQLBuffer sql, Joins joins);
 
     /**
      * Add a GROUP BY clause.
      */
-    public void groupBy(String sql);
+    void groupBy(String sql);
 
     /**
      * Add a GROUP BY clause.
      */
-    public void groupBy(String sql, Joins joins);
+    void groupBy(String sql, Joins joins);
 
     /**
      * Group by the columns of the given mapping, possibly including subclasses.
      * Assumes EAGER_NONE.
      */
-    public void groupBy(ClassMapping mapping, int subclasses, JDBCStore store,
+    void groupBy(ClassMapping mapping, int subclasses, JDBCStore store,
         JDBCFetchConfiguration fetch);
 
     /**
      * Group by the columns of the given mapping, possibly including subclasses.
      * Assumes EAGER_NONE.
      */
-    public void groupBy(ClassMapping mapping, int subclasses, JDBCStore store,
+    void groupBy(ClassMapping mapping, int subclasses, JDBCStore store,
         JDBCFetchConfiguration fetch, Joins joins);
 
     /**
@@ -632,14 +632,14 @@ public interface Select
      *
      * @param sels number of selects to UNION together; ignored if &lt;= 1
      */
-    public SelectExecutor whereClone(int sels);
+    SelectExecutor whereClone(int sels);
 
     /**
      * Return a SELECT that is a complete clone of this one.
      *
      * @param sels number of selects to UNION together; ignored if &lt;= 1
      */
-    public SelectExecutor fullClone(int sels);
+    SelectExecutor fullClone(int sels);
 
     /**
      * Return a select that will be eagerly executed with this one, or null if
@@ -653,119 +653,119 @@ public interface Select
      * @param toMany whether the eager join is to-many
      * @param sels number of selects to UNION together; ignored if &lt;= 1
      */
-    public SelectExecutor eagerClone(FieldMapping key, int eagerType,
+    SelectExecutor eagerClone(FieldMapping key, int eagerType,
         boolean toMany, int sels);
 
     /**
      * Return the eager select for the given key.
      */
-    public SelectExecutor getEager(FieldMapping key);
+    SelectExecutor getEager(FieldMapping key);
 
     /**
      * Return a new instance to use for joining.
      */
-    public Joins newJoins();
+    Joins newJoins();
 
     /**
      * Return a new instance to use for outer joining.
      */
-    public Joins newOuterJoins();
+    Joins newOuterJoins();
 
     /**
      * Append the given joins to the given buffer.
      */
-    public void append(SQLBuffer buf, Joins joins);
+    void append(SQLBuffer buf, Joins joins);
 
     /**
      * AND the given joins together. The given joins will be hollowed in the
      * process.
      */
-    public Joins and(Joins joins1, Joins joins2);
+    Joins and(Joins joins1, Joins joins2);
 
     /**
      * OR the given joins together. The common joins will be removed in the
      * process.
      */
-    public Joins or(Joins joins1, Joins joins2);
+    Joins or(Joins joins1, Joins joins2);
 
     /**
      * Return a join set making the given joins outer joins.
      */
-    public Joins outer(Joins joins);
+    Joins outer(Joins joins);
 
     /**
      * Implement toString to generate SQL string for profiling/debuggging.
      */
-    public String toString();
+    @Override String toString();
 
     /**
      * Return the alias for the given column, without creating new table alias
      */
-    public String getColumnAlias(Column col, Object path);
+    String getColumnAlias(Column col, Object path);
 
     /**
      * Set JPQL query context for this select
      * @param context
      */
-    public void setContext(Context context);
+    void setContext(Context context);
 
     /**
      * Return the JPQL query context of this select
      */
-    public Context ctx();
+    Context ctx();
 
     /**
      * Record the initial schemaAlias of a join path
      * @param schemaAlias
      */
-    public void setSchemaAlias(String schemaAlias);
+    void setSchemaAlias(String schemaAlias);
 
     /**
      * Set the flag to indicate whether this Select has
      * internally generated subselect
      */
-    public void setHasSubselect(boolean hasSub);
+    void setHasSubselect(boolean hasSub);
 
     /**
      * Return the flag to indicate whether this Select has
      * internally generated subselect
      */
-    public boolean getHasSubselect();
+    boolean getHasSubselect();
 
     /**
      * Extended trace that logs eager relations
      */
-    public void logEagerRelations();
+    void logEagerRelations();
 
     /**
      * Set table-per-class metadata for polymorphic queries
      */
-    public void setTablePerClassMeta(ClassMapping meta);
+    void setTablePerClassMeta(ClassMapping meta);
 
     /**
      * get table-per-class metadata for polymorphic queries
      */
-    public ClassMapping getTablePerClassMeta();
+    ClassMapping getTablePerClassMeta();
 
     /**
      * Set joined table metadatas for polymorphic queries
      */
-    public void setJoinedTableClassMeta(List meta);
+    void setJoinedTableClassMeta(List meta);
 
     /**
      * get joined table metadatas for polymorphic queries
      */
-    public List getJoinedTableClassMeta();
+    List getJoinedTableClassMeta();
 
     /**
      * Set joined table metadatas excluded for polymorphic queries
      */
-    public void setExcludedJoinedTableClassMeta(List meta);
+    void setExcludedJoinedTableClassMeta(List meta);
 
     /**
      * get joined table metadatas excluded for polymorphic queries
      */
-    public List getExcludedJoinedTableClassMeta();
+    List getExcludedJoinedTableClassMeta();
 
-    public DBDictionary getDictionary() ;
+    DBDictionary getDictionary() ;
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectExecutor.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectExecutor.java
index c7cfb4c14..249ed9aac 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectExecutor.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectExecutor.java
@@ -34,13 +34,13 @@ public interface SelectExecutor {
     /**
      * Return the select configuration.
      */
-    public JDBCConfiguration getConfiguration();
+    JDBCConfiguration getConfiguration();
 
     /**
      * Return this select as a SQL statement formatted for the current
      * dictionary.
      */
-    public SQLBuffer toSelect(boolean forUpdate, JDBCFetchConfiguration fetch);
+    SQLBuffer toSelect(boolean forUpdate, JDBCFetchConfiguration fetch);
 
     /**
      * Get the buffer if it has been computed by a previous call to
@@ -48,52 +48,52 @@ public interface SelectExecutor {
      *
      * @since 2.0.0
      */
-    public SQLBuffer getSQL();
+    SQLBuffer getSQL();
 
     /**
      * Return this select as a COUNT SQL statement formatted for the current
      * dictionary.
      */
-    public SQLBuffer toSelectCount();
+    SQLBuffer toSelectCount();
 
     /**
      * Whether to automatically make results distinct when relational joins
      * would otherwise introduce duplicates.
      */
-    public boolean getAutoDistinct();
+    boolean getAutoDistinct();
 
     /**
      * Whether to automatically make results distinct when relational joins
      * would otherwise introduce duplicates.
      */
-    public void setAutoDistinct(boolean distinct);
+    void setAutoDistinct(boolean distinct);
 
     /**
      * Whether this is a SELECT DISTINCT / UNION ALL.
      */
-    public boolean isDistinct();
+    boolean isDistinct();
 
     /**
      * Whether this is a SELECT DISTINCT / UNION ALL.
      */
-    public void setDistinct(boolean distinct);
+    void setDistinct(boolean distinct);
 
     /**
      * Whether the result of this select should be treated as a large
      * result set.
      */
-    public boolean isLRS();
+    boolean isLRS();
 
     /**
      * Whether the result of this select should be treated as a large
      * result set.
      */
-    public void setLRS(boolean lrs);
+    void setLRS(boolean lrs);
 
     /**
      * The expected result count for the query.
      */
-    public int getExpectedResultCount();
+    int getExpectedResultCount();
 
     /**
      * The expected result count for the query.
@@ -101,46 +101,46 @@ public interface SelectExecutor {
      * @param force if false, the count will be discarded if this select has
      * any to-many eager joins that would throw off the result count
      */
-    public void setExpectedResultCount(int expectedResultCount, boolean force);
+    void setExpectedResultCount(int expectedResultCount, boolean force);
 
     /**
      * The join syntax for this select, as one of the syntax constants from
      * {@link JoinSyntaxes}.
      */
-    public int getJoinSyntax();
+    int getJoinSyntax();
 
     /**
      * The join syntax for this select, as one of the syntax constants from
      * {@link JoinSyntaxes}.
      */
-    public void setJoinSyntax(int joinSyntax);
+    void setJoinSyntax(int joinSyntax);
 
     /**
      * Return whether this select can support a random access result set type.
      */
-    public boolean supportsRandomAccess(boolean forUpdate);
+    boolean supportsRandomAccess(boolean forUpdate);
 
     /**
      * Whether this select can be executed for update.
      */
-    public boolean supportsLocking();
+    boolean supportsLocking();
 
     /**
      * Return the number of instances matching this select.
      */
-    public int getCount(JDBCStore store)
+    int getCount(JDBCStore store)
         throws SQLException;
 
     /**
      * Execute this select in the context of the given store manager.
      */
-    public Result execute(JDBCStore store, JDBCFetchConfiguration fetch)
+    Result execute(JDBCStore store, JDBCFetchConfiguration fetch)
         throws SQLException;
 
     /**
      * Execute this select in the context of the given store manager.
      */
-    public Result execute(JDBCStore store, JDBCFetchConfiguration fetch,
+    Result execute(JDBCStore store, JDBCFetchConfiguration fetch,
         int lockLevel)
         throws SQLException;
 
@@ -150,5 +150,5 @@ public interface SelectExecutor {
      *
      * @since 2.0.0
      */
-    public boolean hasMultipleSelects();
+    boolean hasMultipleSelects();
 }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
index 585394461..611e730fd 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
@@ -39,7 +39,6 @@ import java.util.Stack;
 import java.util.TreeMap;
 
 import org.apache.commons.collections4.iterators.EmptyIterator;
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
@@ -59,6 +58,8 @@ import org.apache.openjpa.kernel.exps.Context;
 import org.apache.openjpa.kernel.exps.Value;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.util.ApplicationIds;
 import org.apache.openjpa.util.Id;
 import org.apache.openjpa.util.InternalException;
@@ -172,25 +173,31 @@ public class SelectImpl
     private List _joinedTables = null;
     private List _exJoinedTables = null;
 
+    @Override
     public ClassMapping getTablePerClassMeta() {
         return _tpcMeta;
     }
+    @Override
     public void setTablePerClassMeta(ClassMapping meta) {
         _tpcMeta = meta;
     }
 
+    @Override
     public void setJoinedTableClassMeta(List meta) {
         _joinedTables = meta;
     }
 
+    @Override
     public List getJoinedTableClassMeta() {
         return _joinedTables;
     }
 
+    @Override
     public void setExcludedJoinedTableClassMeta(List meta) {
         _exJoinedTables = meta;
     }
 
+    @Override
     public List getExcludedJoinedTableClassMeta() {
         return _exJoinedTables;
     }
@@ -229,6 +236,7 @@ public class SelectImpl
         _selects._dict = _dict;
     }
 
+    @Override
     public void setContext(Context context) {
         if (_ctx == null) {
             _ctx = context;
@@ -236,10 +244,12 @@ public class SelectImpl
         }
     }
 
+    @Override
     public Context ctx() {
         return _ctx;
     }
 
+    @Override
     public void setSchemaAlias(String schemaAlias) {
         _schemaAlias = schemaAlias;
     }
@@ -248,27 +258,33 @@ public class SelectImpl
     // SelectExecutor implementation
     /////////////////////////////////
 
+    @Override
     public JDBCConfiguration getConfiguration() {
         return _conf;
     }
 
+    @Override
     public SQLBuffer toSelect(boolean forUpdate, JDBCFetchConfiguration fetch) {
         _full = _dict.toSelect(this, forUpdate, fetch);
         return _full;
     }
 
+    @Override
     public SQLBuffer getSQL() {
         return _full;
     }
 
+    @Override
     public SQLBuffer toSelectCount() {
         return _dict.toSelectCount(this);
     }
 
+    @Override
     public boolean getAutoDistinct() {
         return (_flags & NONAUTO_DISTINCT) == 0;
     }
 
+    @Override
     public void setAutoDistinct(boolean val) {
         if (val)
             _flags &= ~NONAUTO_DISTINCT;
@@ -276,12 +292,14 @@ public class SelectImpl
             _flags |= NONAUTO_DISTINCT;
     }
 
+    @Override
     public boolean isDistinct() {
         return (_flags & NOT_DISTINCT) == 0 && ((_flags & DISTINCT) != 0
             || ((_flags & NONAUTO_DISTINCT) == 0
             && (_flags & IMPLICIT_DISTINCT) != 0));
     }
 
+    @Override
     public void setDistinct(boolean distinct) {
         // need two flags in case set not_distinct, then a to-many join happens
         // and distinct flag gets set automatically
@@ -294,10 +312,12 @@ public class SelectImpl
         }
     }
 
+    @Override
     public boolean isLRS() {
         return (_flags & LRS) != 0;
     }
 
+    @Override
     public void setLRS(boolean lrs) {
         if (lrs)
             _flags |= LRS;
@@ -305,6 +325,7 @@ public class SelectImpl
             _flags &= ~LRS;
     }
 
+    @Override
     public int getExpectedResultCount() {
         // if the count isn't forced and we have to-many eager joins that could
         // throw the count off, don't pay attention to it
@@ -313,6 +334,7 @@ public class SelectImpl
         return _expectedResultCount;
     }
 
+    @Override
     public void setExpectedResultCount(int expectedResultCount, boolean force) {
         _expectedResultCount = expectedResultCount;
         if (force)
@@ -321,22 +343,27 @@ public class SelectImpl
             _flags &= ~FORCE_COUNT;
     }
 
+    @Override
     public int getJoinSyntax() {
         return _joinSyntax;
     }
 
+    @Override
     public void setJoinSyntax(int joinSyntax) {
         _joinSyntax = joinSyntax;
     }
 
+    @Override
     public boolean supportsRandomAccess(boolean forUpdate) {
         return _dict.supportsRandomAccessResultSet(this, forUpdate);
     }
 
+    @Override
     public boolean supportsLocking() {
         return _dict.supportsLocking(this);
     }
 
+    @Override
     public boolean hasMultipleSelects() {
         if (_eager == null)
             return false;
@@ -349,6 +376,7 @@ public class SelectImpl
         return false;
     }
 
+    @Override
     public int getCount(JDBCStore store)
         throws SQLException {
         Connection conn = null;
@@ -376,6 +404,7 @@ public class SelectImpl
         }
     }
 
+    @Override
     public Result execute(JDBCStore store, JDBCFetchConfiguration fetch)
         throws SQLException {
         if (fetch == null)
@@ -384,6 +413,7 @@ public class SelectImpl
             fetch.getReadLockLevel());
     }
 
+    @Override
     public Result execute(JDBCStore store, JDBCFetchConfiguration fetch,
         int lockLevel)
         throws SQLException {
@@ -544,22 +574,27 @@ public class SelectImpl
     // Select implementation
     /////////////////////////
 
+    @Override
     public int indexOf() {
         return 0;
     }
 
+    @Override
     public List getSubselects() {
         return (_subsels == null) ? Collections.EMPTY_LIST : _subsels;
     }
 
+    @Override
     public Select getParent() {
         return _parent;
     }
 
+    @Override
     public String getSubselectPath() {
         return _subPath;
     }
 
+    @Override
     public void setParent(Select parent, String path) {
         if (path != null)
             _subPath = path;
@@ -589,10 +624,12 @@ public class SelectImpl
         }
     }
 
+    @Override
     public void setHasSubselect(boolean hasSub) {
         _hasSub = hasSub;
     }
 
+    @Override
     public boolean getHasSubselect() {
         return _hasSub;
     }
@@ -613,28 +650,33 @@ public class SelectImpl
         _tables.remove(key);
     }
 
+    @Override
     public Select getFromSelect() {
         return _from;
     }
 
+    @Override
     public void setFromSelect(Select sel) {
         _from = (SelectImpl) sel;
         if (_from != null)
             _from._outer = this;
     }
 
+    @Override
     public boolean hasEagerJoin(boolean toMany) {
         if (toMany)
             return (_flags & EAGER_TO_MANY) != 0;
         return (_flags & EAGER_TO_ONE) != 0;
     }
 
+    @Override
     public boolean hasJoin(boolean toMany) {
         if (toMany)
             return (_flags & TO_MANY) != 0;
         return _tables != null && _tables.size() > 1;
     }
 
+    @Override
     public boolean isSelected(Table table) {
         PathJoins pj = getJoins(null, false);
         if (_from != null)
@@ -642,38 +684,47 @@ public class SelectImpl
         return getTableIndex(table, pj, false) != -1;
     }
 
+    @Override
     public Collection getTableAliases() {
         return (_tables == null) ? Collections.EMPTY_SET : _tables.values();
     }
 
+    @Override
     public List getSelects() {
         return Collections.unmodifiableList(_selects);
     }
 
+    @Override
     public List getSelectAliases() {
         return _selects.getAliases(false, _outer != null);
     }
 
+    @Override
     public List getIdentifierAliases() {
         return _selects.getAliases(true, _outer != null);
     }
 
+    @Override
     public SQLBuffer getOrdering() {
         return _ordering;
     }
 
+    @Override
     public SQLBuffer getGrouping() {
         return _grouping;
     }
 
+    @Override
     public SQLBuffer getWhere() {
         return _where;
     }
 
+    @Override
     public SQLBuffer getHaving() {
         return _having;
     }
 
+    @Override
     public void addJoinClassConditions() {
         if (_joins == null || _joins.joins() == null)
             return;
@@ -691,33 +742,40 @@ public class SelectImpl
         }
     }
 
+    @Override
     public Joins getJoins() {
         return _joins;
     }
 
+    @Override
     public Iterator getJoinIterator() {
         if (_joins == null || _joins.isEmpty())
             return EmptyIterator.INSTANCE;
         return _joins.joins().joinIterator();
     }
 
+    @Override
     public long getStartIndex() {
         return _startIdx;
     }
 
+    @Override
     public long getEndIndex() {
         return _endIdx;
     }
 
+    @Override
     public void setRange(long start, long end) {
         _startIdx = start;
         _endIdx = end;
     }
 
+    @Override
     public String getColumnAlias(Column col) {
         return getColumnAlias(col, (Joins) null);
     }
 
+    @Override
     public String getColumnAlias(Column col, Joins joins) {
         return getColumnAlias(col, getJoins(joins, false));
     }
@@ -729,10 +787,12 @@ public class SelectImpl
         return getColumnAlias(col.getIdentifier().getName(), col.getTable(), pj);
     }
 
+    @Override
     public String getColumnAlias(String col, Table table) {
         return getColumnAlias(col, table, (Joins) null);
     }
 
+    @Override
     public String getColumnAlias(String col, Table table, Joins joins) {
         return getColumnAlias(col, table, getJoins(joins, false));
     }
@@ -740,6 +800,7 @@ public class SelectImpl
     /**
      * Return the alias for the give column
      */
+    @Override
     public String getColumnAlias(Column col, Object path) {
         Table table = col.getTable();
         String tableAlias = null;
@@ -780,10 +841,12 @@ public class SelectImpl
         return buf.append(toAlias(getTableIndex(table, pj, true))).append(".");
     }
 
+    @Override
     public boolean isAggregate() {
         return (_flags & AGGREGATE) != 0;
     }
 
+    @Override
     public void setAggregate(boolean agg) {
         if (agg)
             _flags |= AGGREGATE;
@@ -791,10 +854,12 @@ public class SelectImpl
             _flags &= ~AGGREGATE;
     }
 
+    @Override
     public boolean isLob() {
         return (_flags & LOB) != 0;
     }
 
+    @Override
     public void setLob(boolean lob) {
         if (lob)
             _flags |= LOB;
@@ -802,14 +867,17 @@ public class SelectImpl
             _flags &= ~LOB;
     }
 
+    @Override
     public void clearSelects() {
         _selects.clear();
     }
 
+    @Override
     public boolean select(SQLBuffer sql, Object id) {
         return select(sql, id, null);
     }
 
+    @Override
     public boolean select(SQLBuffer sql, Object id, Joins joins) {
         if (!isGrouping())
             return select((Object) sql, id, joins);
@@ -848,10 +916,12 @@ public class SelectImpl
         return NULL_IDS[_nullIds++];
     }
 
+    @Override
     public boolean select(String sql, Object id) {
         return select(sql, id, null);
     }
 
+    @Override
     public boolean select(String sql, Object id, Joins joins) {
         if (!isGrouping())
             return select((Object) sql, id, joins);
@@ -859,6 +929,7 @@ public class SelectImpl
         return true;
     }
 
+    @Override
     public void selectPlaceholder(String sql) {
         Object holder = (_placeholders >= PLACEHOLDERS.length)
             ? new Placeholder() : PLACEHOLDERS[_placeholders++];
@@ -882,10 +953,12 @@ public class SelectImpl
         _selects.clearPlaceholders();
     }
 
+    @Override
     public boolean select(Column col) {
         return select(col, (Joins) null);
     }
 
+    @Override
     public boolean select(Column col, Joins joins) {
         if (!isGrouping())
             return select(col, getJoins(joins, true), false);
@@ -893,10 +966,12 @@ public class SelectImpl
         return false;
     }
 
+    @Override
     public int select(Column[] cols) {
         return select(cols, null);
     }
 
+    @Override
     public int select(Column[] cols, Joins joins) {
         if (cols == null || cols.length == 0)
             return 0;
@@ -935,11 +1010,13 @@ public class SelectImpl
         return true;
     }
 
+    @Override
     public void select(ClassMapping mapping, int subclasses,
         JDBCStore store, JDBCFetchConfiguration fetch, int eager) {
         select(mapping, subclasses, store, fetch, eager, null);
     }
 
+    @Override
     public void select(ClassMapping mapping, int subclasses,
         JDBCStore store, JDBCFetchConfiguration fetch, int eager,
         Joins joins) {
@@ -989,10 +1066,12 @@ public class SelectImpl
             _flags &= ~OUTER;
     }
 
+    @Override
     public boolean selectIdentifier(Column col) {
         return selectIdentifier(col, (Joins) null);
     }
 
+    @Override
     public boolean selectIdentifier(Column col, Joins joins) {
         if (!isGrouping())
             return select(col, getJoins(joins, true), true);
@@ -1000,10 +1079,12 @@ public class SelectImpl
         return false;
     }
 
+    @Override
     public int selectIdentifier(Column[] cols) {
         return selectIdentifier(cols, null);
     }
 
+    @Override
     public int selectIdentifier(Column[] cols, Joins joins) {
         if (cols == null || cols.length == 0)
             return 0;
@@ -1019,21 +1100,25 @@ public class SelectImpl
         return seld;
     }
 
+    @Override
     public void selectIdentifier(ClassMapping mapping, int subclasses,
         JDBCStore store, JDBCFetchConfiguration fetch, int eager) {
         selectIdentifier(mapping, subclasses, store, fetch, eager, null);
     }
 
+    @Override
     public void selectIdentifier(ClassMapping mapping, int subclasses,
         JDBCStore store, JDBCFetchConfiguration fetch, int eager,
         Joins joins) {
         select(this, mapping, subclasses, store, fetch, eager, joins, true);
     }
 
+    @Override
     public int selectPrimaryKey(ClassMapping mapping) {
         return selectPrimaryKey(mapping, null);
     }
 
+    @Override
     public int selectPrimaryKey(ClassMapping mapping, Joins joins) {
         return primaryKeyOperation(mapping, true, null, joins, false);
     }
@@ -1144,11 +1229,13 @@ public class SelectImpl
             _ordering.append(" DESC");
     }
 
+    @Override
     public int orderByPrimaryKey(ClassMapping mapping, boolean asc,
         boolean sel) {
         return orderByPrimaryKey(mapping, asc, null, sel);
     }
 
+    @Override
     public int orderByPrimaryKey(ClassMapping mapping, boolean asc,
         Joins joins, boolean sel) {
         return orderByPrimaryKey(mapping, asc, joins, sel, false);
@@ -1163,10 +1250,12 @@ public class SelectImpl
             (asc) ? Boolean.TRUE : Boolean.FALSE, joins, aliasOrder);
     }
 
+    @Override
     public boolean orderBy(Column col, boolean asc, boolean sel) {
         return orderBy(col, asc, null, sel);
     }
 
+    @Override
     public boolean orderBy(Column col, boolean asc, Joins joins, boolean sel) {
         return orderBy(col, asc, joins, sel, false);
     }
@@ -1180,10 +1269,12 @@ public class SelectImpl
             getJoins(joins, true), aliasOrder);
     }
 
+    @Override
     public int orderBy(Column[] cols, boolean asc, boolean sel) {
         return orderBy(cols, asc, null, sel);
     }
 
+    @Override
     public int orderBy(Column[] cols, boolean asc, Joins joins, boolean sel) {
         return orderBy(cols, asc, joins, sel, false);
     }
@@ -1202,11 +1293,13 @@ public class SelectImpl
         return seld;
     }
 
+    @Override
     public boolean orderBy(SQLBuffer sql, boolean asc, boolean sel, Value selAs)
     {
         return orderBy(sql, asc, (Joins) null, sel, selAs);
     }
 
+    @Override
     public boolean orderBy(SQLBuffer sql, boolean asc, Joins joins,
         boolean sel, Value selAs) {
         return orderBy(sql, asc, joins, sel, false, selAs);
@@ -1248,10 +1341,12 @@ public class SelectImpl
         return false;
     }
 
+    @Override
     public boolean orderBy(String sql, boolean asc, boolean sel) {
         return orderBy(sql, asc, null, sel);
     }
 
+    @Override
     public boolean orderBy(String sql, boolean asc, Joins joins, boolean sel) {
         return orderBy(sql, asc, joins, sel, false);
     }
@@ -1264,6 +1359,7 @@ public class SelectImpl
         return orderBy((Object) sql, asc, joins, sel, aliasOrder, null);
     }
 
+    @Override
     public void clearOrdering() {
         _ordering = null;
         _orders = 0;
@@ -1294,6 +1390,7 @@ public class SelectImpl
         return idxs;
     }
 
+    @Override
     public void wherePrimaryKey(Object oid, ClassMapping mapping,
         JDBCStore store) {
         wherePrimaryKey(oid, mapping, null, store);
@@ -1323,6 +1420,7 @@ public class SelectImpl
             store);
     }
 
+    @Override
     public void whereForeignKey(ForeignKey fk, Object oid,
         ClassMapping mapping, JDBCStore store) {
         whereForeignKey(fk, oid, mapping, null, store);
@@ -1382,7 +1480,7 @@ public class SelectImpl
         // only bother to pack pk values into array if app id
         Object[] pks = null;
         boolean relationId = RelationStrategies.isRelationId(fromCols);
-        if (!relationId && mapping.getIdentityType() == ClassMapping.ID_APPLICATION)
+        if (!relationId && mapping.getIdentityType() == ClassMetaData.ID_APPLICATION)
             pks = ApplicationIds.toPKValues(oid, mapping);
 
         SQLBuffer buf = new SQLBuffer(_dict);
@@ -1446,15 +1544,18 @@ public class SelectImpl
         return found;
     }
 
+    @Override
     public void where(Joins joins) {
         if (joins != null)
             where((String) null, joins);
     }
 
+    @Override
     public void where(SQLBuffer sql) {
         where(sql, (Joins) null);
     }
 
+    @Override
     public void where(SQLBuffer sql, Joins joins) {
         where(sql, getJoins(joins, true));
     }
@@ -1474,10 +1575,12 @@ public class SelectImpl
         _where.append(sql);
     }
 
+    @Override
     public void where(String sql) {
         where(sql, (Joins) null);
     }
 
+    @Override
     public void where(String sql, Joins joins) {
         where(sql, getJoins(joins, true));
     }
@@ -1497,10 +1600,12 @@ public class SelectImpl
         _where.append(sql);
     }
 
+    @Override
     public void having(SQLBuffer sql) {
         having(sql, (Joins) null);
     }
 
+    @Override
     public void having(SQLBuffer sql, Joins joins) {
         having(sql, getJoins(joins, true));
     }
@@ -1520,10 +1625,12 @@ public class SelectImpl
         _having.append(sql);
     }
 
+    @Override
     public void having(String sql) {
         having(sql, (Joins) null);
     }
 
+    @Override
     public void having(String sql, Joins joins) {
         having(sql, getJoins(joins, true));
     }
@@ -1543,37 +1650,45 @@ public class SelectImpl
         _having.append(sql);
     }
 
+    @Override
     public void groupBy(SQLBuffer sql) {
         groupBy(sql, (Joins) null);
     }
 
+    @Override
     public void groupBy(SQLBuffer sql, Joins joins) {
         getJoins(joins, true);
         groupByAppend(sql.getSQL());
     }
 
+    @Override
     public void groupBy(String sql) {
         groupBy(sql, (Joins) null);
     }
 
+    @Override
     public void groupBy(String sql, Joins joins) {
         getJoins(joins, true);
         groupByAppend(sql);
     }
 
+    @Override
     public void groupBy(Column col) {
         groupBy(col, null);
     }
 
+    @Override
     public void groupBy(Column col, Joins joins) {
         PathJoins pj = getJoins(joins, true);
         groupByAppend(getColumnAlias(col, pj));
     }
 
+    @Override
     public void groupBy(Column[] cols) {
         groupBy(cols, null);
     }
 
+    @Override
     public void groupBy(Column[] cols, Joins joins) {
         PathJoins pj = getJoins(joins, true);
         for (int i = 0; i < cols.length; i++) {
@@ -1594,11 +1709,13 @@ public class SelectImpl
         }
     }
 
+    @Override
     public void groupBy(ClassMapping mapping, int subclasses, JDBCStore store,
         JDBCFetchConfiguration fetch) {
         groupBy(mapping, subclasses, store, fetch, null);
     }
 
+    @Override
     public void groupBy(ClassMapping mapping, int subclasses, JDBCStore store,
         JDBCFetchConfiguration fetch, Joins joins) {
         // we implement this by putting ourselves into grouping mode, where
@@ -1657,6 +1774,7 @@ public class SelectImpl
         return pj;
     }
 
+    @Override
     public SelectExecutor whereClone(int sels) {
         if (sels < 1)
             sels = 1;
@@ -1709,6 +1827,7 @@ public class SelectImpl
         return _conf.getSQLFactoryInstance().newUnion(clones);
     }
 
+    @Override
     public SelectExecutor fullClone(int sels) {
         if (sels < 1)
             sels = 1;
@@ -1741,6 +1860,7 @@ public class SelectImpl
         return _conf.getSQLFactoryInstance().newUnion(clones);
     }
 
+    @Override
     public SelectExecutor eagerClone(FieldMapping key, int eagerType,
         boolean toMany, int sels) {
         if (eagerType == EAGER_OUTER
@@ -1798,6 +1918,7 @@ public class SelectImpl
         return _eager;
     }
 
+    @Override
     public void logEagerRelations() {
         if (_eagerKeys != null) {
             _conf.getLog(JDBCConfiguration.LOG_DIAG).trace(
@@ -1805,6 +1926,7 @@ public class SelectImpl
         }
     }
 
+    @Override
     public SelectExecutor getEager(FieldMapping key) {
         if (_eager == null || !_eagerKeys.contains(key))
             return null;
@@ -1821,6 +1943,7 @@ public class SelectImpl
         return new Key(pj.path().toString(), key);
     }
 
+    @Override
     public Joins newJoins() {
         if (_preJoins != null && !_preJoins.isEmpty()) {
             SelectJoins sj = (SelectJoins) _preJoins.peek();
@@ -1830,10 +1953,12 @@ public class SelectImpl
         return this;
     }
 
+    @Override
     public Joins newOuterJoins() {
         return ((PathJoins) newJoins()).setOuter(true);
     }
 
+    @Override
     public void append(SQLBuffer buf, Joins joins) {
         if (joins == null || joins.isEmpty())
             return;
@@ -1862,10 +1987,12 @@ public class SelectImpl
         }
     }
 
+    @Override
     public Joins and(Joins joins1, Joins joins2) {
         return and((PathJoins) joins1, (PathJoins) joins2, true);
     }
 
+    @Override
     public Select getSelect() {
         return null;
     }
@@ -1910,6 +2037,7 @@ public class SelectImpl
         return sj;
     }
 
+    @Override
     public Joins or(Joins joins1, Joins joins2) {
         PathJoins j1 = (PathJoins) joins1;
         PathJoins j2 = (PathJoins) joins2;
@@ -1958,6 +2086,7 @@ public class SelectImpl
         return sj;
     }
 
+    @Override
     public Joins outer(Joins joins) {
         if (_joinSyntax == JoinSyntaxes.SYNTAX_TRADITIONAL || joins == null)
             return joins;
@@ -2172,6 +2301,7 @@ public class SelectImpl
         return aliases;
     }
 
+    @Override
     public String toString() {
         return toSelect(false, null).getSQL();
     }
@@ -2180,71 +2310,87 @@ public class SelectImpl
     // PathJoins implementation
     ////////////////////////////
 
+    @Override
     public boolean isOuter() {
         return false;
     }
 
+    @Override
     public PathJoins setOuter(boolean outer) {
         return new SelectJoins(this).setOuter(true);
     }
 
+    @Override
     public boolean isDirty() {
         return false;
     }
 
+    @Override
     public StringBuilder path() {
         return null;
     }
 
+    @Override
     public String getPathStr() {
         return null;
     }
 
+    @Override
     public JoinSet joins() {
         return null;
     }
 
+    @Override
     public int joinCount() {
         return 0;
     }
 
+    @Override
     public void nullJoins() {
     }
 
+    @Override
     public boolean isEmpty() {
         return true;
     }
 
+    @Override
     public Joins crossJoin(Table localTable, Table foreignTable) {
         return new SelectJoins(this).crossJoin(localTable, foreignTable);
     }
 
+    @Override
     public Joins join(ForeignKey fk, boolean inverse, boolean toMany) {
         return new SelectJoins(this).join(fk, inverse, toMany);
     }
 
+    @Override
     public Joins outerJoin(ForeignKey fk, boolean inverse, boolean toMany) {
         return new SelectJoins(this).outerJoin(fk, inverse, toMany);
     }
 
+    @Override
     public Joins joinRelation(String name, ForeignKey fk, ClassMapping target,
         int subs, boolean inverse, boolean toMany) {
         return new SelectJoins(this).joinRelation(name, fk, target, subs,
             inverse, toMany);
     }
 
+    @Override
     public Joins outerJoinRelation(String name, ForeignKey fk,
         ClassMapping target, int subs, boolean inverse, boolean toMany) {
         return new SelectJoins(this).outerJoinRelation(name, fk, target, subs,
             inverse, toMany);
     }
 
+    @Override
     public Joins setVariable(String var) {
         if (var == null)
             return this;
         return new SelectJoins(this).setVariable(var);
     }
 
+    @Override
     public Joins setSubselect(String alias) {
         if (alias == null)
             return this;
@@ -2286,10 +2432,12 @@ public class SelectImpl
             _key = key;
         }
 
+        @Override
         public int hashCode() {
             return ((_path == null) ? 0  : _path.hashCode()) ^ ((_key == null) ? 0  : _key.hashCode());
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == null)
                 return false;
@@ -2303,6 +2451,7 @@ public class SelectImpl
             return k._path.equals(_path) && k._key.equals(_key);
         }
 
+        @Override
         public String toString() {
             return _path + "|" + _key;
         }
@@ -2337,6 +2486,7 @@ public class SelectImpl
         /**
          * Select for this result.
          */
+        @Override
         public SelectImpl getSelect() {
             return _sel;
         }
@@ -2348,6 +2498,7 @@ public class SelectImpl
             _sel = sel;
         }
 
+        @Override
         public Object getEager(FieldMapping key) {
             // don't bother creating key if we know we don't have any
             // eager results
@@ -2356,18 +2507,20 @@ public class SelectImpl
             Map map = SelectResult.this.getEagerMap(true);
             if (map == null)
                 return null;
-            return map.get(_sel.toEagerKey(key, getJoins(null)));
+            return map.get(SelectImpl.toEagerKey(key, getJoins(null)));
         }
 
+        @Override
         public void putEager(FieldMapping key, Object res) {
             Map map = SelectResult.this.getEagerMap(true);
             if (map == null) {
                 map = new HashMap();
                 setEagerMap(map);
             }
-            map.put(_sel.toEagerKey(key, getJoins(null)), res);
+            map.put(SelectImpl.toEagerKey(key, getJoins(null)), res);
         }
 
+        @Override
         public Object load(ClassMapping mapping, JDBCStore store,
             JDBCFetchConfiguration fetch, Joins joins)
             throws SQLException {
@@ -2387,6 +2540,7 @@ public class SelectImpl
             return obj;
         }
 
+        @Override
         public Joins newJoins() {
             PathJoins pre = getPreJoins();
             if (pre == null || pre.path() == null)
@@ -2397,6 +2551,7 @@ public class SelectImpl
             return pj;
         }
 
+        @Override
         protected boolean containsInternal(Object obj, Joins joins) {
             // we key directly on objs and join-less cols, or on the alias
             // for cols with joins
@@ -2405,7 +2560,7 @@ public class SelectImpl
                 Object columnAlias = getColumnAlias((Column) obj, pj);
                 if (joins == null) {
                     if (cachedColumnAlias_ == null) {
-                        cachedColumnAlias_ = new HashMap<CachedColumnAliasKey, Object>();
+                        cachedColumnAlias_ = new HashMap<>();
                     }
                     cachedColumnAlias_.put(new CachedColumnAliasKey((Column) obj, pj), columnAlias);
                 }
@@ -2414,6 +2569,7 @@ public class SelectImpl
             return obj != null && _sel._selects.contains(obj);
         }
 
+        @Override
         protected boolean containsAllInternal(Object[] objs, Joins joins)
             throws SQLException {
             PathJoins pj = getJoins(joins);
@@ -2429,24 +2585,28 @@ public class SelectImpl
             return true;
         }
 
+        @Override
         public void pushBack()
             throws SQLException {
             _pos = 0;
             super.pushBack();
         }
 
+        @Override
         protected boolean absoluteInternal(int row)
             throws SQLException {
             _pos = 0;
             return super.absoluteInternal(row);
         }
 
+        @Override
         protected boolean nextInternal()
             throws SQLException {
             _pos = 0;
             return super.nextInternal();
         }
 
+        @Override
         protected int findObject(Object obj, Joins joins)
             throws SQLException {
             Object orig = obj;
@@ -2542,7 +2702,7 @@ public class SelectImpl
         private String getColumnAlias(Column col, PathJoins pj) {
             String alias;
             if (_sel._from != null) {
-                alias = _sel.toAlias(_sel._from.getTableIndex
+                alias = SelectImpl.toAlias(_sel._from.getTableIndex
                     (col.getTable(), pj, false));
                 if (alias == null)
                     return null;
@@ -2550,7 +2710,7 @@ public class SelectImpl
                     return FROM_SELECT_ALIAS + "." + alias + "_" + col;
                 return alias + "_" + col;
             }
-            alias = _sel.toAlias(_sel.getTableIndex(col.getTable(), pj, false));
+            alias = SelectImpl.toAlias(_sel.getTableIndex(col.getTable(), pj, false));
             return (alias == null) ? null : alias + "." + col;
         }
 
@@ -2558,89 +2718,109 @@ public class SelectImpl
         // PathJoins implementation
         ////////////////////////////
 
+        @Override
         public boolean isOuter() {
             return false;
         }
 
+        @Override
         public PathJoins setOuter(boolean outer) {
             return this;
         }
 
+        @Override
         public boolean isDirty() {
             return false;
         }
 
+        @Override
         public StringBuilder path() {
             return null;
         }
 
+        @Override
         public String getPathStr() {
             return null;
         }
 
+        @Override
         public JoinSet joins() {
             return null;
         }
 
+        @Override
         public int joinCount() {
             return 0;
         }
 
+        @Override
         public void nullJoins() {
         }
 
+        @Override
         public boolean isEmpty() {
             return true;
         }
 
+        @Override
         public Joins crossJoin(Table localTable, Table foreignTable) {
             return this;
         }
 
+        @Override
         public Joins join(ForeignKey fk, boolean inverse, boolean toMany) {
             return this;
         }
 
+        @Override
         public Joins outerJoin(ForeignKey fk, boolean inverse, boolean toMany) {
             return this;
         }
 
+        @Override
         public Joins joinRelation(String name, ForeignKey fk,
             ClassMapping target, int subs, boolean inverse, boolean toMany) {
             return new PathJoinsImpl().joinRelation(name, fk, target, subs,
                 inverse, toMany);
         }
 
+        @Override
         public Joins outerJoinRelation(String name, ForeignKey fk,
             ClassMapping target, int subs, boolean inverse, boolean toMany) {
             return new PathJoinsImpl().outerJoinRelation(name, fk, target, subs,
                 inverse, toMany);
         }
 
+        @Override
         public Joins setVariable(String var) {
             if (var == null)
                 return this;
             return new PathJoinsImpl().setVariable(var);
         }
 
+        @Override
         public Joins setSubselect(String alias) {
             if (alias == null)
                 return this;
             return new PathJoinsImpl().setSubselect(alias);
         }
 
+        @Override
         public Joins setCorrelatedVariable(String var) {
             return this;
         }
 
+        @Override
         public Joins setJoinContext(Context ctx) {
             return this;
         }
 
+        @Override
         public String getCorrelatedVariable() {
             return null;
         }
 
+        @Override
         public void moveJoinsToParent() {
         }
 
@@ -2700,37 +2880,46 @@ public class SelectImpl
         protected Context lastContext = null;
         protected String pathStr = null;
 
+        @Override
         public Select getSelect() {
             return null;
         }
 
+        @Override
         public boolean isOuter() {
             return false;
         }
 
+        @Override
         public PathJoins setOuter(boolean outer) {
             return this;
         }
 
+        @Override
         public boolean isDirty() {
             return var != null || path != null;
         }
 
+        @Override
         public StringBuilder path() {
             return path;
         }
 
+        @Override
         public JoinSet joins() {
             return null;
         }
 
+        @Override
         public int joinCount() {
             return 0;
         }
 
+        @Override
         public void nullJoins() {
         }
 
+        @Override
         public Joins setVariable(String var) {
             this.var = var;
             return this;
@@ -2740,47 +2929,56 @@ public class SelectImpl
             return var;
         }
 
+        @Override
         public Joins setCorrelatedVariable(String var) {
             this.correlatedVar = var;
             return this;
         }
 
+        @Override
         public String getCorrelatedVariable() {
             return correlatedVar;
         }
 
+        @Override
         public Joins setJoinContext(Context context) {
             this.context = context;
             return this;
          }
 
+        @Override
         public Joins setSubselect(String alias) {
             append(alias);
             return this;
         }
 
+        @Override
         public boolean isEmpty() {
             return true;
         }
 
+        @Override
         public Joins crossJoin(Table localTable, Table foreignTable) {
             append(var);
             var = null;
             return this;
         }
 
+        @Override
         public Joins join(ForeignKey fk, boolean inverse, boolean toMany) {
             append(var);
             var = null;
             return this;
         }
 
+        @Override
         public Joins outerJoin(ForeignKey fk, boolean inverse, boolean toMany) {
             append(var);
             var = null;
             return this;
         }
 
+        @Override
         public Joins joinRelation(String name, ForeignKey fk,
             ClassMapping target, int subs, boolean inverse, boolean toMany) {
             append(name);
@@ -2789,6 +2987,7 @@ public class SelectImpl
             return this;
         }
 
+        @Override
         public Joins outerJoinRelation(String name, ForeignKey fk,
             ClassMapping target, int subs, boolean inverse, boolean toMany) {
             append(name);
@@ -2807,6 +3006,7 @@ public class SelectImpl
             }
         }
 
+        @Override
         public String getPathStr() {
             if (pathStr == null) {
                 pathStr = path.toString();
@@ -2814,11 +3014,13 @@ public class SelectImpl
             return pathStr;
         }
 
+        @Override
         public String toString() {
             return "PathJoinsImpl<" + hashCode() + ">: "
                 + String.valueOf(path);
         }
 
+    @Override
     public void moveJoinsToParent() {
     }
 }
@@ -2839,23 +3041,28 @@ public class SelectImpl
             _sel = sel;
         }
 
+        @Override
         public Select getSelect() {
             return _sel;
         }
 
+        @Override
         public boolean isOuter() {
             return _outer;
         }
 
+        @Override
         public PathJoins setOuter(boolean outer) {
             _outer = outer;
             return this;
         }
 
+        @Override
         public boolean isDirty() {
             return super.isDirty() || !isEmpty();
         }
 
+        @Override
         public JoinSet joins() {
             return _joins;
         }
@@ -2866,22 +3073,26 @@ public class SelectImpl
                 && joins.last().getType() == Join.TYPE_OUTER;
         }
 
+        @Override
         public int joinCount() {
             if (_joins == null)
                 return _count;
             return Math.max(_count, _joins.size());
         }
 
+        @Override
         public void nullJoins() {
             if (_joins != null)
                 _count = Math.max(_count, _joins.size());
             _joins = null;
         }
 
+        @Override
         public boolean isEmpty() {
             return _joins == null || _joins.isEmpty();
         }
 
+        @Override
         public Joins crossJoin(Table localTable, Table foreignTable) {
             // cross joins are for unbound variables; unfortunately we have
             // to always go DISTINCT for unbound vars because there are certain
@@ -2943,19 +3154,23 @@ public class SelectImpl
             return this;
         }
 
+        @Override
         public Joins join(ForeignKey fk, boolean inverse, boolean toMany) {
             return join(null, fk, null, -1, inverse, toMany, false);
         }
 
+        @Override
         public Joins outerJoin(ForeignKey fk, boolean inverse, boolean toMany) {
             return join(null, fk, null, -1, inverse, toMany, true);
         }
 
+        @Override
         public Joins joinRelation(String name, ForeignKey fk,
             ClassMapping target, int subs, boolean inverse, boolean toMany) {
             return join(name, fk, target, subs, inverse, toMany, false);
         }
 
+        @Override
         public Joins outerJoinRelation(String name, ForeignKey fk,
             ClassMapping target, int subs, boolean inverse, boolean toMany) {
             return join(name, fk, target, subs, inverse, toMany, true);
@@ -3064,11 +3279,12 @@ public class SelectImpl
             }
         }
 
+        @Override
         public void moveJoinsToParent() {
             if (_joins == null)
                 return;
            Join j = null;
-           List<Join> removed = new ArrayList<Join>(5);
+           List<Join> removed = new ArrayList<>(5);
            for (Iterator itr = _joins.iterator(); itr.hasNext();) {
                j = (Join) itr.next();
                if (j.isNotMyJoin()) {
@@ -3120,6 +3336,7 @@ public class SelectImpl
             return sj;
         }
 
+        @Override
         public String toString() {
             return super.toString() + " (" + _outer + "): " + _joins;
         }
@@ -3129,6 +3346,7 @@ public class SelectImpl
         return new Selects();
     }
 
+    @Override
     public DBDictionary getDictionary() {
         return _dict;
     }
@@ -3245,11 +3463,13 @@ public class SelectImpl
                 return Collections.EMPTY_LIST;
 
             return new AbstractList() {
+                @Override
                 public int size() {
                     return (ident && _idents != null) ? _idents.size()
                         : _ids.size();
                 }
 
+                @Override
                 public Object get(int i) {
                     Object id = (ident && _idents != null) ? _idents.get(i)
                         : _ids.get(i);
@@ -3306,20 +3526,24 @@ public class SelectImpl
             }
         }
 
+        @Override
         public boolean contains(Object id) {
             return _aliases != null && _aliases.containsKey(id);
         }
 
+        @Override
         public Object get(int i) {
             if (_ids == null)
                 throw new ArrayIndexOutOfBoundsException();
             return _ids.get(i);
         }
 
+        @Override
         public int size() {
             return (_ids == null) ? 0 : _ids.size();
         }
 
+        @Override
         public void clear() {
             _ids = null;
             _aliases = null;
@@ -3328,22 +3552,26 @@ public class SelectImpl
         }
     }
 
+    @Override
     public Joins setCorrelatedVariable(String var) {
         if (var == null)
             return this;
         return new SelectJoins(this).setCorrelatedVariable(var);
     }
 
+    @Override
     public Joins setJoinContext(Context ctx) {
         if (ctx == null)
             return this;
         return new SelectJoins(this).setJoinContext(ctx);
     }
 
+    @Override
     public String getCorrelatedVariable() {
         return null;
     }
 
+    @Override
     public void moveJoinsToParent() {
     }
 }
@@ -3358,39 +3586,39 @@ interface PathJoins
     /**
      * Mark this as an outer joins set.
      */
-    public PathJoins setOuter(boolean outer);
+    PathJoins setOuter(boolean outer);
 
     /**
      * Return true if this instance has a path, any joins, or a variable.
      */
-    public boolean isDirty();
+    boolean isDirty();
 
     /**
      * Return the relation path traversed by these joins, or null if none.
      */
-    public StringBuilder path();
+    StringBuilder path();
 
     /**
      * Return the set of {@link Join} elements, or null if none.
      */
-    public JoinSet joins();
+    JoinSet joins();
 
     /**
      * Return the maximum number of joins contained in this instance at any
      * time.
      */
-    public int joinCount();
+    int joinCount();
 
     /**
      * Null the set of {@link Join} elements.
      */
-    public void nullJoins();
+    void nullJoins();
 
     /**
      * The select owner of this join
      */
-    public Select getSelect();
+    Select getSelect();
 
-    public String getPathStr();
+    String getPathStr();
 }
 
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SolidDBDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SolidDBDictionary.java
index 4ae4b43a3..42a70a360 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SolidDBDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SolidDBDictionary.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
 import org.apache.openjpa.jdbc.kernel.exps.Lit;
@@ -42,6 +41,7 @@ import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.jdbc.schema.Unique;
 import org.apache.openjpa.kernel.exps.Literal;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.StoreException;
 import org.apache.openjpa.util.UserException;
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/StoredProcedure.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/StoredProcedure.java
index 6203b6b90..c90c07da5 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/StoredProcedure.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/StoredProcedure.java
@@ -18,11 +18,6 @@
  */
 package org.apache.openjpa.jdbc.sql;
 
-import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.schema.Column;
-import org.apache.openjpa.jdbc.schema.Schemas;
-import org.apache.openjpa.meta.MultiQueryMetaData;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.sql.DatabaseMetaData;
@@ -33,6 +28,11 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.Schemas;
+import org.apache.openjpa.meta.MultiQueryMetaData;
+
 /**
  * Holds metadata about a Database Stored Procedure.
  * This is different than {@link MultiQueryMetaData} which holds the metadata
@@ -52,11 +52,11 @@ public class StoredProcedure {
     private DBIdentifier _catalog;
     private DBIdentifier _schema;
     private DBIdentifier _name;
-    private List<Column> _cols = new ArrayList<Column>();
-    private List<String> _params = new ArrayList<String>();
+    private List<Column> _cols = new ArrayList<>();
+    private List<String> _params = new ArrayList<>();
 
 
-    private List<String> _sql = new ArrayList<String>();
+    private List<String> _sql = new ArrayList<>();
     private final boolean _fromDatabase;
 
     /**
@@ -185,7 +185,7 @@ public class StoredProcedure {
         List<Column> cols = null;
         for (Column col : _cols) {
             if (col.getFlag(flag)) {
-                if (cols == null) cols = new ArrayList<Column>();
+                if (cols == null) cols = new ArrayList<>();
                 cols.add(col);
             }
         }
@@ -330,6 +330,7 @@ public class StoredProcedure {
         }
     }
 
+    @Override
     public String toString() {
         return getName();
     }
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
index a893ec2be..a3dabe61c 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
@@ -28,7 +28,6 @@ import java.sql.Types;
 import java.util.Arrays;
 import java.util.Locale;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
 import org.apache.openjpa.jdbc.schema.Column;
@@ -38,6 +37,7 @@ import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.jdbc.schema.Unique;
 import org.apache.openjpa.lib.jdbc.DelegatingConnection;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.StoreException;
 
@@ -365,6 +365,7 @@ public class SybaseDictionary
     /**
      * Create a new primary key from the information in the schema metadata.
      */
+    @Override
     protected PrimaryKey newPrimaryKey(ResultSet pkMeta)
         throws SQLException {
         PrimaryKey pk = new PrimaryKey();
@@ -382,6 +383,7 @@ public class SybaseDictionary
     /**
      * Create a new index from the information in the index metadata.
      */
+    @Override
     protected Index newIndex(ResultSet idxMeta)
         throws SQLException {
         Index idx = new Index();
@@ -397,6 +399,7 @@ public class SybaseDictionary
         return idx;
     }
 
+    @Override
     public boolean isFatalException(int subtype, SQLException ex) {
         if (subtype == StoreException.LOCK) {
             SQLException next = ex.getNextException();
@@ -421,6 +424,7 @@ public class SybaseDictionary
             super(conn);
         }
 
+        @Override
         public String getCatalog()
             throws SQLException {
             if (_catalog == null)
@@ -428,6 +432,7 @@ public class SybaseDictionary
             return _catalog;
         }
 
+        @Override
         public void setAutoCommit(boolean autocommit)
             throws SQLException {
             // the sybase jdbc driver demands that the Connection always
@@ -473,6 +478,7 @@ public class SybaseDictionary
         return identityColumnName;
     }
 
+    @Override
     public void indexOf(SQLBuffer buf, FilterValue str, FilterValue find,
         FilterValue start) {
         buf.append("(CHARINDEX(");
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Union.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Union.java
index acfa3dff9..d320d9cdd 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Union.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Union.java
@@ -29,37 +29,37 @@ public interface Union
     /**
      * Return the selects that make up this union.
      */
-    public Select[] getSelects();
+    Select[] getSelects();
 
     /**
      * Get the union-level ordering, if any.
      */
-    public String getOrdering();
+    String getOrdering();
 
     /**
      * Whether this is a true UNION, rather than a logical combination of
      * independent selects.
      */
-    public boolean isUnion();
+    boolean isUnion();
 
     /**
      * Force the use of a series of standard selects rather than a true UNION.
      */
-    public void abortUnion();
+    void abortUnion();
 
     /**
      * Select data using the given selector.
      */
-    public void select(Selector selector);
+    void select(Selector selector);
 
     /**
      * A callback used to create the selects in a SQL union.
      */
-    public static interface Selector {
+    public interface Selector {
 
         /**
          * Populate the <code>i</code>th select in the union.
          */
-        public void select(Select sel, int i);
+        void select(Select sel, int i);
     }
 }
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestSQLStoreParamsSubstitution.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestSQLStoreParamsSubstitution.java
index b06fe6ca2..06a9b3339 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestSQLStoreParamsSubstitution.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestSQLStoreParamsSubstitution.java
@@ -74,7 +74,7 @@ public class TestSQLStoreParamsSubstitution extends TestCase {
                 }
             };
         try {
-            List<Integer> paramOrder = new ArrayList<Integer>();
+            List<Integer> paramOrder = new ArrayList<>();
 
             for (String sqlNrtn[] : sqlNrtns) {
                 paramOrder.clear();
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestUpdateManagerFlushException.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestUpdateManagerFlushException.java
index ff90ac2df..1172699f1 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestUpdateManagerFlushException.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestUpdateManagerFlushException.java
@@ -34,8 +34,6 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.StateManager;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
@@ -52,6 +50,8 @@ import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.util.Id;
 
+import junit.framework.TestCase;
+
 /**
  * <p>
  * Tests AbstractUpdateManager flush's method exception return behavior.
@@ -69,6 +69,7 @@ public class TestUpdateManagerFlushException extends /* Abstract */TestCase {
 
     private TestUpdateManager updMgr;
 
+    @Override
     public void setUp() {
         updMgr = new TestUpdateManager();
     }
@@ -104,6 +105,7 @@ public class TestUpdateManagerFlushException extends /* Abstract */TestCase {
      */
     class TestUpdateManager extends AbstractUpdateManager {
 
+        @Override
         protected Collection flush(RowManager rowMgr,
             PreparedStatementManager psMgr, Collection exceps) {
 
@@ -112,19 +114,23 @@ public class TestUpdateManagerFlushException extends /* Abstract */TestCase {
             return exceps;
         }
 
+        @Override
         protected PreparedStatementManager newPreparedStatementManager(
             JDBCStore store, Connection conn) {
             return new PreparedStatementManagerImpl(store, conn);
         }
 
+        @Override
         protected RowManager newRowManager() {
             return null;
         }
 
+        @Override
         public boolean orderDirty() {
             return false;
         }
 
+        @Override
         protected Collection populateRowManager(OpenJPAStateManager sm,
             RowManager rowMgr, JDBCStore store, Collection exceps,
             Collection customs) {
@@ -133,54 +139,69 @@ public class TestUpdateManagerFlushException extends /* Abstract */TestCase {
                 "TestUpdateManager.populateRowManager"));
             customs.add(new CustomMapping(CustomMapping.INSERT, sm,
                 new Strategy() {
+                    
+                    private static final long serialVersionUID = 1L;
+
+                    @Override
                     public void customDelete(OpenJPAStateManager sm,
                         JDBCStore store) throws SQLException {
                     }
 
+                    @Override
                     public void customInsert(OpenJPAStateManager sm,
                         JDBCStore store) throws SQLException {
                         throw new SQLException(
                             "TestUpdateManager.customInsert");
                     }
 
+                    @Override
                     public void customUpdate(OpenJPAStateManager sm,
                         JDBCStore store) throws SQLException {
                     }
 
+                    @Override
                     public void delete(OpenJPAStateManager sm, JDBCStore store,
                         RowManager rm) throws SQLException {
                     }
 
+                    @Override
                     public String getAlias() {
                         return null;
                     }
 
+                    @Override
                     public void initialize() {
                     }
 
+                    @Override
                     public void insert(OpenJPAStateManager sm, JDBCStore store,
                         RowManager rm) throws SQLException {
 
                     }
 
+                    @Override
                     public Boolean isCustomDelete(OpenJPAStateManager sm,
                         JDBCStore store) {
                         return null;
                     }
 
+                    @Override
                     public Boolean isCustomInsert(OpenJPAStateManager sm,
                         JDBCStore store) {
                         return null;
                     }
 
+                    @Override
                     public Boolean isCustomUpdate(OpenJPAStateManager sm,
                         JDBCStore store) {
                         return null;
                     }
 
+                    @Override
                     public void map(boolean adapt) {
                     }
 
+                    @Override
                     public void update(OpenJPAStateManager sm, JDBCStore store,
                         RowManager rm) throws SQLException {
                     }
@@ -194,499 +215,632 @@ public class TestUpdateManagerFlushException extends /* Abstract */TestCase {
      */
     class TestOpenJPAStateManager implements OpenJPAStateManager {
 
+        @Override
         public boolean assignObjectId(boolean flush) {
             return false;
         }
 
+        @Override
         public boolean beforeRefresh(boolean refreshAll) {
             return false;
         }
 
+        @Override
         public void dirty(int field) {
         }
 
+        @Override
         public Object fetch(int field) {
             return null;
         }
 
+        @Override
         public boolean fetchBoolean(int field) {
             return false;
         }
 
+        @Override
         public byte fetchByte(int field) {
             return 0;
         }
 
+        @Override
         public char fetchChar(int field) {
             return 0;
         }
 
+        @Override
         public double fetchDouble(int field) {
             return 0;
         }
 
+        @Override
         public Object fetchField(int field, boolean transitions) {
             return null;
         }
 
+        @Override
         public float fetchFloat(int field) {
             return 0;
         }
 
+        @Override
         public Object fetchInitialField(int field) {
             return null;
         }
 
+        @Override
         public int fetchInt(int field) {
             return 0;
         }
 
+        @Override
         public long fetchLong(int field) {
             return 0;
         }
 
+        @Override
         public Object fetchObject(int field) {
             return null;
         }
 
+        @Override
         public short fetchShort(int field) {
             return 0;
         }
 
+        @Override
         public String fetchString(int field) {
             return null;
         }
 
+        @Override
         public StoreContext getContext() {
             return null;
         }
 
+        @Override
         public BitSet getDirty() {
             return null;
         }
 
+        @Override
         public BitSet getFlushed() {
             return null;
         }
 
+        @Override
         public Object getId() {
             return null;
         }
 
+        @Override
         public Object getImplData() {
             return null;
         }
 
+        @Override
         public Object getImplData(int field) {
             return null;
         }
 
+        @Override
         public Object getIntermediate(int field) {
             return null;
         }
 
+        @Override
         public BitSet getLoaded() {
             return null;
         }
 
+        @Override
         public Object getLock() {
             return null;
         }
 
+        @Override
         public Object getManagedInstance() {
             return null;
         }
 
+        @Override
         public ClassMetaData getMetaData() {
             return null;
         }
 
+        @Override
         public Object getObjectId() {
             return null;
         }
 
+        @Override
         public OpenJPAStateManager getOwner() {
             return null;
         }
 
+        @Override
         public int getOwnerIndex() {
             return 0;
         }
 
+        @Override
         public PCState getPCState() {
             return null;
         }
 
+        @Override
         public PersistenceCapable getPersistenceCapable() {
             return null;
         }
 
+        @Override
         public BitSet getUnloaded(FetchConfiguration fetch) {
             return null;
         }
 
+        @Override
         public Object getVersion() {
             return null;
         }
 
+        @Override
         public void initialize(Class forType, PCState state) {
         }
 
+        @Override
         public boolean isDefaultValue(int field) {
             return false;
         }
 
+        @Override
         public boolean isEmbedded() {
             return false;
         }
 
+        @Override
         public boolean isFlushed() {
             return false;
         }
 
+        @Override
         public boolean isFlushedDirty() {
             return false;
         }
 
+        @Override
         public boolean isImplDataCacheable() {
             return false;
         }
 
+        @Override
         public boolean isImplDataCacheable(int field) {
             return false;
         }
 
+        @Override
         public boolean isProvisional() {
             return false;
         }
 
+        @Override
         public boolean isVersionCheckRequired() {
             return false;
         }
 
+        @Override
         public boolean isVersionUpdateRequired() {
             return false;
         }
 
+        @Override
         public void load(FetchConfiguration fetch) {
         }
 
+        @Override
         public Object newFieldProxy(int field) {
             return null;
         }
 
+        @Override
         public Object newProxy(int field) {
             return null;
         }
 
+        @Override
         public void removed(int field, Object removed, boolean key) {
         }
 
+        @Override
         public Object setImplData(Object data, boolean cacheable) {
             return null;
         }
 
+        @Override
         public Object setImplData(int field, Object data) {
             return null;
         }
 
+        @Override
         public void setIntermediate(int field, Object value) {
         }
 
+        @Override
         public void setLock(Object lock) {
         }
 
+        @Override
         public void setNextVersion(Object version) {
         }
 
+        @Override
         public void setObjectId(Object oid) {
         }
 
+        @Override
         public void setRemote(int field, Object value) {
         }
 
+        @Override
         public void setVersion(Object version) {
         }
 
+        @Override
         public void store(int field, Object value) {
         }
 
+        @Override
         public void storeBoolean(int field, boolean externalVal) {
         }
 
+        @Override
         public void storeByte(int field, byte externalVal) {
         }
 
+        @Override
         public void storeChar(int field, char externalVal) {
         }
 
+        @Override
         public void storeDouble(int field, double externalVal) {
         }
 
+        @Override
         public void storeField(int field, Object value) {
         }
 
+        @Override
         public void storeFloat(int field, float externalVal) {
         }
 
+        @Override
         public void storeInt(int field, int externalVal) {
         }
 
+        @Override
         public void storeLong(int field, long externalVal) {
         }
 
+        @Override
         public void storeObject(int field, Object externalVal) {
         }
 
+        @Override
         public void storeShort(int field, short externalVal) {
         }
 
+        @Override
         public void storeString(int field, String externalVal) {
         }
 
+        @Override
         public void accessingField(int idx) {
         }
 
+        @Override
         public void dirty(String field) {
         }
 
+        @Override
         public Object fetchObjectId() {
             return null;
         }
 
+        @Override
         public Object getGenericContext() {
             return null;
         }
 
+        @Override
         public Object getPCPrimaryKey(Object oid, int field) {
             return null;
         }
 
+        @Override
         public boolean isDeleted() {
             return false;
         }
 
+        @Override
         public boolean isDetached() {
             return false;
         }
 
+        @Override
         public boolean isDirty() {
             return false;
         }
 
+        @Override
         public boolean isNew() {
             return false;
         }
 
+        @Override
         public boolean isPersistent() {
             return false;
         }
 
+        @Override
         public boolean isTransactional() {
             return false;
         }
 
+        @Override
         public void providedBooleanField(PersistenceCapable pc, int idx,
             boolean cur) {
         }
 
+        @Override
         public void providedByteField(PersistenceCapable pc, int idx,
             byte cur) {
         }
 
+        @Override
         public void providedCharField(PersistenceCapable pc, int idx,
             char cur) {
         }
 
+        @Override
         public void providedDoubleField(PersistenceCapable pc, int idx,
             double cur) {
         }
 
+        @Override
         public void providedFloatField(PersistenceCapable pc, int idx,
             float cur) {
         }
 
+        @Override
         public void providedIntField(PersistenceCapable pc, int idx,
             int cur) {
         }
 
+        @Override
         public void providedLongField(PersistenceCapable pc, int idx,
             long cur) {
         }
 
+        @Override
         public void providedObjectField(PersistenceCapable pc, int idx,
             Object cur) {
         }
 
+        @Override
         public void providedShortField(PersistenceCapable pc, int idx,
             short cur) {
         }
 
+        @Override
         public void providedStringField(PersistenceCapable pc, int idx,
             String cur) {
         }
 
+        @Override
         public void proxyDetachedDeserialized(int idx) {
         }
 
+        @Override
         public boolean replaceBooleanField(PersistenceCapable pc, int idx) {
             return false;
         }
 
+        @Override
         public byte replaceByteField(PersistenceCapable pc, int idx) {
             return 0;
         }
 
+        @Override
         public char replaceCharField(PersistenceCapable pc, int idx) {
             return 0;
         }
 
+        @Override
         public double replaceDoubleField(PersistenceCapable pc, int idx) {
             return 0;
         }
 
+        @Override
         public float replaceFloatField(PersistenceCapable pc, int idx) {
             return 0;
         }
 
+        @Override
         public int replaceIntField(PersistenceCapable pc, int idx) {
             return 0;
         }
 
+        @Override
         public long replaceLongField(PersistenceCapable pc, int idx) {
             return 0;
         }
 
+        @Override
         public Object replaceObjectField(PersistenceCapable pc, int idx) {
             return null;
         }
 
+        @Override
         public short replaceShortField(PersistenceCapable pc, int idx) {
             return 0;
         }
 
+        @Override
         public StateManager replaceStateManager(StateManager sm) {
             return null;
         }
 
+        @Override
         public String replaceStringField(PersistenceCapable pc, int idx) {
             return null;
         }
 
+        @Override
         public boolean serializing() {
             return false;
         }
 
+        @Override
         public void settingBooleanField(PersistenceCapable pc, int idx,
             boolean cur, boolean next, int set) {
         }
 
+        @Override
         public void settingByteField(PersistenceCapable pc, int idx, byte cur,
             byte next, int set) {
         }
 
+        @Override
         public void settingCharField(PersistenceCapable pc, int idx, char cur,
             char next, int set) {
         }
 
+        @Override
         public void settingDoubleField(PersistenceCapable pc, int idx,
             double cur, double next, int set) {
         }
 
+        @Override
         public void settingFloatField(PersistenceCapable pc, int idx,
             float cur, float next, int set) {
         }
 
+        @Override
         public void settingIntField(PersistenceCapable pc, int idx, int cur,
             int next, int set) {
         }
 
+        @Override
         public void settingLongField(PersistenceCapable pc, int idx, long cur,
             long next, int set) {
         }
 
+        @Override
         public void settingObjectField(PersistenceCapable pc, int idx,
             Object cur, Object next, int set) {
         }
 
+        @Override
         public void settingShortField(PersistenceCapable pc, int idx,
             short cur, short next, int set) {
         }
 
+        @Override
         public void settingStringField(PersistenceCapable pc, int idx,
             String cur, String next, int set) {
         }
 
+        @Override
         public boolean writeDetached(ObjectOutput out) throws IOException {
             return false;
         }
 
+        @Override
         public void storeBooleanField(int fieldIndex, boolean value) {
         }
 
+        @Override
         public void storeByteField(int fieldIndex, byte value) {
         }
 
+        @Override
         public void storeCharField(int fieldIndex, char value) {
         }
 
+        @Override
         public void storeDoubleField(int fieldIndex, double value) {
         }
 
+        @Override
         public void storeFloatField(int fieldIndex, float value) {
         }
 
+        @Override
         public void storeIntField(int fieldIndex, int value) {
         }
 
+        @Override
         public void storeLongField(int fieldIndex, long value) {
         }
 
+        @Override
         public void storeObjectField(int fieldIndex, Object value) {
         }
 
+        @Override
         public void storeShortField(int fieldIndex, short value) {
         }
 
+        @Override
         public void storeStringField(int fieldIndex, String value) {
         }
 
+        @Override
         public boolean fetchBooleanField(int fieldIndex) {
             return false;
         }
 
+        @Override
         public byte fetchByteField(int fieldIndex) {
             return 0;
         }
 
+        @Override
         public char fetchCharField(int fieldIndex) {
             return 0;
         }
 
+        @Override
         public double fetchDoubleField(int fieldIndex) {
             return 0;
         }
 
+        @Override
         public float fetchFloatField(int fieldIndex) {
             return 0;
         }
 
+        @Override
         public int fetchIntField(int fieldIndex) {
             return 0;
         }
 
+        @Override
         public long fetchLongField(int fieldIndex) {
             return 0;
         }
 
+        @Override
         public Object fetchObjectField(int fieldIndex) {
             return null;
         }
 
+        @Override
         public short fetchShortField(int fieldIndex) {
             return 0;
         }
 
+        @Override
         public String fetchStringField(int fieldIndex) {
             return null;
         }
@@ -700,6 +854,7 @@ public class TestUpdateManagerFlushException extends /* Abstract */TestCase {
         public void setDelayed(int field, boolean delay) {
         }
 
+        @Override
         public void loadDelayedField(int field) {
         }
     }
@@ -709,148 +864,184 @@ public class TestUpdateManagerFlushException extends /* Abstract */TestCase {
      */
     abstract class TestConnection implements Connection {
 
+        @Override
         public void clearWarnings() throws SQLException {
         }
 
+        @Override
         public void close() throws SQLException {
         }
 
+        @Override
         public void commit() throws SQLException {
         }
 
+        @Override
         public Statement createStatement() throws SQLException {
             return null;
         }
 
+        @Override
         public Statement createStatement(int resultSetType,
             int resultSetConcurrency) throws SQLException {
             return null;
         }
 
+        @Override
         public Statement createStatement(int resultSetType,
             int resultSetConcurrency, int resultSetHoldability)
             throws SQLException {
             return null;
         }
 
+        @Override
         public boolean getAutoCommit() throws SQLException {
             return false;
         }
 
+        @Override
         public String getCatalog() throws SQLException {
             return null;
         }
 
+        @Override
         public int getHoldability() throws SQLException {
             return 0;
         }
 
+        @Override
         public DatabaseMetaData getMetaData() throws SQLException {
             return null;
         }
 
+        @Override
         public int getTransactionIsolation() throws SQLException {
             return 0;
         }
 
+        @Override
         public Map<String, Class<?>> getTypeMap() throws SQLException {
             return null;
         }
 
+        @Override
         public SQLWarning getWarnings() throws SQLException {
             return null;
         }
 
+        @Override
         public boolean isClosed() throws SQLException {
             return false;
         }
 
+        @Override
         public boolean isReadOnly() throws SQLException {
             return false;
         }
 
+        @Override
         public String nativeSQL(String sql) throws SQLException {
             return null;
         }
 
+        @Override
         public CallableStatement prepareCall(String sql) throws SQLException {
             return null;
         }
 
+        @Override
         public CallableStatement prepareCall(String sql, int resultSetType,
             int resultSetConcurrency) throws SQLException {
             return null;
         }
 
+        @Override
         public CallableStatement prepareCall(String sql, int resultSetType,
             int resultSetConcurrency, int resultSetHoldability)
             throws SQLException {
             return null;
         }
 
+        @Override
         public PreparedStatement prepareStatement(String sql)
             throws SQLException {
             return null;
         }
 
+        @Override
         public PreparedStatement prepareStatement(String sql,
             int autoGeneratedKeys) throws SQLException {
             return null;
         }
 
+        @Override
         public PreparedStatement prepareStatement(String sql,
             int[] columnIndexes) throws SQLException {
             return null;
         }
 
+        @Override
         public PreparedStatement prepareStatement(String sql,
             String[] columnNames) throws SQLException {
             return null;
         }
 
+        @Override
         public PreparedStatement prepareStatement(String sql,
             int resultSetType, int resultSetConcurrency) throws SQLException {
             return null;
         }
 
+        @Override
         public PreparedStatement prepareStatement(String sql,
             int resultSetType, int resultSetConcurrency,
             int resultSetHoldability) throws SQLException {
             return null;
         }
 
+        @Override
         public void releaseSavepoint(Savepoint savepoint) throws SQLException {
         }
 
+        @Override
         public void rollback() throws SQLException {
         }
 
+        @Override
         public void rollback(Savepoint savepoint) throws SQLException {
         }
 
+        @Override
         public void setAutoCommit(boolean autoCommit) throws SQLException {
         }
 
+        @Override
         public void setCatalog(String catalog) throws SQLException {
         }
 
+        @Override
         public void setHoldability(int holdability) throws SQLException {
         }
 
+        @Override
         public void setReadOnly(boolean readOnly) throws SQLException {
         }
 
+        @Override
         public Savepoint setSavepoint() throws SQLException {
             return null;
         }
 
+        @Override
         public Savepoint setSavepoint(String name) throws SQLException {
             return null;
         }
 
+        @Override
         public void setTransactionIsolation(int level) throws SQLException {
         }
 
+        @Override
         public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
         }
     }
@@ -860,48 +1051,59 @@ public class TestUpdateManagerFlushException extends /* Abstract */TestCase {
      */
     class TestJDBCStore implements JDBCStore {
 
+        @Override
         public Object find(Object oid, ValueMapping vm,
             JDBCFetchConfiguration fetch) {
             return null;
         }
 
+        @Override
         public JDBCConfiguration getConfiguration() {
             return null;
         }
 
+        @Override
         public Connection getConnection() {
             throw new RuntimeException("TestConnection is abstract for JDK6");
 //            return new TestConnection();
         }
 
+        @Override
         public Connection getNewConnection() {
             return getConnection();
         }
 
+        @Override
         public StoreContext getContext() {
             return null;
         }
 
+        @Override
         public DBDictionary getDBDictionary() {
             return null;
         }
 
+        @Override
         public JDBCFetchConfiguration getFetchConfiguration() {
             return null;
         }
 
+        @Override
         public JDBCLockManager getLockManager() {
             return null;
         }
 
+        @Override
         public SQLFactory getSQLFactory() {
             return null;
         }
 
+        @Override
         public void loadSubclasses(ClassMapping mapping) {
 
         }
 
+        @Override
         public Id newDataStoreId(long id, ClassMapping mapping, boolean subs) {
             return null;
         }
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java
index e28ca8096..dd3ab8a90 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java
@@ -18,15 +18,16 @@
  */
 package org.apache.openjpa.jdbc.meta;
 
-import org.apache.openjpa.jdbc.schema.Table;
-import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.Table;
 
 import junit.framework.TestCase;
 
 public class TestMappingDefaultsImpl extends TestCase {
 
+    @Override
     public void setUp() {
     }
 
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java
index c9970e977..1a1df91ec 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestBooleanRepresentation.java
@@ -25,9 +25,10 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.openjpa.lib.jdbc.DelegatingPreparedStatement;
+
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import org.apache.openjpa.lib.jdbc.DelegatingPreparedStatement;
 
 /**
  * Test for the {@link org.apache.openjpa.jdbc.sql.BooleanRepresentation} factory and default impls
@@ -62,7 +63,7 @@ public class TestBooleanRepresentation  extends TestCase {
         BooleanRepresentation booleanRepresentation = BooleanRepresentationFactory.valueOf(representationKey, cl);
         Assert.assertNotNull(booleanRepresentation);
 
-        DummyPreparedStatement<T> dummyPreparedStatement = new DummyPreparedStatement<T>(expectedType);
+        DummyPreparedStatement<T> dummyPreparedStatement = new DummyPreparedStatement<>(expectedType);
 
         booleanRepresentation.setBoolean(dummyPreparedStatement, 1, true);
         Assert.assertEquals(yesRepresentation, dummyPreparedStatement.getBooleanRepresentationValue());
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDB2Dictionary.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDB2Dictionary.java
index 3902d2a5e..ca5e661e3 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDB2Dictionary.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDB2Dictionary.java
@@ -18,6 +18,9 @@
  */
 package org.apache.openjpa.jdbc.sql;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -32,8 +35,6 @@ import org.jmock.integration.junit4.JUnitRuleMockery;
 import org.junit.Rule;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 
 public class TestDB2Dictionary {
     @Rule
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java
index 00015eae1..262b91b36 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java
@@ -18,6 +18,10 @@
  */
 package org.apache.openjpa.jdbc.sql;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.identifier.DBIdentifierUtilImpl;
@@ -28,8 +32,6 @@ import org.jmock.integration.junit4.JUnitRuleMockery;
 import org.junit.Rule;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class TestDBDictionaryGeneratedSQL {
 
     @Rule
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDictionaryFactory.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDictionaryFactory.java
index 10652f5f0..c5ed79175 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDictionaryFactory.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDictionaryFactory.java
@@ -172,6 +172,7 @@ public class TestDictionaryFactory extends TestCase {
 
     private static Method getProtocol;
 
+    @Override
     public void setUp() {
         try {
             getProtocol = DBDictionaryFactory.class.getDeclaredMethod(
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestMySQLDictionary.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestMySQLDictionary.java
index 452c5ebce..662e981cc 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestMySQLDictionary.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestMySQLDictionary.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.jdbc.sql;
 
+import static org.junit.Assert.assertEquals;
+
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,7 +31,6 @@ import org.jmock.Expectations;
 import org.jmock.integration.junit4.JUnitRuleMockery;
 import org.junit.Rule;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class TestMySQLDictionary {
 
diff --git a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/identifier/TestDBIdentifiers.java b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/identifier/TestDBIdentifiers.java
index b5da5a3cf..a95f900c1 100644
--- a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/identifier/TestDBIdentifiers.java
+++ b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/identifier/TestDBIdentifiers.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.jdbc.sql.identifier;
 
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
+import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 
 import junit.framework.TestCase;
 
@@ -35,7 +35,7 @@ public class TestDBIdentifiers extends TestCase {
         // delimiters.
         QualifiedDBIdentifier p1 = QualifiedDBIdentifier.newPath(DBIdentifier.newSchema("my.schema"));
         DBIdentifier s1 = DBIdentifier.newSchema("my.schema");
-        assertTrue(QualifiedDBIdentifier.equal(p1, s1));
+        assertTrue(DBIdentifier.equal(p1, s1));
         assertEquals("\"my.schema\"", p1.getName());
         assertEquals("\"my.schema\"", s1.getName());
         assertEquals(p1.getType(), DBIdentifierType.SCHEMA);
@@ -44,7 +44,7 @@ public class TestDBIdentifiers extends TestCase {
 
         QualifiedDBIdentifier p2 = QualifiedDBIdentifier.newPath(DBIdentifier.newSchema("SCHEMA"));
         DBIdentifier s2 = DBIdentifier.newSchema("SCHEMA2");
-        assertFalse(QualifiedDBIdentifier.equal(p2, s2));
+        assertFalse(DBIdentifier.equal(p2, s2));
         assertEquals("SCHEMA", p2.getName());
         assertEquals("SCHEMA2", s2.getName());
         assertEquals(p2.getType(), DBIdentifierType.SCHEMA);
@@ -194,7 +194,7 @@ public class TestDBIdentifiers extends TestCase {
             DBIdentifier.newColumn("mycol"));
         QualifiedDBIdentifier p2 = QualifiedDBIdentifier.newPath(DBIdentifier.newTable("MYTABLE"),
             DBIdentifier.newColumn("MYCOL"));
-        assertTrue(QualifiedDBIdentifier.equal(p1, p1));
+        assertTrue(DBIdentifier.equal(p1, p1));
 
         // Test equals operator with delimited, case sensitive names
         QualifiedDBIdentifier p3 = QualifiedDBIdentifier.newPath(DBIdentifier.newTable("\"MyTable\""),
@@ -203,8 +203,8 @@ public class TestDBIdentifiers extends TestCase {
             DBIdentifier.newColumn("MYCOL"));
         QualifiedDBIdentifier p5 = QualifiedDBIdentifier.newPath(DBIdentifier.newTable("\"MyTable\""),
             DBIdentifier.newColumn("\"mycol\""));
-        assertFalse(QualifiedDBIdentifier.equal(p3, p4));
-        assertTrue(QualifiedDBIdentifier.equal(p3, p5));
+        assertFalse(DBIdentifier.equal(p3, p4));
+        assertTrue(DBIdentifier.equal(p3, p5));
 
         // Test setPath method
         QualifiedDBIdentifier p6 = QualifiedDBIdentifier.newPath(DBIdentifier.newTable("MyTable"),
@@ -266,7 +266,7 @@ public class TestDBIdentifiers extends TestCase {
             idx++;
         } else {
             assertEquals(DBIdentifierType.TABLE, names[idx].getType());
-            String path = QualifiedDBIdentifier.join(DBIdentifier.newSchema(schema),
+            String path = DBIdentifier.join(DBIdentifier.newSchema(schema),
                 DBIdentifier.newTable(table));
             assertEquals(names[idx].getName(), path);
         }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/json/JSON.java b/openjpa-jest/src/main/java/org/apache/openjpa/json/JSON.java
index 0157a55f2..fbcb172dd 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/json/JSON.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/json/JSON.java
@@ -32,23 +32,23 @@ public interface JSON {
      * @param level level at which this instance is being rendered
      * @return a mutable buffer
      */
-    public StringBuilder asString(int level);
+    StringBuilder asString(int level);
 
-    public static final char FIELD_SEPARATOR  = ',';
-    public static final char MEMBER_SEPARATOR = ',';
-    public static final char VALUE_SEPARATOR  = ':';
-    public static final char IOR_SEPARTOR     = '-';
-    public static final char QUOTE            = '"';
-    public static final char SPACE            = ' ';
-    public static final char OBJECT_START     = '{';
-    public static final char OBJECT_END       = '}';
-    public static final char ARRAY_START      = '[';
-    public static final char ARRAY_END        = ']';
+    char FIELD_SEPARATOR  = ',';
+    char MEMBER_SEPARATOR = ',';
+    char VALUE_SEPARATOR  = ':';
+    char IOR_SEPARTOR     = '-';
+    char QUOTE            = '"';
+    char SPACE            = ' ';
+    char OBJECT_START     = '{';
+    char OBJECT_END       = '}';
+    char ARRAY_START      = '[';
+    char ARRAY_END        = ']';
 
-    public static final String NEWLINE        = "\r\n";
-    public static final String NULL_LITERAL   = "null";
-    public static final String REF_MARKER     = "$ref";
-    public static final String ID_MARKER      = "$id";
-    public static final String ARRAY_EMPTY    = "[]";
+    String NEWLINE        = "\r\n";
+    String NULL_LITERAL   = "null";
+    String REF_MARKER     = "$ref";
+    String ID_MARKER      = "$id";
+    String ARRAY_EMPTY    = "[]";
 
 }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/json/JSONObject.java b/openjpa-jest/src/main/java/org/apache/openjpa/json/JSONObject.java
index 3b0add1ac..903794ee5 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/json/JSONObject.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/json/JSONObject.java
@@ -47,7 +47,7 @@ public class JSONObject implements JSON {
         _type = type;
         _id   = id.toString();
         _ref  = ref;
-        _values = new LinkedHashMap<String, Object>();
+        _values = new LinkedHashMap<>();
     }
 
     public void set(String key, Object value) {
@@ -57,10 +57,12 @@ public class JSONObject implements JSON {
     public void write(PrintWriter writer) {
         writer.println(toString());
     }
+    @Override
     public String toString() {
         return asString(0).toString();
     }
 
+    @Override
     public StringBuilder asString(int indent) {
         StringBuilder buf = new StringBuilder().append(OBJECT_START);
         buf.append(encodeField(_ref ? REF_MARKER : ID_MARKER, ior(), 0));
@@ -133,16 +135,18 @@ public class JSONObject implements JSON {
      *
      */
     public static class Array implements JSON {
-        private List<Object> _members = new ArrayList<Object>();
+        private List<Object> _members = new ArrayList<>();
 
         public void add(Object o) {
             _members.add(o);
         }
 
+        @Override
         public String toString() {
             return asString(0).toString();
         }
 
+        @Override
         public StringBuilder asString(int indent) {
             StringBuilder buf = new StringBuilder().append(ARRAY_START);
             StringBuilder tab = JSONObject.newIndent(indent+1);
@@ -170,16 +174,18 @@ public class JSONObject implements JSON {
      *
      */
     public static class KVMap implements JSON {
-        private Map<Object,Object> _entries = new LinkedHashMap<Object,Object>();
+        private Map<Object,Object> _entries = new LinkedHashMap<>();
 
         public void put(Object k, Object v) {
             _entries.put(k,v);
         }
 
+        @Override
         public String toString() {
             return asString(0).toString();
         }
 
+        @Override
         public StringBuilder asString(int indent) {
             StringBuilder buf = new StringBuilder().append(ARRAY_START);
             StringBuilder tab = JSONObject.newIndent(indent+1);
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
index 045689e97..b90a46bc2 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
@@ -58,13 +58,13 @@ abstract class AbstractCommand implements JESTCommand {
     public static final Collection<String> EMPTY_LIST = Collections.emptySet();
     protected ObjectFormatter<?> _formatter;
 
-    private Map<String, String> _qualifiers = new HashMap<String, String>();
-    private Map<String, String> _args = new HashMap<String, String>();
-    private Map<String, String> _margs = new HashMap<String, String>();
+    private Map<String, String> _qualifiers = new HashMap<>();
+    private Map<String, String> _args = new HashMap<>();
+    private Map<String, String> _margs = new HashMap<>();
     protected final JPAServletContext _ctx;
 
     private static PrototypeFactory<Format,ObjectFormatter<?>> _formatterFactory =
-        new PrototypeFactory<Format,ObjectFormatter<?>>();
+        new PrototypeFactory<>();
     protected static Localizer _loc = Localizer.forPackage(AbstractCommand.class);
 
     static {
@@ -76,6 +76,7 @@ abstract class AbstractCommand implements JESTCommand {
         _ctx = ctx;
     }
 
+    @Override
     public JPAServletContext getExecutionContext() {
         return _ctx;
     }
@@ -84,22 +85,27 @@ abstract class AbstractCommand implements JESTCommand {
         return get(key, _margs);
     }
 
+    @Override
     public String getArgument(String key) {
         return get(key, _args);
     }
 
+    @Override
     public boolean hasArgument(String key) {
         return has(key, _args);
     }
 
+    @Override
     public Map<String, String> getArguments() {
         return _args;
     }
 
+    @Override
     public String getQualifier(String key) {
         return get(key, _qualifiers);
     }
 
+    @Override
     public boolean hasQualifier(String key) {
         return has(key, _qualifiers);
     }
@@ -112,6 +118,7 @@ abstract class AbstractCommand implements JESTCommand {
         return false;
     }
 
+    @Override
     public Map<String, String> getQualifiers() {
         return _qualifiers;
     }
@@ -129,6 +136,7 @@ abstract class AbstractCommand implements JESTCommand {
      * <br>
      * The qualifiers and arguments are immutable after parse.
      */
+    @Override
     public void parse() throws ProcessingException {
         HttpServletRequest request = _ctx.getRequest();
         String path = request.getPathInfo();
@@ -275,7 +283,7 @@ abstract class AbstractCommand implements JESTCommand {
     }
 
     protected List<OpenJPAStateManager> toStateManager(Collection<?> objects) {
-        List<OpenJPAStateManager> sms = new ArrayList<OpenJPAStateManager>();
+        List<OpenJPAStateManager> sms = new ArrayList<>();
         for (Object o : objects) {
             OpenJPAStateManager sm = toStateManager(o);
             if (sm != null) sms.add(sm);
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/Closure.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/Closure.java
index 7fc460809..b3757c191 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/Closure.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/Closure.java
@@ -39,7 +39,7 @@ import org.apache.openjpa.meta.JavaTypes;
  *
  */
 public class Closure implements Iterable<OpenJPAStateManager> {
-    private Set<OpenJPAStateManager> _visited = new LinkedHashSet<OpenJPAStateManager>();
+    private Set<OpenJPAStateManager> _visited = new LinkedHashSet<>();
 
     public Closure(OpenJPAStateManager root) {
         this(Collections.singleton(root));
@@ -97,6 +97,7 @@ public class Closure implements Iterable<OpenJPAStateManager> {
         return null;
     }
 
+    @Override
     public Iterator<OpenJPAStateManager> iterator() {
         return _visited.iterator();
     }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/Constants.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/Constants.java
index 88bea9b81..6211d58d5 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/Constants.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/Constants.java
@@ -30,85 +30,85 @@ public interface Constants {
     /**
      * Common Command Qualifiers
      */
-    public static final String QUALIFIER_FORMAT      = "format";
-    public static final String QUALIFIER_PLAN        = "plan";
+    String QUALIFIER_FORMAT      = "format";
+    String QUALIFIER_PLAN        = "plan";
 
     /**
      * Mime Types
      */
-    public static final String MIME_TYPE_PLAIN = "text/plain";
-    public static final String MIME_TYPE_JS    = "text/javascript";
-    public static final String MIME_TYPE_CSS   = "text/css";
-    public static final String MIME_TYPE_XML   = "text/xml";
-    public static final String MIME_TYPE_JSON  = "application/json";
+    String MIME_TYPE_PLAIN = "text/plain";
+    String MIME_TYPE_JS    = "text/javascript";
+    String MIME_TYPE_CSS   = "text/css";
+    String MIME_TYPE_XML   = "text/xml";
+    String MIME_TYPE_JSON  = "application/json";
 
 
     /**
      * Dojo Toolkit URL and Themes
      */
-    public static final String DOJO_BASE_URL = "http://ajax.googleapis.com/ajax/libs/dojo/1.5";
-    public static final String DOJO_THEME    = "claro";
+    String DOJO_BASE_URL = "http://ajax.googleapis.com/ajax/libs/dojo/1.5";
+    String DOJO_THEME    = "claro";
 
 
 
     /**
      * Root element of XML instances. Must match the name defined in <A href="jest-instance.xsd>jest-instance.xsd</A>.
      */
-    public static final String ROOT_ELEMENT_INSTANCE   = "instances";
-    public static final String ATTR_ID      = "id";
-    public static final String ATTR_REL     = "rel";
-    public static final String ATTR_SRC     = "src";
-    public static final String ATTR_TYPE    = "type";
-    public static final String ATTR_NAME    = "name";
-    public static final String ATTR_VERSION = "version";
-    public static final String ATTR_CLASS   = "class";
-    public static final String ATTR_HREF    = "href";
-    public static final String ATTR_STYLE   = "style";
-    public static final String ATTR_NULL           = "null";
-    public static final String ATTR_MEMBER_TYPE    = "member-type";
-    public static final String ATTR_KEY_TYPE       = "key-type";
-    public static final String ATTR_VALUE_TYPE     = "value-type";
+    String ROOT_ELEMENT_INSTANCE   = "instances";
+    String ATTR_ID      = "id";
+    String ATTR_REL     = "rel";
+    String ATTR_SRC     = "src";
+    String ATTR_TYPE    = "type";
+    String ATTR_NAME    = "name";
+    String ATTR_VERSION = "version";
+    String ATTR_CLASS   = "class";
+    String ATTR_HREF    = "href";
+    String ATTR_STYLE   = "style";
+    String ATTR_NULL           = "null";
+    String ATTR_MEMBER_TYPE    = "member-type";
+    String ATTR_KEY_TYPE       = "key-type";
+    String ATTR_VALUE_TYPE     = "value-type";
 
     /**
      * Elements and attributes in properties XML.
      */
-    public static final String ROOT_ELEMENT_PROPERTIES = "properties";
-    public static final String ELEMENT_PROPERTY     = "property";
-    public static final String ATTR_PROPERTY_KEY     = "name";
-    public static final String ATTR_PROPERTY_VALUE     = "value";
+    String ROOT_ELEMENT_PROPERTIES = "properties";
+    String ELEMENT_PROPERTY     = "property";
+    String ATTR_PROPERTY_KEY     = "name";
+    String ATTR_PROPERTY_VALUE     = "value";
 
 
-    public static final String ROOT_ELEMENT_ERROR      = "error";
-    public static final String ELEMENT_ERROR_HEADER    = "error-header";
-    public static final String ELEMENT_ERROR_MESSAGE   = "error-message";
-    public static final String ELEMENT_ERROR_TRACE     = "stacktrace";
+    String ROOT_ELEMENT_ERROR      = "error";
+    String ELEMENT_ERROR_HEADER    = "error-header";
+    String ELEMENT_ERROR_MESSAGE   = "error-message";
+    String ELEMENT_ERROR_TRACE     = "stacktrace";
 
     /**
      * Root element of XML meta-model. Must match the name defined in <A href="jest-model.xsd>jest-model.xsd</A>.
      */
-    public static final String ROOT_ELEMENT_MODEL      = "metamodel";
+    String ROOT_ELEMENT_MODEL      = "metamodel";
 
-    public static final String ELEMENT_INSTANCE      = "instance";
-    public static final String ELEMENT_URI           = "uri";
-    public static final String ELEMENT_DESCRIPTION   = "description";
-    public static final String ELEMENT_REF           = "ref";
-    public static final String ELEMENT_NULL_REF      = "null";
-    public static final String ELEMENT_MEMBER        = "member";
-    public static final String ELEMENT_ENTRY         = "entry";
-    public static final String ELEMENT_ENTRY_KEY     = "key";
-    public static final String ELEMENT_ENTRY_VALUE   = "value";
+    String ELEMENT_INSTANCE      = "instance";
+    String ELEMENT_URI           = "uri";
+    String ELEMENT_DESCRIPTION   = "description";
+    String ELEMENT_REF           = "ref";
+    String ELEMENT_NULL_REF      = "null";
+    String ELEMENT_MEMBER        = "member";
+    String ELEMENT_ENTRY         = "entry";
+    String ELEMENT_ENTRY_KEY     = "key";
+    String ELEMENT_ENTRY_VALUE   = "value";
 
 
 
     /**
      * JEST resources
      */
-    public static final String JEST_INSTANCE_XSD       = "jest-instance.xsd";
+    String JEST_INSTANCE_XSD       = "jest-instance.xsd";
 
-    static final String JAXP_SCHEMA_SOURCE      = "http://java.sun.com/xml/jaxp/properties/schemaSource";
-    static final String JAXP_SCHEMA_LANGUAGE    = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+    String JAXP_SCHEMA_SOURCE      = "http://java.sun.com/xml/jaxp/properties/schemaSource";
+    String JAXP_SCHEMA_LANGUAGE    = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
 
-    public static final String NULL_VALUE          = "null";
+    String NULL_VALUE          = "null";
 
 
 }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
index 55b5006fe..c2c949900 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
@@ -37,10 +37,12 @@ class DomainCommand extends AbstractCommand {
         super(ctx);
     }
 
+    @Override
     protected Collection<String> getValidQualifiers() {
         return _validQualifiers;
     }
 
+    @Override
     protected int getMaximumArguments() {
         return 0;
     }
@@ -49,6 +51,7 @@ class DomainCommand extends AbstractCommand {
         return "domain";
     }
 
+    @Override
     public void process() throws ProcessingException, IOException {
         JPAServletContext ctx = getExecutionContext();
         ObjectFormatter<?> formatter = getObjectFormatter();
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
index be51d6171..3b62c0528 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
@@ -57,6 +57,7 @@ class FindCommand extends AbstractCommand {
         return 1;
     }
 
+    @Override
     protected Collection<String> getValidQualifiers() {
         return _validQualifiers;
     }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTCommand.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTCommand.java
index 01dcdc00d..f7570f90c 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTCommand.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTCommand.java
@@ -67,7 +67,7 @@ public interface JESTCommand {
      *
      * @return the execution context. never null.
      */
-    public JPAServletContext getExecutionContext();
+    JPAServletContext getExecutionContext();
 
     /**
      * Parse the given request to populate qualifiers and parameters of this command.
@@ -76,14 +76,14 @@ public interface JESTCommand {
      * phase, the parameters and qualifiers are accessed from the parsed command itself rather than
      * from the original HTTP request.
      */
-    public void parse() throws ProcessingException;
+    void parse() throws ProcessingException;
 
     /**
      * Process the given request and write the output on to the given response in the given context.
      * @throws ProcessingException
      *
      */
-    public void process() throws ProcessingException, IOException;
+    void process() throws ProcessingException, IOException;
 
 
     /**
@@ -91,7 +91,7 @@ public interface JESTCommand {
      *
      * @exception IllegalStateException if accessed prior to parsing.
      */
-    public Map<String,String> getArguments();
+    Map<String,String> getArguments();
 
     /**
      * Get the value of this command's argument of the given name.
@@ -100,7 +100,7 @@ public interface JESTCommand {
      *
      * @exception IllegalStateException if accessed prior to parsing.
      */
-    public String getArgument(String key);
+    String getArgument(String key);
 
 
     /**
@@ -108,14 +108,14 @@ public interface JESTCommand {
      *
      * @exception IllegalStateException if accessed prior to parsing.
      */
-    public boolean hasArgument(String key);
+    boolean hasArgument(String key);
 
     /**
      * Get this command's qualifiers.
      *
      * @exception IllegalStateException if accessed prior to parsing.
      */
-    public Map<String,String> getQualifiers();
+    Map<String,String> getQualifiers();
 
     /**
      * Get the value of this command's qualifier of the given name.
@@ -124,13 +124,13 @@ public interface JESTCommand {
      *
      * @exception IllegalStateException if accessed prior to parsing.
      */
-    public String getQualifier(String key);
+    String getQualifier(String key);
 
     /**
      * Affirm this command contains an qualifier of the given name.
      *
      * @exception IllegalStateException if accessed prior to parsing.
      */
-    public boolean hasQualifier(String key);
+    boolean hasQualifier(String key);
 
 }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
index b516ac22a..40711599f 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
@@ -58,7 +58,7 @@ public class JESTContext implements JPAServletContext {
     protected MetaDataRepository       _repos;
     private String _rootResource;
     protected Log _log;
-    protected static PrototypeFactory<String,JESTCommand> _cf = new PrototypeFactory<String,JESTCommand>();
+    protected static PrototypeFactory<String,JESTCommand> _cf = new PrototypeFactory<>();
     public static final Localizer _loc = Localizer.forPackage(JESTContext.class);
     private static final String ONE_YEAR_FROM_NOW;
     public static final char QUERY_SEPARATOR = '?';
@@ -95,6 +95,7 @@ public class JESTContext implements JPAServletContext {
     /**
      * Gets the name of the persistence unit.
      */
+    @Override
     public String getPersistenceUnitName() {
         return _unit;
     }
@@ -103,6 +104,7 @@ public class JESTContext implements JPAServletContext {
      * Gets the persistence context. The persistence context is lazily constructed because all commands
      * may not need it.
      */
+    @Override
     public OpenJPAEntityManager getPersistenceContext() {
         if (_em == null) {
             _em = _emf.createEntityManager();
@@ -113,13 +115,13 @@ public class JESTContext implements JPAServletContext {
     /**
      * Gets the request.
      */
+    @Override
     public HttpServletRequest getRequest() {
         return _request;
     }
 
-    /**
-     *
-     */
+    
+    @Override
     public String getRequestURI() {
         StringBuffer buf = _request.getRequestURL();
         String query = _request.getQueryString();
@@ -133,6 +135,7 @@ public class JESTContext implements JPAServletContext {
     /**
      * Gets the response.
      */
+    @Override
     public HttpServletResponse getResponse() {
         return _response;
     }
@@ -211,6 +214,7 @@ public class JESTContext implements JPAServletContext {
     }
 
 
+    @Override
     public ClassMetaData resolve(String alias) {
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
         return _repos.getMetaData(alias, loader, true);
@@ -259,6 +263,7 @@ public class JESTContext implements JPAServletContext {
         }
     }
 
+    @Override
     public void log(short level, String message) {
         switch (level) {
             case Log.INFO:  _log.info(message); break;
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
index 719d440e6..131cc0d59 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
@@ -60,8 +60,8 @@ import org.apache.openjpa.persistence.OpenJPAPersistence;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class JESTServlet extends HttpServlet  {
+    private static final long serialVersionUID = 1L;
     /**
      * Servlet initialization parameter monikers
      */
@@ -169,6 +169,7 @@ public class JESTServlet extends HttpServlet  {
 //        log("Path Translated = [" + request.getPathTranslated() + "]");
     }
 
+    @Override
     public void log(String s) {
         // START - ALLOW PRINT STATEMENTS
         System.err.println(s);
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java
index b75fa250e..4dafb8501 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java
@@ -37,27 +37,27 @@ public interface JPAServletContext {
     /**
      * Get the persistence context of the operational context.
      */
-    public OpenJPAEntityManager getPersistenceContext();
+    OpenJPAEntityManager getPersistenceContext();
 
     /**
      * Get the persistence unit name.
      */
-    public String getPersistenceUnitName();
+    String getPersistenceUnitName();
 
     /**
      * Get the HTTP Request.
      */
-    public HttpServletRequest getRequest();
+    HttpServletRequest getRequest();
 
     /**
      * Get the HTTP Response.
      */
-    public HttpServletResponse getResponse();
+    HttpServletResponse getResponse();
 
     /**
      * Get the requested URI.
      */
-    public String getRequestURI();
+    String getRequestURI();
 
     /**
      * Resolve the given alias to meta-data of the persistent type.
@@ -68,12 +68,12 @@ public interface JPAServletContext {
      * @exception raises runtime exception if the given name can not be identified to a persistent
      * Java type.
      */
-    public ClassMetaData resolve(String alias);
+    ClassMetaData resolve(String alias);
 
     /**
      * Logging message.
      * @param level OpenJPA defined {@link Log#INFO log levels}. Invalid levels will print the message on console.
      * @param message a printable message.
      */
-    public void log(short level, String message);
+    void log(short level, String message);
 }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSON.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSON.java
index 25b3e23d6..eba848d6a 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSON.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSON.java
@@ -32,23 +32,23 @@ public interface JSON {
      * @param level level at which this instance is being rendered
      * @return a mutable buffer
      */
-    public StringBuilder asString(int level);
+    StringBuilder asString(int level);
 
-    public static final char FIELD_SEPARATOR  = ',';
-    public static final char MEMBER_SEPARATOR = ',';
-    public static final char VALUE_SEPARATOR  = ':';
-    public static final char IOR_SEPARTOR     = '-';
-    public static final char QUOTE            = '"';
-    public static final char SPACE            = ' ';
-    public static final char OBJECT_START     = '{';
-    public static final char OBJECT_END       = '}';
-    public static final char ARRAY_START      = '[';
-    public static final char ARRAY_END        = ']';
+    char FIELD_SEPARATOR  = ',';
+    char MEMBER_SEPARATOR = ',';
+    char VALUE_SEPARATOR  = ':';
+    char IOR_SEPARTOR     = '-';
+    char QUOTE            = '"';
+    char SPACE            = ' ';
+    char OBJECT_START     = '{';
+    char OBJECT_END       = '}';
+    char ARRAY_START      = '[';
+    char ARRAY_END        = ']';
 
-    public static final String NEWLINE        = "\r\n";
-    public static final String NULL_LITERAL   = "null";
-    public static final String REF_MARKER     = "$ref";
-    public static final String ID_MARKER      = "$id";
-    public static final String ARRAY_EMPTY    = "[]";
+    String NEWLINE        = "\r\n";
+    String NULL_LITERAL   = "null";
+    String REF_MARKER     = "$ref";
+    String ID_MARKER      = "$id";
+    String ARRAY_EMPTY    = "[]";
 
 }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java
index ba3a15d47..168f957c7 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java
@@ -47,7 +47,7 @@ public class JSONObject implements JSON {
         _type = type;
         _id   = id.toString();
         _ref  = ref;
-        _values = new LinkedHashMap<String, Object>();
+        _values = new LinkedHashMap<>();
     }
 
     public void set(String key, Object value) {
@@ -57,10 +57,12 @@ public class JSONObject implements JSON {
     public void write(PrintWriter writer) {
         writer.println(toString());
     }
+    @Override
     public String toString() {
         return asString(0).toString();
     }
 
+    @Override
     public StringBuilder asString(int indent) {
         StringBuilder buf = new StringBuilder().append(OBJECT_START);
         buf.append(encodeField(_ref ? REF_MARKER : ID_MARKER, ior(), 0));
@@ -133,16 +135,18 @@ public class JSONObject implements JSON {
      *
      */
     public static class Array implements JSON {
-        private List<Object> _members = new ArrayList<Object>();
+        private List<Object> _members = new ArrayList<>();
 
         public void add(Object o) {
             _members.add(o);
         }
 
+        @Override
         public String toString() {
             return asString(0).toString();
         }
 
+        @Override
         public StringBuilder asString(int indent) {
             StringBuilder buf = new StringBuilder().append(ARRAY_START);
             StringBuilder tab = JSONObject.newIndent(indent+1);
@@ -170,16 +174,18 @@ public class JSONObject implements JSON {
      *
      */
     public static class KVMap implements JSON {
-        private Map<Object,Object> _entries = new LinkedHashMap<Object,Object>();
+        private Map<Object,Object> _entries = new LinkedHashMap<>();
 
         public void put(Object k, Object v) {
             _entries.put(k,v);
         }
 
+        @Override
         public String toString() {
             return asString(0).toString();
         }
 
+        @Override
         public StringBuilder asString(int indent) {
             StringBuilder buf = new StringBuilder().append(ARRAY_START);
             StringBuilder tab = JSONObject.newIndent(indent+1);
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
index 6ce4b910b..a574e77d5 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
@@ -19,6 +19,8 @@
 
 package org.apache.openjpa.persistence.jest;
 
+import static org.apache.openjpa.persistence.jest.Constants.MIME_TYPE_JSON;
+
 import java.io.BufferedReader;
 import java.io.CharArrayWriter;
 import java.io.IOException;
@@ -45,7 +47,6 @@ import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.persistence.meta.Members;
-import static org.apache.openjpa.persistence.jest.Constants.MIME_TYPE_JSON;
 
 /**
  * Marshals a root instance and its persistent closure as JSON object.
@@ -57,6 +58,7 @@ import static org.apache.openjpa.persistence.jest.Constants.MIME_TYPE_JSON;
  */
 public class JSONObjectFormatter implements ObjectFormatter<JSON> {
 
+    @Override
     public String getMimeType() {
         return MIME_TYPE_JSON;
     }
@@ -77,6 +79,7 @@ public class JSONObjectFormatter implements ObjectFormatter<JSON> {
         return;
     }
 
+    @Override
     public JSON writeOut(Collection<OpenJPAStateManager> sms, Metamodel model, String title, String desc,
         String uri, OutputStream out) throws IOException {
         JSON json = encode(sms,model);
@@ -84,6 +87,7 @@ public class JSONObjectFormatter implements ObjectFormatter<JSON> {
         return json;
     }
 
+    @Override
     public JSON encode(Collection<OpenJPAStateManager> sms, Metamodel model) {
         return encodeManagedInstances(sms, model);
     }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/MetamodelHelper.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/MetamodelHelper.java
index f56470b1f..b48b9649b 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/MetamodelHelper.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/MetamodelHelper.java
@@ -70,7 +70,7 @@ public class MetamodelHelper {
      * @param type
      */
     public static List<Attribute<?,?>> getAttributesInOrder(ManagedType<?> type) {
-        List<Attribute<?,?>> list = new ArrayList<Attribute<?,?>>(type.getAttributes());
+        List<Attribute<?,?>> list = new ArrayList<>(type.getAttributes());
         Collections.sort(list, new AttributeComparator());
         return list;
     }
@@ -170,6 +170,7 @@ public class MetamodelHelper {
      *
      */
     public static class AttributeComparator implements Comparator<Attribute<?,?>> {
+        @Override
         public int compare(Attribute<?, ?> a1, Attribute<?, ?> a2) {
             AttributeCategory t1 = getAttributeCategory(a1);
             AttributeCategory t2 = getAttributeCategory(a2);
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
index b4441df42..f1209f8f4 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
@@ -51,12 +51,12 @@ import org.apache.openjpa.kernel.OpenJPAStateManager;
  *
  */
 public interface ObjectFormatter<T> {
-    public static final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd, yyyy");
+    SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd, yyyy");
 
     /**
      * Gets the mime type produced by this formatter.
      */
-    public String getMimeType();
+    String getMimeType();
 
     /**
      * Encode the {@link Closure persistent closure} of the given collection of managed instances as a
@@ -68,7 +68,7 @@ public interface ObjectFormatter<T> {
      *
      * @return an encoded object e.g. a XML or HTML Document or a JSON object.
      */
-    public T encode(Collection<OpenJPAStateManager> objs, Metamodel model);
+    T encode(Collection<OpenJPAStateManager> objs, Metamodel model);
 
     /**
      * Encode the given domain model in to a object.
@@ -77,7 +77,7 @@ public interface ObjectFormatter<T> {
      *
      * @return an encoded object e.g. a XML or HTML Document or a JSON object.
      */
-    public T encode(Metamodel model);
+    T encode(Metamodel model);
 
     /**
      * Encodes the {@link Closure persistent closure} of the given collection of objects, then write it into
@@ -91,7 +91,7 @@ public interface ObjectFormatter<T> {
      * @param writer a text-oriented output stream
      * @throws IOException
      */
-    public T writeOut(Collection<OpenJPAStateManager> objs, Metamodel model,
+    T writeOut(Collection<OpenJPAStateManager> objs, Metamodel model,
         String title, String desc, String uri, OutputStream out) throws IOException;
 
     /**
@@ -102,5 +102,5 @@ public interface ObjectFormatter<T> {
      *
      * @throws IOException
      */
-    public T writeOut(Metamodel model, String title, String desc, String uri, OutputStream out) throws IOException;
+    T writeOut(Metamodel model, String title, String desc, String uri, OutputStream out) throws IOException;
 }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ProcessingException.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ProcessingException.java
index f3d080e12..ef6f29e21 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ProcessingException.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/ProcessingException.java
@@ -37,8 +37,8 @@ import org.w3c.dom.Document;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class ProcessingException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
     private final JPAServletContext ctx;
     private final int _errorCode;
 
@@ -74,6 +74,7 @@ public class ProcessingException extends RuntimeException {
      * @param response
      * @throws IOException
      */
+    @Override
     public void printStackTrace() {
         HttpServletResponse response = ctx.getResponse();
         response.setContentType(MIME_TYPE_XML);
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
index 6eded8cb4..578889be5 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
@@ -19,7 +19,7 @@
 
 package org.apache.openjpa.persistence.jest;
 
-import static org.apache.openjpa.persistence.jest.Constants.*;
+import static org.apache.openjpa.persistence.jest.Constants.MIME_TYPE_XML;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -44,6 +44,7 @@ public class PropertiesCommand extends AbstractCommand {
         super(ctx);
     }
 
+    @Override
     protected int getMaximumArguments() {
         return 0;
     }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/PrototypeFactory.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/PrototypeFactory.java
index e4f6d361b..29ed72aee 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/PrototypeFactory.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/PrototypeFactory.java
@@ -43,7 +43,7 @@ import org.apache.openjpa.kernel.Filters;
  *
  */
 public class PrototypeFactory<K,T> {
-    private Map<K, Class<? extends T>> _registry = new TreeMap<K, Class<? extends T>>();
+    private Map<K, Class<? extends T>> _registry = new TreeMap<>();
 
     /**
      * Register the given class with the given key.
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
index 140aee78a..505723267 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
@@ -19,19 +19,20 @@
 
 package org.apache.openjpa.persistence.jest;
 
+import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
+import static org.apache.openjpa.persistence.jest.Constants.QUALIFIER_FORMAT;
+import static org.apache.openjpa.persistence.jest.Constants.QUALIFIER_PLAN;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import static org.apache.openjpa.persistence.jest.Constants.*;
 
 import javax.persistence.Query;
 
 import org.apache.openjpa.persistence.ArgumentException;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;;
 
 /**
  * Executes query.
@@ -64,6 +65,7 @@ class QueryCommand extends AbstractCommand {
         return 0;
     }
 
+    @Override
     protected Collection<String> getValidQualifiers() {
         return _validQualifiers;
     }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/TokenReplacedStream.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/TokenReplacedStream.java
index 82fb00b74..3beba286b 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/TokenReplacedStream.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/TokenReplacedStream.java
@@ -179,6 +179,7 @@ public class TokenReplacedStream {
             return _replace;
         }
 
+        @Override
         public String toString() {
             return new String(chars) + ":" + _cursor;
         }
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
index 9588a5987..21aa4a2c1 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
@@ -123,6 +123,7 @@ public class XMLFormatter implements ObjectFormatter<Document> {
         }
     }
 
+    @Override
     public String getMimeType() {
         return MIME_TYPE_XML;
     }
@@ -134,6 +135,7 @@ public class XMLFormatter implements ObjectFormatter<Document> {
      * @param sm a collection of managed instances.
      * @param parent the parent node to which the new node be attached.
      */
+    @Override
     public Document encode(final Collection<OpenJPAStateManager> sms, Metamodel model) {
         Element root = newDocument(ROOT_ELEMENT_INSTANCE);
         Closure closure = new Closure(sms);
@@ -148,6 +150,7 @@ public class XMLFormatter implements ObjectFormatter<Document> {
      *
      * @param model a persistent domain model. Must not be null.
      */
+    @Override
     public Document encode(Metamodel model) {
         Element root = newDocument(ROOT_ELEMENT_MODEL);
         for (ManagedType<?> t : model.getManagedTypes()) {
diff --git a/openjpa-jest/src/test/java/demo/Actor.java b/openjpa-jest/src/test/java/demo/Actor.java
index 54a9966ba..cbc0b4b27 100644
--- a/openjpa-jest/src/test/java/demo/Actor.java
+++ b/openjpa-jest/src/test/java/demo/Actor.java
@@ -104,7 +104,7 @@ public class Actor {
 
     public void addMovie(Movie movie) {
         if (movies == null)
-            movies = new HashSet<Movie>();
+            movies = new HashSet<>();
         movies.add(movie);
     }
 }
diff --git a/openjpa-jest/src/test/java/demo/Movie.java b/openjpa-jest/src/test/java/demo/Movie.java
index cc0584cbf..be6f0ff53 100644
--- a/openjpa-jest/src/test/java/demo/Movie.java
+++ b/openjpa-jest/src/test/java/demo/Movie.java
@@ -71,7 +71,7 @@ public class Movie {
 
     public void addActor(Actor a) {
         if (actors == null)
-            actors = new HashSet<Actor>();
+            actors = new HashSet<>();
         actors.add(a);
     }
 
diff --git a/openjpa-jest/src/test/java/org/apache/openjpa/persistence/jest/TestJEST.java b/openjpa-jest/src/test/java/org/apache/openjpa/persistence/jest/TestJEST.java
index 350bc63df..43ba8c4e3 100644
--- a/openjpa-jest/src/test/java/org/apache/openjpa/persistence/jest/TestJEST.java
+++ b/openjpa-jest/src/test/java/org/apache/openjpa/persistence/jest/TestJEST.java
@@ -32,14 +32,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import junit.framework.TestCase;
-
 import com.meterware.httpunit.HttpException;
 import com.meterware.httpunit.HttpUnitOptions;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletRunner;
 import com.meterware.servletunit.ServletUnitClient;
 
+import junit.framework.TestCase;
+
 /**
  * Tests JEST Servlet using <A href="http://httpunit.sourceforge.net/doc/servletunit-intro.html">ServletUnit</A>.
  *
@@ -66,6 +66,7 @@ public class TestJEST extends TestCase {
     /**
      * Sets up a class-wide Servlet Engine.
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         if (container == null) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java
index 57d1ee2f7..408db521d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java
@@ -52,6 +52,9 @@ import org.apache.openjpa.util.UserException;
 public class AbstractStoreBrokerFactory
     extends AbstractBrokerFactory {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * The property name under which to name the concrete store manager
      * class for this runtime.
@@ -79,7 +82,7 @@ public class AbstractStoreBrokerFactory
             return factory;
 
         factory = newInstance(cp);
-        factory.pool(key, factory);
+        AbstractBrokerFactory.pool(key, factory);
         return factory;
     }
 
@@ -120,12 +123,14 @@ public class AbstractStoreBrokerFactory
         _platform = platform;
     }
 
+    @Override
     public Map<String,Object> getProperties() {
         Map<String,Object> props = super.getProperties();
         props.put("Platform", _platform);
         return props;
     }
 
+    @Override
     protected StoreManager newStoreManager() {
         return createStoreManager(_storeCls, _storeProps);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreManager.java
index 8ad54277b..516004f5d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreManager.java
@@ -121,6 +121,7 @@ public abstract class AbstractStoreManager
 
     protected StoreContext ctx;
 
+    @Override
     public final void setContext(StoreContext ctx) {
         this.ctx = ctx;
         open();
@@ -145,6 +146,7 @@ public abstract class AbstractStoreManager
      * locking semantics for your data store if you need notification of
      * the beginning of an optimistic transaction.
      */
+    @Override
     public void beginOptimistic() {
     }
 
@@ -153,6 +155,7 @@ public abstract class AbstractStoreManager
      * locking semantics for your data store if you need notification of
      * a rollback of an optimistic transaction before {@link #begin} is invoked.
      */
+    @Override
     public void rollbackOptimistic() {
     }
 
@@ -164,6 +167,7 @@ public abstract class AbstractStoreManager
      * support any concept of locking or transactions, you need not
      * override this method.
      */
+    @Override
     public void begin() {
     }
 
@@ -173,6 +177,7 @@ public abstract class AbstractStoreManager
      * override this method. If it does, then override this method to
      * notify the data store that the current transaction should be committed.
      */
+    @Override
     public void commit() {
     }
 
@@ -182,6 +187,7 @@ public abstract class AbstractStoreManager
      * override this method. If it does, then override this method to
      * notify the data store that the current transaction should be rolled back.
      */
+    @Override
     public void rollback() {
     }
 
@@ -189,6 +195,7 @@ public abstract class AbstractStoreManager
      * Since this store manager does not provide optimistic locking
      * support, this method always returns <code>true</code>.
      */
+    @Override
     public boolean syncVersion(OpenJPAStateManager sm, Object edata) {
         return true;
     }
@@ -211,6 +218,7 @@ public abstract class AbstractStoreManager
      * <code>OpenJPAStateManager.store<em>type</em></code> method) to put the
      * data into the object.
      */
+    @Override
     public abstract boolean initialize(OpenJPAStateManager sm, PCState state,
         FetchConfiguration fetch, Object edata);
 
@@ -223,6 +231,7 @@ public abstract class AbstractStoreManager
      * <code>OpenJPAStateManager.store<em>type</em></code> method) to put the
      * data into the object.
      */
+    @Override
     public abstract boolean load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, int lockLevel, Object edata);
 
@@ -233,6 +242,7 @@ public abstract class AbstractStoreManager
      * bulk loading APIs, overriding this method to be more clever may be
      * advantageous.
      */
+    @Override
     public Collection<Object> loadAll(Collection<OpenJPAStateManager> sms, PCState state, int load,
         FetchConfiguration fetch, Object edata) {
         return ImplHelper.loadAll(sms, this, state, load, fetch, edata);
@@ -243,14 +253,15 @@ public abstract class AbstractStoreManager
      * states, and delegates to
      * {@link #flush(Collection,Collection,Collection,Collection,Collection)}.
      */
+    @Override
     public Collection<Exception> flush(Collection<OpenJPAStateManager> sms) {
         // break down state managers by state; initialize as empty lists;
         // use constants for efficiency
-        Collection<OpenJPAStateManager> pNew = new LinkedList<OpenJPAStateManager>();
-        Collection<OpenJPAStateManager> pNewUpdated = new LinkedList<OpenJPAStateManager>();
-        Collection<OpenJPAStateManager> pNewFlushedDeleted = new LinkedList<OpenJPAStateManager>();
-        Collection<OpenJPAStateManager> pDirty = new LinkedList<OpenJPAStateManager>();
-        Collection<OpenJPAStateManager> pDeleted = new LinkedList<OpenJPAStateManager>();
+        Collection<OpenJPAStateManager> pNew = new LinkedList<>();
+        Collection<OpenJPAStateManager> pNewUpdated = new LinkedList<>();
+        Collection<OpenJPAStateManager> pNewFlushedDeleted = new LinkedList<>();
+        Collection<OpenJPAStateManager> pDirty = new LinkedList<>();
+        Collection<OpenJPAStateManager> pDeleted = new LinkedList<>();
 
         for (OpenJPAStateManager sm : sms) {
             if (sm.getPCState() == PCState.PNEW && !sm.isFlushed())
@@ -274,10 +285,12 @@ public abstract class AbstractStoreManager
         return flush(pNew, pNewUpdated, pNewFlushedDeleted, pDirty, pDeleted);
     }
 
+    @Override
     public void beforeStateChange(OpenJPAStateManager sm, PCState fromState,
         PCState toState) {
     }
 
+    @Override
     public boolean assignObjectId(OpenJPAStateManager sm, boolean preFlush) {
         ClassMetaData meta = sm.getMetaData();
         if (meta.getIdentityType() == ClassMetaData.ID_APPLICATION)
@@ -303,6 +316,7 @@ public abstract class AbstractStoreManager
         return true;
     }
 
+    @Override
     public boolean assignField(OpenJPAStateManager sm, int field,
         boolean preFlush) {
         FieldMetaData fmd = sm.getMetaData().getField(field);
@@ -313,22 +327,26 @@ public abstract class AbstractStoreManager
         return true;
     }
 
+    @Override
     public Class<?> getManagedType(Object oid) {
         if (oid instanceof Id)
             return ((Id) oid).getType();
         return null;
     }
 
+    @Override
     public Class<?> getDataStoreIdType(ClassMetaData meta) {
         return Id.class;
     }
 
+    @Override
     public Object copyDataStoreId(Object oid, ClassMetaData meta) {
         Id id = (Id) oid;
         return new Id(meta.getDescribedType(), id.getId(),
             id.hasSubclasses());
     }
 
+    @Override
     public Object newDataStoreId(Object val, ClassMetaData meta) {
         // we use base types for all oids
         while (meta.getPCSuperclass() != null)
@@ -339,12 +357,14 @@ public abstract class AbstractStoreManager
     /**
      * Override to retain a dedicated connection.
      */
+    @Override
     public void retainConnection() {
     }
 
     /**
      * Override to release previously-retained connection.
      */
+    @Override
     public void releaseConnection() {
     }
 
@@ -352,6 +372,7 @@ public abstract class AbstractStoreManager
      * Returns <code>null</code>. If your data store can provide a
      * distinct connection object, return it here.
      */
+    @Override
     public Object getClientConnection() {
         return null;
     }
@@ -375,13 +396,16 @@ public abstract class AbstractStoreManager
      * {@link #load} method will have to issue another command to the data
      * store in order to fetch the data to be loaded.
      */
+    @Override
     public abstract ResultObjectProvider executeExtent(ClassMetaData meta,
         boolean subs, FetchConfiguration fetch);
 
+    @Override
     public StoreQuery newQuery(String language) {
         return null;
     }
 
+    @Override
     public FetchConfiguration newFetchConfiguration() {
         return new FetchConfigurationImpl();
     }
@@ -394,6 +418,7 @@ public abstract class AbstractStoreManager
      * #VERSION_LATER}. If either <code>v1</code> or <code>v2</code> are
      * <code>null</code>, returns {@link #VERSION_DIFFERENT}.
      */
+    @Override
     public int compareVersion(OpenJPAStateManager state, Object v1, Object v2) {
         if (v1 == null || v2 == null)
             return VERSION_DIFFERENT;
@@ -413,6 +438,7 @@ public abstract class AbstractStoreManager
      * {@link #getDataStoreIdType}, {@link #copyDataStoreId},
      * {@link #newDataStoreId}.
      */
+    @Override
     public Seq getDataStoreIdSequence(ClassMetaData forClass) {
         return ctx.getConfiguration().getSequenceInstance();
     }
@@ -420,6 +446,7 @@ public abstract class AbstractStoreManager
     /**
      * Returns null.
      */
+    @Override
     public Seq getValueSequence(FieldMetaData forField) {
         return null;
     }
@@ -430,10 +457,12 @@ public abstract class AbstractStoreManager
      * currently-running queries and return <code>true</code> if any
      * were cancelled.
      */
+    @Override
     public boolean cancelAll() {
         return false;
     }
 
+    @Override
     public void close() {
     }
 
@@ -496,7 +525,7 @@ public abstract class AbstractStoreManager
      * </ul>
      */
     protected Collection<String> getUnsupportedOptions() {
-        Collection<String> c = new HashSet<String>();
+        Collection<String> c = new HashSet<>();
         c.add(OpenJPAConfiguration.OPTION_OPTIMISTIC);
         c.add(OpenJPAConfiguration.OPTION_ID_DATASTORE);
         c.add(OpenJPAConfiguration.OPTION_INC_FLUSH);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ant/ApplicationIdToolTask.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ant/ApplicationIdToolTask.java
index 9d29bec48..df19c3566 100755
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ant/ApplicationIdToolTask.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ant/ApplicationIdToolTask.java
@@ -98,10 +98,12 @@ public class ApplicationIdToolTask
         return flags.format;
     }
 
+    @Override
     protected ConfigurationImpl newConfiguration() {
         return new OpenJPAConfigurationImpl();
     }
 
+    @Override
     protected void executeOn(String[] files)
         throws IOException, ClassNotFoundException {
         flags.directory = (dirName == null) ? null
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ant/MetaDataToolTask.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ant/MetaDataToolTask.java
index 899f6b787..07ece1188 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ant/MetaDataToolTask.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ant/MetaDataToolTask.java
@@ -21,8 +21,6 @@ package org.apache.openjpa.ant;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.lib.ant.AbstractTask;
@@ -30,6 +28,8 @@ import org.apache.openjpa.lib.conf.ConfigurationImpl;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.MetaDataTool;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
  * Executes the metadata tool on the specified files. This task can
@@ -61,10 +61,12 @@ public class MetaDataToolTask
         this.fileName = fileName;
     }
 
+    @Override
     protected ConfigurationImpl newConfiguration() {
         return new OpenJPAConfigurationImpl();
     }
 
+    @Override
     protected void executeOn(String[] files)
         throws IOException {
         ClassLoader loader = getClassLoader();
@@ -83,6 +85,7 @@ public class MetaDataToolTask
     public static class Action
         extends EnumeratedAttribute {
 
+        @Override
         public String[] getValues() {
             return MetaDataTool.ACTIONS;
         }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ant/PCEnhancerTask.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ant/PCEnhancerTask.java
index 49e857052..180161f8f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ant/PCEnhancerTask.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ant/PCEnhancerTask.java
@@ -76,10 +76,12 @@ public class PCEnhancerTask
         flags.tmpClassLoader = tmpClassLoader;
     }
 
+    @Override
     protected ConfigurationImpl newConfiguration() {
         return new OpenJPAConfigurationImpl();
     }
 
+    @Override
     protected void executeOn(String[] files)
         throws IOException {
         flags.directory = (dirName == null) ? null
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/audit/AuditLogger.java b/openjpa-kernel/src/main/java/org/apache/openjpa/audit/AuditLogger.java
index 4b607d531..91b90d245 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/audit/AuditLogger.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/audit/AuditLogger.java
@@ -65,7 +65,8 @@ public class AuditLogger implements Auditor {
 		return _file;
 	}
 
-	public boolean isRollbackOnError() {
+	@Override
+    public boolean isRollbackOnError() {
 		return false;
 	}
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/audit/Auditable.java b/openjpa-kernel/src/main/java/org/apache/openjpa/audit/Auditable.java
index e3b869050..5f7b40ded 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/audit/Auditable.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/audit/Auditable.java
@@ -18,11 +18,12 @@
  */
 package org.apache.openjpa.audit;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Annotates a persistent type for {@link Auditor audit}.
  * <br>
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/audit/Auditor.java b/openjpa-kernel/src/main/java/org/apache/openjpa/audit/Auditor.java
index 75e2ed546..ec76a434b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/audit/Auditor.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/audit/Auditor.java
@@ -46,12 +46,12 @@ public interface Auditor extends Configurable, Closeable {
 	 * @param updates the set of auditable objects being updated. Can be empty, but never null.
 	 * @param deletes the set of auditable objects being deleted. Can be empty, but never null.
 	 */
-	public void audit(Broker broker, Collection<Audited> newObjects, Collection<Audited> updates,
+	void audit(Broker broker, Collection<Audited> newObjects, Collection<Audited> updates,
 			Collection<Audited> deletes);
 
 	/**
 	 * Affirm if the transaction be rolled back if {@link #audit(Broker, Collection, Collection, Collection) audit}
 	 * operation fails with an exception.
 	 */
-	public boolean isRollbackOnError();
+	boolean isRollbackOnError();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/AutoDetachValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/AutoDetachValue.java
index 0a96688ae..06735835d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/AutoDetachValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/AutoDetachValue.java
@@ -59,6 +59,7 @@ class AutoDetachValue
         setAliasListComprehensive(true);
     }
 
+    @Override
     public Class getValueType() {
         return String[].class;
     }
@@ -78,10 +79,11 @@ class AutoDetachValue
         return _flags;
     }
 
+    @Override
     protected List<String> getAliasList() {
         // We do not document the numeric values and they are not
         // helpful to someone trying to understand the error message
-        ArrayList<String> list = new ArrayList<String>();
+        ArrayList<String> list = new ArrayList<>();
         for (int x = 0; x < ALIASES.length; x += 2)
             list.add(ALIASES[x]);
         return list;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java
index 25d865575..73ce3b520 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java
@@ -25,8 +25,8 @@ import org.apache.openjpa.abstractstore.AbstractStoreBrokerFactory;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.lib.conf.ConfigurationProvider;
 import org.apache.openjpa.lib.conf.PluginValue;
-import org.apache.openjpa.lib.conf.ProductDerivations;
 import org.apache.openjpa.lib.conf.ProductDerivation;
+import org.apache.openjpa.lib.conf.ProductDerivations;
 
 /**
  * Value type used to represent the {@link BrokerFactory}. This type is
@@ -42,7 +42,7 @@ public class BrokerFactoryValue
 
     private static final String[] _aliases;
     static {
-        Map<String, String> aliases = new HashMap<String, String>();
+        Map<String, String> aliases = new HashMap<>();
         aliases.put("abstractstore", AbstractStoreBrokerFactory.class.getName());
         ProductDerivation[] ds = ProductDerivations.getProductDerivations();
         for (int i = 0; i < ds.length; i++) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerValue.java
index c47900321..ac66aab8c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerValue.java
@@ -18,10 +18,10 @@
  */
 package org.apache.openjpa.conf;
 
-import org.apache.openjpa.lib.conf.PluginValue;
-import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.kernel.BrokerImpl;
 import org.apache.openjpa.kernel.FinalizingBrokerImpl;
+import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.lib.conf.PluginValue;
 import org.apache.openjpa.util.InternalException;
 
 /**
@@ -50,6 +50,7 @@ public class BrokerValue
         setString(aliases[0]);
     }
 
+    @Override
     public Object newInstance(String clsName, Class type, Configuration conf,
         boolean fatal) {
         getTemplateBroker(clsName, type, conf, fatal);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshaller.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshaller.java
index 9d308f703..c5cd0bb9f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshaller.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshaller.java
@@ -37,23 +37,23 @@ public interface CacheMarshaller {
      * {@link Configurable#startConfiguration()}, and
      * {@link Configurable#endConfiguration()} on the instance before returning.
      */
-    public Object load();
+    Object load();
 
     /**
      * Store <code>o</code> into the cache.
      */
-    public void store(Object o);
+    void store(Object o);
 
     /**
      * The id that this marshaller is responsible for.
      * A value for this parameter is required.
      */
-    public void setId(String id);
+    void setId(String id);
 
     /**
      * The id that this marshaller is responsible for.
      */
-    public String getId();
+    String getId();
 
     /**
      * The {@link ValidationPolicy} that this marshaller should use.
@@ -63,7 +63,7 @@ public interface CacheMarshaller {
      * {@link org.apache.openjpa.lib.conf.GenericConfigurable}, it will be taken
      * through the appropriate lifecycle.
      */
-    public void setValidationPolicy(String policy)
+    void setValidationPolicy(String policy)
         throws InstantiationException, IllegalAccessException;
 
     /**
@@ -83,11 +83,11 @@ public interface CacheMarshaller {
          * on <code>o</code>. If <code>o</code> is not valid, this method
          * will return <code>null</code>.
          */
-        public Object getValidData(Object o);
+        Object getValidData(Object o);
 
         /**
          * Return an object that the {@link CacheMarshaller} should store.
          */
-        public Object getCacheableData(Object o);
+        Object getCacheableData(Object o);
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java
index 61ffe8fe6..523391c14 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallerImpl.java
@@ -27,9 +27,9 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
-import java.util.ArrayList;
 
 import org.apache.openjpa.lib.conf.Configurable;
 import org.apache.openjpa.lib.conf.Configuration;
@@ -62,6 +62,7 @@ public class CacheMarshallerImpl
 
     private boolean _consumeErrors = true;
 
+    @Override
     public Object load() {
         if (_inputURL == null) {
             _log.trace(_loc.get("cache-marshaller-no-inputs", getId()));
@@ -115,6 +116,7 @@ public class CacheMarshallerImpl
         }
     }
 
+    @Override
     public void store(Object o) {
         if (_outputFile == null) {
             _log.trace(_loc.get("cache-marshaller-no-output-file", getId()));
@@ -170,14 +172,17 @@ public class CacheMarshallerImpl
         _consumeErrors = consume;
     }
 
+    @Override
     public String getId() {
         return _id;
     }
 
+    @Override
     public void setId(String id) {
         _id = id;
     }
 
+    @Override
     public void setValidationPolicy(String policy)
         throws InstantiationException, IllegalAccessException {
         String name = Configurations.getClassName(policy);
@@ -190,14 +195,17 @@ public class CacheMarshallerImpl
         return _validationPolicy;
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (OpenJPAConfiguration) conf;
         _log = conf.getConfigurationLog();
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
         if (_inputResourceLocation != null && _inputURL != null)
             throw new IllegalStateException(
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallersValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallersValue.java
index 6869e9fdf..66f790f4b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallersValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshallersValue.java
@@ -21,11 +21,10 @@ package org.apache.openjpa.conf;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.lib.conf.PluginListValue;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.conf.PluginListValue;
-import org.apache.openjpa.conf.NoOpCacheMarshaller;
-import org.apache.openjpa.lib.conf.Configuration;
 
 /**
  * A configuration value for handling and accessing cache marshallers.
@@ -55,12 +54,13 @@ public class CacheMarshallersValue
         setScope(getClass());
     }
 
+    @Override
     public Object instantiate(Class<?> elemType, Configuration conf,
         boolean fatal) {
         CacheMarshaller[] ms = (CacheMarshaller[])
             super.instantiate(elemType, conf, fatal);
         if (ms != null) {
-            _marshallers = new HashMap<String,CacheMarshaller>();
+            _marshallers = new HashMap<>();
             for (int i = 0; i < ms.length; i++) {
                 String mid = ms[i].getId();
                 if (mid != null)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CallbackOptions.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CallbackOptions.java
index a32e3758f..dfcbd83f5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CallbackOptions.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CallbackOptions.java
@@ -26,6 +26,8 @@ import java.io.Serializable;
  * @author Pinaki Poddar
  */
 public class CallbackOptions implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     private boolean _isPostPersistCallbackImmediate = false;
     private boolean _allowsMultipleMethodsForSameCallback = false;
     private boolean _allowsDuplicateListener = true;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/DetachOptions.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/DetachOptions.java
index f030c56fd..17513f4fb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/DetachOptions.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/DetachOptions.java
@@ -167,6 +167,7 @@ public abstract class DetachOptions
     public static class Loaded
         extends DetachOptions {
 
+        @Override
         public int getDetachState() {
             return DETACH_LOADED;
         }
@@ -178,6 +179,7 @@ public abstract class DetachOptions
     public static class FetchGroups
         extends DetachOptions {
 
+        @Override
         public int getDetachState() {
             return DETACH_FGS;
         }
@@ -189,6 +191,7 @@ public abstract class DetachOptions
     public static class All
         extends DetachOptions {
 
+        @Override
         public int getDetachState() {
             return DETACH_ALL;
 		}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java
index c10632fa3..a78ad6e15 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java
@@ -26,11 +26,12 @@ import org.apache.openjpa.kernel.Bootstrap;
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.Query;
-import org.apache.openjpa.lib.util.Options;
-import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.lib.conf.MapConfigurationProvider;
 import org.apache.openjpa.lib.conf.ConfigurationProvider;
+import org.apache.openjpa.lib.conf.MapConfigurationProvider;
+import org.apache.openjpa.lib.log.Log;
+import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.QueryMetaData;
 import org.apache.openjpa.meta.SequenceMetaData;
@@ -79,6 +80,7 @@ public class MetaDataCacheMaintenance {
     /**
      * @deprecated logging is routed to the logging system now.
      */
+    @Deprecated
     public MetaDataCacheMaintenance(BrokerFactory factory, boolean devpath,
         boolean verbose) {
         this(factory, devpath);
@@ -116,7 +118,7 @@ public class MetaDataCacheMaintenance {
      */
     public void store() {
         MetaDataRepository repos = conf.getMetaDataRepositoryInstance();
-        repos.setSourceMode(MetaDataRepository.MODE_ALL);
+        repos.setSourceMode(MetaDataModes.MODE_ALL);
         Collection types = repos.loadPersistentTypes(devpath, null);
         for (Iterator iter = types.iterator(); iter.hasNext(); )
             repos.getMetaData((Class) iter.next(), null, true);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataRepositoryValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataRepositoryValue.java
index c027a5271..26f9855c0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataRepositoryValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataRepositoryValue.java
@@ -22,7 +22,6 @@ import java.util.Map;
 
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.conf.PluginValue;
-import org.apache.openjpa.conf.CacheMarshallersValue;
 import org.apache.openjpa.meta.MetaDataRepository;
 
 /**
@@ -47,6 +46,7 @@ public class MetaDataRepositoryValue
         setString(aliases[0]);
     }
 
+    @Override
     public Object instantiate(Class type, Configuration c, boolean fatal) {
         MetaDataRepository repos = null;
         OpenJPAConfiguration conf = (OpenJPAConfiguration) c;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/NoOpCacheMarshaller.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/NoOpCacheMarshaller.java
index 3413add2a..07b77d6fe 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/NoOpCacheMarshaller.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/NoOpCacheMarshaller.java
@@ -28,21 +28,26 @@ public class NoOpCacheMarshaller
 
     private String id;
 
+    @Override
     public Object load() {
         return null;
     }
 
+    @Override
     public void setId(String id) {
         this.id = id;
     }
 
+    @Override
     public String getId() {
         return id;
     }
 
+    @Override
     public void setValidationPolicy(String policy) {
     }
 
+    @Override
     public void store(Object o) {
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java
index dea3f4395..bd844f620 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java
@@ -77,166 +77,166 @@ public interface OpenJPAConfiguration
      * Name of logger for metadata-related messages:
      * <code>openjpa.MetaData</code>.
      */
-    public static final String LOG_METADATA = "openjpa.MetaData";
+    String LOG_METADATA = "openjpa.MetaData";
 
     /**
      * Name of logger for enhancement-related messages:
      * <code>openjpa.Enhance</code>.
      */
-    public static final String LOG_ENHANCE = "openjpa.Enhance";
+    String LOG_ENHANCE = "openjpa.Enhance";
 
     /**
      * Name of logger for messages from the runtime system:
      * <code>openjpa.Runtime</code>.
      */
-    public static final String LOG_RUNTIME = "openjpa.Runtime";
+    String LOG_RUNTIME = "openjpa.Runtime";
 
     /**
      * Name of logger for query logging:
      * <code>openjpa.Query</code>.
      */
-    public static final String LOG_QUERY = "openjpa.Query";
+    String LOG_QUERY = "openjpa.Query";
 
     /**
      * Name of logger for messages from the data cache:
      * <code>openjpa.DataCache</code>.
      */
-    public static final String LOG_DATACACHE = "openjpa.DataCache";
+    String LOG_DATACACHE = "openjpa.DataCache";
 
     /**
      * Name of logger for messages from the development tools:
      * <code>openjpa.Tool</code>.
      */
-    public static final String LOG_TOOL = "openjpa.Tool";
+    String LOG_TOOL = "openjpa.Tool";
 
     /**
      * Option for runtimes that support nontransactional reads.
      */
-    public static final String OPTION_NONTRANS_READ =
+    String OPTION_NONTRANS_READ =
         "openjpa.option.NontransactionalRead";
 
     /**
      * Option for runtimes that support optimistic transactions.
      */
-    public static final String OPTION_OPTIMISTIC =
+    String OPTION_OPTIMISTIC =
         "openjpa.option.Optimistic";
 
     /**
      * Option for runtimes that support application identity.
      */
-    public static final String OPTION_ID_APPLICATION =
+    String OPTION_ID_APPLICATION =
         "openjpa.option.ApplicationIdentity";
 
     /**
      * Option for runtimes that support application identity.
      */
-    public static final String OPTION_ID_DATASTORE =
+    String OPTION_ID_DATASTORE =
         "openjpa.option.DatastoreIdentity";
 
     /**
      * Option for SQL support.
      */
-    public static final String OPTION_QUERY_SQL = "openjpa.option.SQL";
+    String OPTION_QUERY_SQL = "openjpa.option.SQL";
 
     /**
      * Option for runtimes that support persistent collection fields.
      */
-    public static final String OPTION_TYPE_COLLECTION =
+    String OPTION_TYPE_COLLECTION =
         "openjpa.option.Collection";
 
     /**
      * Option for runtimes that support persistent map fields.
      */
-    public static final String OPTION_TYPE_MAP = "openjpa.option.Map";
+    String OPTION_TYPE_MAP = "openjpa.option.Map";
 
     /**
      * Option for runtimes that support persistent array fields.
      */
-    public static final String OPTION_TYPE_ARRAY = "openjpa.option.Array";
+    String OPTION_TYPE_ARRAY = "openjpa.option.Array";
 
     /**
      * Option for runtime that can differentiate between null and empty
      * container fields.
      */
-    public static final String OPTION_NULL_CONTAINER =
+    String OPTION_NULL_CONTAINER =
         "openjpa.option.NullContainer";
 
     /**
      * Option for runtimes that support embedded relations to other
      * persistence capable objects.
      */
-    public static final String OPTION_EMBEDDED_RELATION =
+    String OPTION_EMBEDDED_RELATION =
         "openjpa.option.EmbeddedRelation";
 
     /**
      * Option for runtimes that support collections of embedded
      * relations to other persistence capable objects.
      */
-    public static final String OPTION_EMBEDDED_COLLECTION_RELATION =
+    String OPTION_EMBEDDED_COLLECTION_RELATION =
         "openjpa.option.EmbeddedCollectionRelation";
 
     /**
      * Option for runtimes that support maps of embedded
      * relations to other persistence capable objects.
      */
-    public static final String OPTION_EMBEDDED_MAP_RELATION =
+    String OPTION_EMBEDDED_MAP_RELATION =
         "openjpa.option.EmbeddedMapRelation";
 
     /**
      * Option for runtimes that support incremental flushing.
      */
-    public static final String OPTION_INC_FLUSH =
+    String OPTION_INC_FLUSH =
         "openjpa.option.IncrementalFlush";
 
     /**
      * Option for runtimes that the autoassign value strategy.
      */
-    public static final String OPTION_VALUE_AUTOASSIGN =
+    String OPTION_VALUE_AUTOASSIGN =
         "openjpa.option.AutoassignValue";
 
     /**
      * Option for runtimes that the increment value strategy.
      */
-    public static final String OPTION_VALUE_INCREMENT =
+    String OPTION_VALUE_INCREMENT =
         "openjpa.option.IncrementValue";
 
     /**
      * Option for runtimes that support returning the datastore connection.
      */
-    public static final String OPTION_DATASTORE_CONNECTION =
+    String OPTION_DATASTORE_CONNECTION =
         "openjpa.option.DataStoreConnection";
 
     /**
      * Option for runtimes that support returning the datastore connection
      * that is a JDBC Connection.
      */
-    public static final String OPTION_JDBC_CONNECTION =
+    String OPTION_JDBC_CONNECTION =
         "openjpa.option.JDBCConnection";
 
     /**
      * Option for enable fire &#064;PostLoad events on merge operations
      */
-    public static final String OPTION_POSTLOAD_ON_MERGE =
+    String OPTION_POSTLOAD_ON_MERGE =
         "openjpa.option.PostLoadOnMerge";
 
     /**
      * Option to enable TCCL if the result class for select new is not found
      * in the entities classloader
      */
-    public static final String OPTION_USE_TCCL_IN_SELECT_NEW =
+    String OPTION_USE_TCCL_IN_SELECT_NEW =
             "openjpa.option.UseTCCLinSelectNew";
 
     /**
      * Return the set of option strings supported by this runtime. This set
      * is mutable.
      */
-    public Collection<String> supportedOptions();
+    Collection<String> supportedOptions();
 
     /**
      * Get a name of the Specification. Specification determines various
      * important default behaviors.
      */
-    public String getSpecification();
+    String getSpecification();
 
     /**
      * Get the Specification. Specification determines various important default
@@ -244,7 +244,7 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public Specification getSpecificationInstance();
+    Specification getSpecificationInstance();
 
     /**
      * Set the Specification for this configuration.
@@ -260,7 +260,7 @@ public interface OpenJPAConfiguration
      *
      * @since 1.1.0
      */
-    public void setSpecification(String spec);
+    void setSpecification(String spec);
 
     /**
      * Set the Specification for this configuration.
@@ -276,74 +276,74 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public void setSpecification(Specification spec);
+    void setSpecification(Specification spec);
 
     /**
      * The plugin string for the {@link ClassResolver} to use for custom
      * class loading.
      */
-    public String getClassResolver();
+    String getClassResolver();
 
     /**
      * The plugin string for the {@link ClassResolver} to use for custom
      * class loading.
      */
-    public void setClassResolver(String classResolver);
+    void setClassResolver(String classResolver);
 
     /**
      * The {@link ClassResolver} to use.
      */
-    public ClassResolver getClassResolverInstance();
+    ClassResolver getClassResolverInstance();
 
     /**
      * The {@link ClassResolver} to use.
      */
-    public void setClassResolver(ClassResolver classResolver);
+    void setClassResolver(ClassResolver classResolver);
 
     /**
      * The {@link BrokerFactory} class to use.
      */
-    public String getBrokerFactory();
+    String getBrokerFactory();
 
     /**
      * The {@link BrokerFactory} class to use.
      */
-    public void setBrokerFactory(String factory);
+    void setBrokerFactory(String factory);
 
     /**
      * The plugin string of the {@link BrokerImpl} extension to create.
      */
-    public String getBrokerImpl();
+    String getBrokerImpl();
 
     /**
      * The plugin string of the {@link BrokerImpl} extension to create.
      */
-    public void setBrokerImpl(String broker);
+    void setBrokerImpl(String broker);
 
     /**
      * Create a new broker instance with the configured plugin data.
      */
-    public BrokerImpl newBrokerInstance(String user, String pass);
+    BrokerImpl newBrokerInstance(String user, String pass);
 
     /**
      * The {@link DataCache} to use for level-2 data store caching.
      */
-    public String getDataCache();
+    String getDataCache();
 
     /**
      * The {@link DataCache} to use for level-2 data store caching.
      */
-    public void setDataCache(String dataCache);
+    void setDataCache(String dataCache);
 
     /**
      * The data cache manager manages this configuration's cache instances.
      */
-    public String getDataCacheManager();
+    String getDataCacheManager();
 
     /**
      * The data cache manager manages this configuration's cache instances.
      */
-    public void setDataCacheManager(String mgr);
+    void setDataCacheManager(String mgr);
 
     /**
      * The data cache manager manages this configuration's cache instances.
@@ -353,35 +353,35 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.0
      */
-    public DataCacheManager getDataCacheManagerInstance();
+    DataCacheManager getDataCacheManagerInstance();
 
     /**
      * The data cache manager manages this configuration's cache instances.
      *
      * @since 0.3.0
      */
-    public void setDataCacheManager(DataCacheManager manager);
+    void setDataCacheManager(DataCacheManager manager);
 
     /**
      * Default data cache timeout.
      *
      * @since 0.2.5
      */
-    public int getDataCacheTimeout();
+    int getDataCacheTimeout();
 
     /**
      * Default data cache timeout.
      *
      * @since 0.2.5
      */
-    public void setDataCacheTimeout(int timeout);
+    void setDataCacheTimeout(int timeout);
 
     /**
      * Wrapper for JCA usage of {@link #setDataCacheTimeout(int)}.
      *
      * @since 0.2.5
      */
-    public void setDataCacheTimeout(Integer timeout);
+    void setDataCacheTimeout(Integer timeout);
 
     /**
      * Gets whether entity state is to be refreshed from {@link DataCache}.
@@ -393,7 +393,7 @@ public interface OpenJPAConfiguration
      *
      * @since 1.2.0
      */
-    public boolean getRefreshFromDataCache();
+    boolean getRefreshFromDataCache();
 
     /**
      * Sets whether entity state is to be refreshed from {@link DataCache}.
@@ -403,7 +403,7 @@ public interface OpenJPAConfiguration
      *
      * @since 1.2.0
      */
-    public void setRefreshFromDataCache(boolean refreshFromDataCache);
+    void setRefreshFromDataCache(boolean refreshFromDataCache);
 
     /**
      * Sets whether entity state is to be refreshed from {@link DataCache}.
@@ -413,21 +413,21 @@ public interface OpenJPAConfiguration
      *
      * @since 1.2.0
      */
-    public void setRefreshFromDataCache(Boolean refreshFromDataCache);
+    void setRefreshFromDataCache(Boolean refreshFromDataCache);
 
     /**
      * The plugin to use for level-2 data store query caching.
      *
      * @since 0.2.5
      */
-    public String getQueryCache();
+    String getQueryCache();
 
     /**
      * The plugin to use for level-2 data store query caching.
      *
      * @since 0.2.5
      */
-    public void setQueryCache(String queryCache);
+    void setQueryCache(String queryCache);
 
     /**
      * Return whether to generate dynamic data structures
@@ -435,7 +435,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.3
      */
-    public boolean getDynamicDataStructs();
+    boolean getDynamicDataStructs();
 
     /**
      * Set whether to generate dynamic data structures
@@ -443,45 +443,45 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.3
      */
-    public void setDynamicDataStructs(boolean dynamic);
+    void setDynamicDataStructs(boolean dynamic);
 
     /**
      * Wrapper for JCA usage of {@link #setDynamicDataStructs(boolean)}.
      */
-    public void setDynamicDataStructs(Boolean dynamic);
+    void setDynamicDataStructs(Boolean dynamic);
 
     /**
      * The plugin to use for datastore lock management.
      *
      * @since 0.3.1
      */
-    public String getLockManager();
+    String getLockManager();
 
     /**
      * The plugin to use for datastore lock management.
      *
      * @since 0.3.1
      */
-    public void setLockManager(String lockManager);
+    void setLockManager(String lockManager);
 
     /**
      * Return a new lock manager instance using the configured plugin settings.
      */
-    public LockManager newLockManagerInstance();
+    LockManager newLockManagerInstance();
 
     /**
      * The plugin to use for managing inverse relations.
      *
      * @since 0.3.2
      */
-    public String getInverseManager();
+    String getInverseManager();
 
     /**
      * The plugin to use for managing inverse relations.
      *
      * @since 0.3.2
      */
-    public void setInverseManager(String inverse);
+    void setInverseManager(String inverse);
 
     /**
      * Return a new inverse manager instance using the configured plugin
@@ -489,75 +489,75 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.2
      */
-    public InverseManager newInverseManagerInstance();
+    InverseManager newInverseManagerInstance();
 
     /**
      * The plugin to use for savepoint management.
      *
      * @since 0.3.4
      */
-    public String getSavepointManager();
+    String getSavepointManager();
 
     /**
      * The plugin to use for savepoint management.
      *
      * @since 0.3.4
      */
-    public void setSavepointManager(String savepointManager);
+    void setSavepointManager(String savepointManager);
 
     /**
      * Return the configured savepoint manager instance.
      */
-    public SavepointManager getSavepointManagerInstance();
+    SavepointManager getSavepointManagerInstance();
 
     /**
      * The action to take when an orphaned key is detected.
      *
      * @since 0.3.2.2
      */
-    public String getOrphanedKeyAction();
+    String getOrphanedKeyAction();
 
     /**
      * The action to take when an orphaned key is detected.
      *
      * @since 0.3.2.2
      */
-    public void setOrphanedKeyAction(String action);
+    void setOrphanedKeyAction(String action);
 
     /**
      * The action to take when an orphaned key is detected.
      *
      * @since 0.3.2.2
      */
-    public OrphanedKeyAction getOrphanedKeyActionInstance();
+    OrphanedKeyAction getOrphanedKeyActionInstance();
 
     /**
      * The action to take when an orphaned key is detected.
      *
      * @since 0.3.2.2
      */
-    public void setOrphanedKeyAction(OrphanedKeyAction action);
+    void setOrphanedKeyAction(OrphanedKeyAction action);
 
     /**
      * The plugin to use for remote commit notification.
      *
      * @since 0.2.5
      */
-    public String getRemoteCommitProvider();
+    String getRemoteCommitProvider();
 
     /**
      * The plugin to use for remote commit notification.
      *
      * @since 0.2.5
      */
-    public void setRemoteCommitProvider(String remoteCommitProvider);
+    void setRemoteCommitProvider(String remoteCommitProvider);
 
     /**
      * Create a remote commit provider from the configured plugin.
      *
      * @since 0.3.0
      */
-    public RemoteCommitProvider newRemoteCommitProviderInstance();
+    RemoteCommitProvider newRemoteCommitProviderInstance();
 
     /**
      * The remote event manager that manages this configuration's remote
@@ -565,7 +565,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.0
      */
-    public RemoteCommitEventManager getRemoteCommitEventManager();
+    RemoteCommitEventManager getRemoteCommitEventManager();
 
     /**
      * The remote event manager that manages this configuration's remote
@@ -573,7 +573,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.0
      */
-    public void setRemoteCommitEventManager(RemoteCommitEventManager manager);
+    void setRemoteCommitEventManager(RemoteCommitEventManager manager);
 
     /**
      * Specifies the behavior of the transaction model. Possible values are:
@@ -585,7 +585,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public String getTransactionMode();
+    String getTransactionMode();
 
     /**
      * Specifies the behavior of the transaction model. Possible values are:
@@ -597,96 +597,96 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public void setTransactionMode(String mode);
+    void setTransactionMode(String mode);
 
     /**
      * Return whether managed transactions are being used.
      */
-    public boolean isTransactionModeManaged();
+    boolean isTransactionModeManaged();
 
     /**
      * Set whether managed transactions are being used.
      */
-    public void setTransactionModeManaged(boolean managed);
+    void setTransactionModeManaged(boolean managed);
 
     /**
      * The plugin string for the {@link ManagedRuntime} to use for managed
      * environments.
      */
-    public String getManagedRuntime();
+    String getManagedRuntime();
 
     /**
      * The plugin string for the {@link ManagedRuntime} to use for managed
      * environments.
      */
-    public void setManagedRuntime(String managedRuntime);
+    void setManagedRuntime(String managedRuntime);
 
     /**
      * The plugin to use for integrating with a managed runtime.
      */
-    public ManagedRuntime getManagedRuntimeInstance();
+    ManagedRuntime getManagedRuntimeInstance();
 
     /**
      * The plugin to use for integrating with a managed runtime.
      */
-    public void setManagedRuntime(ManagedRuntime runtime);
+    void setManagedRuntime(ManagedRuntime runtime);
 
     /**
      * The plugin string for the {@link ProxyManager} to use for second
      * class object proxies.
      */
-    public String getProxyManager();
+    String getProxyManager();
 
     /**
      * The plugin string for the {@link ProxyManager} to use for second
      * class object proxies.
      */
-    public void setProxyManager(String proxyManager);
+    void setProxyManager(String proxyManager);
 
     /**
      * The {@link ProxyManager} to use.
      */
-    public ProxyManager getProxyManagerInstance();
+    ProxyManager getProxyManagerInstance();
 
     /**
      * The {@link ProxyManager} to use.
      */
-    public void setProxyManager(ProxyManager manager);
+    void setProxyManager(ProxyManager manager);
 
     /**
      * The name mapping to use for this data store.
      */
-    public String getMapping();
+    String getMapping();
 
     /**
      * The name mapping to use for this data store.
      */
-    public void setMapping(String mapping);
+    void setMapping(String mapping);
 
     /**
      * A plugin string describing the {@link MetaDataFactory} to use.
      */
-    public String getMetaDataFactory();
+    String getMetaDataFactory();
 
     /**
      * A plugin string describing the {@link MetaDataFactory} to use.
      */
-    public void setMetaDataFactory(String meta);
+    void setMetaDataFactory(String meta);
 
     /**
      * Create a new {@link MetaDataFactory} to use with a repository.
      */
-    public MetaDataFactory newMetaDataFactoryInstance();
+    MetaDataFactory newMetaDataFactoryInstance();
 
     /**
      * A plugin string describing the {@link MetaDataRepository} to use.
      */
-    public String getMetaDataRepository();
+    String getMetaDataRepository();
 
     /**
      * A plugin string describing the {@link MetaDataRepository} to use.
      */
-    public void setMetaDataRepository(String meta);
+    void setMetaDataRepository(String meta);
 
     /**
      * The metadata repository of managed class information. If no
@@ -694,7 +694,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.0
      */
-    public MetaDataRepository getMetaDataRepositoryInstance();
+    MetaDataRepository getMetaDataRepositoryInstance();
 
     /**
      * Returns true if a metaDataRepository has been created for this
@@ -702,101 +702,101 @@ public interface OpenJPAConfiguration
      *
      * @since 1.1.0 1.0.1
      */
-    public boolean metaDataRepositoryAvailable();
+    boolean metaDataRepositoryAvailable();
 
     /**
      * Create a new empty metadata repository of the configured type.
      */
-    public MetaDataRepository newMetaDataRepositoryInstance();
+    MetaDataRepository newMetaDataRepositoryInstance();
 
     /**
      * The metadata repository of managed class information.
      *
      * @since 0.3.0
      */
-    public void setMetaDataRepository(MetaDataRepository mdRepos);
+    void setMetaDataRepository(MetaDataRepository mdRepos);
 
     /**
      * The user name for the data store connection.
      */
-    public String getConnectionUserName();
+    String getConnectionUserName();
 
     /**
      * The user name for the data store connection.
      */
-    public void setConnectionUserName(String connectionUserName);
+    void setConnectionUserName(String connectionUserName);
 
     /**
      * The password for the data store connection.
      */
-    public String getConnectionPassword();
+    String getConnectionPassword();
 
     /**
      * The password for the data store connection.
      */
-    public void setConnectionPassword(String connectionPassword);
+    void setConnectionPassword(String connectionPassword);
 
     /**
      * The URL for the data store connection.
      */
-    public String getConnectionURL();
+    String getConnectionURL();
 
     /**
      * The URL for the data store connection.
      */
-    public void setConnectionURL(String connectionURL);
+    void setConnectionURL(String connectionURL);
 
     /**
      * Class name of the connection driver.
      */
-    public String getConnectionDriverName();
+    String getConnectionDriverName();
 
     /**
      * Class name of the connection driver.
      */
-    public void setConnectionDriverName(String driverName);
+    void setConnectionDriverName(String driverName);
 
     /**
      * The name for the data store connection factory.
      */
-    public String getConnectionFactoryName();
+    String getConnectionFactoryName();
 
     /**
      * The name for the data store connection factory.
      */
-    public void setConnectionFactoryName(String cfName);
+    void setConnectionFactoryName(String cfName);
 
     /**
      * The connection factory, possibly from JNDI.
      */
-    public Object getConnectionFactory();
+    Object getConnectionFactory();
 
     /**
      * The connection factory.
      */
-    public void setConnectionFactory(Object factory);
+    void setConnectionFactory(Object factory);
 
     /**
      * These properties provide any additional information needed to
      * establish connections.
      */
-    public String getConnectionProperties();
+    String getConnectionProperties();
 
     /**
      * These properties provide any additional information needed to
      * establish connections.
      */
-    public void setConnectionProperties(String props);
+    void setConnectionProperties(String props);
 
     /**
      * Configuration properties for the connection factory.
      */
-    public String getConnectionFactoryProperties();
+    String getConnectionFactoryProperties();
 
     /**
      * Configuration properties for the connection factory.
      */
-    public void setConnectionFactoryProperties(String props);
+    void setConnectionFactoryProperties(String props);
 
     /**
      * The mode of the connection factory in use. Available options are:
@@ -806,7 +806,7 @@ public interface OpenJPAConfiguration
      * the current global transaction by an application server.</li>
      * </ul> Defaults to local.
      */
-    public String getConnectionFactoryMode();
+    String getConnectionFactoryMode();
 
     /**
      * The mode of the connection factory in use. Available options are:
@@ -816,77 +816,77 @@ public interface OpenJPAConfiguration
      * the current global transaction by an application server.</li>
      * </ul> Defaults to local.
      */
-    public void setConnectionFactoryMode(String mode);
+    void setConnectionFactoryMode(String mode);
 
     /**
      * Whether connections are automatically enlisted in global transactions.
      */
-    public boolean isConnectionFactoryModeManaged();
+    boolean isConnectionFactoryModeManaged();
 
     /**
      * Whether connections are automatically enlisted in global transactions.
      */
-    public void setConnectionFactoryModeManaged(boolean managed);
+    void setConnectionFactoryModeManaged(boolean managed);
 
     /**
      * The user name for the non-XA data store connection.
      */
-    public String getConnection2UserName();
+    String getConnection2UserName();
 
     /**
      * The user name for the non-XA data store connection.
      */
-    public void setConnection2UserName(String connectionUserName);
+    void setConnection2UserName(String connectionUserName);
 
     /**
      * The password for the non-XA data store connection.
      */
-    public String getConnection2Password();
+    String getConnection2Password();
 
     /**
      * The password for the non-XA data store connection.
      */
-    public void setConnection2Password(String connectionPassword);
+    void setConnection2Password(String connectionPassword);
 
     /**
      * The URL for the non-XA data store connection.
      */
-    public String getConnection2URL();
+    String getConnection2URL();
 
     /**
      * The URL for the non-XA data store connection.
      */
-    public void setConnection2URL(String connectionURL);
+    void setConnection2URL(String connectionURL);
 
     /**
      * Class name of the non-XA connection driver.
      */
-    public String getConnection2DriverName();
+    String getConnection2DriverName();
 
     /**
      * Class name of the non-XA connection driver.
      */
-    public void setConnection2DriverName(String driverName);
+    void setConnection2DriverName(String driverName);
 
     /**
      * The name for the second data store connection factory.
      */
-    public String getConnectionFactory2Name();
+    String getConnectionFactory2Name();
 
     /**
      * The name for the second data store connection factory.
      */
-    public void setConnectionFactory2Name(String cf2Name);
+    void setConnectionFactory2Name(String cf2Name);
 
     /**
      * The non-XA connection factory.
      */
-    public Object getConnectionFactory2();
+    Object getConnectionFactory2();
 
     /**
      * The non-XA connection factory.
      */
-    public void setConnectionFactory2(Object factory);
+    void setConnectionFactory2(Object factory);
 
     /**
      * These properties provide any additional information needed to
@@ -894,7 +894,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.0
      */
-    public String getConnection2Properties();
+    String getConnection2Properties();
 
     /**
      * These properties provide any additional information needed to
@@ -902,108 +902,108 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.0
      */
-    public void setConnection2Properties(String props);
+    void setConnection2Properties(String props);
 
     /**
      * Configuration properties for the non-XA connection factory.
      *
      * @since 0.2.5
      */
-    public String getConnectionFactory2Properties();
+    String getConnectionFactory2Properties();
 
     /**
      * Configuration properties for the non-XA connection factory.
      *
      * @since 0.2.5
      */
-    public void setConnectionFactory2Properties(String props);
+    void setConnectionFactory2Properties(String props);
 
     /**
      * Whether to use optimistic transactions by default.
      */
-    public boolean getOptimistic();
+    boolean getOptimistic();
 
     /**
      * Whether to use optimistic transactions by default.
      */
-    public void setOptimistic(boolean optimistic);
+    void setOptimistic(boolean optimistic);
 
     /**
      * Wrapper for JCA usage of {@link #setOptimistic(boolean)}.
      */
-    public void setOptimistic(Boolean optimistic);
+    void setOptimistic(Boolean optimistic);
 
     /**
      * Whether to retain state after a transaction by default.
      */
-    public boolean getRetainState();
+    boolean getRetainState();
 
     /**
      * Whether to retain state after a transaction by default.
      */
-    public void setRetainState(boolean retainState);
+    void setRetainState(boolean retainState);
 
     /**
      * Wrapper for JCA usage of {@link #setRetainState(boolean)}.
      */
-    public void setRetainState(Boolean retainState);
+    void setRetainState(Boolean retainState);
 
     /**
      * Whether instances clear their state when entering a transaction.
      */
-    public String getAutoClear();
+    String getAutoClear();
 
     /**
      * Whether instances clear their state when entering a transaction.
      */
-    public void setAutoClear(String clear);
+    void setAutoClear(String clear);
 
     /**
      * Return the {@link AutoClear} constant.
      */
-    public int getAutoClearConstant();
+    int getAutoClearConstant();
 
     /**
      * Whether instances clear their state when entering a transaction.
      */
-    public void setAutoClear(int clear);
+    void setAutoClear(int clear);
 
     /**
      * Whether to restore initial state on rollback by default.
      */
-    public String getRestoreState();
+    String getRestoreState();
 
     /**
      * Whether to restore initial state on rollback by default.
      */
-    public void setRestoreState(String restoreState);
+    void setRestoreState(String restoreState);
 
     /**
      * Return the {@link RestoreState} constant.
      */
-    public int getRestoreStateConstant();
+    int getRestoreStateConstant();
 
     /**
      * Whether to restore initial state on rollback by default.
      */
-    public void setRestoreState(int restoreState);
+    void setRestoreState(int restoreState);
 
     /**
      * Whether changes in the current transaction are taken into account when
      * executing queries and iterating extents.
      */
-    public boolean getIgnoreChanges();
+    boolean getIgnoreChanges();
 
     /**
      * Whether changes in the current transaction are taken into account when
      * executing queries and iterating extents.
      */
-    public void setIgnoreChanges(boolean ignoreChanges);
+    void setIgnoreChanges(boolean ignoreChanges);
 
     /**
      * Wrapper for JCA usage of {@link #setIgnoreChanges(boolean)}.
      */
-    public void setIgnoreChanges(Boolean ignoreChanges);
+    void setIgnoreChanges(Boolean ignoreChanges);
 
     /**
      * A comma-separated list of events which trigger auto-detachment
@@ -1015,7 +1015,7 @@ public interface OpenJPAConfiguration
      * non-transactionally.</li>
      * </ul>
      */
-    public String getAutoDetach();
+    String getAutoDetach();
 
     /**
      * A comma-separated list of events which trigger auto-detachment
@@ -1027,115 +1027,115 @@ public interface OpenJPAConfiguration
      * non-transactionally.</li>
      * </ul>
      */
-    public void setAutoDetach(String detach);
+    void setAutoDetach(String detach);
 
     /**
      * The {@link AutoDetach} flags.
      */
-    public int getAutoDetachConstant();
+    int getAutoDetachConstant();
 
     /**
      * The {@link AutoDetach} flags.
      */
-    public void setAutoDetach(int flags);
+    void setAutoDetach(int flags);
 
     /**
      * Which field values to include when detaching.
      */
-    public void setDetachState(String detachState);
+    void setDetachState(String detachState);
 
     /**
      * Return the instance specified by the detach state plugin.
      */
-    public DetachOptions getDetachStateInstance();
+    DetachOptions getDetachStateInstance();
 
     /**
      * Return the instance specified by the detach state plugin.
      */
-    public void setDetachState(DetachOptions detachState);
+    void setDetachState(DetachOptions detachState);
 
     /**
      * Whether persistent state is accessible outside a transaction by default.
      */
-    public boolean getNontransactionalRead();
+    boolean getNontransactionalRead();
 
     /**
      * Whether persistent state is accessible outside a transaction by default.
      */
-    public void setNontransactionalRead(boolean ntRead);
+    void setNontransactionalRead(boolean ntRead);
 
     /**
      * Wrapper for JCA usage of {@link #setNontransactionalRead(boolean)}.
      */
-    public void setNontransactionalRead(Boolean ntRead);
+    void setNontransactionalRead(Boolean ntRead);
 
     /**
      * Whether persistent state can be modified outside a transaction by
      * default.
      */
-    public boolean getNontransactionalWrite();
+    boolean getNontransactionalWrite();
 
     /**
      * Whether persistent state can be modified outside a transaction by
      * default.
      */
-    public void setNontransactionalWrite(boolean ntWrite);
+    void setNontransactionalWrite(boolean ntWrite);
 
     /**
      * Wrapper for JCA usage of {@link #setNontransactionalWrite(boolean)}.
      */
-    public void setNontransactionalWrite(Boolean ntWrite);
+    void setNontransactionalWrite(Boolean ntWrite);
 
     /**
      * Whether brokers or their managed objects will be used by multiple
      * concurrent threads.
      */
-    public boolean getMultithreaded();
+    boolean getMultithreaded();
 
     /**
      * Whether brokers or their managed objects will be used by multiple
      * concurrent threads.
      */
-    public void setMultithreaded(boolean multithreaded);
+    void setMultithreaded(boolean multithreaded);
 
     /**
      * Wrapper for JCA usage of {@link #setMultithreaded(boolean)}.
      */
-    public void setMultithreaded(Boolean multithreaded);
+    void setMultithreaded(Boolean multithreaded);
 
     /**
      * Get the size of the batch that will be pre-selected when accessing
      * elements in a query or relationship. Use -1 to prefetch all results.
      */
-    public int getFetchBatchSize();
+    int getFetchBatchSize();
 
     /**
      * Set the size of the batch that will be pre-selected when accessing
      * elements in a query or relationship. Use -1 to prefetch all results.
      */
-    public void setFetchBatchSize(int size);
+    void setFetchBatchSize(int size);
 
     /**
      * Wrapper for JCA usage of {@link #setFetchBatchSize(int)}.
      */
-    public void setFetchBatchSize(Integer size);
+    void setFetchBatchSize(Integer size);
 
     /**
      * The maximum relation depth to traverse when eager fetching.  Use
      * -1 for no limit.
      */
-    public int getMaxFetchDepth();
+    int getMaxFetchDepth();
 
     /**
      * The maximum relation depth to traverse when eager fetching.  Use
      * -1 for no limit.
      */
-    public void setMaxFetchDepth(int depth);
+    void setMaxFetchDepth(int depth);
 
     /**
      * Wrapper for JCA usage of {@link #setMaxFetchDepth(int)}.
      */
-    public void setMaxFetchDepth(Integer size);
+    void setMaxFetchDepth(Integer size);
 
     /**
      * Comma-separated list of fetch group names that will be pre-set for
@@ -1143,7 +1143,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public String getFetchGroups();
+    String getFetchGroups();
 
     /**
      * Comma-separated list of fetch group names that will be pre-set for
@@ -1151,19 +1151,19 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public void setFetchGroups(String groups);
+    void setFetchGroups(String groups);
 
     /**
      * List of fetch group names that will be pre-set for all new
      * {@link FetchConfiguration}s.
      */
-    public String[] getFetchGroupsList();
+    String[] getFetchGroupsList();
 
     /**
      * List of fetch group names that will be pre-set for all new
      * {@link FetchConfiguration}s.
      */
-    public void setFetchGroups(String[] names);
+    void setFetchGroups(String[] names);
 
     /**
      * Returns whether or not OpenJPA should automatically flush
@@ -1171,7 +1171,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public String getFlushBeforeQueries();
+    String getFlushBeforeQueries();
 
     /**
      * Sets whether or not OpenJPA should automatically flush
@@ -1179,7 +1179,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public void setFlushBeforeQueries(String flush);
+    void setFlushBeforeQueries(String flush);
 
     /**
      * Returns one of {@link QueryFlushModes#FLUSH_TRUE},
@@ -1189,7 +1189,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public int getFlushBeforeQueriesConstant();
+    int getFlushBeforeQueriesConstant();
 
     /**
      * Set to one of {@link QueryFlushModes#FLUSH_TRUE},
@@ -1198,7 +1198,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public void setFlushBeforeQueries(int flushBeforeQueries);
+    void setFlushBeforeQueries(int flushBeforeQueries);
 
     /**
      * The time to wait for an object lock in milliseconds, or -1 for no
@@ -1206,7 +1206,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.1
      */
-    public int getLockTimeout();
+    int getLockTimeout();
 
     /**
      * The time to wait for an object lock in milliseconds, or -1 for no
@@ -1214,14 +1214,14 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.1
      */
-    public void setLockTimeout(int timeout);
+    void setLockTimeout(int timeout);
 
     /**
      * Wrapper for JCA usage of {@link #setLockTimeout(int)}.
      *
      * @since 0.3.1
      */
-    public void setLockTimeout(Integer timeout);
+    void setLockTimeout(Integer timeout);
 
     /**
      * The time to wait for a query to execute in milliseconds, or -1 for no
@@ -1229,7 +1229,7 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public int getQueryTimeout();
+    int getQueryTimeout();
 
     /**
      * The time to wait for a query to execute in milliseconds, or -1 for no
@@ -1237,7 +1237,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.1
      */
-    public void setQueryTimeout(int timeout);
+    void setQueryTimeout(int timeout);
 
     /**
      * The default read lock level to use during non-optimistic transactions.
@@ -1245,7 +1245,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.1
      */
-    public String getReadLockLevel();
+    String getReadLockLevel();
 
     /**
      * The default read lock level to use during non-optimistic transactions.
@@ -1253,21 +1253,21 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.1
      */
-    public void setReadLockLevel(String level);
+    void setReadLockLevel(String level);
 
     /**
      * The numeric read lock level.
      *
      * @since 0.3.1
      */
-    public int getReadLockLevelConstant();
+    int getReadLockLevelConstant();
 
     /**
      * The numeric read lock level.
      *
      * @since 0.3.1
      */
-    public void setReadLockLevel(int level);
+    void setReadLockLevel(int level);
 
     /**
      * The default write lock level to use during non-optimistic transactions.
@@ -1275,7 +1275,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.1
      */
-    public String getWriteLockLevel();
+    String getWriteLockLevel();
 
     /**
      * The default write lock level to use during non-optimistic transactions.
@@ -1283,41 +1283,41 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.1
      */
-    public void setWriteLockLevel(String level);
+    void setWriteLockLevel(String level);
 
     /**
      * The numeric write lock level.
      *
      * @since 0.3.1
      */
-    public int getWriteLockLevelConstant();
+    int getWriteLockLevelConstant();
 
     /**
      * The numeric write lock level.
      *
      * @since 0.3.1
      */
-    public void setWriteLockLevel(int level);
+    void setWriteLockLevel(int level);
 
     /**
      * Plugin string for the default system {@link Seq}.
      */
-    public String getSequence();
+    String getSequence();
 
     /**
      * Plugin string for the default system {@link Seq}.
      */
-    public void setSequence(String sequence);
+    void setSequence(String sequence);
 
     /**
      * The default system sequence.
      */
-    public Seq getSequenceInstance();
+    Seq getSequenceInstance();
 
     /**
      * The default system sequence.
      */
-    public void setSequence(Seq sequence);
+    void setSequence(Seq sequence);
 
     /**
      * Specifies the behavior of the broker with respect to data store
@@ -1337,7 +1337,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public String getConnectionRetainMode();
+    String getConnectionRetainMode();
 
     /**
      * Specifies the behavior of the broker with respect to data store
@@ -1357,7 +1357,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.2.5
      */
-    public void setConnectionRetainMode(String mode);
+    void setConnectionRetainMode(String mode);
 
     /**
      * Return the connection retain mode as one of the following symbolic
@@ -1368,7 +1368,7 @@ public interface OpenJPAConfiguration
      * <li>{@link ConnectionRetainModes#CONN_RETAIN_DEMAND}</li>
      * </ul>
      */
-    public int getConnectionRetainModeConstant();
+    int getConnectionRetainModeConstant();
 
     /**
      * Set the connection retain mode as one of the following symbolic
@@ -1379,53 +1379,53 @@ public interface OpenJPAConfiguration
      * <li>{@link ConnectionRetainModes#CONN_RETAIN_DEMAND}</li>
      * </ul>
      */
-    public void setConnectionRetainMode(int mode);
+    void setConnectionRetainMode(int mode);
 
     /**
      * A comma-separted list of the plugin strings of the query
      * {@link FilterListener}s to use.
      */
-    public String getFilterListeners();
+    String getFilterListeners();
 
     /**
      * A comma-separted list of the plugin strings of the query
      * {@link FilterListener}s to use.
      */
-    public void setFilterListeners(String listeners);
+    void setFilterListeners(String listeners);
 
     /**
      * Return the query filter listeners. If none have been set explicitly,
      * this method instantiates the listeners from the set plugin list.
      */
-    public FilterListener[] getFilterListenerInstances();
+    FilterListener[] getFilterListenerInstances();
 
     /**
      * Set the query filter listeners. Overrides the list of listener classes.
      */
-    public void setFilterListeners(FilterListener[] listeners);
+    void setFilterListeners(FilterListener[] listeners);
 
     /**
      * A comma-separted list of the plugin strings of the query
      * {@link AggregateListener}s to use.
      */
-    public String getAggregateListeners();
+    String getAggregateListeners();
 
     /**
      * A comma-separted list of the plugin strings of the query
      * {@link AggregateListener}s to use.
      */
-    public void setAggregateListeners(String listeners);
+    void setAggregateListeners(String listeners);
 
     /**
      * Return the query function listeners. If none have been set explicitly,
      * this method instantiates the listeners from the set plugin list.
      */
-    public AggregateListener[] getAggregateListenerInstances();
+    AggregateListener[] getAggregateListenerInstances();
 
     /**
      * Set the query function listeners. Overrides the list of listener classes.
      */
-    public void setAggregateListeners(AggregateListener[] listeners);
+    void setAggregateListeners(AggregateListener[] listeners);
 
     /**
      * Whether to warn and defer registration instead of throwing an
@@ -1435,7 +1435,7 @@ public interface OpenJPAConfiguration
      *
      * @since 0.3.2.3
      */
-    public boolean getRetryClassRegistration();
+    boolean getRetryClassRegistration();
 
     /**
      * Whether to warn and defer registration instead of throwing an
@@ -1445,43 +1445,43 @@ public interface OpenJPAConfiguration
 	 *
 	 * @since 0.3.2.3
 	 */
-	public void setRetryClassRegistration(boolean warn);
+	void setRetryClassRegistration(boolean warn);
 
     /**
      * Wrapper for JCA usage of {@link #setRetryClassRegistration(boolean)}.
      *
      * @since 0.3.2.3
      */
-	public void setRetryClassRegistration(Boolean warn);
+	void setRetryClassRegistration(Boolean warn);
 
 	/**
 	 * Backwards compatibility options.
 	 */
-	public String getCompatibility();
+	String getCompatibility();
 
 	/**
 	 * Backwards compatibility options.
 	 */
-	public void setCompatibility(String compatibility);
+	void setCompatibility(String compatibility);
 
 	/**
 	 * Backwards compatibility options.
 	 */
-	public Compatibility getCompatibilityInstance ();
+	Compatibility getCompatibilityInstance ();
 
 	/**
 	 * Options for configuring callbacks as a String.
      *
      * @since 2.0.0
 	 */
-	public String getCallbackOptions();
+	String getCallbackOptions();
 
 	/**
 	 * Options for configuring callbacks.
 	 *
 	 * @since 2.0.0
 	 */
-	public CallbackOptions getCallbackOptionsInstance();
+	CallbackOptions getCallbackOptionsInstance();
 
     /**
      * Options for configuring callbacks set as a comma-separated string value
@@ -1489,34 +1489,34 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-	public void setCallbackOptions(String options);
+	void setCallbackOptions(String options);
 
     /**
      * Configuration settings for the query compilation cache to use.
      * @see QueryCompilationCacheValue
      * @since 0.9.6
      */
-    public String getQueryCompilationCache();
+    String getQueryCompilationCache();
 
     /**
      * Configuration settings for the query compilation cache to use.
      * @see QueryCompilationCacheValue
      * @since 0.9.6
      */
-    public void setQueryCompilationCache(String conf);
+    void setQueryCompilationCache(String conf);
 
     /**
      * Configuration settings for the query compilation cache to use.
      * @see QueryCompilationCacheValue
      * @since 0.9.6
      */
-    public Map getQueryCompilationCacheInstance();
+    Map getQueryCompilationCacheInstance();
 
     /**
      * Return the {@link StoreFacadeTypeRegistry} instance associated with this
      * configuration.
      */
-    public StoreFacadeTypeRegistry getStoreFacadeTypeRegistry();
+    StoreFacadeTypeRegistry getStoreFacadeTypeRegistry();
 
     /**
      * Return the {@link org.apache.openjpa.event.BrokerFactoryEventManager}
@@ -1524,7 +1524,7 @@ public interface OpenJPAConfiguration
      *
      * @since 1.0.0
      */
-    public BrokerFactoryEventManager getBrokerFactoryEventManager();
+    BrokerFactoryEventManager getBrokerFactoryEventManager();
 
     /**
      * Specifies how OpenJPA handles unenhanced types. Possible values are:
@@ -1543,7 +1543,7 @@ public interface OpenJPAConfiguration
      *
      * @since 1.0.0
      */
-    public String getRuntimeUnenhancedClasses();
+    String getRuntimeUnenhancedClasses();
 
     /**
      * Specifies how OpenJPA handles unenhanced types.
@@ -1551,7 +1551,7 @@ public interface OpenJPAConfiguration
      * @see {@link #getRuntimeUnenhancedClasses()}
      * @since 1.0.0
      */
-    public void setRuntimeUnenhancedClasses(String mode);
+    void setRuntimeUnenhancedClasses(String mode);
 
     /**
      * Return the runtime class optimization setting as one of the
@@ -1564,7 +1564,7 @@ public interface OpenJPAConfiguration
      *
      * @since 1.0.0
      */
-    public int getRuntimeUnenhancedClassesConstant();
+    int getRuntimeUnenhancedClassesConstant();
 
     /**
      * Set the runtime class optimization setting as one of the
@@ -1577,23 +1577,23 @@ public interface OpenJPAConfiguration
      *
      * @since 1.0.0
      */
-    public void setRuntimeUnenhancedClasses(int mode);
+    void setRuntimeUnenhancedClasses(int mode);
     /**
      * Whether OpenJPA will attempt to dynamically load the enhancement agent.
      */
-    public boolean getDynamicEnhancementAgent();
+    boolean getDynamicEnhancementAgent();
     /**
      * Sets whether OpenJPA will attempt to dynamically load the enhancement
      * agent.
      */
-    public void setDynamicEnhancementAgent(boolean dynamic);
+    void setDynamicEnhancementAgent(boolean dynamic);
     /**
      * A comma-separted list of the plugin strings specifying the
      * {@link CacheMarshaller}s to use.
      *
      * @since 1.1.0
      */
-    public String getCacheMarshallers();
+    String getCacheMarshallers();
 
     /**
      * A comma-separated list of the plugin strings specifying the
@@ -1601,14 +1601,14 @@ public interface OpenJPAConfiguration
      *
      * @since 1.1.0
      */
-    public void setCacheMarshallers(String marshallers);
+    void setCacheMarshallers(String marshallers);
 
     /**
      * Return the cache marshaller listeners.
      *
      * @since 1.1.0
      */
-    public Map<String,CacheMarshaller> getCacheMarshallerInstances();
+    Map<String,CacheMarshaller> getCacheMarshallerInstances();
 
     /**
      * Affirms if all configured elements are initialized eagerly as opposed
@@ -1616,7 +1616,7 @@ public interface OpenJPAConfiguration
      *
      * @since 1.3.0
      */
-    public boolean isInitializeEagerly();
+    boolean isInitializeEagerly();
 
     /**
      * Sets whether all configured elements will be initialized eagerly or
@@ -1624,56 +1624,56 @@ public interface OpenJPAConfiguration
      *
      * @since 1.3.0
      */
-    public void setInitializeEagerly(boolean flag);
+    void setInitializeEagerly(boolean flag);
 
     /**
      * Return PreparedQueryCache used for caching datastore queries.
      *
      * @since 2.0.0
      */
-    public PreparedQueryCache getQuerySQLCacheInstance();
+    PreparedQueryCache getQuerySQLCacheInstance();
 
     /**
      * Gets the configuration of QuerySQLCache.
      *
      * @since 2.0.0
      */
-    public String getQuerySQLCache();
+    String getQuerySQLCache();
 
     /**
      * Sets QuerySQLCache with the given cache.
      *
      * @since 2.0.0
      */
-    public void setQuerySQLCache(PreparedQueryCache cache);
+    void setQuerySQLCache(PreparedQueryCache cache);
 
     /**
      * Sets QuerySQLCache with the given configuration.
      *
      * @since 2.0.0
      */
-    public void setQuerySQLCache(String config);
+    void setQuerySQLCache(String config);
 
     /**
      * Get the cache of finder queries.
      *
      * @since 2.0.0
      */
-    public FinderCache getFinderCacheInstance();
+    FinderCache getFinderCacheInstance();
 
     /**
      * Get the string configuration of the finder cache.
      *
      * @since 2.0.0
      */
-    public String getFinderCache();
+    String getFinderCache();
 
     /**
      * Set the finder cache from a string configuration.
      *
      * @since 2.0.0
      */
-    public void setFinderCache(String cache);
+    void setFinderCache(String cache);
 
     /**
      * The bean validation mode to use for managed classes.
@@ -1681,7 +1681,7 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public String getValidationMode();
+    String getValidationMode();
 
     /**
      * Set the bean validation mode to use for managed classes.
@@ -1689,7 +1689,7 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public void setValidationMode(String mode);
+    void setValidationMode(String mode);
 
     /**
      * The ValidatorFactory provided by the container or application.
@@ -1697,7 +1697,7 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public Object getValidationFactoryInstance();
+    Object getValidationFactoryInstance();
 
     /**
      * Set the container or application provided ValidatorFactory instance.
@@ -1705,7 +1705,7 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public void setValidationFactory(Object factory);
+    void setValidationFactory(Object factory);
 
     /**
      * The Validator provided by the container or created by the runtime.
@@ -1713,7 +1713,7 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public Object getValidatorInstance();
+    Object getValidatorInstance();
 
     /**
      * Set the container or application provided Validator instance.
@@ -1721,83 +1721,83 @@ public interface OpenJPAConfiguration
      *
      * @since 2.0.0
      */
-    public void setValidatorInstance(Object val);
+    void setValidatorInstance(Object val);
 
     /**
      * Gets the lifecycle event manager instance classname.
      *
      * @since 2.0.0
      */
-    public String getLifecycleEventManager();
+    String getLifecycleEventManager();
 
     /**
      * Gets the lifecycle event manager instance.
      *
      * @since 2.0.0
      */
-    public LifecycleEventManager getLifecycleEventManagerInstance();
+    LifecycleEventManager getLifecycleEventManagerInstance();
 
     /**
      * Sets the lifecycle event manager instance classname.
      *
      * @since 2.0.0
      */
-    public void setLifecycleEventManager(String eventMgr);
+    void setLifecycleEventManager(String eventMgr);
 
     /**
      * Gets the validation groups for pre-persist
      *
      * @since 2.0.0
      */
-    public String getValidationGroupPrePersist();
+    String getValidationGroupPrePersist();
 
     /**
      * Sets the validation groups for pre-persist
      *
      * @since 2.0.0
      */
-    public void setValidationGroupPrePersist(String vgPrePersist);
+    void setValidationGroupPrePersist(String vgPrePersist);
 
     /**
      * Gets the validation groups for pre-update
      *
      * @since 2.0.0
      */
-    public String getValidationGroupPreUpdate();
+    String getValidationGroupPreUpdate();
 
     /**
      * Sets the validation groups for pre-update
      *
      * @since 2.0.0
      */
-    public void setValidationGroupPreUpdate(String vgPreUpdate);
+    void setValidationGroupPreUpdate(String vgPreUpdate);
 
     /**
      * Gets the validation groups for pre-remove
      *
      * @since 2.0.0
      */
-    public String getValidationGroupPreRemove();
+    String getValidationGroupPreRemove();
 
     /**
      * Sets the validation groups for pre-remove
      *
      * @since 2.0.0
      */
-    public void setValidationGroupPreRemove(String vgPreRemove);
+    void setValidationGroupPreRemove(String vgPreRemove);
 
     /**
      * Sets the {@link EncryptionProvider}.
      *
      */
-    public void setEncryptionProvider(String className);
+    void setEncryptionProvider(String className);
 
     /**
      * Gets the {@link EncryptionProvider}.
      *
      * @return EncryptionProvider
      */
-    public EncryptionProvider getEncryptionProvider();
+    EncryptionProvider getEncryptionProvider();
 
 
     /**
@@ -1806,14 +1806,14 @@ public interface OpenJPAConfiguration
      * @param mode One of the Sting constants from {@link DataCacheMode}
      * @since 2.0.0
      */
-    public void setDataCacheMode(String mode);
+    void setDataCacheMode(String mode);
 
     /**
      * Return the String constant that matches the {@link DataCacheMode}
      * @return DataCacheMode
      * @since 2.0.0
      */
-    public String getDataCacheMode();
+    String getDataCacheMode();
 
     /**
      * Gets the policy object that determines distribution of cached instances
@@ -1822,7 +1822,7 @@ public interface OpenJPAConfiguration
      * @return an implementation of {@link CacheDistributionPolicy}.
      * @since 2.0.0
      */
-    public CacheDistributionPolicy getCacheDistributionPolicyInstance();
+    CacheDistributionPolicy getCacheDistributionPolicyInstance();
 
     /**
      * Sets the policy object that determines distribution of cached instances
@@ -1831,7 +1831,7 @@ public interface OpenJPAConfiguration
      * @param policy a non-null implementation of {@link CacheDistributionPolicy}.
      * @since 2.0.0
      */
-    public void setCacheDistributionPolicyInstance(CacheDistributionPolicy policy);
+    void setCacheDistributionPolicyInstance(CacheDistributionPolicy policy);
 
     /**
      * Gets the plug-in string that described the policy to distribute cached instances
@@ -1840,7 +1840,7 @@ public interface OpenJPAConfiguration
      * @return a plug-in string for {@link CacheDistributionPolicy}.
      * @since 2.0.0
      */
-    public String getCacheDistributionPolicy();
+    String getCacheDistributionPolicy();
 
     /**
      * Sets the plug-in string that describes the policy to distribute cached instances
@@ -1849,7 +1849,7 @@ public interface OpenJPAConfiguration
      * @param a plug-in string for {@link CacheDistributionPolicy}.
      * @since 2.0.0
      */
-    public void setCacheDistributionPolicy(String policyPlugin);
+    void setCacheDistributionPolicy(String policyPlugin);
 
     /**
      * Gets the plug-in string that defines instrumentation providers and what
@@ -1857,7 +1857,7 @@ public interface OpenJPAConfiguration
      * @return a plug-in string for the instrumentation configuration
      * @since 2.1.0
      */
-    public String getInstrumentation();
+    String getInstrumentation();
 
     /**
      * Sets the plug-in string that defines instrumentation providers and what
@@ -1865,7 +1865,7 @@ public interface OpenJPAConfiguration
      * @param providers a plug-in string for the instrumentation configuration
      * @since 2.1.0
      */
-    public void setInstrumentation(String providers);
+    void setInstrumentation(String providers);
 
     /**
      * Gets an instance of the instrumentation manager.  The instrumentation
@@ -1874,7 +1874,7 @@ public interface OpenJPAConfiguration
      * @return an instance of the instrumentation manager
      * @since 2.1.0
      */
-    public InstrumentationManager getInstrumentationManagerInstance();
+    InstrumentationManager getInstrumentationManagerInstance();
 
 
     /**
@@ -1882,7 +1882,7 @@ public interface OpenJPAConfiguration
      *
      * @since 2.2.0
      */
-    public Auditor getAuditorInstance();
+    Auditor getAuditorInstance();
 
     /**
      * Sets the singular instance of {@link Auditor} associated with this configuration.
@@ -1890,39 +1890,39 @@ public interface OpenJPAConfiguration
      * @since 2.2.0
      */
 
-    public void setAuditorInstance(Auditor auditor);
+    void setAuditorInstance(Auditor auditor);
 
     /**
      * Gets the plug-in string of {@link Auditor} specified in this configuration.
      *
      * @since 2.2.0
      */
-    public String getAuditor();
+    String getAuditor();
 
     /**
      * Sets the plug-in string of {@link Auditor} specified in this configuration.
      *
      * @since 2.2.0
      */
-    public void setAuditor(String s);
+    void setAuditor(String s);
 
      /**
       * Whether to send &#064;PostLoad events on a merge operation.
       * @since 2.2.0
       */
-     public boolean getPostLoadOnMerge();
+     boolean getPostLoadOnMerge();
 
      /**
       * Whether to send &#064;PostLoad events on a merge operation.
       * @since 2.2.0
       */
-     public void setPostLoadOnMerge(boolean postLoadOnMerge);
+     void setPostLoadOnMerge(boolean postLoadOnMerge);
 
      /**
       * Whether to send &#064;PostLoad events on a merge operation.
       * @since 2.2.0
       */
-     public void setPostLoadOnMerge(Boolean postLoadOnMerge);
+     void setPostLoadOnMerge(Boolean postLoadOnMerge);
 
      /**
       * Whether to attempt to optimize id class copy operations during the
@@ -1933,7 +1933,7 @@ public interface OpenJPAConfiguration
       * noraml behavior.
       * @since 2.2.0
       */
-     public boolean getOptimizeIdCopy();
+     boolean getOptimizeIdCopy();
 
      /**
       * Whether to attempt to optimize id class copy operations during the
@@ -1944,7 +1944,7 @@ public interface OpenJPAConfiguration
       * normal behavior.
       * @since 2.2.0
       */
-     public void setOptimizeIdCopy(boolean optimizeIds);
+     void setOptimizeIdCopy(boolean optimizeIds);
 
      /**
       * Whether to attempt to optimize id class copy operations during the
@@ -1955,7 +1955,7 @@ public interface OpenJPAConfiguration
       * normal behavior.
       * @since 2.2.0
       */
-      public void setOptimizeIdCopy(Boolean optimizeIds);
+      void setOptimizeIdCopy(Boolean optimizeIds);
 
       /**
        * Indicates if the {@link Thread#contextClassLoader} should be used
@@ -1964,7 +1964,7 @@ public interface OpenJPAConfiguration
        *
        * @since 2.4.2
        */
-      public boolean getUseTCCLinSelectNew();
+      boolean getUseTCCLinSelectNew();
 
       /**
        * Indicates if the {@link Thread#contextClassLoader} should be used
@@ -1973,7 +1973,7 @@ public interface OpenJPAConfiguration
        *
        * @since 2.4.2
        */
-      public void setUseTCCLinSelectNew(boolean useTcclForSelectNew);
+      void setUseTCCLinSelectNew(boolean useTcclForSelectNew);
 
       /**
        * Indicates if the {@link Thread#contextClassLoader} should be used
@@ -1982,11 +1982,11 @@ public interface OpenJPAConfiguration
        *
        * @since 2.4.2
        */
-      public void setUseTCCLinSelectNew(Boolean useTcclForSelectNew);
+      void setUseTCCLinSelectNew(Boolean useTcclForSelectNew);
 
-    public String getDatabaseAction();
+    String getDatabaseAction();
 
-    public int getDatabaseActionConstant();
+    int getDatabaseActionConstant();
 
     String getScriptsAction();
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
index cd35d5254..d3b6765fb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
@@ -22,7 +22,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.audit.AuditLogger;
 import org.apache.openjpa.audit.Auditor;
 import org.apache.openjpa.datacache.CacheDistributionPolicy;
@@ -68,6 +67,7 @@ import org.apache.openjpa.lib.encryption.EncryptionProvider;
 import org.apache.openjpa.lib.instrumentation.InstrumentationLevel;
 import org.apache.openjpa.lib.instrumentation.InstrumentationProvider;
 import org.apache.openjpa.lib.log.Log;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.MetaDataFactory;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.util.ClassResolver;
@@ -195,7 +195,7 @@ public class OpenJPAConfigurationImpl
     public RemoteCommitProviderValue remoteProviderPlugin;
     public AutoDetachValue autoDetach;
 
-    private Collection<String> supportedOptions = new HashSet<String>(33);
+    private Collection<String> supportedOptions = new HashSet<>(33);
     private final StoreFacadeTypeRegistry _storeFacadeRegistry = new StoreFacadeTypeRegistry();
     private BrokerFactoryEventManager _brokerFactoryEventManager = new BrokerFactoryEventManager(this);
     private Map<String, Object> _peMap; //contains persistence environment-specific info
@@ -697,6 +697,7 @@ public class OpenJPAConfigurationImpl
             loadGlobals();
     }
 
+    @Override
     public Collection<String> supportedOptions() {
         return supportedOptions;
     }
@@ -706,11 +707,13 @@ public class OpenJPAConfigurationImpl
      * information) or an empty String if not set.
      *
      */
+    @Override
     public String getSpecification() {
         Specification spec = getSpecificationInstance();
         return spec == null ? "" : spec.getName();
     }
 
+    @Override
     public Specification getSpecificationInstance() {
         return (Specification)specification.get();
     }
@@ -721,48 +724,59 @@ public class OpenJPAConfigurationImpl
      * @param spec should be encoded in the format specified in {@link
      * Specification}.
      */
+    @Override
     public void setSpecification(String spec) {
         specification.setString(spec);
     }
 
+    @Override
     public void setSpecification(Specification newSpec) {
         specification.set(newSpec);
     }
 
+    @Override
     public void setClassResolver(String classResolver) {
         classResolverPlugin.setString(classResolver);
     }
 
+    @Override
     public String getClassResolver() {
         return classResolverPlugin.getString();
     }
 
+    @Override
     public void setClassResolver(ClassResolver classResolver) {
         classResolverPlugin.set(classResolver);
     }
 
+    @Override
     public ClassResolver getClassResolverInstance() {
         if (classResolverPlugin.get() == null)
             classResolverPlugin.instantiate(ClassResolver.class, this);
         return (ClassResolver) classResolverPlugin.get();
     }
 
+    @Override
     public void setBrokerFactory(String factory) {
         brokerFactoryPlugin.setString(factory);
     }
 
+    @Override
     public String getBrokerFactory() {
         return brokerFactoryPlugin.getString();
     }
 
+    @Override
     public void setBrokerImpl(String broker) {
         brokerPlugin.setString(broker);
     }
 
+    @Override
     public String getBrokerImpl() {
         return brokerPlugin.getString();
     }
 
+    @Override
     public BrokerImpl newBrokerInstance(String user, String pass) {
         BrokerImpl broker = (BrokerImpl) brokerPlugin.instantiate(BrokerImpl.class, this);
         if (broker != null)
@@ -770,20 +784,24 @@ public class OpenJPAConfigurationImpl
         return broker;
     }
 
+    @Override
     public void setDataCacheManager(String mgr) {
         dataCacheManagerPlugin.setString(mgr);
     }
 
+    @Override
     public String getDataCacheManager() {
         return dataCacheManagerPlugin.getString();
     }
 
+    @Override
     public void setDataCacheManager(DataCacheManager dcm) {
         if (dcm != null)
             dcm.initialize(this, dataCachePlugin, queryCachePlugin);
         dataCacheManagerPlugin.set(dcm);
     }
 
+    @Override
     public DataCacheManager getDataCacheManagerInstance() {
         DataCacheManager dcm = (DataCacheManager) dataCacheManagerPlugin.get();
         if (dcm == null) {
@@ -795,69 +813,85 @@ public class OpenJPAConfigurationImpl
         return dcm;
     }
 
+    @Override
     public void setDataCache(String dataCache) {
         dataCachePlugin.setString(dataCache);
     }
 
+    @Override
     public String getDataCache() {
         return dataCachePlugin.getString();
     }
 
+    @Override
     public void setDataCacheTimeout(int dataCacheTimeout) {
         this.dataCacheTimeout.set(dataCacheTimeout);
     }
 
+    @Override
     public void setDataCacheTimeout(Integer dataCacheTimeout) {
         if (dataCacheTimeout != null)
             setDataCacheTimeout(dataCacheTimeout.intValue());
     }
 
+    @Override
     public int getDataCacheTimeout() {
         return dataCacheTimeout.get();
     }
 
+    @Override
     public void setQueryCache(String queryCache) {
         queryCachePlugin.setString(queryCache);
     }
 
+    @Override
     public String getQueryCache() {
         return queryCachePlugin.getString();
     }
 
+    @Override
     public boolean getRefreshFromDataCache() {
     	return refreshFromDataCache.get();
     }
 
+    @Override
     public void setRefreshFromDataCache(boolean flag) {
     	refreshFromDataCache.set(flag);
     }
 
+    @Override
     public void setRefreshFromDataCache(Boolean flag) {
     	if (flag != null) {
     		refreshFromDataCache.set(flag.booleanValue());
     	}
     }
 
+    @Override
     public boolean getDynamicDataStructs() {
         return dynamicDataStructs.get();
     }
 
+    @Override
     public void setDynamicDataStructs(boolean dynamic) {
         dynamicDataStructs.set(dynamic);
     }
 
+    @Override
     public void setDynamicDataStructs(Boolean dynamic) {
         setDynamicDataStructs(dynamic.booleanValue());
     }
 
+    @Override
     public void setLockManager(String lockManager) {
         lockManagerPlugin.setString(lockManager);
     }
 
+    @Override
     public String getLockManager() {
         return lockManagerPlugin.getString();
     }
 
+    @Override
     public LockManager newLockManagerInstance() {
         // don't validate plugin properties on instantiation because it
         // is likely that back ends will override defaults with their
@@ -866,68 +900,83 @@ public class OpenJPAConfigurationImpl
             this, false);
     }
 
+    @Override
     public void setInverseManager(String inverseManager) {
         inverseManagerPlugin.setString(inverseManager);
     }
 
+    @Override
     public String getInverseManager() {
         return inverseManagerPlugin.getString();
     }
 
+    @Override
     public InverseManager newInverseManagerInstance() {
         return (InverseManager) inverseManagerPlugin.instantiate(InverseManager.class, this);
     }
 
+    @Override
     public void setSavepointManager(String savepointManager) {
         savepointManagerPlugin.setString(savepointManager);
     }
 
+    @Override
     public String getSavepointManager() {
         return savepointManagerPlugin.getString();
     }
 
+    @Override
     public SavepointManager getSavepointManagerInstance() {
         if (savepointManagerPlugin.get() == null)
             savepointManagerPlugin.instantiate(SavepointManager.class, this);
         return (SavepointManager) savepointManagerPlugin.get();
     }
 
+    @Override
     public void setOrphanedKeyAction(String action) {
         orphanedKeyPlugin.setString(action);
     }
 
+    @Override
     public String getOrphanedKeyAction() {
         return orphanedKeyPlugin.getString();
     }
 
+    @Override
     public OrphanedKeyAction getOrphanedKeyActionInstance() {
         if (orphanedKeyPlugin.get() == null)
             orphanedKeyPlugin.instantiate(OrphanedKeyAction.class, this);
         return (OrphanedKeyAction) orphanedKeyPlugin.get();
     }
 
+    @Override
     public void setOrphanedKeyAction(OrphanedKeyAction action) {
         orphanedKeyPlugin.set(action);
     }
 
+    @Override
     public void setRemoteCommitProvider(String remoteCommitProvider) {
         remoteProviderPlugin.setString(remoteCommitProvider);
     }
 
+    @Override
     public String getRemoteCommitProvider() {
         return remoteProviderPlugin.getString();
     }
 
+    @Override
     public RemoteCommitProvider newRemoteCommitProviderInstance() {
         return remoteProviderPlugin.instantiateProvider(this);
     }
 
+    @Override
     public void setRemoteCommitEventManager(
         RemoteCommitEventManager remoteEventManager) {
         this.remoteEventManager = remoteEventManager;
         remoteProviderPlugin.configureEventManager(remoteEventManager);
     }
 
+    @Override
     public RemoteCommitEventManager getRemoteCommitEventManager() {
         if (remoteEventManager == null) {
             remoteEventManager = new RemoteCommitEventManager(this);
@@ -936,118 +985,145 @@ public class OpenJPAConfigurationImpl
         return remoteEventManager;
     }
 
+    @Override
     public void setTransactionMode(String transactionMode) {
         this.transactionMode.setString(transactionMode);
     }
 
+    @Override
     public String getTransactionMode() {
         return transactionMode.getString();
     }
 
+    @Override
     public void setTransactionModeManaged(boolean managed) {
         transactionMode.set(managed);
     }
 
+    @Override
     public boolean isTransactionModeManaged() {
         return transactionMode.get();
     }
 
+    @Override
     public void setManagedRuntime(String managedRuntime) {
         managedRuntimePlugin.setString(managedRuntime);
     }
 
+    @Override
     public String getManagedRuntime() {
         return managedRuntimePlugin.getString();
     }
 
+    @Override
     public void setManagedRuntime(ManagedRuntime managedRuntime) {
         managedRuntimePlugin.set(managedRuntime);
     }
 
+    @Override
     public ManagedRuntime getManagedRuntimeInstance() {
         if (managedRuntimePlugin.get() == null)
             managedRuntimePlugin.instantiate(ManagedRuntime.class, this);
         return (ManagedRuntime) managedRuntimePlugin.get();
     }
 
+    @Override
     public void setProxyManager(String proxyManager) {
         proxyManagerPlugin.setString(proxyManager);
     }
 
+    @Override
     public String getProxyManager() {
         return proxyManagerPlugin.getString();
     }
 
+    @Override
     public void setProxyManager(ProxyManager proxyManager) {
         proxyManagerPlugin.set(proxyManager);
     }
 
+    @Override
     public ProxyManager getProxyManagerInstance() {
         if (proxyManagerPlugin.get() == null)
             proxyManagerPlugin.instantiate(ProxyManager.class, this);
         return (ProxyManager) proxyManagerPlugin.get();
     }
 
+    @Override
     public void setMapping(String mapping) {
         this.mapping.setString(mapping);
     }
 
+    @Override
     public String getMapping() {
         return mapping.getString();
     }
 
+    @Override
     public void setMetaDataFactory(String meta) {
         this.metaFactoryPlugin.setString(meta);
     }
 
+    @Override
     public String getMetaDataFactory() {
         return metaFactoryPlugin.getString();
     }
 
+    @Override
     public MetaDataFactory newMetaDataFactoryInstance() {
         return (MetaDataFactory) metaFactoryPlugin.instantiate(
             MetaDataFactory.class, this);
     }
 
+    @Override
     public void setMetaDataRepository(String meta) {
         this.metaRepositoryPlugin.setString(meta);
     }
 
+    @Override
     public String getMetaDataRepository() {
         return metaRepositoryPlugin.getString();
     }
 
+    @Override
     public void setMetaDataRepository(MetaDataRepository meta) {
         metaRepository = meta;
     }
 
+    @Override
     public MetaDataRepository getMetaDataRepositoryInstance() {
         if (metaRepository == null)
             metaRepository = newMetaDataRepositoryInstance();
         return metaRepository;
     }
 
+    @Override
     public boolean metaDataRepositoryAvailable(){
         return metaRepository != null;
     }
 
+    @Override
     public MetaDataRepository newMetaDataRepositoryInstance() {
         return (MetaDataRepository) metaRepositoryPlugin.instantiate(
             MetaDataRepository.class, this);
     }
 
+    @Override
     public void setConnectionUserName(String connectionUserName) {
         this.connectionUserName.setString(connectionUserName);
     }
 
+    @Override
     public String getConnectionUserName() {
         return connectionUserName.getString();
     }
 
+    @Override
     public void setConnectionPassword(String connectionPassword) {
         this.connectionPassword.setString(connectionPassword);
     }
 
+    @Override
     public String getConnectionPassword() {
     	EncryptionProvider p = getEncryptionProvider();
     	if(p != null) {
@@ -1056,67 +1132,83 @@ public class OpenJPAConfigurationImpl
         return connectionPassword.getString();
     }
 
+    @Override
     public void setConnectionURL(String connectionURL) {
         this.connectionURL.setString(connectionURL);
     }
 
+    @Override
     public String getConnectionURL() {
         return connectionURL.getString();
     }
 
+    @Override
     public void setConnectionDriverName(String driverName) {
         this.connectionDriverName.setString(driverName);
     }
 
+    @Override
     public String getConnectionDriverName() {
         return connectionDriverName.getString();
     }
 
+    @Override
     public void setConnectionProperties(String connectionProperties) {
         this.connectionProperties.setString(connectionProperties);
     }
 
+    @Override
     public String getConnectionProperties() {
         return connectionProperties.getString();
     }
 
+    @Override
     public void setConnectionFactoryProperties(
         String connectionFactoryProperties) {
         this.connectionFactoryProperties.setString(connectionFactoryProperties);
     }
 
+    @Override
     public String getConnectionFactoryProperties() {
         return connectionFactoryProperties.getString();
     }
 
+    @Override
     public String getConnectionFactoryMode() {
         return connectionFactoryMode.getString();
     }
 
+    @Override
     public void setConnectionFactoryMode(String mode) {
         connectionFactoryMode.setString(mode);
     }
 
+    @Override
     public boolean isConnectionFactoryModeManaged() {
         return connectionFactoryMode.get();
     }
 
+    @Override
     public void setConnectionFactoryModeManaged(boolean managed) {
         connectionFactoryMode.set(managed);
     }
 
+    @Override
     public void setConnectionFactoryName(String connectionFactoryName) {
         this.connectionFactoryName.setString(connectionFactoryName);
     }
 
+    @Override
     public String getConnectionFactoryName() {
         return connectionFactoryName.getString();
     }
 
+    @Override
     public void setConnectionFactory(Object factory) {
         connectionFactory.set(factory);
     }
 
+    @Override
     public Object getConnectionFactory() {
         if (connectionFactory.get() == null)
             connectionFactory.set(
@@ -1140,18 +1232,22 @@ public class OpenJPAConfigurationImpl
         }
     }
 
+    @Override
     public void setConnection2UserName(String connection2UserName) {
         this.connection2UserName.setString(connection2UserName);
     }
 
+    @Override
     public String getConnection2UserName() {
         return connection2UserName.getString();
     }
 
+    @Override
     public void setConnection2Password(String connection2Password) {
         this.connection2Password.setString(connection2Password);
     }
 
+    @Override
     public String getConnection2Password() {
     	EncryptionProvider p = getEncryptionProvider();
     	if(p != null){
@@ -1160,52 +1256,64 @@ public class OpenJPAConfigurationImpl
         return connection2Password.getString();
     }
 
+    @Override
     public void setConnection2URL(String connection2URL) {
         this.connection2URL.setString(connection2URL);
     }
 
+    @Override
     public String getConnection2URL() {
         return connection2URL.getString();
     }
 
+    @Override
     public void setConnection2DriverName(String driverName) {
         this.connection2DriverName.setString(driverName);
     }
 
+    @Override
     public String getConnection2DriverName() {
         return connection2DriverName.getString();
     }
 
+    @Override
     public void setConnection2Properties(String connection2Properties) {
         this.connection2Properties.setString(connection2Properties);
     }
 
+    @Override
     public String getConnection2Properties() {
         return connection2Properties.getString();
     }
 
+    @Override
     public void setConnectionFactory2Properties(
         String connectionFactory2Properties) {
         this.connectionFactory2Properties
             .setString(connectionFactory2Properties);
     }
 
+    @Override
     public String getConnectionFactory2Properties() {
         return connectionFactory2Properties.getString();
     }
 
+    @Override
     public void setConnectionFactory2Name(String connectionFactory2Name) {
         this.connectionFactory2Name.setString(connectionFactory2Name);
     }
 
+    @Override
     public String getConnectionFactory2Name() {
         return connectionFactory2Name.getString();
     }
 
+    @Override
     public void setConnectionFactory2(Object factory) {
         connectionFactory2.set(factory);
     }
 
+    @Override
     public Object getConnectionFactory2() {
         if (connectionFactory2.get() == null)
             connectionFactory2.set(
@@ -1214,80 +1322,99 @@ public class OpenJPAConfigurationImpl
         return connectionFactory2.get();
     }
 
+    @Override
     public void setOptimistic(boolean optimistic) {
         this.optimistic.set(optimistic);
     }
 
+    @Override
     public void setOptimistic(Boolean optimistic) {
         if (optimistic != null)
             setOptimistic(optimistic.booleanValue());
     }
 
+    @Override
     public boolean getOptimistic() {
         return optimistic.get();
     }
 
+    @Override
     public void setAutoClear(String clear) {
         autoClear.setString(clear);
     }
 
+    @Override
     public String getAutoClear() {
         return autoClear.getString();
     }
 
+    @Override
     public void setAutoClear(int clear) {
         autoClear.set(clear);
     }
 
+    @Override
     public int getAutoClearConstant() {
         return autoClear.get();
     }
 
+    @Override
     public void setRetainState(boolean retainState) {
         this.retainState.set(retainState);
     }
 
+    @Override
     public void setRetainState(Boolean retainState) {
         if (retainState != null)
             setRetainState(retainState.booleanValue());
     }
 
+    @Override
     public boolean getRetainState() {
         return retainState.get();
     }
 
+    @Override
     public void setRestoreState(String restoreState) {
         this.restoreState.setString(restoreState);
     }
 
+    @Override
     public String getRestoreState() {
         return restoreState.getString();
     }
 
+    @Override
     public void setRestoreState(int restoreState) {
         this.restoreState.set(restoreState);
     }
 
+    @Override
     public int getRestoreStateConstant() {
         return restoreState.get();
     }
 
+    @Override
     public void setAutoDetach(String autoDetach) {
         this.autoDetach.setString(autoDetach);
     }
 
+    @Override
     public String getAutoDetach() {
         return autoDetach.getString();
     }
 
+    @Override
     public void setAutoDetach(int autoDetachFlags) {
         autoDetach.setConstant(autoDetachFlags);
     }
 
+    @Override
     public int getAutoDetachConstant() {
         return autoDetach.getConstant();
     }
 
+    @Override
     public void setDetachState(String detachState) {
         detachStatePlugin.setString(detachState);
     }
@@ -1296,266 +1423,328 @@ public class OpenJPAConfigurationImpl
         return detachStatePlugin.getString();
     }
 
+    @Override
     public void setDetachState(DetachOptions detachState) {
         detachStatePlugin.set(detachState);
     }
 
+    @Override
     public DetachOptions getDetachStateInstance() {
         if (detachStatePlugin.get() == null)
             detachStatePlugin.instantiate(DetachOptions.class, this);
         return (DetachOptions) detachStatePlugin.get();
     }
 
+    @Override
     public void setIgnoreChanges(boolean ignoreChanges) {
         this.ignoreChanges.set(ignoreChanges);
     }
 
+    @Override
     public void setIgnoreChanges(Boolean ignoreChanges) {
         if (ignoreChanges != null)
             setIgnoreChanges(ignoreChanges.booleanValue());
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         return ignoreChanges.get();
     }
 
+    @Override
     public void setNontransactionalRead(boolean nontransactionalRead) {
         this.nontransactionalRead.set(nontransactionalRead);
     }
 
+    @Override
     public void setNontransactionalRead(Boolean nontransactionalRead) {
         if (nontransactionalRead != null)
             setNontransactionalRead(nontransactionalRead.booleanValue());
     }
 
+    @Override
     public boolean getNontransactionalRead() {
         return nontransactionalRead.get();
     }
 
+    @Override
     public void setNontransactionalWrite(boolean nontransactionalWrite) {
         this.nontransactionalWrite.set(nontransactionalWrite);
     }
 
+    @Override
     public void setNontransactionalWrite(Boolean nontransactionalWrite) {
         if (nontransactionalWrite != null)
             setNontransactionalWrite(nontransactionalWrite.booleanValue());
     }
 
+    @Override
     public boolean getNontransactionalWrite() {
         return nontransactionalWrite.get();
     }
 
+    @Override
     public void setMultithreaded(boolean multithreaded) {
         this.multithreaded.set(multithreaded);
     }
 
+    @Override
     public void setMultithreaded(Boolean multithreaded) {
         if (multithreaded != null)
             setMultithreaded(multithreaded.booleanValue());
     }
 
+    @Override
     public boolean getMultithreaded() {
         return multithreaded.get();
     }
 
+    @Override
     public void setFetchBatchSize(int fetchBatchSize) {
         this.fetchBatchSize.set(fetchBatchSize);
     }
 
+    @Override
     public void setFetchBatchSize(Integer fetchBatchSize) {
         if (fetchBatchSize != null)
             setFetchBatchSize(fetchBatchSize.intValue());
     }
 
+    @Override
     public int getFetchBatchSize() {
         return fetchBatchSize.get();
     }
 
+    @Override
     public void setMaxFetchDepth(int maxFetchDepth) {
         this.maxFetchDepth.set(maxFetchDepth);
     }
 
+    @Override
     public void setMaxFetchDepth(Integer maxFetchDepth) {
         if (maxFetchDepth != null)
             setMaxFetchDepth(maxFetchDepth.intValue());
     }
 
+    @Override
     public int getMaxFetchDepth() {
         return maxFetchDepth.get();
     }
 
+    @Override
     public void setFetchGroups(String fetchGroups) {
         this.fetchGroups.setString(fetchGroups);
     }
 
+    @Override
     public String getFetchGroups() {
         return fetchGroups.getString();
     }
 
+    @Override
     public String[] getFetchGroupsList() {
         return fetchGroups.get();
     }
 
+    @Override
     public void setFetchGroups(String[] fetchGroups) {
         this.fetchGroups.set(fetchGroups);
     }
 
+    @Override
     public void setFlushBeforeQueries(String flush) {
         flushBeforeQueries.setString(flush);
     }
 
+    @Override
     public String getFlushBeforeQueries() {
         return flushBeforeQueries.getString();
     }
 
+    @Override
     public void setFlushBeforeQueries(int flush) {
         flushBeforeQueries.set(flush);
     }
 
+    @Override
     public int getFlushBeforeQueriesConstant() {
         return flushBeforeQueries.get();
     }
 
+    @Override
     public void setLockTimeout(int timeout) {
         lockTimeout.set(timeout);
     }
 
+    @Override
     public void setLockTimeout(Integer timeout) {
         if (timeout != null)
             setLockTimeout(timeout.intValue());
     }
 
+    @Override
     public int getLockTimeout() {
         return lockTimeout.get();
     }
 
+    @Override
     public int getQueryTimeout() {
         return queryTimeout.get();
     }
 
+    @Override
     public void setQueryTimeout(int timeout) {
          queryTimeout.set(timeout);
     }
 
+    @Override
     public void setReadLockLevel(String level) {
         readLockLevel.setString(level);
     }
 
+    @Override
     public String getReadLockLevel() {
         return readLockLevel.getString();
     }
 
+    @Override
     public void setReadLockLevel(int level) {
         readLockLevel.set(level);
     }
 
+    @Override
     public int getReadLockLevelConstant() {
         return readLockLevel.get();
     }
 
+    @Override
     public void setWriteLockLevel(String level) {
         writeLockLevel.setString(level);
     }
 
+    @Override
     public String getWriteLockLevel() {
         return writeLockLevel.getString();
     }
 
+    @Override
     public void setWriteLockLevel(int level) {
         writeLockLevel.set(level);
     }
 
+    @Override
     public int getWriteLockLevelConstant() {
         return writeLockLevel.get();
     }
 
+    @Override
     public void setSequence(String sequence) {
         seqPlugin.setString(sequence);
     }
 
+    @Override
     public String getSequence() {
         return seqPlugin.getString();
     }
 
+    @Override
     public void setSequence(Seq seq) {
         seqPlugin.set(seq);
     }
 
+    @Override
     public Seq getSequenceInstance() {
         if (seqPlugin.get() == null)
             seqPlugin.instantiate(Seq.class, this);
         return (Seq) seqPlugin.get();
     }
 
+    @Override
     public void setConnectionRetainMode(String connectionRetainMode) {
         this.connectionRetainMode.setString(connectionRetainMode);
     }
 
+    @Override
     public String getConnectionRetainMode() {
         return connectionRetainMode.getString();
     }
 
+    @Override
     public void setConnectionRetainMode(int connectionRetainMode) {
         this.connectionRetainMode.set(connectionRetainMode);
     }
 
+    @Override
     public int getConnectionRetainModeConstant() {
         return connectionRetainMode.get();
     }
 
+    @Override
     public void setFilterListeners(String filterListeners) {
         filterListenerPlugins.setString(filterListeners);
     }
 
+    @Override
     public String getFilterListeners() {
         return filterListenerPlugins.getString();
     }
 
+    @Override
     public void setFilterListeners(FilterListener[] listeners) {
         filterListenerPlugins.set(listeners);
     }
 
+    @Override
     public FilterListener[] getFilterListenerInstances() {
         if (filterListenerPlugins.get() == null)
             filterListenerPlugins.instantiate(FilterListener.class, this);
         return (FilterListener[]) filterListenerPlugins.get();
     }
 
+    @Override
     public void setAggregateListeners(String aggregateListeners) {
         aggregateListenerPlugins.setString(aggregateListeners);
     }
 
+    @Override
     public String getAggregateListeners() {
         return aggregateListenerPlugins.getString();
     }
 
+    @Override
     public void setAggregateListeners(AggregateListener[] listeners) {
         aggregateListenerPlugins.set(listeners);
     }
 
+    @Override
     public AggregateListener[] getAggregateListenerInstances() {
         if (aggregateListenerPlugins.get() == null)
             aggregateListenerPlugins.instantiate(AggregateListener.class, this);
         return (AggregateListener[]) aggregateListenerPlugins.get();
     }
 
+    @Override
     public void setRetryClassRegistration(boolean retry) {
         retryClassRegistration.set(retry);
     }
 
+    @Override
     public void setRetryClassRegistration(Boolean retry) {
         if (retry != null)
             setRetryClassRegistration(retry.booleanValue());
     }
 
+    @Override
     public boolean getRetryClassRegistration() {
         return retryClassRegistration.get();
     }
 
+    @Override
     public String getCompatibility() {
         return compatibilityPlugin.getString();
     }
 
+    @Override
     public void setCompatibility(String compatibility) {
         compatibilityPlugin.setString(compatibility);
     }
@@ -1566,6 +1755,7 @@ public class OpenJPAConfigurationImpl
      * new one so that the compatibility flags set in compliance with the
      * Specification can be preserved.
      */
+    @Override
     public Compatibility getCompatibilityInstance() {
         if (compatibilityPlugin.get() == null) {
             Specification spec = getSpecificationInstance();
@@ -1578,82 +1768,101 @@ public class OpenJPAConfigurationImpl
         return (Compatibility) compatibilityPlugin.get();
     }
 
+    @Override
     public String getCallbackOptions() {
         return callbackPlugin.getString();
     }
 
+    @Override
     public void setCallbackOptions(String options) {
         callbackPlugin.setString(options);
     }
 
+    @Override
     public CallbackOptions getCallbackOptionsInstance() {
         if (callbackPlugin.get() == null)
             callbackPlugin.instantiate(CallbackOptions.class, this);
         return (CallbackOptions) callbackPlugin.get();
     }
 
+    @Override
     public String getQueryCompilationCache() {
         return queryCompilationCachePlugin.getString();
     }
 
+    @Override
     public void setQueryCompilationCache(String queryCompilationCache) {
         queryCompilationCachePlugin.setString(queryCompilationCache);
     }
 
+    @Override
     public Map getQueryCompilationCacheInstance() {
         if (queryCompilationCachePlugin.get() == null)
             queryCompilationCachePlugin.instantiate(Map.class, this);
         return (Map) queryCompilationCachePlugin.get();
     }
 
+    @Override
     public StoreFacadeTypeRegistry getStoreFacadeTypeRegistry() {
         return _storeFacadeRegistry;
     }
 
+    @Override
     public BrokerFactoryEventManager getBrokerFactoryEventManager() {
         return _brokerFactoryEventManager;
     }
 
+    @Override
     public String getRuntimeUnenhancedClasses() {
         return runtimeUnenhancedClasses.getString();
     }
 
+    @Override
     public int getRuntimeUnenhancedClassesConstant() {
         return runtimeUnenhancedClasses.get();
     }
 
+    @Override
     public void setRuntimeUnenhancedClasses(int mode) {
         runtimeUnenhancedClasses.set(mode);
     }
 
+    @Override
     public void setRuntimeUnenhancedClasses(String mode) {
         runtimeUnenhancedClasses.setString(mode);
     }
 
+    @Override
     public String getCacheMarshallers() {
         return cacheMarshallerPlugins.getString();
     }
 
+    @Override
     public void setCacheMarshallers(String marshallers) {
         cacheMarshallerPlugins.setString(marshallers);
     }
 
+    @Override
     public Map getCacheMarshallerInstances() {
         return cacheMarshallerPlugins.getInstancesAsMap();
     }
 
+    @Override
     public boolean isInitializeEagerly() {
     	return eagerInitialization.get();
     }
 
+    @Override
     public void setInitializeEagerly(boolean retry) {
     	eagerInitialization.set(retry);
     }
 
+    @Override
     public void setValidationMode(String mode) {
         validationMode.setString(mode);
     }
 
+    @Override
     public String getValidationMode() {
         String mode = validationMode.getString();
         if (mode == null)
@@ -1661,10 +1870,12 @@ public class OpenJPAConfigurationImpl
         return mode;
     }
 
+    @Override
     public void setValidationGroupPrePersist(String vgPrePersist) {
         validationGroupPrePersist.setString(vgPrePersist);
     }
 
+    @Override
     public String getValidationGroupPrePersist() {
         String vgPrePersist = validationGroupPrePersist.getString();
         if (vgPrePersist == null)
@@ -1672,10 +1883,12 @@ public class OpenJPAConfigurationImpl
         return vgPrePersist;
     }
 
+    @Override
     public void setValidationGroupPreUpdate(String vgPreUpdate) {
         validationGroupPreUpdate.setString(vgPreUpdate);
     }
 
+    @Override
     public String getValidationGroupPreUpdate() {
         String vgPreUpdate = validationGroupPreUpdate.getString();
         if (vgPreUpdate == null)
@@ -1683,10 +1896,12 @@ public class OpenJPAConfigurationImpl
         return vgPreUpdate;
     }
 
+    @Override
     public void setValidationGroupPreRemove(String vgPreRemove) {
         validationGroupPreRemove.setString(vgPreRemove);
     }
 
+    @Override
     public String getValidationGroupPreRemove() {
         String vgPreRemove = validationGroupPreRemove.getString();
         if (vgPreRemove == null)
@@ -1694,10 +1909,12 @@ public class OpenJPAConfigurationImpl
         return vgPreRemove;
     }
 
+    @Override
     public String getInstrumentation() {
         return instrumentationProviders.getString();
     }
 
+    @Override
     public void setInstrumentation(String providers) {
         instrumentationProviders.setString(providers);
     }
@@ -1722,6 +1939,7 @@ public class OpenJPAConfigurationImpl
         instrumentationManager.set(im);
     }
 
+    @Override
     public InstrumentationManager getInstrumentationManagerInstance() {
         InstrumentationManager im = (InstrumentationManager) instrumentationManager.get();
         if (im == null) {
@@ -1734,6 +1952,7 @@ public class OpenJPAConfigurationImpl
         return im;
     }
 
+    @Override
     public void instantiateAll() {
         super.instantiateAll();
         getMetaDataRepositoryInstance();
@@ -1746,6 +1965,7 @@ public class OpenJPAConfigurationImpl
         }
     }
 
+    @Override
     protected void preClose() {
         ImplHelper.close(metaRepository);
         ImplHelper.close(remoteEventManager);
@@ -1753,22 +1973,27 @@ public class OpenJPAConfigurationImpl
         super.preClose();
     }
 
+    @Override
     public Log getConfigurationLog() {
         return getLog(LOG_RUNTIME);
     }
 
+    @Override
     public void setQuerySQLCache(String querySQLCache) {
         preparedQueryCachePlugin.setString(querySQLCache);
     }
 
+    @Override
     public void setQuerySQLCache(PreparedQueryCache querySQLCache) {
         preparedQueryCachePlugin.set(querySQLCache);
     }
 
+    @Override
     public String getQuerySQLCache() {
         return preparedQueryCachePlugin.getString();
     }
 
+    @Override
     public PreparedQueryCache getQuerySQLCacheInstance() {
         if (preparedQueryCachePlugin == null)
             return null;
@@ -1780,14 +2005,17 @@ public class OpenJPAConfigurationImpl
         return (PreparedQueryCache)preparedQueryCachePlugin.get();
     }
 
+    @Override
     public void setFinderCache(String finderCache) {
         finderCachePlugin.setString(finderCache);
     }
 
+    @Override
     public String getFinderCache() {
         return finderCachePlugin.getString();
     }
 
+    @Override
     public FinderCache getFinderCacheInstance() {
         if (finderCachePlugin.get() == null) {
             finderCachePlugin.instantiate(FinderCache.class, this);
@@ -1795,26 +2023,32 @@ public class OpenJPAConfigurationImpl
         return (FinderCache)finderCachePlugin.get();
     }
 
+    @Override
     public Object getValidationFactoryInstance() {
         return validationFactory.get();
     }
 
+    @Override
     public void setValidationFactory(Object factory) {
         validationFactory.set(factory);
     }
 
+    @Override
     public Object getValidatorInstance() {
         return validator.get();
     }
 
+    @Override
     public void setValidatorInstance(Object val) {
         validator.set(val);
     }
 
+    @Override
     public String getLifecycleEventManager() {
         return lifecycleEventManager.getString();
     }
 
+    @Override
     public LifecycleEventManager getLifecycleEventManagerInstance() {
         LifecycleEventManager lem = null;
         if (!getCompatibilityInstance().isSingletonLifecycleEventManager() ||
@@ -1825,6 +2059,7 @@ public class OpenJPAConfigurationImpl
         return lem;
     }
 
+    @Override
     public void setLifecycleEventManager(String lem) {
         if (_allowSetLifeCycleEventManager) {
             _allowSetLifeCycleEventManager = false;
@@ -1839,37 +2074,45 @@ public class OpenJPAConfigurationImpl
         }
     }
 
+    @Override
     public boolean getDynamicEnhancementAgent() {
         return dynamicEnhancementAgent.get();
     }
 
+    @Override
     public void setDynamicEnhancementAgent(boolean dynamic) {
         dynamicEnhancementAgent.set(dynamic);
     }
 
+    @Override
     public void setEncryptionProvider(String p) {
         encryptionProvider.setString(p);
     }
 
+    @Override
     public EncryptionProvider getEncryptionProvider() {
         if (encryptionProvider.get() == null)
             encryptionProvider.instantiate(EncryptionProvider.class, this);
         return (EncryptionProvider) encryptionProvider.get();
     }
 
+    @Override
     public void setDataCacheMode(String mode) {
         this.dataCacheMode.setString(mode);
     }
 
+    @Override
     public String getDataCacheMode() {
         return dataCacheMode.getString();
     }
 
 
+    @Override
     public String getCacheDistributionPolicy() {
         return cacheDistributionPolicyPlugin.getString();
     }
 
+    @Override
     public CacheDistributionPolicy getCacheDistributionPolicyInstance() {
         CacheDistributionPolicy policy = (CacheDistributionPolicy) cacheDistributionPolicyPlugin.get();
         if (policy == null) {
@@ -1879,10 +2122,12 @@ public class OpenJPAConfigurationImpl
         return policy;
     }
 
+    @Override
     public void setCacheDistributionPolicy(String policyPlugin) {
         cacheDistributionPolicyPlugin.setString(policyPlugin);
     }
 
+    @Override
     public void setCacheDistributionPolicyInstance(CacheDistributionPolicy policy) {
         cacheDistributionPolicyPlugin.set(policy);
     }
@@ -1895,6 +2140,7 @@ public class OpenJPAConfigurationImpl
         return _peMap;
     }
 
+    @Override
     public Auditor getAuditorInstance() {
     	Auditor auditor = (Auditor) auditorPlugin.get();
         if (auditor == null) {
@@ -1903,93 +2149,115 @@ public class OpenJPAConfigurationImpl
        return auditor;
     }
 
+    @Override
     public void setAuditorInstance(Auditor auditor) {
     	auditorPlugin.set(auditor);
     }
 
+    @Override
     public String getAuditor() {
     	return auditorPlugin.getString();
     }
 
+    @Override
     public void setAuditor(String auditor) {
     	auditorPlugin.setString(auditor);
     }
 
+    @Override
     public boolean getPostLoadOnMerge() {
         return postLoadOnMerge.get();
     }
 
+    @Override
     public void setPostLoadOnMerge(boolean postLoadOnMerge) {
         this.postLoadOnMerge.set(postLoadOnMerge);
     }
 
+    @Override
     public void setPostLoadOnMerge(Boolean postLoadOnMerge) {
         if (postLoadOnMerge != null)
             setPostLoadOnMerge(postLoadOnMerge.booleanValue());
     }
 
+    @Override
     public boolean getOptimizeIdCopy() {
         return optimizeIdCopy.get();
     }
 
+    @Override
     public void setOptimizeIdCopy(boolean optimizeId) {
         optimizeIdCopy.set(optimizeId);
     }
 
+    @Override
     public void setOptimizeIdCopy(Boolean optimizeId) {
         if (optimizeId != null) {
             setOptimizeIdCopy(optimizeId.booleanValue());
         }
     }
 
+    @Override
     public String getDatabaseAction() {
         return databaseAction.getString();
     }
 
+    @Override
     public int getDatabaseActionConstant() {
         return databaseAction.get();
     }
 
+    @Override
     public String getScriptsAction() {
         return scriptsAction.getString();
     }
 
+    @Override
     public int getScriptsActionConstant() {
         return scriptsAction.get();
     }
 
+    @Override
     public String getCreateSource() {
         return createSource.getString();
     }
 
+    @Override
     public int getCreateSourceConstant() {
         return createSource.get();
     }
 
+    @Override
     public String getDropSource() {
         return dropSource.getString();
     }
 
+    @Override
     public int getDropSourceConstant() {
         return dropSource.get();
     }
 
+    @Override
     public String getCreateScriptSource() {
         return createScriptSource.getString();
     }
 
+    @Override
     public String getDropScriptSource() {
         return dropScriptSource.getString();
     }
 
+    @Override
     public String getCreateScriptTarget() {
         return createScriptTarget.getString();
     }
 
+    @Override
     public String getDropScriptTarget() {
         return dropScriptTarget.getString();
     }
 
+    @Override
     public String getLoadScriptSource() {
         return loadScriptSource.getString();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAProductDerivation.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAProductDerivation.java
index 242c18344..5b5f15e8b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAProductDerivation.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAProductDerivation.java
@@ -18,9 +18,10 @@
  */
 package org.apache.openjpa.conf;
 
-import org.apache.openjpa.lib.conf.ProductDerivation;
 import java.util.Map;
 
+import org.apache.openjpa.lib.conf.ProductDerivation;
+
 /**
  * Adds datastore based extension to ProductDerivation.
  *
@@ -29,15 +30,15 @@ import java.util.Map;
  */
 public interface OpenJPAProductDerivation extends ProductDerivation {
 
-    public static final int TYPE_SPEC = 0;
-    public static final int TYPE_STORE = 200;
-    public static final int TYPE_SPEC_STORE = 300;
-    public static final int TYPE_PRODUCT_STORE = 400;
+    int TYPE_SPEC = 0;
+    int TYPE_STORE = 200;
+    int TYPE_SPEC_STORE = 300;
+    int TYPE_PRODUCT_STORE = 400;
 
     /**
      * Load default alias options into the given map.  Each entry maps an
      * alias to a broker factory class name.  Replace anything previously
      * under the desired keys.
      */
-    public void putBrokerFactoryAliases(Map<String, String> aliases);
+    void putBrokerFactoryAliases(Map<String, String> aliases);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
index ab8d5a939..18af9f8eb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
@@ -103,6 +103,7 @@ public class OpenJPAVersion {
         // STOP - ALLOW PRINT STATEMENTS
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder(80 * 40);
         appendOpenJPABanner(buf);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersionAndConfigurationTypeValidationPolicy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersionAndConfigurationTypeValidationPolicy.java
index df3cd84bd..9efe355b6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersionAndConfigurationTypeValidationPolicy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersionAndConfigurationTypeValidationPolicy.java
@@ -34,6 +34,7 @@ public class OpenJPAVersionAndConfigurationTypeValidationPolicy
 
     private String confClassName;
 
+    @Override
     public Object getCacheableData(Object o) {
         return new Object[] {
             OpenJPAVersion.VERSION_ID,
@@ -42,6 +43,7 @@ public class OpenJPAVersionAndConfigurationTypeValidationPolicy
         };
     }
 
+    @Override
     public Object getValidData(Object o) {
         Object[] array = (Object[]) o;
         if (array.length != 3)
@@ -54,13 +56,16 @@ public class OpenJPAVersionAndConfigurationTypeValidationPolicy
             return null;
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         confClassName = conf.getClass().getName();
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/QueryCompilationCacheValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/QueryCompilationCacheValue.java
index a04ee0ad5..5b90493d0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/QueryCompilationCacheValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/QueryCompilationCacheValue.java
@@ -21,10 +21,10 @@ package org.apache.openjpa.conf;
 import java.util.Collections;
 import java.util.Hashtable;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.conf.PluginValue;
-import java.util.concurrent.ConcurrentHashMap;
 import org.apache.openjpa.lib.util.ParseException;
 import org.apache.openjpa.util.CacheMap;
 
@@ -50,6 +50,7 @@ public class QueryCompilationCacheValue
         setClassName(ALIASES[1]);
     }
 
+    @Override
     public Object newInstance(String clsName, Class type,
         Configuration conf, boolean fatal) {
         // make sure map handles concurrency
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java
index 192e7c0e8..338f40edb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/RemoteCommitProviderValue.java
@@ -18,13 +18,13 @@
  */
 package org.apache.openjpa.conf;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.event.RemoteCommitEventManager;
 import org.apache.openjpa.event.RemoteCommitProvider;
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.lib.conf.PluginValue;
 import org.apache.openjpa.lib.util.Options;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Value type used to represent a {@link RemoteCommitProvider}. This
@@ -50,12 +50,14 @@ public class RemoteCommitProviderValue
         setAliases(ALIASES);
     }
 
+    @Override
     public void setProperties(String props) {
         super.setProperties(props);
         _opts = null;
         _transmitPersIds = null;
     }
 
+    @Override
     public void setString(String str) {
         super.setString(str);
         _opts = null;
@@ -118,6 +120,7 @@ public class RemoteCommitProviderValue
     /**
      * Override to keep decorators out of transport configuration.
      */
+    @Override
     public Object instantiate(Class type, Configuration conf, boolean fatal) {
         Object obj = newInstance(getClassName(), type, conf, fatal);
         parseOptions();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SchemaGenerationAction.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SchemaGenerationAction.java
index 56b1ca100..4181813d8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SchemaGenerationAction.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SchemaGenerationAction.java
@@ -22,11 +22,11 @@ package org.apache.openjpa.conf;
  * @author Roberto Cortez
  */
 public interface SchemaGenerationAction {
-    public static final int NONE = 0;
+    int NONE = 0;
 
-    public static final int CREATE = 1;
+    int CREATE = 1;
 
-    public static final int DROP_AND_CREATE = 2;
+    int DROP_AND_CREATE = 2;
 
-    public static final int DROP = 3;
+    int DROP = 3;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SchemaGenerationSource.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SchemaGenerationSource.java
index 0ed9ea51b..05b5e1b74 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SchemaGenerationSource.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SchemaGenerationSource.java
@@ -22,13 +22,13 @@ package org.apache.openjpa.conf;
  * @author Roberto Cortez
  */
 public interface SchemaGenerationSource {
-    public static final int NONE = 0;
+    int NONE = 0;
 
-    public static final int METADATA = 1;
+    int METADATA = 1;
 
-    public static final int SCRIPT = 2;
+    int SCRIPT = 2;
 
-    public static final int METADATA_THEN_SCRIPT = 3;
+    int METADATA_THEN_SCRIPT = 3;
 
-    public static final int SCRIPT_THEN_METADATA = 4;
+    int SCRIPT_THEN_METADATA = 4;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java
index a4a47b9bd..d167716bb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java
@@ -87,6 +87,7 @@ public class Specification {
     /**
      * Affirms if the given argument is equal to this receiver.
      */
+    @Override
     public boolean equals(Object other) {
         if (this == other)
             return true;
@@ -126,6 +127,7 @@ public class Specification {
         return _major > other._major ? 1 : _major == other._major ? 0 : -1;
     }
 
+    @Override
     public String toString() {
         return _name.toUpperCase(Locale.ENGLISH) + " " + _major + "." + _minor;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SpecificationPlugin.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SpecificationPlugin.java
index aadeac2a0..12a2dbac3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SpecificationPlugin.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/SpecificationPlugin.java
@@ -110,6 +110,7 @@ public class SpecificationPlugin extends ObjectValue implements ValueListener {
         }
     }
 
+    @Override
     public void valueChanged(Value value) {
         if (this.getClass().isInstance(value))
             ProductDerivations.afterSpecificationSet(_conf);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java
index 913c7edb1..eff64cf04 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java
@@ -52,10 +52,11 @@ import org.apache.openjpa.util.GeneralException;
  * @author Patrick Linskey
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public abstract class AbstractDataCache extends AbstractConcurrentEventManager
     implements DataCache, Configurable {
 
+    private static final long serialVersionUID = 1L;
+
     protected CacheStatisticsSPI _stats = new CacheStatisticsImpl();
 
     private static final BitSet EMPTY_BITSET = new BitSet(0);
@@ -76,14 +77,16 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
     private String _name = null;
     private boolean _closed = false;
     private String _schedule = null;
-    protected Set<String> _includedTypes = new HashSet<String>();
-    protected Set<String> _excludedTypes = new HashSet<String>();
+    protected Set<String> _includedTypes = new HashSet<>();
+    protected Set<String> _excludedTypes = new HashSet<>();
     protected boolean _evictOnBulkUpdate = true;
 
+    @Override
     public String getName() {
         return _name;
     }
 
+    @Override
     public void setName(String name) {
         _name = name;
     }
@@ -104,6 +107,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         _schedule = s;
     }
 
+    @Override
     public void initialize(DataCacheManager manager) {
         if (_schedule != null && !"".equals(_schedule)) {
             ClearableScheduler scheduler = manager.getClearableScheduler();
@@ -112,7 +116,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         }
         // Cast here rather than add to the interface because this is a hack to support an older way of configuring
         if(manager instanceof DataCacheManagerImpl){
-            List<String> invalidConfigured = new ArrayList<String>();
+            List<String> invalidConfigured = new ArrayList<>();
             // assert that things are configured properly
             if(_includedTypes!=null){
                 for(String s : _includedTypes){
@@ -128,6 +132,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         }
     }
 
+    @Override
     public void commit(Collection<DataCachePCData> additions, Collection<DataCachePCData> newUpdates,
             Collection<DataCachePCData> existingUpdates, Collection<Object> deletes) {
         // remove all objects in deletes list
@@ -143,9 +148,9 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
             putAllInternal(existingUpdates);
 
         if (log.isTraceEnabled()) {
-            Collection<Object> addIds = new ArrayList<Object>(additions.size());
-            Collection<Object> upIds = new ArrayList<Object>(newUpdates.size());
-            Collection<Object> exIds = new ArrayList<Object>(existingUpdates.size());
+            Collection<Object> addIds = new ArrayList<>(additions.size());
+            Collection<Object> upIds = new ArrayList<>(newUpdates.size());
+            Collection<Object> exIds = new ArrayList<>(existingUpdates.size());
 
             for (DataCachePCData addition : additions)
                 addIds.add(addition.getId());
@@ -158,6 +163,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         }
     }
 
+    @Override
     public boolean contains(Object key) {
         DataCachePCData o = getInternal(key);
         if (o != null && o.isTimedOut()) {
@@ -169,6 +175,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return o != null;
     }
 
+    @Override
     public BitSet containsAll(Collection<Object> keys) {
         if (keys.isEmpty())
             return EMPTY_BITSET;
@@ -181,6 +188,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return set;
     }
 
+    @Override
     public DataCachePCData get(Object key) {
         DataCachePCData o = getInternal(key);
         if (o != null && o.isTimedOut()) {
@@ -203,13 +211,15 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
     /**
      * Returns the objects for the given key List.
      */
+    @Override
     public Map<Object,DataCachePCData> getAll(List<Object> keys) {
-        Map<Object,DataCachePCData> resultMap = new HashMap<Object,DataCachePCData>(keys.size());
+        Map<Object,DataCachePCData> resultMap = new HashMap<>(keys.size());
         for (Object key : keys)
             resultMap.put(key, get(key));
         return resultMap;
     }
 
+    @Override
     public DataCachePCData put(DataCachePCData data) {
         DataCachePCData o = putInternal(data.getId(), data);
         if (log.isTraceEnabled())
@@ -217,12 +227,14 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return (o == null || o.isTimedOut()) ? null : o;
     }
 
+    @Override
     public void update(DataCachePCData data) {
         if (recacheUpdates()) {
             putInternal(data.getId(), data);
         }
     }
 
+    @Override
     public DataCachePCData remove(Object key) {
         DataCachePCData o = removeInternal(key);
         if (o != null && o.isTimedOut())
@@ -236,6 +248,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return o;
     }
 
+    @Override
     public BitSet removeAll(Collection<Object> keys) {
         if (keys.isEmpty())
             return EMPTY_BITSET;
@@ -251,10 +264,12 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
     /**
      * Remove the objects of the given class from the cache.
      */
+    @Override
     public void removeAll(Class<?> cls, boolean subClasses) {
         removeAllInternal(cls, subClasses);
     }
 
+    @Override
     public boolean pin(Object key) {
         boolean bool = pinInternal(key);
         if (log.isTraceEnabled()) {
@@ -266,6 +281,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return bool;
     }
 
+    @Override
     public BitSet pinAll(Collection<Object> keys) {
         if (keys.isEmpty())
             return EMPTY_BITSET;
@@ -278,11 +294,13 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return set;
     }
 
+    @Override
     public void pinAll(Class<?> cls, boolean subs) {
         if (log.isWarnEnabled())
             log.warn(s_loc.get("cache-class-pin", getName()));
     }
 
+    @Override
     public boolean unpin(Object key) {
         boolean bool = unpinInternal(key);
         if (log.isTraceEnabled()) {
@@ -294,6 +312,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return bool;
     }
 
+    @Override
     public BitSet unpinAll(Collection<Object> keys) {
         if (keys.isEmpty())
             return EMPTY_BITSET;
@@ -306,17 +325,20 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return set;
     }
 
+    @Override
     public void unpinAll(Class<?> cls, boolean subs) {
         if (log.isWarnEnabled())
             log.warn(s_loc.get("cache-class-unpin", getName()));
     }
 
+    @Override
     public void clear() {
         clearInternal();
         if (log.isTraceEnabled())
             log.trace(s_loc.get("cache-clear", getName()));
     }
 
+    @Override
     public void close() {
         close(true);
     }
@@ -333,14 +355,17 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return _closed;
     }
 
+    @Override
     public void addExpirationListener(ExpirationListener listen) {
         addListener(listen);
     }
 
+    @Override
     public boolean removeExpirationListener(ExpirationListener listen) {
         return removeListener(listen);
     }
 
+    @Override
     public String toString() {
         return "[" + super.toString() + ":" + _name + "]";
     }
@@ -459,40 +484,43 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
      */
     protected abstract boolean unpinInternal(Object oid);
 
-    /**
-     *
-     */
+    
+    @Override
     public DataCache getPartition(String name, boolean create) {
         if (Objects.equals(_name, name))
             return this;
         return null;
     }
 
-    /**
-     *
-     */
+    
+    @Override
     public Set<String> getPartitionNames() {
         return Collections.emptySet();
     }
 
+    @Override
     public boolean isPartitioned() {
         return false;
     }
 
-     public CacheStatistics getStatistics() {
+     @Override
+    public CacheStatistics getStatistics() {
     	return _stats;
     }
 
     // ---------- Configurable implementation ----------
 
+    @Override
     public void setConfiguration(Configuration conf) {
         this.conf = (OpenJPAConfiguration) conf;
         this.log = conf.getLog(OpenJPAConfiguration.LOG_DATACACHE);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
         if (_name == null)
             setName(NAME_DEFAULT);
@@ -500,6 +528,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
 
     // ---------- AbstractEventManager implementation ----------
 
+    @Override
     protected void fireEvent(Object event, Object listener) {
         ExpirationListener listen = (ExpirationListener) listener;
         ExpirationEvent ev = (ExpirationEvent) event;
@@ -549,6 +578,7 @@ public abstract class AbstractDataCache extends AbstractConcurrentEventManager
         return this;
     }
 
+    @Override
     public boolean getEvictOnBulkUpdate(){
         return _evictOnBulkUpdate;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java
index a4204133d..3eac6db6f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java
@@ -41,7 +41,6 @@ import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.util.ReferenceMap;
 import org.apache.openjpa.lib.util.concurrent.AbstractConcurrentEventManager;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashSet;
@@ -61,6 +60,9 @@ public abstract class AbstractQueryCache
     extends AbstractConcurrentEventManager
     implements QueryCache, Configurable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer s_loc =
         Localizer.forPackage(AbstractQueryCache.class);
 
@@ -95,13 +97,15 @@ public abstract class AbstractQueryCache
         return _statsEnabled;
     }
 
+    @Override
     public QueryStatistics<QueryKey> getStatistics() {
         return _stats;
     }
 
+    @Override
     public void initialize(DataCacheManager manager) {
         if (evictPolicy == EvictPolicy.TIMESTAMP) {
-            entityTimestampMap = new ConcurrentHashMap<String,Long>();
+            entityTimestampMap = new ConcurrentHashMap<>();
 
             // Get all persistence types to pre-load the entityTimestamp Map
             Collection perTypes =
@@ -120,6 +124,7 @@ public abstract class AbstractQueryCache
         }
     }
 
+    @Override
     public void onTypesChanged(TypesChangedEvent ev) {
         if (evictPolicy == EvictPolicy.DEFAULT) {
             writeLock();
@@ -138,7 +143,7 @@ public abstract class AbstractQueryCache
                     qk = (QueryKey) o;
                 if (qk.changeInvalidatesQuery(ev.getTypes())) {
                     if (removes == null)
-                        removes = new ArrayList<QueryKey>();
+                        removes = new ArrayList<>();
                     removes.add(qk);
                 }
             }
@@ -147,7 +152,7 @@ public abstract class AbstractQueryCache
         } else {
             Collection changedTypes = ev.getTypes();
             HashMap<String,Long> changedClasses =
-                new HashMap<String,Long>();
+                new HashMap<>();
             Long tstamp = Long.valueOf(System.currentTimeMillis());
             for (Object o: changedTypes) {
                 String name = ((Class) o).getName();
@@ -160,6 +165,7 @@ public abstract class AbstractQueryCache
         }
     }
 
+    @Override
     public QueryResult get(QueryKey key) {
         if (_statsEnabled) {
             _stats.recordExecution(key);
@@ -184,6 +190,7 @@ public abstract class AbstractQueryCache
         return o;
     }
 
+    @Override
     public QueryResult put(QueryKey qk, QueryResult oids) {
         QueryResult o = putInternal(qk, oids);
         if (log.isTraceEnabled())
@@ -191,6 +198,7 @@ public abstract class AbstractQueryCache
         return (o == null || o.isTimedOut()) ? null : o;
     }
 
+    @Override
     public QueryResult remove(QueryKey key) {
         QueryResult o = removeInternal(key);
         if (_statsEnabled) {
@@ -207,6 +215,7 @@ public abstract class AbstractQueryCache
         return o;
     }
 
+    @Override
     public boolean pin(QueryKey key) {
         boolean bool = pinInternal(key);
         if (log.isTraceEnabled()) {
@@ -218,6 +227,7 @@ public abstract class AbstractQueryCache
         return bool;
     }
 
+    @Override
     public boolean unpin(QueryKey key) {
         boolean bool = unpinInternal(key);
         if (log.isTraceEnabled()) {
@@ -229,6 +239,7 @@ public abstract class AbstractQueryCache
         return bool;
     }
 
+    @Override
     public void clear() {
         clearInternal();
         if (log.isTraceEnabled())
@@ -238,6 +249,7 @@ public abstract class AbstractQueryCache
         }
     }
 
+    @Override
     public void close() {
         close(true);
     }
@@ -254,10 +266,12 @@ public abstract class AbstractQueryCache
         return _closed;
     }
 
+    @Override
     public void addTypesChangedListener(TypesChangedListener listen) {
         addListener(listen);
     }
 
+    @Override
     public boolean removeTypesChangedListener(TypesChangedListener listen) {
         return removeListener(listen);
     }
@@ -366,21 +380,25 @@ public abstract class AbstractQueryCache
 
     // ---------- Configurable implementation ----------
 
+    @Override
     public void setConfiguration(Configuration conf) {
         this.conf = (OpenJPAConfiguration) conf;
         this.log = conf.getLog(OpenJPAConfiguration.LOG_DATACACHE);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
-        _stats = _statsEnabled ? new Default<QueryKey>() :
-            new QueryStatistics.None<QueryKey>();
+        _stats = _statsEnabled ? new Default<>() :
+            new QueryStatistics.None<>();
     }
 
     // ---------- AbstractEventManager implementation ----------
 
+    @Override
     protected void fireEvent(Object event, Object listener) {
         TypesChangedListener listen = (TypesChangedListener) listener;
         TypesChangedEvent ev = (TypesChangedEvent) event;
@@ -397,6 +415,7 @@ public abstract class AbstractQueryCache
      * listeners. We want such query results to be gc'd once
      * the only reference is held by the list of expiration listeners.
      */
+    @Override
     protected Collection newListenerCollection() {
         return new ConcurrentReferenceHashSet(ReferenceStrength.WEAK);
 	}
@@ -441,7 +460,7 @@ public abstract class AbstractQueryCache
             for (String s: keyList) {
                 if (entityTimestampMap.containsKey(s)) {
                     if(tmval == null)
-                        tmval = new ArrayList<Long>();
+                        tmval = new ArrayList<>();
                     tmval.add(entityTimestampMap.get(s));
                 }
             }
@@ -504,46 +523,57 @@ public abstract class AbstractQueryCache
             astats = aStatsMap;
         }
 
+        @Override
         public Set<T> keys() {
             return stats.keySet();
         }
 
+        @Override
         public long getExecutionCount() {
             return stat[READ];
         }
 
+        @Override
         public long getTotalExecutionCount() {
             return astat[READ];
         }
 
+        @Override
         public long getExecutionCount(T query) {
             return getCount(stats, query, READ);
         }
 
+        @Override
         public long getTotalExecutionCount(T query) {
             return getCount(astats, query, READ);
         }
 
+        @Override
         public long getHitCount() {
             return stat[HIT];
         }
 
+        @Override
         public long getTotalHitCount() {
             return astat[HIT];
         }
 
+        @Override
         public long getHitCount(T query) {
             return getCount(stats, query, HIT);
         }
 
+        @Override
         public long getTotalHitCount(T query) {
             return getCount(astats, query, HIT);
         }
 
+        @Override
         public long getEvictionCount() {
             return stat[EVICT];
         }
 
+        @Override
         public long getTotalEvictionCount() {
             return astat[EVICT];
         }
@@ -553,20 +583,24 @@ public abstract class AbstractQueryCache
             return (row == null) ? 0 : row[i];
         }
 
+        @Override
         public Date since() {
             return since;
         }
 
+        @Override
         public Date start() {
             return start;
         }
 
+        @Override
         public synchronized void reset() {
             stat = new long[ARRAY_SIZE];
             stats.clear();
             since = new Date();
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public synchronized void clear() {
            astat = new long[ARRAY_SIZE];
@@ -592,6 +626,7 @@ public abstract class AbstractQueryCache
             target.put(query, row);
         }
 
+        @Override
         public void recordExecution(T query) {
             if (query == null)
                 return;
@@ -602,12 +637,14 @@ public abstract class AbstractQueryCache
             addSample(query, HIT);
         }
 
+        @Override
         public void recordEviction(T query) {
             if (query == null)
                 return;
             addSample(query, EVICT);
         }
 
+        @Override
         public void dump(PrintStream out) {
             String header = "Query Statistics starting from " + start;
             out.print(header);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatistics.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatistics.java
index 9a0b99b86..de75e8e7c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatistics.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatistics.java
@@ -40,132 +40,132 @@ public interface CacheStatistics extends Serializable {
 	/**
 	 * Gets number of total read requests since last reset.
 	 */
-	public long getReadCount();
+	long getReadCount();
 
 	/**
 	 * Gets number of total read requests that has been found in cache since
 	 * last reset.
 	 */
-	public long getHitCount();
+	long getHitCount();
 
 	/**
 	 * Gets number of total write requests since last reset.
 	 */
-	public long getWriteCount();
+	long getWriteCount();
 
 	/**
 	 * Gets number of total read requests since start.
 	 */
-	public long getTotalReadCount();
+	long getTotalReadCount();
 
 	/**
 	 * Gets number of total read requests that has been found in cache since
 	 * start.
 	 */
-	public long getTotalHitCount();
+	long getTotalHitCount();
 
 	/**
 	 * Gets number of total write requests since start.
 	 */
-	public long getTotalWriteCount();
+	long getTotalWriteCount();
 
     /**
      * Gets number of total read requests for the given class since last reset.
      *
      * @deprecated - should use getReadCount(String c)
      */
-    public long getReadCount(Class<?> cls);
+    @Deprecated long getReadCount(Class<?> cls);
 
     /**
      * Gets number of total read requests for the given class since last reset.
 	 */
-	public long getReadCount(String c);
+	long getReadCount(String c);
 
     /**
      * Gets number of total read requests that has been found in cache for the given class since last reset.
      *
      * @deprecated - should use getHitCount(String c)
      */
-    public long getHitCount(Class<?> cls);
+    @Deprecated long getHitCount(Class<?> cls);
 
 	/**
      * Gets number of total read requests that has been found in cache for the given class since last reset.
      */
-	public long getHitCount(String c);
+	long getHitCount(String c);
 
 	/**
      * Gets number of total write requests for the given class since last reset.
      *
      * @deprecated - should use getWriteCount(String c)
      */
-    public long getWriteCount(Class<?> cls);
+    @Deprecated long getWriteCount(Class<?> cls);
 
     /**
      * Gets number of total write requests for the given class since last reset.
 	 */
-	public long getWriteCount(String c);
+	long getWriteCount(String c);
 
 	/**
      * Gets number of total read requests for the given class since start.
      *
      * @deprecated - should use getTotalReadCount(String c)
      */
-    public long getTotalReadCount(Class<?> cls);
+    @Deprecated long getTotalReadCount(Class<?> cls);
 
 	/**
 	 * Gets number of total read requests for the given class since start.
 	 */
-	public long getTotalReadCount(String c);
+	long getTotalReadCount(String c);
 
 	/**
      * Gets number of total read requests that has been found in cache for the given class since start.
      */
-    public long getTotalHitCount(String c);
+    long getTotalHitCount(String c);
 
     /**
      * Gets number of total read requests that has been found in cache for the given class since start.
      *
      * @deprecated - should use getTotalHitCount(String c)
      */
-    public long getTotalHitCount(Class<?> cls);
+    @Deprecated long getTotalHitCount(Class<?> cls);
 
 	/**
      * Gets number of total write requests for the given class since start.
      */
-    public long getTotalWriteCount(String c);
+    long getTotalWriteCount(String c);
 
     /**
      * Gets number of total write requests for the given class since start.
      *
      * @deprecated - should use getTotalWriteCount(String c)
      */
-    public long getTotalWriteCount(Class<?> cls);
+    @Deprecated long getTotalWriteCount(Class<?> cls);
 
 	/**
 	 * Gets the time of last reset.
 	 */
-	public Date since();
+	Date since();
 
 	/**
 	 * Gets the time of start.
 	 */
-	public Date start();
+	Date start();
 
 	/**
 	 * Clears all accumulated statistics.
 	 */
-	public void reset();
+	void reset();
 
 	/**
 	 * Returns whether or not statistics will be collected.
 	 */
-	public boolean isEnabled();
+	boolean isEnabled();
 
 	/**
 	 * Returns the types that are known to this cache being tracked.
 	 */
-    public Set<String> classNames();
+    Set<String> classNames();
 
-    public Map<String, long[]> toMap();
+    Map<String, long[]> toMap();
 
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatisticsImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatisticsImpl.java
index 18131e013..33034835b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatisticsImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatisticsImpl.java
@@ -21,8 +21,8 @@ package org.apache.openjpa.datacache;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.apache.openjpa.util.OpenJPAId;
 
@@ -34,8 +34,8 @@ public class CacheStatisticsImpl implements CacheStatisticsSPI {
     private static final int ARRAY_SIZE = 3;
     private long[] totalStat = new long[ARRAY_SIZE];
     private long[] stat = new long[ARRAY_SIZE];
-    private Map<String, long[]> stats = new HashMap<String, long[]>();
-    private Map<String, long[]> totalStats = new HashMap<String, long[]>();
+    private Map<String, long[]> stats = new HashMap<>();
+    private Map<String, long[]> totalStats = new HashMap<>();
 
     private Date start = new Date();
     private Date since = new Date();
@@ -45,101 +45,125 @@ public class CacheStatisticsImpl implements CacheStatisticsSPI {
     private static final int HIT = 1;
     private static final int WRITE = 2;
 
+    @Override
     public long getReadCount() {
         return stat[READ];
     }
 
+    @Override
     public long getHitCount() {
         return stat[HIT];
     }
 
+    @Override
     public long getWriteCount() {
         return stat[WRITE];
     }
 
+    @Override
     public long getTotalReadCount() {
         return totalStat[READ];
     }
 
+    @Override
     public long getTotalHitCount() {
         return totalStat[HIT];
     }
 
+    @Override
     public long getTotalWriteCount() {
         return totalStat[WRITE];
     }
 
+    @Override
     public long getReadCount(Class<?> c) {
         return getReadCount(c.getName());
     }
 
+    @Override
     public long getReadCount(String str){
         return getCount(stats, str, READ);
     }
 
+    @Override
     public long getHitCount(Class<?> c) {
         return getHitCount(c.getName());
     }
 
+    @Override
     public long getHitCount(String str) {
         return getCount(stats, str, HIT);
     }
 
+    @Override
     public long getWriteCount(Class<?> c) {
         return getWriteCount(c.getName());
     }
+    @Override
     public long getWriteCount(String str) {
         return getCount(stats, str, WRITE);
     }
 
+    @Override
     public long getTotalReadCount(Class<?> c) {
         return getTotalReadCount(c.getName());
     }
 
+    @Override
     public long getTotalReadCount(String str) {
         return getCount(totalStats, str, READ);
     }
 
+    @Override
     public long getTotalHitCount(Class<?> c) {
         return getTotalHitCount(c.getName());
     }
 
+    @Override
     public long getTotalHitCount(String str) {
         return getCount(totalStats, str, HIT);
     }
 
+    @Override
     public long getTotalWriteCount(Class<?> c) {
         return getCount(totalStats, c.getName(), WRITE);
     }
 
+    @Override
     public long getTotalWriteCount(String str) {
         return getCount(totalStats, str, WRITE);
     }
 
+    @Override
     public Date since() {
         return since;
     }
 
+    @Override
     public Date start() {
         return start;
     }
 
+    @Override
     public void reset() {
         stat = new long[ARRAY_SIZE];
         stats.clear();
         since = new Date();
     }
 
+    @Override
     public boolean isEnabled() {
         return enabled;
     }
 
+    @Override
     public Set<String> classNames() {
         return totalStats.keySet();
     }
 
+    @Override
     public Map<String, long[]> toMap() {
-        Map<String, long[]> res = new HashMap<String, long[]>();
+        Map<String, long[]> res = new HashMap<>();
         for(Entry<String, long[]> s  : stats.entrySet()){
             res.put(s.getKey(), s.getValue());
         }
@@ -149,14 +173,17 @@ public class CacheStatisticsImpl implements CacheStatisticsSPI {
     /**
      * SPI implementation
      */
+    @Override
     public void enable() {
         enabled = true;
     }
 
+    @Override
     public void disable() {
         enabled = false;
     }
 
+    @Override
     public void newGet(Class<?> cls, boolean hit) {
         if (!enabled) {
             return;
@@ -178,6 +205,7 @@ public class CacheStatisticsImpl implements CacheStatisticsSPI {
         }
     }
 
+    @Override
     public void newPut(Class<?> cls) {
         if (!enabled) {
             return;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatisticsSPI.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatisticsSPI.java
index f66fb11d0..f64fe59bd 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatisticsSPI.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatisticsSPI.java
@@ -30,7 +30,7 @@ public interface CacheStatisticsSPI extends CacheStatistics {
      * @param hit
      *            - true for a cache hit, false otherwise
      */
-    public void newGet(Class<?> cls, boolean hit);
+    void newGet(Class<?> cls, boolean hit);
 
 
     /**
@@ -39,16 +39,16 @@ public interface CacheStatisticsSPI extends CacheStatistics {
      * @param cls
      *            - The class describing the type that is contained in the cache.
      */
-    public void newPut(Class<?> cls);
+    void newPut(Class<?> cls);
 
 
     /**
      * Enable statistics collection.
      */
-    public void enable();
+    void enable();
 
     /**
      * Disable statistics collection.
      */
-    public void disable();
+    void disable();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/Caches.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/Caches.java
index fa43e7a3e..432546fb8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/Caches.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/Caches.java
@@ -43,7 +43,7 @@ class Caches {
             try {
                 cls = Class.forName(className, true, loader);
                 if (classes == null)
-                    classes = new HashSet<Class<?>>();
+                    classes = new HashSet<>();
                 classes.add(cls);
             } catch (Throwable t) {
                 conf.getLog(OpenJPAConfiguration.LOG_RUNTIME).warn(null, t);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ClearableScheduler.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ClearableScheduler.java
index 5a4d511a6..9ce195306 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ClearableScheduler.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ClearableScheduler.java
@@ -25,8 +25,8 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
-import java.util.StringTokenizer;
 import java.util.Map.Entry;
+import java.util.StringTokenizer;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.openjpa.conf.OpenJPAConfiguration;
@@ -53,7 +53,7 @@ public class ClearableScheduler implements Runnable {
 
     private static final Localizer _loc = Localizer.forPackage(ClearableScheduler.class);
 
-    private Map<Clearable,Schedule> _clearables = new ConcurrentHashMap<Clearable,Schedule>();
+    private Map<Clearable,Schedule> _clearables = new ConcurrentHashMap<>();
     private boolean _stop = false;
     private int _interval = 1;
     private Log _log;
@@ -119,6 +119,7 @@ public class ClearableScheduler implements Runnable {
             stop();
     }
 
+    @Override
     public void run() {
         if (_log.isTraceEnabled())
             _log.trace(_loc.get("scheduler-interval", _interval + ""));
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java
index 6ae0145d0..b953301c4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java
@@ -35,6 +35,9 @@ public class ConcurrentDataCache
     extends AbstractDataCache
     implements RemoteCommitListener {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (ConcurrentDataCache.class);
 
@@ -90,6 +93,7 @@ public class ConcurrentDataCache
         return _cache.getSoftReferenceSize();
     }
 
+    @Override
     public void initialize(DataCacheManager mgr) {
         super.initialize(mgr);
         conf.getRemoteCommitEventManager().addInternalListener(this);
@@ -103,16 +107,19 @@ public class ConcurrentDataCache
         }
     }
 
+    @Override
     public void unpinAll(Class<?> cls, boolean subs) {
         if (log.isWarnEnabled())
             log.warn(_loc.get("cache-class-unpin-all", getName()));
         unpinAll(_cache.getPinnedKeys());
     }
 
+    @Override
     public void writeLock() {
         _cache.writeLock();
     }
 
+    @Override
     public void writeUnlock() {
         _cache.writeUnlock();
     }
@@ -123,6 +130,7 @@ public class ConcurrentDataCache
      */
     protected CacheMap newCacheMap() {
         CacheMap res = new CacheMap(_lru) {
+            @Override
             protected void entryRemoved(Object key, Object value, boolean expired) {
                 keyRemoved(key, expired);
             }
@@ -131,18 +139,22 @@ public class ConcurrentDataCache
         return res;
     }
 
+    @Override
     protected DataCachePCData getInternal(Object key) {
         return (DataCachePCData) _cache.get(key);
     }
 
+    @Override
     protected DataCachePCData putInternal(Object key, DataCachePCData pc) {
         return (DataCachePCData) _cache.put(key, pc);
     }
 
+    @Override
     protected DataCachePCData removeInternal(Object key) {
         return (DataCachePCData) _cache.remove(key);
     }
 
+    @Override
     protected void removeAllInternal(Class<?> cls, boolean subs) {
         // The performance in this area can be improved upon, however it seems
         // unlikely that this method will be called in a performance intensive
@@ -151,18 +163,22 @@ public class ConcurrentDataCache
         _cache.clear();
     }
 
+    @Override
     protected void clearInternal() {
         _cache.clear();
     }
 
+    @Override
     protected boolean pinInternal(Object key) {
         return _cache.pin(key);
     }
 
+    @Override
     protected boolean unpinInternal(Object key) {
         return _cache.unpin (key);
 	}
 
+    @Override
     protected boolean recacheUpdates() {
         return true;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentQueryCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentQueryCache.java
index e1075428f..e51e2b30c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentQueryCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentQueryCache.java
@@ -36,6 +36,8 @@ public class ConcurrentQueryCache
     extends AbstractQueryCache
     implements RemoteCommitListener {
 
+    
+    private static final long serialVersionUID = 1L;
     private CacheMap _cache;
     protected boolean _lru = false;
     private int _cacheSize = Integer.MIN_VALUE;
@@ -91,6 +93,7 @@ public class ConcurrentQueryCache
         _softRefs = size;
     }
 
+    @Override
     public void initialize(DataCacheManager mgr) {
         super.initialize(mgr);
         conf.getRemoteCommitEventManager().addInternalListener(this);
@@ -103,11 +106,13 @@ public class ConcurrentQueryCache
         }
     }
 
+    @Override
     public void writeLock() {
         // delegate actually does nothing, but in case that changes...
         _cache.writeLock();
     }
 
+    @Override
     public void writeUnlock() {
         // delegate actually does nothing, but in case that changes...
         _cache.writeUnlock();
@@ -122,30 +127,37 @@ public class ConcurrentQueryCache
         return res;
     }
 
+    @Override
     protected QueryResult getInternal(QueryKey qk) {
         return (QueryResult) _cache.get(qk);
     }
 
+    @Override
     protected QueryResult putInternal(QueryKey qk, QueryResult result) {
         return (QueryResult) _cache.put(qk, result);
     }
 
+    @Override
     protected QueryResult removeInternal(QueryKey qk) {
         return (QueryResult) _cache.remove(qk);
     }
 
+    @Override
     protected void clearInternal() {
         _cache.clear();
     }
 
+    @Override
     protected boolean pinInternal(QueryKey qk) {
         return _cache.pin(qk);
     }
 
+    @Override
     protected boolean unpinInternal(QueryKey qk) {
         return _cache.unpin(qk);
     }
 
+    @Override
     protected Collection keySet() {
         return _cache.keySet ();
 	}
@@ -153,6 +165,7 @@ public class ConcurrentQueryCache
     /**
      * Returns the eviction policy of the query cache
      */
+    @Override
     public EvictPolicy getEvictPolicy() {
         return super.evictPolicy;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCache.java
index ade7b5bda..ce0043656 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCache.java
@@ -46,7 +46,7 @@ public interface DataCache
     /**
      * The name of the default data cache: <code>default</code>
      */
-    public static final String NAME_DEFAULT = "default";
+    String NAME_DEFAULT = "default";
 
     /**
      * Returns a string name that can be used by end-user-visible
@@ -54,20 +54,20 @@ public interface DataCache
      *
      * @since 0.2.5.0
      */
-    public String getName();
+    String getName();
 
     /**
      * Sets a string name to be used to identify this cache to end-user needs.
      *
      * @since 0.2.5.0
      */
-    public void setName(String name);
+    void setName(String name);
 
     /**
      * Initialize any resources associated with the given
      * {@link DataCacheManager}.
      */
-    public void initialize(DataCacheManager manager);
+    void initialize(DataCacheManager manager);
 
     /**
      * Perform a batch update of the cache. Add all {@link DataCachePCData}
@@ -100,7 +100,7 @@ public interface DataCache
      * @param deletes A collection of object IDs that have been deleted
      * and must therefore be dropped from the cache.
      */
-    public void commit(Collection<DataCachePCData> additions, Collection<DataCachePCData> newUpdates,
+    void commit(Collection<DataCachePCData> additions, Collection<DataCachePCData> newUpdates,
         Collection<DataCachePCData> existingUpdates, Collection<Object> deletes);
 
     /**
@@ -108,12 +108,12 @@ public interface DataCache
      * corresponding to <code>oid</code>; otherwise returns
      * <code>false</code>.
      */
-    public boolean contains(Object oid);
+    boolean contains(Object oid);
 
     /**
      * Returns the indexes of the oids in this cache.
      */
-    public BitSet containsAll(Collection<Object> oids);
+    BitSet containsAll(Collection<Object> oids);
 
     /**
      * Return the cached object for the given oid. Modifying the returned
@@ -122,7 +122,7 @@ public interface DataCache
      *
      * @return the object matching the given oid, or null if none
      */
-    public DataCachePCData get(Object oid);
+    DataCachePCData get(Object oid);
 
     /**
      * Set the cached value for the given instance. This does <em>not</em>
@@ -134,7 +134,7 @@ public interface DataCache
      * the value was not previously cached. See {@link Map#put}
      * for more information.
      */
-    public DataCachePCData put(DataCachePCData value);
+    DataCachePCData put(DataCachePCData value);
 
     /**
      * Update the cached value for the given instance. This does
@@ -147,7 +147,7 @@ public interface DataCache
      * invoked instead of invoking {@link #put}. The DataCache implementation
      * can then make optimizations based on how its {@link #get} method works.
      */
-    public void update(DataCachePCData value);
+    void update(DataCachePCData value);
 
     /**
      * Remove the value stored under the given oid. This does
@@ -160,7 +160,7 @@ public interface DataCache
      * the oid was not previously cached. See {@link Map#remove}
      * for more information.
      */
-    public DataCachePCData remove(Object oid);
+    DataCachePCData remove(Object oid);
 
     /**
      * Remove the values stored under the given oids.
@@ -168,12 +168,12 @@ public interface DataCache
      * @return the indexes of the removed oids
      * @see #remove
      */
-    public BitSet removeAll(Collection<Object> oids);
+    BitSet removeAll(Collection<Object> oids);
 
     /**
      * Evict all values of a specified type.
      */
-    public void removeAll(Class<?> cls, boolean subclasses);
+    void removeAll(Class<?> cls, boolean subclasses);
 
     /**
      * Remove all data from this cache. This does <em>not</em> result
@@ -181,7 +181,7 @@ public interface DataCache
      * for clearing the cache. Meaningful changes to the state of the
      * cache should be made via the {@link #commit} method.
      */
-    public void clear();
+    @Override void clear();
 
     /**
      * Pin the value stored under <code>oid</code> into the cache.
@@ -192,7 +192,7 @@ public interface DataCache
      * @return <code>true</code> if <code>oid</code>'s value was
      * pinned into the cache; <code>false</code> if the oid is not in the cache.
      */
-    public boolean pin(Object oid);
+    boolean pin(Object oid);
 
     /**
      * Pin all oids to the cache.
@@ -200,13 +200,13 @@ public interface DataCache
      * @return the indexes of the pinned oids
      * @see #pin
      */
-    public BitSet pinAll(Collection<Object> oids);
+    BitSet pinAll(Collection<Object> oids);
 
     /**
      * Pin all oids for the given type.
      * @param subs Whether to include subclasses.
      */
-    public void pinAll(Class<?> cls, boolean subs);
+    void pinAll(Class<?> cls, boolean subs);
 
     /**
      * Unpin the value stored under <code>oid</code> from the cache.
@@ -218,7 +218,7 @@ public interface DataCache
      * unpinned from the cache; <code>false</code> if the
      * oid is not in the cache.
      */
-    public boolean unpin(Object oid);
+    boolean unpin(Object oid);
 
     /**
      * Unpin all oids from the cache.
@@ -226,42 +226,42 @@ public interface DataCache
      * @return the indexes of the unpinned oids
      * @see #unpin
      */
-    public BitSet unpinAll(Collection<Object> oids);
+    BitSet unpinAll(Collection<Object> oids);
 
     /**
      * Unpin all oids associaed with the given type from the cache.
      * @param subs Whether to include subclasses.
      */
-    public void unpinAll(Class<?> cls, boolean subs);
+    void unpinAll(Class<?> cls, boolean subs);
 
     /**
      * Obtain a write lock on the cache.
      */
-    public void writeLock();
+    void writeLock();
 
     /**
      * Release the write lock on the cache.
      */
-    public void writeUnlock();
+    void writeUnlock();
 
     /**
      * Add a new expiration event listener to this cache.
      *
      * @since 0.2.5.0
      */
-    public void addExpirationListener(ExpirationListener listen);
+    void addExpirationListener(ExpirationListener listen);
 
     /**
      * Remove an expiration event listener from this cache.
      *
      * @since 0.2.5.0
      */
-    public boolean removeExpirationListener(ExpirationListener listen);
+    boolean removeExpirationListener(ExpirationListener listen);
 
     /**
      * Free the resources used by this cache.
 	 */
-	public void close ();
+	@Override void close ();
 
     /**
 	 * Gets objects from the caches for a given list of keys.
@@ -270,7 +270,7 @@ public interface DataCache
 	 * the returned map still contains the key with a null value.
 	 *
      */
-    public Map<Object,DataCachePCData> getAll(List<Object> keys);
+    Map<Object,DataCachePCData> getAll(List<Object> keys);
 
     /**
      * Gets the named partition. Note that a partition itself is another cache.
@@ -282,7 +282,7 @@ public interface DataCache
      * @return a partition of the given name. Or null, if either no such partition exists or can not be created.
      * @since 2.0.0
      */
-    public DataCache getPartition(String name, boolean create);
+    DataCache getPartition(String name, boolean create);
 
     /**
      * Gets the name of the known partitions.
@@ -291,22 +291,22 @@ public interface DataCache
      *
      * @since 2.0.0
      */
-    public Set<String> getPartitionNames();
+    Set<String> getPartitionNames();
 
     /**
      * Affirms if this cache maintains partitions.
      *
      * @since 2.0.0
      */
-    public boolean isPartitioned();
+    boolean isPartitioned();
 
     /**
      * Returns number of read/write request and cache hit ratio data.
      */
-    public CacheStatistics getStatistics();
+    CacheStatistics getStatistics();
 
     /**
      * Returns whether the the cache needs to be updated when bulk updates as executed. Defaults to true.
      */
-    public boolean getEvictOnBulkUpdate();
+    boolean getEvictOnBulkUpdate();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManager.java
index 3e7ec912f..9e79d8719 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManager.java
@@ -43,18 +43,18 @@ public interface DataCacheManager {
     /**
      * Initialize the manager, supplying the cache configuration.
      */
-    public void initialize(OpenJPAConfiguration conf, ObjectValue dataCache,
+    void initialize(OpenJPAConfiguration conf, ObjectValue dataCache,
         ObjectValue queryCache);
 
     /**
      * Return the system-wide data cache, or null if caching is not enabled.
      */
-    public DataCache getSystemDataCache();
+    DataCache getSystemDataCache();
 
     /**
      * Return the named data cache, or null if it does not exist.
      */
-    public DataCache getDataCache(String name);
+    DataCache getDataCache(String name);
 
     /**
      * Return the named data cache. If the given name is null, the default
@@ -63,22 +63,22 @@ public interface DataCacheManager {
      * @param create if true, the cache will be created if it does
      * not already exist
      */
-    public DataCache getDataCache(String name, boolean create);
+    DataCache getDataCache(String name, boolean create);
 
     /**
      * Return the system query cache, or null if not configured.
      */
-    public QueryCache getSystemQueryCache();
+    QueryCache getSystemQueryCache();
 
     /**
      * Return the PCData generator if configured.
      */
-    public DataCachePCDataGenerator getPCDataGenerator();
+    DataCachePCDataGenerator getPCDataGenerator();
 
     /**
      * Return the runnable which schedules evictions.
      */
-    public ClearableScheduler getClearableScheduler();
+    ClearableScheduler getClearableScheduler();
 
     /**
      * Select the cache where the given managed proxy instance should be cached.
@@ -91,32 +91,32 @@ public interface DataCacheManager {
      *
      * @since 2.0.0
      */
-    public DataCache selectCache(final OpenJPAStateManager sm);
+    DataCache selectCache(final OpenJPAStateManager sm);
 
     /**
      * Return the user-specific policy that <em>suggests</em> the cache where a managed entity state is stored.
      *
      * @since 2.0.0
      */
-    public CacheDistributionPolicy getDistributionPolicy();
+    CacheDistributionPolicy getDistributionPolicy();
 
     /**
      * Close all caches.
      */
-    public void close();
+    void close();
 
     /**
      * Stop caching the type matching the provided class name.
      */
-    public void stopCaching(String cls);
+    void stopCaching(String cls);
 
     /**
      * Start caching the type matching the provided class name.
      */
-    public void startCaching(String cls);
+    void startCaching(String cls);
 
     /**
      * Returns the names of classes that are known to the cache and whether or not they are currently being cached.
      */
-    public Map<String, Boolean> listKnownTypes();
+    Map<String, Boolean> listKnownTypes();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
index da12bdd65..32e4d6e24 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.datacache;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.openjpa.conf.OpenJPAConfiguration;
@@ -58,9 +58,10 @@ public class DataCacheManagerImpl
     private Set<String> _includedTypes;
     private Set<String> _excludedTypes;
 
+    @Override
     public void initialize(OpenJPAConfiguration conf, ObjectValue dataCache, ObjectValue queryCache) {
         _conf = conf;
-        _cacheable = new ConcurrentHashMap<ClassMetaData, Boolean>();
+        _cacheable = new ConcurrentHashMap<>();
         _queryCache = (QueryCache) queryCache.instantiate(QueryCache.class, conf);
         if (_queryCache != null)
             _queryCache.initialize(this);
@@ -80,10 +81,12 @@ public class DataCacheManagerImpl
 
     }
 
+    @Override
     public DataCache getSystemDataCache() {
         return getDataCache(null, false);
     }
 
+    @Override
     public DataCache getDataCache(String name) {
         return getDataCache(name, false);
     }
@@ -94,6 +97,7 @@ public class DataCacheManagerImpl
      * Otherwise, {@linkplain DataCache#getPartition(String, boolean) delegates} to the main cache
      * to obtain a partition.
      */
+    @Override
     public DataCache getDataCache(String name, boolean create) {
         if (name == null || (_cache != null && name.equals(_cache.getName())))
             return _cache;
@@ -102,18 +106,22 @@ public class DataCacheManagerImpl
         return null;
     }
 
+    @Override
     public QueryCache getSystemQueryCache() {
         return _queryCache;
     }
 
+    @Override
     public DataCachePCDataGenerator getPCDataGenerator() {
         return _pcGenerator;
     }
 
+    @Override
     public ClearableScheduler getClearableScheduler() {
         return _scheduler;
     }
 
+    @Override
     public void close() {
         ImplHelper.close(_cache);
         ImplHelper.close(_queryCache);
@@ -126,6 +134,7 @@ public class DataCacheManagerImpl
      * If type based verification affirms the type to be cached then the instance based policy
      * is called to determine the target cache.
      */
+    @Override
     public DataCache selectCache(OpenJPAStateManager sm) {
         if (sm == null || !isCachable(sm.getMetaData()))
             return null;
@@ -136,6 +145,7 @@ public class DataCacheManagerImpl
     /**
      * Gets the instance-based cache distribution policy, if configured.
      */
+    @Override
     public CacheDistributionPolicy getDistributionPolicy() {
         return _policy;
     }
@@ -203,20 +213,23 @@ public class DataCacheManagerImpl
         return meta.getDataCacheName() != null;
     }
 
+    @Override
     public void startCaching(String cls) {
         MetaDataRepository mdr = _conf.getMetaDataRepositoryInstance();
         ClassMetaData cmd = mdr.getCachedMetaData(cls);
         _cacheable.put(cmd, Boolean.TRUE);
     }
 
+    @Override
     public void stopCaching(String cls) {
         MetaDataRepository mdr = _conf.getMetaDataRepositoryInstance();
         ClassMetaData cmd = mdr.getCachedMetaData(cls);
         _cacheable.put(cmd, Boolean.FALSE);
     }
 
+    @Override
     public Map<String, Boolean> listKnownTypes() {
-        Map<String, Boolean> res = new HashMap<String, Boolean>();
+        Map<String, Boolean> res = new HashMap<>();
         for (Entry<ClassMetaData, Boolean> entry : _cacheable.entrySet()) {
             res.put(entry.getKey().getDescribedTypeString(), entry.getValue());
         }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCData.java
index 2d0212287..4971b8462 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCData.java
@@ -31,12 +31,12 @@ public interface DataCachePCData
     /**
      * Whether this data is timed out.
      */
-    public boolean isTimedOut();
+    boolean isTimedOut();
 
     /**
      * Gets the original timeout of this instance.
      *
      * @return -1 for no timeout ever.
      */
-    public long getTimeOut();
+    long getTimeOut();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataGenerator.java
index cc46e86ee..435eda3f8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataGenerator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataGenerator.java
@@ -33,6 +33,7 @@ import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.ValueMetaData;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.BCField;
 import serp.bytecode.BCMethod;
@@ -62,10 +63,12 @@ public class DataCachePCDataGenerator extends PCDataGenerator {
         super(conf);
     }
 
+    @Override
     protected String getUniqueName(Class type) {
         return super.getUniqueName(type) + POSTFIX;
     }
 
+    @Override
     protected void finish(DynamicPCData data, ClassMetaData meta) {
         int timeout = meta.getDataCacheTimeout();
         if (timeout > 0)
@@ -74,6 +77,7 @@ public class DataCachePCDataGenerator extends PCDataGenerator {
             ((Timed) data).setTimeout(-1);
     }
 
+    @Override
     protected void decorate(BCClass bc, ClassMetaData meta) {
         enhanceToData(bc);
         enhanceToNestedData(bc);
@@ -248,8 +252,8 @@ public class DataCachePCDataGenerator extends PCDataGenerator {
     /**
      * Simple interface to give access to expiration time.
      */
-    public static interface Timed {
+    public interface Timed {
 
-        public void setTimeout(long time);
+        void setTimeout(long time);
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java
index 46c1fabf7..357f098f6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java
@@ -37,11 +37,11 @@ import org.apache.openjpa.meta.ValueMetaData;
  *
  * @author Patrick Linskey
  */
-@SuppressWarnings("serial")
 public class DataCachePCDataImpl
     extends PCDataImpl
     implements DataCachePCData {
 
+    private static final long serialVersionUID = 1L;
     private final long _exp;
 
     public DataCachePCDataImpl(Object oid, ClassMetaData meta) {
@@ -61,70 +61,87 @@ public class DataCachePCDataImpl
             _exp = -1;
     }
 
+    @Override
     public boolean isTimedOut() {
         return _exp != -1 && _exp < System.currentTimeMillis();
     }
 
+    @Override
     public long getTimeOut() {
         return _exp;
     }
 
+    @Override
     public synchronized Object getData(int index) {
         return super.getData(index);
     }
 
+    @Override
     public synchronized void setData(int index, Object val) {
         super.setData(index, val);
     }
 
+    @Override
     public synchronized void clearData(int index) {
         super.clearData(index);
     }
 
+    @Override
     public synchronized Object getImplData() {
         return super.getImplData();
     }
 
+    @Override
     public synchronized void setImplData(Object val) {
         super.setImplData(val);
     }
 
+    @Override
     public synchronized Object getImplData(int index) {
         return super.getImplData(index);
     }
 
+    @Override
     public synchronized void setImplData(int index, Object val) {
         super.setImplData(index, val);
     }
 
+    @Override
     public synchronized Object getIntermediate(int index) {
         return super.getIntermediate(index);
     }
 
+    @Override
     public synchronized void setIntermediate(int index, Object val) {
         super.setIntermediate(index, val);
     }
 
+    @Override
     public synchronized boolean isLoaded(int index) {
         return super.isLoaded(index);
     }
 
+    @Override
     public synchronized void setLoaded(int index, boolean loaded) {
         super.setLoaded(index, loaded);
     }
 
+    @Override
     public synchronized Object getVersion() {
         return super.getVersion();
     }
 
+    @Override
     public synchronized void setVersion(Object version) {
         super.setVersion(version);
     }
 
+    @Override
     public synchronized void store(OpenJPAStateManager sm) {
         super.store(sm);
     }
 
+    @Override
     public synchronized void store(OpenJPAStateManager sm, BitSet fields) {
         super.store(sm, fields);
     }
@@ -134,6 +151,7 @@ public class DataCachePCDataImpl
      * Special process of checking if the cached collection data is out of
      * order.
      */
+    @Override
     protected void storeField(OpenJPAStateManager sm, FieldMetaData fmd) {
         if (fmd.getManagement() != FieldMetaData.MANAGE_PERSISTENT)
             return;
@@ -187,6 +205,7 @@ public class DataCachePCDataImpl
         }
     }
 
+    @Override
     protected Object toData(FieldMetaData fmd, Object val, StoreContext ctx) {
         // avoid caching large result set fields
         if (fmd.isLRS() || fmd.isStream())
@@ -194,6 +213,7 @@ public class DataCachePCDataImpl
         return super.toData(fmd, val, ctx);
     }
 
+    @Override
     protected Object toNestedData(ValueMetaData vmd, Object val,
         StoreContext ctx) {
         if (val == null)
@@ -210,6 +230,7 @@ public class DataCachePCDataImpl
         }
     }
 
+    @Override
     public AbstractPCData newEmbeddedPCData(OpenJPAStateManager sm) {
         return new DataCachePCDataImpl(sm.getId(), sm.getMetaData(), getCache());
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
index c2d39babc..45bfbe778 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheStoreManager.java
@@ -70,6 +70,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         super(sm);
     }
 
+    @Override
     public void setContext(StoreContext ctx) {
         _ctx = ctx;
         _mgr = ctx.getConfiguration().getDataCacheManagerInstance();
@@ -77,10 +78,12 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         super.setContext(ctx);
     }
 
+    @Override
     public void begin() {
         super.begin();
     }
 
+    @Override
     public void commit() {
         try {
             super.commit();
@@ -92,6 +95,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         }
     }
 
+    @Override
     public void rollback() {
         try {
             super.rollback();
@@ -128,7 +132,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
             // map each data cache to the modifications we need to perform
             Map<DataCache,Modifications> modMap = null;
             if ((_ctx.getPopulateDataCache() && _inserts != null) || _updates != null || _deletes != null)
-                modMap = new HashMap<DataCache,Modifications>();
+                modMap = new HashMap<>();
             Modifications mods;
             DataCachePCData data;
             DataCache cache;
@@ -238,10 +242,10 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
      * stale instances into a collection of up-to-date {@link DataCachePCData}s.
      */
     private List<DataCachePCData> transformToVersionSafePCDatas(DataCache cache, List<PCDataHolder> holders) {
-        List<DataCachePCData> transformed = new ArrayList<DataCachePCData>(holders.size());
-        Map<Object,Integer> ids = new HashMap<Object,Integer>(holders.size());
+        List<DataCachePCData> transformed = new ArrayList<>(holders.size());
+        Map<Object,Integer> ids = new HashMap<>(holders.size());
         // this list could be removed if DataCache.getAll() took a Collection
-        List<Object> idList = new ArrayList<Object>(holders.size());
+        List<Object> idList = new ArrayList<>(holders.size());
         int i = 0;
         for (PCDataHolder holder : holders) {
             ids.put(holder.sm.getObjectId(), i++);
@@ -276,6 +280,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         return mods;
     }
 
+    @Override
     public boolean exists(OpenJPAStateManager sm, Object edata) {
         DataCache cache = _mgr.selectCache(sm);
         CacheStatistics stats = (cache == null) ? null : cache.getStatistics();
@@ -296,6 +301,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         return super.exists(sm, edata);
     }
 
+    @Override
     public boolean isCached(List<Object> oids, BitSet edata) {
         // If using partitioned cache, we were and still are broke.
         DataCache cache = _mgr.getSystemDataCache();
@@ -316,6 +322,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         return super.isCached(oids, edata);
     }
 
+    @Override
     public boolean syncVersion(OpenJPAStateManager sm, Object edata) {
         DataCache cache = _mgr.selectCache(sm);
         FetchConfiguration fc = sm.getContext().getFetchConfiguration();
@@ -352,6 +359,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         return super.syncVersion(sm, edata);
     }
 
+    @Override
     public boolean initialize(OpenJPAStateManager sm, PCState state, FetchConfiguration fetch, Object edata) {
         DataCache cache = _mgr.selectCache(sm);
         if (cache == null) {
@@ -431,6 +439,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         }
     }
 
+    @Override
     public boolean load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, int lockLevel, Object edata) {
         DataCache cache = _mgr.selectCache(sm);
@@ -513,6 +522,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         }
     }
 
+    @Override
     public Collection<Object> loadAll(Collection<OpenJPAStateManager> sms, PCState state, int load,
         FetchConfiguration fetch, Object edata) {
         if (bypass(fetch, load)) {
@@ -521,7 +531,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
 
         Map<OpenJPAStateManager, BitSet> unloaded = null;
         List<OpenJPAStateManager> smList = null;
-        Map<DataCache,List<OpenJPAStateManager>> caches = new HashMap<DataCache,List<OpenJPAStateManager>>();
+        Map<DataCache,List<OpenJPAStateManager>> caches = new HashMap<>();
         DataCache cache;
         DataCachePCData data;
         BitSet fields;
@@ -538,7 +548,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
                 || sm.getPCState() == PCState.HOLLOW) {
                 smList = caches.get(cache);
                 if (smList == null) {
-                    smList = new ArrayList<OpenJPAStateManager>();
+                    smList = new ArrayList<>();
                     caches.put(cache, smList);
                 }
                 smList.add(sm);
@@ -549,7 +559,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
     for(Entry<DataCache,List<OpenJPAStateManager>> entry : caches.entrySet()){
             cache = entry.getKey();
             smList = entry.getValue();
-            List<Object> oidList = new ArrayList<Object>(smList.size());
+            List<Object> oidList = new ArrayList<>(smList.size());
 
             for (OpenJPAStateManager sm : smList) {
                 oidList.add((OpenJPAId) sm.getObjectId());
@@ -659,11 +669,12 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
     private static Map<OpenJPAStateManager, BitSet> addUnloaded(OpenJPAStateManager sm, BitSet fields,
         Map<OpenJPAStateManager, BitSet> unloaded) {
         if (unloaded == null)
-            unloaded = new HashMap<OpenJPAStateManager, BitSet>();
+            unloaded = new HashMap<>();
         unloaded.put(sm, fields);
         return unloaded;
     }
 
+    @Override
     public Collection<Exception> flush(Collection<OpenJPAStateManager> states) {
         Collection<Exception> exceps = super.flush(states);
 
@@ -683,7 +694,7 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
         for (OpenJPAStateManager sm : states) {
             if (sm.getPCState() == PCState.PNEW && !sm.isFlushed()) {
                 if (_inserts == null) {
-                    _inserts = new ArrayList<OpenJPAStateManager>();
+                    _inserts = new ArrayList<>();
                 }
                 _inserts.add(sm);
 
@@ -698,12 +709,12 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
             }
             else if (sm.getPCState() == PCState.PDIRTY) {
                 if (_updates == null) {
-                    _updates = new HashMap<OpenJPAStateManager, BitSet>();
+                    _updates = new HashMap<>();
                 }
                 _updates.put(sm, sm.getDirty());
             } else if (sm.getPCState() == PCState.PDELETED) {
                 if (_deletes == null) {
-                    _deletes = new HashSet<OpenJPAStateManager>();
+                    _deletes = new HashSet<>();
                 }
                 _deletes.add(sm);
             }
@@ -830,10 +841,10 @@ public class DataCacheStoreManager extends DelegatingStoreManager {
      */
     private static class Modifications {
 
-        public final List<PCDataHolder> additions = new ArrayList<PCDataHolder>();
-        public final List<PCDataHolder> newUpdates = new ArrayList<PCDataHolder>();
-        public final List<PCDataHolder> existingUpdates = new ArrayList<PCDataHolder>();
-        public final List<Object> deletes = new ArrayList<Object>();
+        public final List<PCDataHolder> additions = new ArrayList<>();
+        public final List<PCDataHolder> newUpdates = new ArrayList<>();
+        public final List<PCDataHolder> existingUpdates = new ArrayList<>();
+        public final List<Object> deletes = new ArrayList<>();
     }
 
     /**
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DefaultCacheDistributionPolicy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DefaultCacheDistributionPolicy.java
index 225765670..131867983 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DefaultCacheDistributionPolicy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DefaultCacheDistributionPolicy.java
@@ -29,17 +29,21 @@ import org.apache.openjpa.meta.ClassMetaData;
  *
  */
 public class DefaultCacheDistributionPolicy implements CacheDistributionPolicy {
+    @Override
     public String selectCache(OpenJPAStateManager sm, Object context) {
         return sm.getMetaData().getDataCacheName();
 
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
     }
 
+    @Override
     public void startConfiguration() {
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java
index 24b7e7ecf..59961ae7b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingDataCache.java
@@ -22,9 +22,9 @@ import java.util.BitSet;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
-import java.util.Objects;
 import org.apache.openjpa.util.RuntimeExceptionTranslator;
 
 /**
@@ -74,12 +74,14 @@ public class DelegatingDataCache
         return (_del == null) ? _cache : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         if (_cache == null)
             return super.hashCode();
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -95,6 +97,7 @@ public class DelegatingDataCache
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public String getName() {
         if (_cache == null)
             return null;
@@ -105,6 +108,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void setName(String name) {
         if (_cache == null)
             return;
@@ -115,6 +119,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void initialize(DataCacheManager manager) {
         if (_cache == null)
             return;
@@ -125,6 +130,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void commit(Collection<DataCachePCData> additions, Collection<DataCachePCData> newUpdates,
         Collection<DataCachePCData> existingUpdates, Collection<Object> deletes) {
         if (_cache == null)
@@ -136,6 +142,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public boolean contains(Object oid) {
         if (_cache == null)
             return false;
@@ -146,6 +153,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public BitSet containsAll(Collection<Object> oids) {
         if (_cache == null)
             return EMPTY_BITSET;
@@ -156,6 +164,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public DataCachePCData get(Object oid) {
         if (_cache == null)
             return null;
@@ -166,6 +175,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public DataCachePCData put(DataCachePCData value) {
         if (_cache == null)
             return null;
@@ -176,6 +186,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void update(DataCachePCData value) {
         if (_cache == null)
             return;
@@ -186,6 +197,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public DataCachePCData remove(Object oid) {
         if (_cache == null)
             return null;
@@ -196,6 +208,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public BitSet removeAll(Collection<Object> oids) {
         if (_cache == null)
             return EMPTY_BITSET;
@@ -206,6 +219,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void removeAll(Class<?> cls, boolean subclasses) {
         if (_cache == null)
             return;
@@ -216,6 +230,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void clear() {
         if (_cache == null)
             return;
@@ -226,6 +241,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public boolean pin(Object oid) {
         if (_cache == null)
             return false;
@@ -236,6 +252,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public BitSet pinAll(Collection<Object> oids) {
         if (_cache == null)
             return EMPTY_BITSET;
@@ -246,6 +263,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void pinAll(Class<?> cls, boolean subs) {
         if (_cache == null)
             return;
@@ -256,6 +274,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public boolean unpin(Object oid) {
         if (_cache == null)
             return false;
@@ -266,6 +285,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public BitSet unpinAll(Collection<Object> oids) {
         if (_cache == null)
             return EMPTY_BITSET;
@@ -276,6 +296,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void unpinAll(Class<?> cls, boolean subs) {
         if (_cache == null)
             return;
@@ -286,6 +307,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void writeLock() {
         if (_cache == null)
             return;
@@ -296,6 +318,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void writeUnlock() {
         if (_cache == null)
             return;
@@ -306,6 +329,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void addExpirationListener(ExpirationListener listen) {
         if (_cache == null)
             return;
@@ -316,6 +340,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public boolean removeExpirationListener(ExpirationListener listen) {
         if (_cache == null)
             return false;
@@ -326,6 +351,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public void close() {
         if (_cache == null)
             return;
@@ -336,6 +362,7 @@ public class DelegatingDataCache
 		}
 	}
 
+    @Override
     public Map<Object,DataCachePCData> getAll(List<Object> keys) {
         if (_cache == null)
             return null;
@@ -346,11 +373,13 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public CacheStatistics getStatistics() {
     	return (_cache == null) ? null : _cache.getStatistics();
     }
 
 
+    @Override
     public DataCache getPartition(String name, boolean create) {
         if (_cache == null)
             return null;
@@ -361,6 +390,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public Set<String> getPartitionNames() {
         if (_cache == null)
             return null;
@@ -371,6 +401,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public boolean isPartitioned() {
         if (_cache == null)
             return false;
@@ -381,6 +412,7 @@ public class DelegatingDataCache
         }
     }
 
+    @Override
     public boolean getEvictOnBulkUpdate() {
         if (_cache == null)
             return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java
index d5161076a..5fffa1b1e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DelegatingQueryCache.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.datacache;
 
 import java.util.Objects;
+
 import org.apache.openjpa.kernel.QueryStatistics;
 import org.apache.openjpa.util.RuntimeExceptionTranslator;
 
@@ -68,10 +69,12 @@ public class DelegatingQueryCache
         return (_del == null) ? _cache : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -87,6 +90,7 @@ public class DelegatingQueryCache
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public void initialize(DataCacheManager mgr) {
         if (_cache == null)
             return;
@@ -97,6 +101,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public void onTypesChanged(TypesChangedEvent e) {
         if (_cache == null)
             return;
@@ -107,6 +112,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public QueryResult get(QueryKey qk) {
         if (_cache == null)
             return null;
@@ -117,6 +123,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public QueryResult put(QueryKey qk, QueryResult oids) {
         if (_cache == null)
             return null;
@@ -127,6 +134,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public QueryResult remove(QueryKey qk) {
         if (_cache == null)
             return null;
@@ -137,6 +145,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public void clear() {
         if (_cache == null)
             return;
@@ -147,6 +156,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public boolean pin(QueryKey qk) {
         if (_cache == null)
             return false;
@@ -157,6 +167,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public boolean unpin(QueryKey qk) {
         if (_cache == null)
             return false;
@@ -167,6 +178,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public void writeLock() {
         if (_cache == null)
             return;
@@ -177,6 +189,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public void writeUnlock() {
         if (_cache == null)
             return;
@@ -187,6 +200,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public void addTypesChangedListener(TypesChangedListener listen) {
         if (_cache == null)
             return;
@@ -197,6 +211,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public boolean removeTypesChangedListener(TypesChangedListener listen) {
         if (_cache == null)
             return false;
@@ -207,6 +222,7 @@ public class DelegatingQueryCache
         }
     }
 
+    @Override
     public void close() {
         if (_cache == null)
             return;
@@ -217,6 +233,7 @@ public class DelegatingQueryCache
 		}
 	}
 
+    @Override
     public QueryStatistics<QueryKey> getStatistics() {
         if (_cache == null)
             return null;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationEvent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationEvent.java
index c10fc4ae7..196239501 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationEvent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationEvent.java
@@ -31,6 +31,8 @@ import java.util.EventObject;
 public class ExpirationEvent
     extends EventObject {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Object _key;
     private final boolean _expired;
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationListener.java
index c9d8ab22c..68d8fe74e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ExpirationListener.java
@@ -29,5 +29,5 @@ public interface ExpirationListener {
     /**
      * Notification that an object has expired from the cache.
      */
-    public void onExpire(ExpirationEvent event);
+    void onExpire(ExpirationEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/PartitionedDataCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/PartitionedDataCache.java
index caa550bfc..33e78a56b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/PartitionedDataCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/PartitionedDataCache.java
@@ -61,12 +61,12 @@ import org.apache.openjpa.util.UserException;
  *
  * @since 2.0.0
  */
-@SuppressWarnings("serial")
 public class PartitionedDataCache extends ConcurrentDataCache {
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage(PartitionedDataCache.class);
     private Class<? extends DataCache> _type = ConcurrentDataCache.class;
-    private final List<String> _partProperties = new ArrayList<String>();
-    private final Map<String, DataCache> _partitions = new HashMap<String, DataCache>();
+    private final List<String> _partProperties = new ArrayList<>();
+    private final Map<String, DataCache> _partitions = new HashMap<>();
 
     @Override
     public void initialize(DataCacheManager mgr) {
@@ -125,6 +125,7 @@ public class PartitionedDataCache extends ConcurrentDataCache {
         return _partProperties;
     }
 
+    @Override
     public DataCache getPartition(String name, boolean create) {
         return _partitions.get(name);
     }
@@ -132,6 +133,7 @@ public class PartitionedDataCache extends ConcurrentDataCache {
     /**
      * Gets the name of the configured partitions.
      */
+    @Override
     public Set<String> getPartitionNames() {
         return _partitions.keySet();
     }
@@ -139,10 +141,12 @@ public class PartitionedDataCache extends ConcurrentDataCache {
     /**
      * Always returns true.
      */
+    @Override
     public final boolean isPartitioned() {
         return !_partitions.isEmpty();
     }
 
+    @Override
     public void endConfiguration() {
         if (!isPartitioned())
             conf.getConfigurationLog().warn(_loc.get("partition-cache-no-config"));
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCache.java
index ddf0fd635..e3e7cd63c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCache.java
@@ -42,7 +42,7 @@ public interface QueryCache
      *
      * @since 0.4.1
      */
-    public void initialize(DataCacheManager manager);
+    void initialize(DataCacheManager manager);
 
     /**
      * Return a list of oids for the given query key. This is an
@@ -50,7 +50,7 @@ public interface QueryCache
      *
      * @return The query results matching the given key, or null if none
      */
-    public QueryResult get(QueryKey qk);
+    QueryResult get(QueryKey qk);
 
     /**
      * Set the list of OIDs for the given query key. A reference
@@ -61,7 +61,7 @@ public interface QueryCache
      * the key was not previously cached. See {@link Map#put}
      * for more information.
      */
-    public QueryResult put(QueryKey qk, QueryResult oids);
+    QueryResult put(QueryKey qk, QueryResult oids);
 
     /**
      * Remove the value stored under the given query key.
@@ -75,12 +75,12 @@ public interface QueryCache
      * the key was not previously cached. See {@link Map#remove}
      * for more information.
      */
-    public QueryResult remove(QueryKey qk);
+    QueryResult remove(QueryKey qk);
 
     /**
      * Remove all data from this cache.
      */
-    public void clear();
+    void clear();
 
     /**
      * Pin the value stored under <code>qk</code> into the
@@ -94,7 +94,7 @@ public interface QueryCache
      * @return <code>true</code> if <code>key</code>'s value was
      * pinned into the cache; <code>false</code> if the key is not in the cache.
      */
-    public boolean pin(QueryKey qk);
+    boolean pin(QueryKey qk);
 
     /**
      * Unpin the value stored under <code>key</code> into the cache.
@@ -106,41 +106,41 @@ public interface QueryCache
      * unpinned from the cache; <code>false</code> if the
      * key is not in the cache.
      */
-    public boolean unpin(QueryKey qk);
+    boolean unpin(QueryKey qk);
 
     /**
      * Obtain a write lock on the cache.
      */
-    public void writeLock();
+    void writeLock();
 
     /**
      * Release the write lock on the cache.
      */
-    public void writeUnlock();
+    void writeUnlock();
 
     /**
      * Add a new types event listener to this cache.
      *
      * @since 0.3.3
      */
-    public void addTypesChangedListener(TypesChangedListener listen);
+    void addTypesChangedListener(TypesChangedListener listen);
 
     /**
      * Remove an types event listener from this cache.
      *
      * @since 0.3.3
      */
-    public boolean removeTypesChangedListener(TypesChangedListener listen);
+    boolean removeTypesChangedListener(TypesChangedListener listen);
 
     /**
      * Free the resources used by this cache.
 	 */
-	public void close ();
+	@Override void close ();
 
 	   /**
      * Gets the simple statistics for query results.
      * If the statistics gathering is disabled, an empty statistics is returned.
      * @since 2.1.0
      */
-    public QueryStatistics<QueryKey> getStatistics();
+    QueryStatistics<QueryKey> getStatistics();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
index 4f228efd1..17224f155 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
@@ -130,7 +130,7 @@ public class QueryCacheStoreQuery
             AbstractQueryCache qcache = (AbstractQueryCache) _cache;
             if (qcache.getEvictPolicy() == EvictPolicy.TIMESTAMP) {
                 Set<String> classNames = qk.getAcessPathClassNames();
-                List<String> keyList = new ArrayList<String>();
+                List<String> keyList = new ArrayList<>();
                 keyList.addAll(classNames);
 
                 List<Long> timestamps =
@@ -228,82 +228,101 @@ public class QueryCacheStoreQuery
         return _query;
     }
 
+    @Override
     public QueryContext getContext() {
         return _query.getContext();
     }
 
+    @Override
     public void setContext(QueryContext qctx) {
         _query.setContext(qctx);
         _sctx = qctx.getStoreContext();
         _repos = _sctx.getConfiguration().getMetaDataRepositoryInstance();
     }
 
+    @Override
     public boolean setQuery(Object query) {
         return _query.setQuery(query);
     }
 
+    @Override
     public FilterListener getFilterListener(String tag) {
         return _query.getFilterListener(tag);
     }
 
+    @Override
     public AggregateListener getAggregateListener(String tag) {
         return _query.getAggregateListener(tag);
     }
 
+    @Override
     public Object newCompilationKey() {
         return _query.newCompilationKey();
     }
 
+    @Override
     public Object newCompilation() {
         return _query.newCompilation();
     }
 
+    @Override
     public Object getCompilation() {
         return _query.getCompilation();
     }
 
+    @Override
     public void populateFromCompilation(Object comp) {
         _query.populateFromCompilation(comp);
     }
 
+    @Override
     public void invalidateCompilation() {
         _query.invalidateCompilation();
     }
 
+    @Override
     public boolean supportsDataStoreExecution() {
         return _query.supportsDataStoreExecution();
     }
 
+    @Override
     public boolean supportsInMemoryExecution() {
         return _query.supportsInMemoryExecution();
     }
 
+    @Override
     public Executor newInMemoryExecutor(ClassMetaData meta, boolean subs) {
         return _query.newInMemoryExecutor(meta, subs);
     }
 
+    @Override
     public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs) {
         Executor ex = _query.newDataStoreExecutor(meta, subs);
         return new QueryCacheExecutor(ex, meta, subs,
                       getContext().getFetchConfiguration());
     }
 
+    @Override
     public boolean supportsAbstractExecutors() {
         return _query.supportsAbstractExecutors();
     }
 
+    @Override
     public boolean requiresCandidateType() {
         return _query.requiresCandidateType();
     }
 
+    @Override
     public boolean requiresParameterDeclarations() {
         return _query.requiresParameterDeclarations();
     }
 
+    @Override
     public boolean supportsParameterDeclarations() {
         return _query.supportsParameterDeclarations();
     }
 
+    @Override
     public Object evaluate(Object value, Object ob, Object[] params,
         OpenJPAStateManager sm) {
         return _query.evaluate(value, ob, params, sm);
@@ -328,6 +347,7 @@ public class QueryCacheStoreQuery
             _fc = fc;
         }
 
+        @Override
         public ResultObjectProvider executeQuery(StoreQuery q, Object[] params, Range range) {
             QueryCacheStoreQuery cq = (QueryCacheStoreQuery) q;
             Object parsed = cq.getDelegate().getCompilation();
@@ -369,6 +389,7 @@ public class QueryCacheStoreQuery
                 return rop;
         }
 
+        @Override
         public QueryExpressions[] getQueryExpressions() {
             return _ex.getQueryExpressions();
         }
@@ -387,7 +408,7 @@ public class QueryCacheStoreQuery
             if (cmd == null || cmd.length == 0)
                 return;
 
-            List<Class<?>> classes = new ArrayList<Class<?>>(cmd.length);
+            List<Class<?>> classes = new ArrayList<>(cmd.length);
             for (int i = 0; i < cmd.length; i++)
                 classes.add(cmd[i].getDescribedType());
 
@@ -404,6 +425,7 @@ public class QueryCacheStoreQuery
             }
         }
 
+        @Override
         public Number executeDelete(StoreQuery q, Object[] params) {
             try {
                 return _ex.executeDelete(unwrap(q), params);
@@ -412,6 +434,7 @@ public class QueryCacheStoreQuery
             }
         }
 
+        @Override
         public Number executeUpdate(StoreQuery q, Object[] params) {
             try {
                 return _ex.executeUpdate(unwrap(q), params);
@@ -420,85 +443,105 @@ public class QueryCacheStoreQuery
             }
         }
 
+        @Override
         public String[] getDataStoreActions(StoreQuery q, Object[] params,
             Range range) {
             return EMPTY_STRINGS;
         }
 
+        @Override
         public void validate(StoreQuery q) {
             _ex.validate(unwrap(q));
         }
 
+        @Override
         public void getRange(StoreQuery q, Object[] params, Range range) {
             _ex.getRange(q, params, range);
         }
 
+        @Override
         public Object getOrderingValue(StoreQuery q, Object[] params,
             Object resultObject, int orderIndex) {
             return _ex.getOrderingValue(unwrap(q), params, resultObject,
                 orderIndex);
         }
 
+        @Override
         public boolean[] getAscending(StoreQuery q) {
             return _ex.getAscending(unwrap(q));
         }
 
+        @Override
         public boolean isPacking(StoreQuery q) {
             return _ex.isPacking(unwrap(q));
         }
 
+        @Override
         public String getAlias(StoreQuery q) {
             return _ex.getAlias(unwrap(q));
         }
 
+        @Override
         public Class<?> getResultClass(StoreQuery q) {
             return _ex.getResultClass(unwrap(q));
         }
 
+        @Override
         public ResultShape<?> getResultShape(StoreQuery q) {
             return _ex.getResultShape(q);
         }
 
+        @Override
         public String[] getProjectionAliases(StoreQuery q) {
             return _ex.getProjectionAliases(unwrap(q));
         }
 
+        @Override
         public Class<?>[] getProjectionTypes(StoreQuery q) {
             return _ex.getProjectionTypes(unwrap(q));
         }
 
+        @Override
         public ClassMetaData[] getAccessPathMetaDatas(StoreQuery q) {
             return _ex.getAccessPathMetaDatas(unwrap(q));
         }
 
+        @Override
         public int getOperation(StoreQuery q) {
             return _ex.getOperation(unwrap(q));
         }
 
+        @Override
         public boolean isAggregate(StoreQuery q) {
             return _ex.isAggregate(unwrap(q));
         }
 
+        @Override
         public boolean isDistinct(StoreQuery q) {
             return _ex.isDistinct(unwrap(q));
         }
 
+        @Override
         public boolean hasGrouping(StoreQuery q) {
             return _ex.hasGrouping(unwrap(q));
         }
 
+        @Override
         public OrderedMap<Object, Class<?>> getOrderedParameterTypes(StoreQuery q) {
             return _ex.getOrderedParameterTypes(unwrap(q));
         }
 
+        @Override
         public LinkedMap getParameterTypes(StoreQuery q) {
             return _ex.getParameterTypes(unwrap(q));
         }
 
+        @Override
         public Object[] toParameterArray(StoreQuery q, Map userParams) {
             return _ex.toParameterArray(q, userParams);
         }
 
+        @Override
         public Map getUpdates(StoreQuery q) {
             return _ex.getUpdates(unwrap(q));
         }
@@ -527,6 +570,7 @@ public class QueryCacheStoreQuery
             _fc = fc;
         }
 
+        @Override
         public Object get(int idx) {
             if (!_proj)
                 return fromObjectId(_res.get(idx), _sctx, _fc);
@@ -540,13 +584,14 @@ public class QueryCacheStoreQuery
             return uncached;
         }
 
+        @Override
         public int size() {
             return _res.size();
         }
 
         public Object writeReplace()
             throws ObjectStreamException {
-            return new ArrayList<Object>(this);
+            return new ArrayList<>(this);
         }
     }
 
@@ -562,7 +607,7 @@ public class QueryCacheStoreQuery
         private final ResultObjectProvider _rop;
         private final boolean _proj;
         private final QueryKey _qk;
-        private final TreeMap<Integer,Object> _data = new TreeMap<Integer,Object>();
+        private final TreeMap<Integer,Object> _data = new TreeMap<>();
         private boolean _maintainCache = true;
         private int _pos = -1;
 
@@ -655,15 +700,18 @@ public class QueryCacheStoreQuery
             }
         }
 
+        @Override
         public boolean supportsRandomAccess() {
             return _rop.supportsRandomAccess();
         }
 
+        @Override
         public void open()
             throws Exception {
             _rop.open();
         }
 
+        @Override
         public Object getResultObject()
             throws Exception {
             Object obj = _rop.getResultObject();
@@ -671,6 +719,7 @@ public class QueryCacheStoreQuery
             return obj;
         }
 
+        @Override
         public boolean next()
             throws Exception {
             _pos++;
@@ -683,6 +732,7 @@ public class QueryCacheStoreQuery
             return next;
         }
 
+        @Override
         public boolean absolute(int pos)
             throws Exception {
             _pos = pos;
@@ -695,6 +745,7 @@ public class QueryCacheStoreQuery
             return valid;
         }
 
+        @Override
         public int size()
             throws Exception {
             if (_size != Integer.MAX_VALUE)
@@ -705,22 +756,26 @@ public class QueryCacheStoreQuery
             return size;
         }
 
+        @Override
         public void reset()
             throws Exception {
             _rop.reset();
             _pos = -1;
         }
 
+        @Override
         public void close()
             throws Exception {
             abortCaching();
             _rop.close();
         }
 
+        @Override
         public void handleCheckedException(Exception e) {
             _rop.handleCheckedException(e);
         }
 
+        @Override
         public void onTypesChanged(TypesChangedEvent ev) {
             if (_qk.changeInvalidatesQuery(ev.getTypes()))
                 abortCaching();
@@ -732,6 +787,8 @@ public class QueryCacheStoreQuery
      */
     private static class CachedObjectId implements java.io.Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public final Object oid;
 
         public CachedObjectId (Object oid)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryKey.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryKey.java
index 769157026..ca7134cec 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryKey.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryKey.java
@@ -32,12 +32,11 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import java.util.Objects;
-
 import org.apache.openjpa.enhance.PCRegistry;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.QueryContext;
@@ -62,21 +61,21 @@ public class QueryKey
     // initialize the set of unmodifiable classes. This allows us
     // to avoid cloning collections that are not modifiable,
     // provided that they do not contain mutable objects.
-    private static Collection<Class<?>> s_unmod = new HashSet<Class<?>>();
+    private static Collection<Class<?>> s_unmod = new HashSet<>();
 
     static {
         // handle the set types; jdk uses different classes for collection,
         // set, and sorted set
-        TreeSet<Object> s = new TreeSet<Object>();
+        TreeSet<Object> s = new TreeSet<>();
         s_unmod.add(Collections.unmodifiableCollection(s).getClass());
         s_unmod.add(Collections.unmodifiableSet(s).getClass());
         s_unmod.add(Collections.unmodifiableSortedSet(s).getClass());
 
         // handle the list types; jdk uses different classes for standard
         // and random access lists
-        List<Object> l = new LinkedList<Object>();
+        List<Object> l = new LinkedList<>();
         s_unmod.add(Collections.unmodifiableList(l).getClass());
-        l = new ArrayList<Object>(0);
+        l = new ArrayList<>(0);
         s_unmod.add(Collections.unmodifiableList(l).getClass());
 
         // handle the constant types
@@ -149,7 +148,7 @@ public class QueryKey
         Class<?> candidate, boolean subs, long startIdx, long endIdx, Object parsed) {
         QueryKey key = createKey(q, packed, candidate, subs, startIdx, endIdx, parsed);
         if (key != null && (args == null || args.isEmpty() ||
-            setParams(key, q.getStoreContext(), new HashMap<Object,Object>(args))))
+            setParams(key, q.getStoreContext(), new HashMap<>(args))))
             return key;
         return null;
     }
@@ -194,7 +193,7 @@ public class QueryKey
         if (metas.length == 0)
             return null;
 
-        Set<String> accessPathClassNames = new HashSet<String>((int) (metas.length * 1.33 + 1));
+        Set<String> accessPathClassNames = new HashSet<>((int) (metas.length * 1.33 + 1));
         ClassMetaData meta;
         for (int i = 0; i < metas.length; i++) {
             // since the class change framework deals with least-derived types,
@@ -268,7 +267,7 @@ public class QueryKey
         // parameter list into a map, using the query's parameter
         // declaration to determine ordering etc.
         Map<Object,Class<?>> types = q.getOrderedParameterTypes();
-        Map<Object,Object> map = new HashMap<Object,Object>((int) (types.size() * 1.33 + 1));
+        Map<Object,Object> map = new HashMap<>((int) (types.size() * 1.33 + 1));
         int idx = 0;
         for (Iterator<Object> iter = types.keySet().iterator(); iter.hasNext(); idx++)
             map.put(iter.next(), args[idx]);
@@ -319,11 +318,11 @@ public class QueryKey
                         // copy the collection
                         Collection<Object> copy;
                         if (c instanceof SortedSet)
-                            copy = new TreeSet<Object>();
+                            copy = new TreeSet<>();
                         else if (c instanceof Set)
-                            copy = new HashSet<Object>();
+                            copy = new HashSet<>();
                         else
-                            copy = new ArrayList<Object>(c.size());
+                            copy = new ArrayList<>(c.size());
 
                         if (contentsAreDates) {
                             // must go through by hand and do the
@@ -395,6 +394,7 @@ public class QueryKey
      * created for queries that specify a candidate collection are
      * always not equal.
      */
+    @Override
     public boolean equals(Object ob) {
         if (this == ob)
             return true;
@@ -416,6 +416,7 @@ public class QueryKey
      * Define a hashing algorithm corresponding to the {@link #equals}
      * method defined above.
      */
+    @Override
     public int hashCode() {
         int code = 37 * 17 + _candidateClassName.hashCode();
         if (_query != null)
@@ -425,6 +426,7 @@ public class QueryKey
         return code;
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder(1024);
         buf.append(super.toString()).
@@ -441,6 +443,7 @@ public class QueryKey
 
     // ---------- Externalizable implementation ----------
 
+    @Override
     public void writeExternal(ObjectOutput out)
         throws IOException {
         out.writeObject(_candidateClassName);
@@ -454,6 +457,7 @@ public class QueryKey
         out.writeInt(_timeout);
     }
 
+    @Override
     public void readExternal(ObjectInput in)
         throws IOException, ClassNotFoundException {
         _candidateClassName = (String) in.readObject();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryResult.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryResult.java
index 2b3257420..575f08166 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryResult.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryResult.java
@@ -26,9 +26,8 @@ import java.util.Collection;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class QueryResult
-    extends ArrayList<Object> {
+public class QueryResult extends ArrayList<Object> {
+    private static final long serialVersionUID = 1L;
 
     private final long _ex;
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypeBasedCacheDistributionPolicy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypeBasedCacheDistributionPolicy.java
index b356cbade..ab8c9d34b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypeBasedCacheDistributionPolicy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypeBasedCacheDistributionPolicy.java
@@ -78,7 +78,7 @@ public class TypeBasedCacheDistributionPolicy extends DefaultCacheDistributionPo
         if (StringUtil.isEmpty(types))
             return Collections.emptySet();
         String[] names = StringUtil.split(types, ";", 0);
-        Set<String> set = new HashSet<String>();
+        Set<String> set = new HashSet<>();
         set.addAll(Arrays.asList(names));
 
         return  Collections.unmodifiableSet(set);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypesChangedEvent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypesChangedEvent.java
index 08c397a0e..887c8af57 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypesChangedEvent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypesChangedEvent.java
@@ -30,6 +30,8 @@ import java.util.EventObject;
 public class TypesChangedEvent
     extends EventObject {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Collection _types;
 
     /**
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypesChangedListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypesChangedListener.java
index 014168af0..0b764a42a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypesChangedListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/TypesChangedListener.java
@@ -29,5 +29,5 @@ public interface TypesChangedListener {
     /**
      * Notification that instances of persistent types have changed.
      */
-    public void onTypesChanged(TypesChangedEvent event);
+    void onTypesChanged(TypesChangedEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java
index 7b11d77f2..0c3fbf18c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java
@@ -42,6 +42,7 @@ public abstract class AbstractManagedRuntime implements ManagedRuntime {
      * with the current thread's transaction.
      * @return the transaction key
      */
+    @Override
     public Object getTransactionKey() throws Exception, SystemException {
         return getTransactionManager().getTransaction();
     }
@@ -62,6 +63,7 @@ public abstract class AbstractManagedRuntime implements ManagedRuntime {
      *            if the current transaction can not be obtained, or an error
      *            occurs when suspending or resuming the transaction.
      */
+    @Override
     public void doNonTransactionalWork(Runnable runnable) throws
             NotSupportedException {
         TransactionManager tm = null;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
index bd6f340c5..0c8064c1e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
@@ -142,12 +142,13 @@ public class AutomaticManagedRuntime extends AbstractManagedRuntime
     private Configuration _conf = null;
     private ManagedRuntime _runtime = null;
 
+    @Override
     public TransactionManager getTransactionManager()
         throws Exception {
         if (_runtime != null)
             return _runtime.getTransactionManager();
 
-        List<Throwable> errors = new LinkedList<Throwable>();
+        List<Throwable> errors = new LinkedList<>();
         TransactionManager tm = null;
 
         // Try the registry extensions first so that any applicable vendor
@@ -254,16 +255,20 @@ public class AutomaticManagedRuntime extends AbstractManagedRuntime
             setFatal(true).setNestedThrowables(t);
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = conf;
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause)
         throws Exception {
         // check to see if the runtime is cached
@@ -274,6 +279,7 @@ public class AutomaticManagedRuntime extends AbstractManagedRuntime
             _runtime.setRollbackOnly(cause);
     }
 
+    @Override
     public Throwable getRollbackCause()
         throws Exception {
         // check to see if the runtime is cached
@@ -286,6 +292,7 @@ public class AutomaticManagedRuntime extends AbstractManagedRuntime
         return null;
     }
 
+    @Override
     public Object getTransactionKey() throws Exception, SystemException {
         if(_runtime == null)
             getTransactionManager();
@@ -300,6 +307,7 @@ public class AutomaticManagedRuntime extends AbstractManagedRuntime
      * Delegate nonTransactional work to the appropriate managed runtime. If no
      * managed runtime is found then delegate {@link AbstractManagedRuntime}.
      */
+    @Override
     public void doNonTransactionalWork(Runnable runnable)
             throws NotSupportedException {
         // Obtain a transaction manager to initialize the runtime.
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java
index f2b54b643..0cd3e9e5d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.ee;
 
 import java.lang.reflect.Method;
+
 import javax.transaction.TransactionManager;
 
 import org.apache.openjpa.conf.OpenJPAConfiguration;
@@ -59,6 +60,7 @@ public class InvocationManagedRuntime extends AbstractManagedRuntime
         _method = null;
     }
 
+    @Override
     public TransactionManager getTransactionManager()
         throws Exception {
         if (_method == null) {
@@ -70,22 +72,27 @@ public class InvocationManagedRuntime extends AbstractManagedRuntime
         return (TransactionManager) _method.invoke(null, null);
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (OpenJPAConfiguration) conf;
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
 	}
 
+    @Override
     public void setRollbackOnly(Throwable cause)
         throws Exception {
         // there is no generic support for setting the rollback cause
         getTransactionManager().getTransaction().setRollbackOnly();
     }
 
+    @Override
     public Throwable getRollbackCause()
         throws Exception {
         // there is no generic support for setting the rollback cause
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/JNDIManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/JNDIManagedRuntime.java
index c63d4d143..a63a7d474 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/JNDIManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/JNDIManagedRuntime.java
@@ -52,6 +52,7 @@ public class JNDIManagedRuntime extends AbstractManagedRuntime
     /**
      * Return the cached TransactionManager instance.
      */
+    @Override
     public TransactionManager getTransactionManager() throws Exception {
 
         if (_tm == null) {
@@ -65,12 +66,14 @@ public class JNDIManagedRuntime extends AbstractManagedRuntime
         return _tm;
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause)
         throws Exception {
         // there is no generic support for setting the rollback cause
         getTransactionManager().getTransaction().setRollbackOnly();
     }
 
+    @Override
     public Throwable getRollbackCause()
         throws Exception {
         // there is no generic support for setting the rollback cause
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/ManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/ManagedRuntime.java
index 30c33fa81..3beeb75c0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/ManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/ManagedRuntime.java
@@ -36,7 +36,7 @@ public interface ManagedRuntime {
      * map transactional PersistenceManagers to the current transaction,
      * and possibly to enlist XA resources.
      */
-    public TransactionManager getTransactionManager()
+    TransactionManager getTransactionManager()
         throws Exception;
 
     /**
@@ -47,7 +47,7 @@ public interface ManagedRuntime {
      * @param  cause  the Throwable that caused the transaction to be
      *                marked for rollback, or null of none is known
      */
-    public void setRollbackOnly(Throwable cause)
+    void setRollbackOnly(Throwable cause)
         throws Exception;
 
     /**
@@ -56,7 +56,7 @@ public interface ManagedRuntime {
      *
      * @return the Throwable cause, or null if none
      */
-    public Throwable getRollbackCause()
+    Throwable getRollbackCause()
         throws Exception;
 
     /**
@@ -64,7 +64,7 @@ public interface ManagedRuntime {
      * and Brokers.
      * @return the transaction key
      */
-    public Object getTransactionKey()
+    Object getTransactionKey()
         throws Exception, SystemException;
 
     /**
@@ -85,7 +85,7 @@ public interface ManagedRuntime {
      * @throws NotSupportedException
      *             if the transaction can not be suspended.
      */
-    public void doNonTransactionalWork(Runnable runnable)
+    void doNonTransactionalWork(Runnable runnable)
             throws NotSupportedException;
 
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java
index 6f5218107..dd3b92752 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/RegistryManagedRuntime.java
@@ -54,6 +54,7 @@ public class RegistryManagedRuntime
     /**
      * Return the cached TransactionManager instance.
      */
+    @Override
     public TransactionManager getTransactionManager() throws Exception {
         if (_tm == null) {
             Context ctx = new InitialContext();
@@ -68,12 +69,14 @@ public class RegistryManagedRuntime
         return _tm;
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause)
         throws Exception {
         // there is no generic support for setting the rollback cause
         getTransactionManager().getTransaction().setRollbackOnly();
     }
 
+    @Override
     public Throwable getRollbackCause()
         throws Exception {
         // there is no generic support for setting the rollback cause
@@ -88,6 +91,7 @@ public class RegistryManagedRuntime
         return _registryName;
     }
 
+    @Override
     public Object getTransactionKey() throws Exception, SystemException {
         return _tm.getTransactionKey();
     }
@@ -111,24 +115,28 @@ public class RegistryManagedRuntime
         }
 
 
+        @Override
         public Transaction getTransaction()
             throws SystemException {
             return TransactionManagerRegistryFacade.this;
         }
 
 
+        @Override
         public void registerSynchronization(Synchronization sync)
             throws RollbackException, IllegalStateException, SystemException {
             _registry.registerInterposedSynchronization(sync);
         }
 
 
+        @Override
         public void setRollbackOnly()
             throws IllegalStateException, SystemException {
             _registry.setRollbackOnly();
         }
 
 
+        @Override
         public int getStatus()
             throws SystemException {
             return _registry.getTransactionStatus();
@@ -142,12 +150,14 @@ public class RegistryManagedRuntime
         // Unsupported methods follow
         //////////////////////////////
 
+        @Override
         public void begin()
             throws NotSupportedException, SystemException {
             throw new NotSupportedException();
         }
 
 
+        @Override
         public void commit()
             throws RollbackException, HeuristicMixedException, SystemException,
                 HeuristicRollbackException, SecurityException,
@@ -156,6 +166,7 @@ public class RegistryManagedRuntime
         }
 
 
+        @Override
         public void resume(Transaction tobj)
             throws InvalidTransactionException, IllegalStateException,
                 SystemException {
@@ -163,30 +174,35 @@ public class RegistryManagedRuntime
         }
 
 
+        @Override
         public void rollback()
             throws IllegalStateException, SecurityException, SystemException {
             throw new SystemException();
         }
 
 
+        @Override
         public void setTransactionTimeout(int seconds)
             throws SystemException {
             throw new SystemException();
         }
 
 
+        @Override
         public Transaction suspend()
             throws SystemException {
             throw new SystemException();
         }
 
 
+        @Override
         public boolean delistResource(XAResource xaRes, int flag)
             throws IllegalStateException, SystemException {
             throw new SystemException();
         }
 
 
+        @Override
         public boolean enlistResource(XAResource xaRes)
             throws RollbackException, IllegalStateException, SystemException {
             throw new SystemException();
@@ -198,6 +214,7 @@ public class RegistryManagedRuntime
      * RegistryManagedRuntime cannot suspend transactions.
      * </P>
      */
+    @Override
     public void doNonTransactionalWork(Runnable runnable)
         throws NotSupportedException {
         throw new NotSupportedException(_loc.get("tsr-cannot-suspend")
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/SunOneManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/SunOneManagedRuntime.java
index 8580cf782..ff33600d8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/SunOneManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/SunOneManagedRuntime.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.ee;
 
 import java.lang.reflect.Method;
+
 import javax.transaction.TransactionManager;
 
 /**
@@ -40,6 +41,7 @@ public class SunOneManagedRuntime extends AbstractManagedRuntime
             (Class[]) null);
     }
 
+    @Override
     public TransactionManager getTransactionManager()
         throws Exception {
         // return Switch.getSwitch ().getTransactionManager ();
@@ -47,12 +49,14 @@ public class SunOneManagedRuntime extends AbstractManagedRuntime
         return (TransactionManager) _txManagerMeth.invoke(sw, (Object[]) null);
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause)
         throws Exception {
         // there is no generic support for setting the rollback cause
         getTransactionManager().getTransaction().setRollbackOnly();
     }
 
+    @Override
     public Throwable getRollbackCause()
         throws Exception {
         // there is no generic support for setting the rollback cause
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASManagedRuntime.java
index 2ded4381f..d53ae31f6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASManagedRuntime.java
@@ -78,6 +78,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
      * Gets an extendedJTATransaction from JNDI and creates a transaction
      * wrapper
      */
+    @Override
     public javax.transaction.TransactionManager getTransactionManager()
         throws Exception {
         return new WASTransaction();
@@ -99,6 +100,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
     class WASTransaction implements javax.transaction.TransactionManager,
         javax.transaction.Transaction {
 
+        @Override
         public int getStatus() throws SystemException {
             int rval;
             try {
@@ -121,6 +123,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          *
          * @return A WebSphere transaction wrapper.
          */
+        @Override
         public Transaction getTransaction() throws SystemException {
             return this;
         }
@@ -129,6 +132,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * Register for synchronization with a WebSphere managed transaction via
          * the extendedJTATransaction interface.
          */
+        @Override
         public void registerSynchronization(Synchronization arg0)
             throws IllegalStateException, RollbackException, SystemException {
             if (_extendedTransaction != null) {
@@ -164,6 +168,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * Unimplemented, WAS does not provide this level of control. Throws an
          * IllegalStateException
          */
+        @Override
         public void begin() throws NotSupportedException, SystemException {
             throw new InvalidStateException(_loc.get("was-unsupported-op",
                 "begin"));
@@ -173,6 +178,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * Unimplemented, WAS does not provide this level of control. Throws an
          * IllegalStateException
          */
+        @Override
         public void commit() throws HeuristicMixedException,
             HeuristicRollbackException, IllegalStateException,
             RollbackException, SecurityException, SystemException {
@@ -184,6 +190,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * Unimplemented, WAS does not provide this level of control. Throws an
          * IllegalStateException
          */
+        @Override
         public void resume(Transaction arg0) throws IllegalStateException,
             InvalidTransactionException, SystemException {
             throw new InvalidStateException(_loc.get("was-unsupported-op",
@@ -196,6 +203,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * some error paths, throwing another exception may result in the
          * original exception being lost.
          */
+        @Override
         public void rollback() throws IllegalStateException, SecurityException,
             SystemException {
             if (_log.isTraceEnabled()) {
@@ -209,6 +217,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * in some error paths, throwing another exception may result in the
          * original exception being lost.
          */
+        @Override
         public void setRollbackOnly() throws IllegalStateException,
             SystemException {
             if (_log.isTraceEnabled()) {
@@ -220,6 +229,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * Unimplemented, WAS does not provide this level of control. Throws an
          * IllegalStateException
          */
+        @Override
         public void setTransactionTimeout(int arg0) throws SystemException {
             throw new InvalidStateException(_loc.get("was-unsupported-op",
                 "setTransactionTimeout"));
@@ -229,6 +239,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * Unimplemented, WAS does not provide this level of control. Throws an
          * IllegalStateException
          */
+        @Override
         public Transaction suspend() throws SystemException {
             throw new InvalidStateException(_loc.get("was-unsupported-op",
                 "suspend"));
@@ -238,6 +249,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * Unimplemented, WAS does not provide this level of control. Throws an
          * IllegalStateException
          */
+        @Override
         public boolean delistResource(XAResource arg0, int arg1)
             throws IllegalStateException, SystemException {
             throw new InvalidStateException(_loc.get("was-unsupported-op",
@@ -248,6 +260,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
          * Unimplemented, WAS does not provide this level of control. Throws an
          * IllegalStateException
          */
+        @Override
         public boolean enlistResource(XAResource arg0)
             throws IllegalStateException, RollbackException, SystemException {
             throw new InvalidStateException(_loc.get("was-unsupported-op",
@@ -311,6 +324,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
      * Caches a copy of the configuration. The configuration is used to obtain
      * the logger and classloader.
      */
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (OpenJPAConfiguration) conf;
         _log = _conf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
@@ -319,6 +333,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
     /**
      * EndConfiguration stub.
      */
+    @Override
     public void endConfiguration() {
         try {
             Context ctx = new InitialContext();
@@ -348,6 +363,7 @@ public class WASManagedRuntime extends AbstractManagedRuntime
     /**
      * StartConfiguration stub.
      */
+    @Override
     public void startConfiguration() {
         // Nothing to do
     }
@@ -385,12 +401,14 @@ public class WASManagedRuntime extends AbstractManagedRuntime
         AsmAdaptor.write(bcClass);
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause)
         throws Exception {
         // there is no generic support for setting the rollback cause
         getTransactionManager().getTransaction().setRollbackOnly();
     }
 
+    @Override
     public Throwable getRollbackCause()
         throws Exception {
         // there is no generic support for setting the rollback cause
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java
index 76008af59..da23e7609 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java
@@ -18,10 +18,10 @@
  */
 package org.apache.openjpa.ee;
 
+import com.ibm.websphere.uow.UOWSynchronizationRegistry;
 import com.ibm.wsspi.uow.UOWAction;
 import com.ibm.wsspi.uow.UOWActionException;
 import com.ibm.wsspi.uow.UOWException;
-import com.ibm.wsspi.uow.UOWManager;
 import com.ibm.wsspi.uow.UOWManagerFactory;
 
 /**
@@ -36,11 +36,12 @@ public class WASRegistryManagedRuntime extends RegistryManagedRuntime {
      * provides an interface to submit work outside of the current tran.
      * </P>
      */
+    @Override
     public void doNonTransactionalWork(Runnable runnable)
             throws RuntimeException, UnsupportedOperationException {
         try {
             UOWManagerFactory.getUOWManager().runUnderUOW(
-                UOWManager.UOW_TYPE_LOCAL_TRANSACTION, false,
+                UOWSynchronizationRegistry.UOW_TYPE_LOCAL_TRANSACTION, false,
                 new DelegatingUOWAction(runnable));
         }
         catch(UOWActionException e ) {
@@ -67,6 +68,7 @@ public class WASRegistryManagedRuntime extends RegistryManagedRuntime {
             _del = delegate;
         }
 
+        @Override
         public void run() throws Exception {
             _del.run();
         }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java
index d19b36477..dabb7449f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.ee;
 
 import java.lang.reflect.Method;
+
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
@@ -42,6 +43,7 @@ public class WLSManagedRuntime extends AbstractManagedRuntime
         _txManagerMeth = txHelper.getMethod("getTransactionManager", null);
     }
 
+    @Override
     public TransactionManager getTransactionManager()
         throws Exception {
         // return TransactionHelper.getTransactionHelper ().
@@ -50,6 +52,7 @@ public class WLSManagedRuntime extends AbstractManagedRuntime
         return (TransactionManager) _txManagerMeth.invoke(o, null);
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause)
         throws Exception {
         Transaction transaction = getTransactionManager().getTransaction();
@@ -65,6 +68,7 @@ public class WLSManagedRuntime extends AbstractManagedRuntime
         }
     }
 
+    @Override
     public Throwable getRollbackCause()
         throws Exception {
         Transaction transaction = getTransactionManager().getTransaction();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
index d586d6e5a..da7e481e9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
@@ -55,9 +55,11 @@ import org.apache.openjpa.meta.DelegatingMetaDataFactory;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.MetaDataFactory;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.util.InvalidStateException;
 import org.apache.openjpa.util.UserException;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.BCClassLoader;
 import serp.bytecode.Project;
@@ -99,8 +101,8 @@ public class ApplicationIdTool {
         _type = type;
 
         MetaDataRepository repos = conf.newMetaDataRepositoryInstance();
-        repos.setValidate(repos.VALIDATE_NONE);
-        repos.setSourceMode(repos.MODE_MAPPING, false);
+        repos.setValidate(MetaDataRepository.VALIDATE_NONE);
+        repos.setSourceMode(MetaDataModes.MODE_MAPPING, false);
         loadObjectIds(repos, true);
         _meta = repos.getMetaData(type, null, false);
         if (_meta != null) {
@@ -1284,6 +1286,7 @@ public class ApplicationIdTool {
         final String[] arguments = opts.setFromCmdLine(args);
         boolean ret = Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts)
                 throws ClassNotFoundException, IOException {
                 OpenJPAConfiguration conf = new OpenJPAConfigurationImpl();
@@ -1349,7 +1352,7 @@ public class ApplicationIdTool {
         Flags flags, ClassLoader loader)
         throws IOException, ClassNotFoundException {
         MetaDataRepository repos = conf.newMetaDataRepositoryInstance();
-        repos.setValidate(repos.VALIDATE_NONE, true);
+        repos.setValidate(MetaDataRepository.VALIDATE_NONE, true);
         loadObjectIds(repos, flags.name == null && flags.suffix == null);
 
         Log log = conf.getLog(OpenJPAConfiguration.LOG_TOOL);
@@ -1473,12 +1476,12 @@ public class ApplicationIdTool {
      * Interface implemented by metadata factories that can load non-existant
      * object id classes.
      */
-    public static interface ObjectIdLoader
+    public interface ObjectIdLoader
 	{
 		/**
          * Turn on the loading of all identity classes, even if they don't
          * exist.
 	 	 */
-		public void setLoadObjectIds ();
+		void setLoadObjectIds ();
 	}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
index fb8228b24..ff2b3b9e0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.enhance;
 
+import static java.util.Arrays.asList;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -32,9 +34,8 @@ import org.apache.xbean.asm6.ClassReader;
 import org.apache.xbean.asm6.ClassVisitor;
 import org.apache.xbean.asm6.ClassWriter;
 import org.apache.xbean.asm6.Opcodes;
-import serp.bytecode.BCClass;
 
-import static java.util.Arrays.asList;
+import serp.bytecode.BCClass;
 
 
 /**
@@ -201,6 +202,8 @@ public final class AsmAdaptor {
     }
 
     private static class EnhancedStatusException extends RuntimeException {
+        
+        private static final long serialVersionUID = 1L;
         private final boolean status;
 
         private EnhancedStatusException(final boolean status) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AttributeTranslator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AttributeTranslator.java
index 390423225..89cf6d060 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AttributeTranslator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AttributeTranslator.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.enhance;
 
+import org.apache.openjpa.meta.FieldMetaData;
+
 /**
  * Instances of this interface can convert a positional index for a
  * {@link FieldMetaData} that uses property access into the underlying
@@ -27,5 +29,5 @@ package org.apache.openjpa.enhance;
  * @since 1.0.0
  */
 public interface AttributeTranslator {
-    public String pcAttributeIndexToFieldName(int i);
+    String pcAttributeIndexToFieldName(int i);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ClassRedefiner.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ClassRedefiner.java
index c0e3315fe..339dc2ebe 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ClassRedefiner.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ClassRedefiner.java
@@ -66,6 +66,7 @@ public class ClassRedefiner {
                 log.trace(_loc.get("retransform-types", classes.keySet()));
 
                 t = new ClassFileTransformer() {
+                    @Override
                     public byte[] transform(ClassLoader loader, String clsName,
                         Class<?> classBeingRedefined, ProtectionDomain pd,
                         byte[] classfileBuffer) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java
index 2aef076a5..53b3c7583 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java
@@ -22,16 +22,16 @@ import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.List;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.lib.util.ClassUtil;
 import org.apache.openjpa.lib.util.CodeFormat;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.ParameterTemplate;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorage.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorage.java
index effbaa452..e62c2ccea 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorage.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorage.java
@@ -31,110 +31,110 @@ public interface DynamicStorage {
     /**
      * Return the number of fields, regardless of type
      */
-    public int getFieldCount();
+    int getFieldCount();
 
     /**
      * Return the number of object fields
      */
-    public int getObjectCount();
+    int getObjectCount();
 
     /**
      * Factory method for getting new instances of the same definition.
      */
-    public DynamicStorage newInstance();
+    DynamicStorage newInstance();
 
     /**
      * Get the boolean at the given index.
      */
-    public boolean getBoolean(int field);
+    boolean getBoolean(int field);
 
     /**
      * Set the boolean at the given index.
      */
-    public void setBoolean(int field, boolean val);
+    void setBoolean(int field, boolean val);
 
     /**
      * Get the byte at the given index.
      */
-    public byte getByte(int field);
+    byte getByte(int field);
 
     /**
      * Set the byte at the given index.
      */
-    public void setByte(int field, byte val);
+    void setByte(int field, byte val);
 
     /**
      * Get the char at the given index.
      */
-    public char getChar(int field);
+    char getChar(int field);
 
     /**
      * Set the char at the given index.
      */
-    public void setChar(int field, char val);
+    void setChar(int field, char val);
 
     /**
      * Get the double at the given index.
      */
-    public double getDouble(int field);
+    double getDouble(int field);
 
     /**
      * Set the double at the given index.
      */
-    public void setDouble(int field, double val);
+    void setDouble(int field, double val);
 
     /**
      * Get the float at the given index.
      */
-    public float getFloat(int field);
+    float getFloat(int field);
 
     /**
      * Set the float at the given index.
      */
-    public void setFloat(int field, float val);
+    void setFloat(int field, float val);
 
     /**
      * Get the int at the given index.
      */
-    public int getInt(int field);
+    int getInt(int field);
 
     /**
      * Set the int at the given index.
      */
-    public void setInt(int field, int val);
+    void setInt(int field, int val);
 
     /**
      * Get the long at the given index.
      */
-    public long getLong(int field);
+    long getLong(int field);
 
     /**
      * Set the long at the given index.
      */
-    public void setLong(int field, long val);
+    void setLong(int field, long val);
 
     /**
      * Get the short at the given index.
      */
-    public short getShort(int field);
+    short getShort(int field);
 
     /**
      * Set the short at the given index.
      */
-    public void setShort(int field, short val);
+    void setShort(int field, short val);
 
     /**
      * Get the object at the given index.
      */
-    public Object getObject(int field);
+    Object getObject(int field);
 
     /**
      * Set the object at the given index.
      */
-    public void setObject(int field, Object val);
+    void setObject(int field, Object val);
 
     /**
      * Ensure object capacity
      */
-    public void initialize ();
+    void initialize ();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java
index ba3487ede..9ad81f695 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.InternalException;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.BCClassLoader;
 import serp.bytecode.BCField;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
index 0593c1a55..feeb9825b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
@@ -98,6 +98,7 @@ public class InstrumentationFactory {
         }
 
         AccessController.doPrivileged(new PrivilegedAction<Object>() {
+            @Override
             public Object run() {
                 // Dynamic agent enhancement should only occur when the OpenJPA library is
                 // loaded using the system class loader.  Otherwise, the OpenJPA
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
index c1972c25d..fab02ab37 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
@@ -32,8 +32,8 @@ import java.util.Set;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.BytecodeWriter;
-import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Files;
+import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Localizer.Message;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
@@ -45,6 +45,7 @@ import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
 import org.apache.openjpa.util.UserException;
+
 import serp.bytecode.BCClass;
 
 /**
@@ -88,7 +89,7 @@ public class ManagedClassSubclasser {
 
         Log log = conf.getLog(OpenJPAConfiguration.LOG_ENHANCE);
         if (conf.getRuntimeUnenhancedClassesConstant() != RuntimeUnenhancedClassesModes.SUPPORTED) {
-            Collection<Class<?>> unenhanced = new ArrayList<Class<?>>();
+            Collection<Class<?>> unenhanced = new ArrayList<>();
             for (Class<?> cls : classes)
                 if (!PersistenceCapable.class.isAssignableFrom(cls))
                     unenhanced.add(cls);
@@ -124,15 +125,16 @@ public class ManagedClassSubclasser {
         } else {
             log.warn(_loc.get("enhance-and-subclass-no-redef-start",  classes));
         }
-        final Map<Class<?>, byte[]> map = new HashMap<Class<?>, byte[]>();
-        final List<Class<?>> subs = new ArrayList<Class<?>>(classes.size());
-        final List<Class<?>> ints = new ArrayList<Class<?>>(classes.size());
+        final Map<Class<?>, byte[]> map = new HashMap<>();
+        final List<Class<?>> subs = new ArrayList<>(classes.size());
+        final List<Class<?>> ints = new ArrayList<>(classes.size());
         Set<Class<?>> unspecified = null;
         for (Class<?> cls : classes) {
             final Class<?> c = cls;
             final PCEnhancer enhancer = new PCEnhancer(conf, cls);
 
             enhancer.setBytecodeWriter(new BytecodeWriter() {
+                @Override
                 public void write(BCClass bc) throws IOException {
                     ManagedClassSubclasser.write(bc, enhancer, map, c, subs, ints);
                 }
@@ -216,7 +218,7 @@ public class ManagedClassSubclasser {
             && !ImplHelper.isManagedType(null, cls)
             && !cls.isInterface()) {
             if (unspecified == null)
-                unspecified = new HashSet<Class<?>>();
+                unspecified = new HashSet<>();
             unspecified.add(cls);
         }
         return unspecified;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedInstanceProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedInstanceProvider.java
index ebdd746c8..55f4545a9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedInstanceProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedInstanceProvider.java
@@ -24,5 +24,5 @@ package org.apache.openjpa.enhance;
  * @since 1.0.0
  */
 public interface ManagedInstanceProvider {
-    public Object getManagedInstance();
+    Object getManagedInstance();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
index c79a7a536..872d413a4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
@@ -107,6 +107,7 @@ public class PCClassFileTransformer
             _log.info(_loc.get("runtime-enhance-pcclasses"));
     }
 
+    @Override
     public byte[] transform(ClassLoader loader, String className,
         Class redef, ProtectionDomain domain, byte[] bytes)
         throws IllegalClassFormatException {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
index f3d91dedb..0b23bb43a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
@@ -23,8 +23,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.kernel.AbstractPCData;
 import org.apache.openjpa.kernel.FetchConfiguration;
@@ -33,11 +33,12 @@ import org.apache.openjpa.kernel.PCData;
 import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
-import java.util.concurrent.ConcurrentHashMap;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.InternalException;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.BCField;
 import serp.bytecode.BCMethod;
@@ -64,7 +65,7 @@ public class PCDataGenerator
 
     protected static final String POSTFIX = "$openjpapcdata";
 
-    private final Map<Class<?>, DynamicStorage> _generated = new ConcurrentHashMap<Class<?>, DynamicStorage>();
+    private final Map<Class<?>, DynamicStorage> _generated = new ConcurrentHashMap<>();
     private final OpenJPAConfiguration _conf;
     private final Log _log;
 
@@ -121,6 +122,7 @@ public class PCDataGenerator
     protected void finish(DynamicPCData data, ClassMetaData meta) {
     }
 
+    @Override
     protected int getCreateFieldMethods(int typeCode) {
         if (typeCode >= JavaTypes.OBJECT)
             return POLICY_SILENT;
@@ -128,12 +130,14 @@ public class PCDataGenerator
         return POLICY_EMPTY;
     }
 
+    @Override
     protected void declareClasses(BCClass bc) {
         super.declareClasses(bc);
         bc.declareInterface(DynamicPCData.class);
         bc.setSuperclass(AbstractPCData.class);
     }
 
+    @Override
     protected final String getClassName(Object obj) {
         return getUniqueName(((ClassMetaData) obj).getDescribedType());
     }
@@ -145,6 +149,7 @@ public class PCDataGenerator
         return type.getName() + "$" + System.identityHashCode(type) + POSTFIX;
     }
 
+    @Override
     protected final void decorate(Object obj, BCClass bc, int[] types) {
         super.decorate(obj, bc, types);
         ClassMetaData meta = (ClassMetaData) obj;
@@ -217,7 +222,7 @@ public class PCDataGenerator
         // }
         code.getstatic().setField(type);
 
-        Collection<Instruction> jumps = new LinkedList<Instruction>();
+        Collection<Instruction> jumps = new LinkedList<>();
         jumps.add(code.ifnonnull());
         ExceptionHandler handler = code.addExceptionHandler();
 
@@ -527,7 +532,7 @@ public class PCDataGenerator
         // 		Object context)
         Code code = addLoadMethod(bc, false);
         FieldMetaData[] fmds = meta.getFields();
-        Collection<Instruction> jumps = new LinkedList<Instruction>();
+        Collection<Instruction> jumps = new LinkedList<>();
         Collection<Instruction> jumps2;
 
         int local = code.getNextLocalsIndex();
@@ -540,7 +545,7 @@ public class PCDataGenerator
         int objectCount = 0;
         boolean intermediate;
         for (int i = 0; i < fmds.length; i++) {
-            jumps2 = new LinkedList<Instruction>();
+            jumps2 = new LinkedList<>();
             intermediate = usesIntermediate(fmds[i]);
             setTarget(code.aload().setThis(), jumps);
             // if (loaded.get(i)) or (!loaded.get(i)) depending on inter resp
@@ -582,7 +587,7 @@ public class PCDataGenerator
         // public void load(OpenJPAStateManager sm, BitSet fields,
         // 		FetchConfiguration fetch, Object conn)
         FieldMetaData[] fmds = meta.getFields();
-        Collection<Instruction> jumps = new LinkedList<Instruction>();
+        Collection<Instruction> jumps = new LinkedList<>();
         Collection<Instruction> jumps2;
         int objectCount = 0;
         boolean intermediate;
@@ -594,7 +599,7 @@ public class PCDataGenerator
         code.astore().setLocal(inter);
 
         for (int i = 0; i < fmds.length; i++) {
-            jumps2 = new LinkedList<Instruction>();
+            jumps2 = new LinkedList<>();
             intermediate = usesIntermediate(fmds[i]);
             // if (fields.get(i))
             // {
@@ -793,7 +798,7 @@ public class PCDataGenerator
             new Class[]{ OpenJPAStateManager.class });
 
         FieldMetaData[] fmds = meta.getFields();
-        Collection<Instruction> jumps = new LinkedList<Instruction>();
+        Collection<Instruction> jumps = new LinkedList<>();
         int objectCount = 0;
         for (int i = 0; i < fmds.length; i++) {
             if (fields) {
@@ -1065,12 +1070,12 @@ public class PCDataGenerator
      * Dynamic {@link PCData}s generated will implement this interface
      * to simplify initialization.
      */
-    public static interface DynamicPCData extends PCData {
+    public interface DynamicPCData extends PCData {
 
-        public void setId(Object oid);
+        void setId(Object oid);
 
-        public PCDataGenerator getStorageGenerator();
+        PCDataGenerator getStorageGenerator();
 
-        public void setStorageGenerator (PCDataGenerator generator);
+        void setStorageGenerator (PCDataGenerator generator);
 	}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
index 677c729d4..aa4f60ba6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
@@ -27,8 +27,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamClass;
-import java.io.Serializable;
 import java.io.ObjectStreamException;
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -49,7 +49,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.lib.conf.Configurations;
@@ -60,38 +59,42 @@ import org.apache.openjpa.lib.util.ClassUtil;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.Localizer.Message;
 import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.lib.util.Services;
-import org.apache.openjpa.lib.util.Localizer.Message;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.util.svn.SVNUtils;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.ValueStrategies;
 import org.apache.openjpa.util.ApplicationIds;
-import org.apache.openjpa.util.GeneralException;
-import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.BigDecimalId;
 import org.apache.openjpa.util.BigIntegerId;
 import org.apache.openjpa.util.ByteId;
 import org.apache.openjpa.util.CharId;
 import org.apache.openjpa.util.DateId;
 import org.apache.openjpa.util.DoubleId;
-import org.apache.openjpa.util.Id;
-import org.apache.openjpa.util.IntId;
 import org.apache.openjpa.util.FloatId;
+import org.apache.openjpa.util.GeneralException;
+import org.apache.openjpa.util.Id;
+import org.apache.openjpa.util.ImplHelper;
+import org.apache.openjpa.util.IntId;
+import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.LongId;
 import org.apache.openjpa.util.ObjectId;
+import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.ShortId;
 import org.apache.openjpa.util.StringId;
-import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.UserException;
-import org.apache.openjpa.util.ImplHelper;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.BCField;
 import serp.bytecode.BCMethod;
+import serp.bytecode.ClassInstruction;
 import serp.bytecode.Code;
 import serp.bytecode.Constants;
 import serp.bytecode.Exceptions;
@@ -106,7 +109,6 @@ import serp.bytecode.MethodInstruction;
 import serp.bytecode.Project;
 import serp.bytecode.PutFieldInstruction;
 import serp.bytecode.TableSwitchInstruction;
-import serp.bytecode.ClassInstruction;
 
 /**
  * Bytecode enhancer used to enhance persistent classes from metadata. The
@@ -252,6 +254,7 @@ public class PCEnhancer {
      * @deprecated use {@link #PCEnhancer(OpenJPAConfiguration, BCClass,
         MetaDataRepository, ClassLoader)} instead.
      */
+    @Deprecated
     public PCEnhancer(OpenJPAConfiguration conf, BCClass type,
         MetaDataRepository repos) {
         this(conf, type, repos, null);
@@ -280,7 +283,7 @@ public class PCEnhancer {
 
         if (repos == null) {
             _repos = conf.newMetaDataRepositoryInstance();
-            _repos.setSourceMode(MetaDataRepository.MODE_META);
+            _repos.setSourceMode(MetaDataModes.MODE_META);
         } else
             _repos = repos;
         _meta = _repos.getMetaData(type.getType(), loader, false);
@@ -735,13 +738,13 @@ public class PCEnhancer {
     private void addAttributeTranslation() {
 
         // Get all field metadata
-        ArrayList<Integer> propFmds = new ArrayList<Integer>();
+        ArrayList<Integer> propFmds = new ArrayList<>();
         FieldMetaData[] fmds = _meta.getFields();
 
         if (_meta.isMixedAccess()) {
             // Stores indexes of property access fields to be used in
             //
-            propFmds = new ArrayList<Integer>();
+            propFmds = new ArrayList<>();
 
             // Determine which fields have property access and save their
             // indexes
@@ -4798,6 +4801,7 @@ public class PCEnhancer {
     public static boolean run(final String[] args, Options opts) {
         return Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws IOException {
                 OpenJPAConfiguration conf = new OpenJPAConfigurationImpl();
                 try {
@@ -4850,7 +4854,7 @@ public class PCEnhancer {
 
         if (repos == null) {
             repos = conf.newMetaDataRepositoryInstance();
-            repos.setSourceMode(MetaDataRepository.MODE_META);
+            repos.setSourceMode(MetaDataModes.MODE_META);
         }
 
         Log log = conf.getLog(OpenJPAConfiguration.LOG_TOOL);
@@ -4925,10 +4929,10 @@ public class PCEnhancer {
     /**
      * Plugin interface for additional enhancement.
      */
-    public static interface AuxiliaryEnhancer
+    public interface AuxiliaryEnhancer
     {
-        public void run (BCClass bc, ClassMetaData meta);
-        public boolean skipEnhance(BCMethod m);
+        void run (BCClass bc, ClassMetaData meta);
+        boolean skipEnhance(BCMethod m);
     }
 
     private void addGetIDOwningClass() throws NoSuchMethodException {
@@ -4992,7 +4996,7 @@ public class PCEnhancer {
         // collect all object id fields and verify they
         // a) have a private field
         // b) do not have a public setter
-        ArrayList<Integer> pkFields = new ArrayList<Integer>();
+        ArrayList<Integer> pkFields = new ArrayList<>();
         // build list of primary key fields
         for (int i = 0; i < fmds.length; i++) {
             if (!fmds[i].isPrimaryKey())
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java
index 3293b11a5..b3c7c93c6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java
@@ -173,7 +173,8 @@ public class PCEnhancerAgent {
     		    .doPrivileged(J2DoPrivHelper.getContextClassLoaderAction())
     		    ));
     		conf.setClassResolver(new ClassResolver() {
-    		    public ClassLoader getClassLoader(Class context,
+    		    @Override
+                public ClassLoader getClassLoader(Class context,
                     ClassLoader env) {
     		        return tmpLoader;
     		    }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCRegistry.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCRegistry.java
index 35af2beae..e361203bf 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCRegistry.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCRegistry.java
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.util.ReferenceMap;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashSet;
 import org.apache.openjpa.util.UserException;
@@ -47,7 +46,7 @@ public class PCRegistry {
     // register class listeners
     // Weak reference prevents OutOfMemeoryError as described in OPENJPA-2042
     private static final Collection<RegisterClassListener> _listeners =
-        new ConcurrentReferenceHashSet<RegisterClassListener>(
+        new ConcurrentReferenceHashSet<>(
                 ReferenceStrength.WEAK);
 
     /**
@@ -258,9 +257,9 @@ public class PCRegistry {
     /**
      * Listener for persistent class registration events.
      */
-    public static interface RegisterClassListener {
+    public interface RegisterClassListener {
 
-        public void register(Class<?> cls);
+        void register(Class<?> cls);
     }
 
     /**
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java
index 4c45f4e9a..a67159356 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java
@@ -18,24 +18,27 @@
  */
 package org.apache.openjpa.enhance;
 
-import java.lang.reflect.Member;
-import java.lang.reflect.Modifier;
+import java.io.Externalizable;
+import java.io.ObjectInput;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.openjpa.lib.log.Log;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.Localizer.Message;
 import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
-import org.apache.openjpa.util.UserException;
 import org.apache.openjpa.util.InternalException;
-import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.util.Localizer.Message;
-import org.apache.openjpa.lib.log.Log;
-import serp.bytecode.BCField;
+import org.apache.openjpa.util.UserException;
+
 import serp.bytecode.BCClass;
+import serp.bytecode.BCField;
 import serp.bytecode.BCMethod;
 
 /**
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PersistenceCapable.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PersistenceCapable.java
index 58ab51902..d1cd27809 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PersistenceCapable.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PersistenceCapable.java
@@ -26,16 +26,16 @@ package org.apache.openjpa.enhance;
 public interface PersistenceCapable {
     // DO NOT ADD ADDITIONAL DEPENDENCIES TO THIS CLASS
 
-    public static final byte READ_WRITE_OK = 0;
-    public static final byte LOAD_REQUIRED = 1;
-    public static final byte READ_OK = -1;
-    public static final byte CHECK_READ = 1;
-    public static final byte MEDIATE_READ = 2;
-    public static final byte CHECK_WRITE = 4;
-    public static final byte MEDIATE_WRITE = 8;
-    public static final byte SERIALIZABLE = 16;
+    byte READ_WRITE_OK = 0;
+    byte LOAD_REQUIRED = 1;
+    byte READ_OK = -1;
+    byte CHECK_READ = 1;
+    byte MEDIATE_READ = 2;
+    byte CHECK_WRITE = 4;
+    byte MEDIATE_WRITE = 8;
+    byte SERIALIZABLE = 16;
 
-    public static final Object DESERIALIZED = new Object();
+    Object DESERIALIZED = new Object();
 
     int pcGetEnhancementContractVersion();
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RedefinitionHelper.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RedefinitionHelper.java
index b49ad7e86..be3990cc3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RedefinitionHelper.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RedefinitionHelper.java
@@ -18,10 +18,10 @@
  */
 package org.apache.openjpa.enhance;
 
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Method;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StateManagerImpl;
@@ -222,6 +222,7 @@ public class RedefinitionHelper {
         final StateManagerImpl sm) {
         InvocationHandler handler = new InvocationHandler() {
 
+            @Override
             public Object invoke(Object proxy, Method method, Object[] args)
                 throws Throwable {
                 // this will replace the field in the instance, so the dynamic
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ReflectingPersistenceCapable.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ReflectingPersistenceCapable.java
index 95348ad9a..82f460258 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ReflectingPersistenceCapable.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ReflectingPersistenceCapable.java
@@ -47,6 +47,8 @@ import org.apache.openjpa.util.ObjectId;
 public class ReflectingPersistenceCapable
     implements PersistenceCapable, ManagedInstanceProvider, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object o;
     private StateManager sm;
 
@@ -67,10 +69,12 @@ public class ReflectingPersistenceCapable
             .getMetaData(type, null, true);
     }
 
+    @Override
     public int pcGetEnhancementContractVersion() {
         return PCEnhancer.ENHANCER_VERSION;
     }
 
+    @Override
     public Object pcGetGenericContext() {
         if (sm == null)
             return null;
@@ -78,16 +82,19 @@ public class ReflectingPersistenceCapable
             return sm.getGenericContext();
     }
 
+    @Override
     public StateManager pcGetStateManager() {
         return sm;
     }
 
+    @Override
     public void pcReplaceStateManager(StateManager sm) {
         this.sm = sm;
         if (meta == null && sm instanceof OpenJPAStateManager)
             meta = ((OpenJPAStateManager) sm).getMetaData();
     }
 
+    @Override
     public void pcProvideField(int i) {
         Object value = getValue(i, o);
         switch (meta.getField(i).getDeclaredTypeCode()) {
@@ -132,11 +139,13 @@ public class ReflectingPersistenceCapable
         }
     }
 
+    @Override
     public void pcProvideFields(int[] fieldIndices) {
         for(int i = 0; i < fieldIndices.length; i++)
             pcProvideField(fieldIndices[i]);
     }
 
+    @Override
     public void pcReplaceField(int i) {
         switch(meta.getField(i).getDeclaredTypeCode()) {
             case JavaTypes.BOOLEAN:
@@ -173,6 +182,7 @@ public class ReflectingPersistenceCapable
         }
     }
 
+    @Override
     public void pcReplaceFields(int[] fieldIndices) {
         for(int i = 0; i < fieldIndices.length; i++)
             pcReplaceField(fieldIndices[i]);
@@ -184,6 +194,7 @@ public class ReflectingPersistenceCapable
         setValue(i, o, getValue(i, fromObject));
     }
 
+    @Override
     public void pcCopyFields(Object fromObject, int[] fieldIndices) {
         if (fromObject instanceof ReflectingPersistenceCapable)
             fromObject = ((ReflectingPersistenceCapable) fromObject)
@@ -193,11 +204,13 @@ public class ReflectingPersistenceCapable
             pcCopyField(fromObject, fieldIndices[i]);
     }
 
+    @Override
     public void pcDirty(String fieldName) {
         if (sm != null)
             sm.dirty(fieldName);
     }
 
+    @Override
     public Object pcFetchObjectId() {
         if (sm != null)
             return sm.fetchObjectId();
@@ -205,6 +218,7 @@ public class ReflectingPersistenceCapable
             return null;
     }
 
+    @Override
     public Object pcGetVersion() {
         if (sm == null)
             return null;
@@ -212,6 +226,7 @@ public class ReflectingPersistenceCapable
             return sm.getVersion();
     }
 
+    @Override
     public boolean pcIsDirty() {
         if (sm == null)
             return false;
@@ -222,6 +237,7 @@ public class ReflectingPersistenceCapable
         }
     }
 
+    @Override
     public boolean pcIsTransactional() {
         if (sm == null)
             return false;
@@ -229,6 +245,7 @@ public class ReflectingPersistenceCapable
             return sm.isTransactional();
     }
 
+    @Override
     public boolean pcIsPersistent() {
         if (sm == null)
             return false;
@@ -236,6 +253,7 @@ public class ReflectingPersistenceCapable
             return sm.isPersistent();
     }
 
+    @Override
     public boolean pcIsNew() {
         if (sm == null)
             return false;
@@ -243,6 +261,7 @@ public class ReflectingPersistenceCapable
             return sm.isNew();
     }
 
+    @Override
     public boolean pcIsDeleted() {
         if (sm == null)
             return false;
@@ -251,6 +270,7 @@ public class ReflectingPersistenceCapable
     }
 
     // null == unknown
+    @Override
     public Boolean pcIsDetached() {
         if (sm != null)
             return Boolean.valueOf(sm.isDetached());
@@ -260,15 +280,18 @@ public class ReflectingPersistenceCapable
         return null;
     }
 
+    @Override
     public PersistenceCapable pcNewInstance(StateManager sm, boolean clear) {
         return pcSubclassInstance.pcNewInstance(sm, clear);
     }
 
+    @Override
     public PersistenceCapable pcNewInstance(StateManager sm, Object oid,
         boolean clear) {
         return pcSubclassInstance.pcNewInstance(sm, oid, clear);
     }
 
+    @Override
     public Object pcNewObjectIdInstance() {
         FieldMetaData[] pkFields = meta.getPrimaryKeyFields();
         Object[] pks = new Object[pkFields.length];
@@ -277,10 +300,12 @@ public class ReflectingPersistenceCapable
         return ApplicationIds.fromPKValues(pks, meta);
     }
 
+    @Override
     public Object pcNewObjectIdInstance(Object oid) {
         return pcSubclassInstance.pcNewObjectIdInstance(oid);
     }
 
+    @Override
     public void pcCopyKeyFieldsToObjectId(Object oid) {
         Object target;
         if (oid instanceof ObjectId)
@@ -297,6 +322,7 @@ public class ReflectingPersistenceCapable
         }
     }
 
+    @Override
     public void pcCopyKeyFieldsToObjectId(FieldSupplier supplier, Object obj) {
         // This is only ever invoked against PCs in the PCRegistry. Such PCs
         // will always be enhanced types or subtypes of user types, and will
@@ -304,6 +330,7 @@ public class ReflectingPersistenceCapable
         throw new InternalException();
     }
 
+    @Override
     public void pcCopyKeyFieldsFromObjectId(FieldConsumer consumer,
         Object obj) {
         // This is only ever invoked against PCs in the PCRegistry. Such PCs
@@ -312,11 +339,13 @@ public class ReflectingPersistenceCapable
         throw new InternalException();
     }
 
+    @Override
     public Object pcGetDetachedState() {
         // ##### we can implement this if a state field has been set
         return null;
     }
 
+    @Override
     public void pcSetDetachedState(Object state) {
         // StateManagerImpl will invoke this with null during instance
         // initialization
@@ -333,6 +362,7 @@ public class ReflectingPersistenceCapable
         return serializationUserVisible;
     }
 
+    @Override
     public Object getManagedInstance() {
         return o;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java
index 136d4406f..7492d862f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java
@@ -29,13 +29,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.util.ReferenceMap;
-import org.apache.openjpa.lib.util.Reflectable;
 import org.apache.openjpa.lib.util.Localizer.Message;
+import org.apache.openjpa.lib.util.Reflectable;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
 import org.apache.openjpa.util.GeneralException;
 import org.apache.openjpa.util.UserException;
@@ -859,7 +858,7 @@ public class Reflection {
         Method[] methods = c.getMethods();
         if (methods == null || methods.length < 2)
             return Collections.emptySet();
-        result = new TreeSet<String>();
+        result = new TreeSet<>();
         for (Method m : methods) {
             if (m.getName().startsWith("get")) {
                 if (!canReflect(m))
@@ -891,7 +890,7 @@ public class Reflection {
         Field[] fields = c.getFields();
         if (fields == null || fields.length == 0)
             return Collections.EMPTY_SET;
-        Set<String> result = new TreeSet<String>();
+        Set<String> result = new TreeSet<>();
         for (Field f : fields) {
             if (canReflect(f))
                 result.add(f.getName());
@@ -911,7 +910,7 @@ public class Reflection {
         Field[] fields = c.getFields();
         if (fields == null || fields.length == 0)
             return Collections.EMPTY_SET;
-        Set<T> result = new TreeSet<T>();
+        Set<T> result = new TreeSet<>();
         for (Field f : fields) {
             if (mods == f.getModifiers()
             && (t == Object.class || t.isAssignableFrom(f.getType()))
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClassesModes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClassesModes.java
index 1ecdef295..fa10113d4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClassesModes.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClassesModes.java
@@ -25,7 +25,7 @@ package org.apache.openjpa.enhance;
  * @since 1.0.0
  */
 public interface RuntimeUnenhancedClassesModes {
-    public final static int SUPPORTED = 0;
-    public final static int UNSUPPORTED = 1;
-    public final static int WARN = 2;
+    int SUPPORTED = 0;
+    int UNSUPPORTED = 1;
+    int WARN = 2;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/StateManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/StateManager.java
index ab8a73f22..7c483d173 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/StateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/StateManager.java
@@ -27,79 +27,79 @@ import java.io.ObjectOutput;
 public interface StateManager {
     // DO NOT ADD ADDITIONAL DEPENDENCIES TO THIS CLASS
 
-    public static final int SET_USER = 0;
-    public static final int SET_REMOTE = 1;
-    public static final int SET_ATTACH = 2;
+    int SET_USER = 0;
+    int SET_REMOTE = 1;
+    int SET_ATTACH = 2;
 
     /**
      * Persistence context.
      */
-    public Object getGenericContext();
+    Object getGenericContext();
 
     /**
      * Return the persistence-capable primary key object by extracting the
      * identity value of the related instance stored in the given field from
      * the given object id.
      */
-    public Object getPCPrimaryKey(Object oid, int field);
+    Object getPCPrimaryKey(Object oid, int field);
 
     /**
      * Change state manager.
      */
-    public StateManager replaceStateManager(StateManager sm);
+    StateManager replaceStateManager(StateManager sm);
 
     /**
      * Returns the optimistic version for this instance.
      */
-    public Object getVersion();
+    Object getVersion();
 
     /**
      * Whether the instance has been modified in this transaction.
      */
-    public boolean isDirty();
+    boolean isDirty();
 
     /**
      * Whether the instance is transactional.
      */
-    public boolean isTransactional();
+    boolean isTransactional();
 
     /**
      * Whether the instance is persistent.
      */
-    public boolean isPersistent();
+    boolean isPersistent();
 
     /**
      * Whether the instance is newly-persisted in this transaction.
      */
-    public boolean isNew();
+    boolean isNew();
 
     /**
      * Whether the instance is deleted in this transaction.
      */
-    public boolean isDeleted();
+    boolean isDeleted();
 
     /**
      * Whether the instance is detached (i.e. this manager is a detached
      * state manager)
      */
-    public boolean isDetached();
+    boolean isDetached();
 
     /**
      * Make named field dirty.
      */
-    public void dirty(String field);
+    void dirty(String field);
 
     /**
      * Return the object id, assigning it if necessary.
      */
-    public Object fetchObjectId();
+    Object fetchObjectId();
 
     /**
      * Callback to prepare instance for serialization.
      *
      * @return true to null detached state after serialize
      */
-    public boolean serializing();
+    boolean serializing();
 
     /**
      * Write detached state object and detached state manager to the
@@ -107,180 +107,180 @@ public interface StateManager {
      *
      * @return true if managed fields also written to stream
      */
-    public boolean writeDetached(ObjectOutput out)
+    boolean writeDetached(ObjectOutput out)
         throws IOException;
 
     /**
      * Proxy the given detached field after deserialization.
      */
-    public void proxyDetachedDeserialized(int idx);
+    void proxyDetachedDeserialized(int idx);
 
     /**
      * Field access callback.
      */
-    public void accessingField(int idx);
+    void accessingField(int idx);
 
     /**
      * Setting state callback.
      */
-    public void settingBooleanField(PersistenceCapable pc, int idx,
+    void settingBooleanField(PersistenceCapable pc, int idx,
         boolean cur, boolean next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingCharField(PersistenceCapable pc, int idx, char cur,
+    void settingCharField(PersistenceCapable pc, int idx, char cur,
         char next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingByteField(PersistenceCapable pc, int idx, byte cur,
+    void settingByteField(PersistenceCapable pc, int idx, byte cur,
         byte next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingShortField(PersistenceCapable pc, int idx, short cur,
+    void settingShortField(PersistenceCapable pc, int idx, short cur,
         short next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingIntField(PersistenceCapable pc, int idx, int cur,
+    void settingIntField(PersistenceCapable pc, int idx, int cur,
         int next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingLongField(PersistenceCapable pc, int idx, long cur,
+    void settingLongField(PersistenceCapable pc, int idx, long cur,
         long next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingFloatField(PersistenceCapable pc, int idx, float cur,
+    void settingFloatField(PersistenceCapable pc, int idx, float cur,
         float next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingDoubleField(PersistenceCapable pc, int idx, double cur,
+    void settingDoubleField(PersistenceCapable pc, int idx, double cur,
         double next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingStringField(PersistenceCapable pc, int idx, String cur,
+    void settingStringField(PersistenceCapable pc, int idx, String cur,
         String next, int set);
 
     /**
      * Setting state callback.
      */
-    public void settingObjectField(PersistenceCapable pc, int idx, Object cur,
+    void settingObjectField(PersistenceCapable pc, int idx, Object cur,
         Object next, int set);
 
     /**
      * Provide state callback.
      */
-    public void providedBooleanField(PersistenceCapable pc, int idx,
+    void providedBooleanField(PersistenceCapable pc, int idx,
         boolean cur);
 
     /**
      * Provide state callback.
      */
-    public void providedCharField(PersistenceCapable pc, int idx, char cur);
+    void providedCharField(PersistenceCapable pc, int idx, char cur);
 
     /**
      * Provide state callback.
      */
-    public void providedByteField(PersistenceCapable pc, int idx, byte cur);
+    void providedByteField(PersistenceCapable pc, int idx, byte cur);
 
     /**
      * Provide state callback.
      */
-    public void providedShortField(PersistenceCapable pc, int idx, short cur);
+    void providedShortField(PersistenceCapable pc, int idx, short cur);
 
     /**
      * Provide state callback.
      */
-    public void providedIntField(PersistenceCapable pc, int idx, int cur);
+    void providedIntField(PersistenceCapable pc, int idx, int cur);
 
     /**
      * Provide state callback.
      */
-    public void providedLongField(PersistenceCapable pc, int idx, long cur);
+    void providedLongField(PersistenceCapable pc, int idx, long cur);
 
     /**
      * Provide state callback.
      */
-    public void providedFloatField(PersistenceCapable pc, int idx, float cur);
+    void providedFloatField(PersistenceCapable pc, int idx, float cur);
 
     /**
      * Provide state callback.
      */
-    public void providedDoubleField(PersistenceCapable pc, int idx,
+    void providedDoubleField(PersistenceCapable pc, int idx,
         double cur);
 
     /**
      * Provide state callback.
      */
-    public void providedStringField(PersistenceCapable pc, int idx,
+    void providedStringField(PersistenceCapable pc, int idx,
         String cur);
 
     /**
      * Provide state callback.
      */
-    public void providedObjectField(PersistenceCapable pc, int idx,
+    void providedObjectField(PersistenceCapable pc, int idx,
         Object cur);
 
     /**
      * Replace state callback.
      */
-    public boolean replaceBooleanField(PersistenceCapable pc, int idx);
+    boolean replaceBooleanField(PersistenceCapable pc, int idx);
 
     /**
      * Replace state callback.
      */
-    public char replaceCharField(PersistenceCapable pc, int idx);
+    char replaceCharField(PersistenceCapable pc, int idx);
 
     /**
      * Replace state callback.
      */
-    public byte replaceByteField(PersistenceCapable pc, int idx);
+    byte replaceByteField(PersistenceCapable pc, int idx);
 
     /**
      * Replace state callback.
      */
-    public short replaceShortField(PersistenceCapable pc, int idx);
+    short replaceShortField(PersistenceCapable pc, int idx);
 
     /**
      * Replace state callback.
      */
-    public int replaceIntField(PersistenceCapable pc, int idx);
+    int replaceIntField(PersistenceCapable pc, int idx);
 
     /**
      * Replace state callback.
      */
-    public long replaceLongField(PersistenceCapable pc, int idx);
+    long replaceLongField(PersistenceCapable pc, int idx);
 
     /**
      * Replace state callback.
      */
-    public float replaceFloatField(PersistenceCapable pc, int idx);
+    float replaceFloatField(PersistenceCapable pc, int idx);
 
     /**
      * Replace state callback.
      */
-    public double replaceDoubleField(PersistenceCapable pc, int idx);
+    double replaceDoubleField(PersistenceCapable pc, int idx);
 
     /**
      * Replace state callback.
      */
-    public String replaceStringField(PersistenceCapable pc, int idx);
+    String replaceStringField(PersistenceCapable pc, int idx);
 
 	/**
 	 * Replace state callback.
 	 */
-    public Object replaceObjectField (PersistenceCapable pc, int idx);
+    Object replaceObjectField (PersistenceCapable pc, int idx);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractLifecycleListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractLifecycleListener.java
index 05d96bc9c..ff81cd7fa 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractLifecycleListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractLifecycleListener.java
@@ -34,74 +34,92 @@ public abstract class AbstractLifecycleListener
     protected void eventOccurred(LifecycleEvent event) {
     }
 
+    @Override
     public void beforePersist(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterPersist(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeClear(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterClear(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterLoad(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeDelete(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterDelete(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeStore(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterStore(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeDirty(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterDirty(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeDirtyFlushed(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterDirtyFlushed(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterRefresh(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeDetach(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterDetach(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeAttach(LifecycleEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterAttach(LifecycleEvent event) {
         eventOccurred(event);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractRemoteCommitProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractRemoteCommitProvider.java
index 60d2ff659..1479a3103 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractRemoteCommitProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractRemoteCommitProvider.java
@@ -42,16 +42,20 @@ public abstract class AbstractRemoteCommitProvider
     protected RemoteCommitEventManager eventManager;
     protected Log log;
 
+    @Override
     public void setConfiguration(Configuration config) {
         this.log = config.getLog(OpenJPAConfiguration.LOG_RUNTIME);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public void setRemoteCommitEventManager(RemoteCommitEventManager mgr) {
         eventManager = mgr;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractTransactionListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractTransactionListener.java
index f78ea19a0..7a4926356 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractTransactionListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/AbstractTransactionListener.java
@@ -35,38 +35,47 @@ public abstract class AbstractTransactionListener
     protected void eventOccurred(TransactionEvent event) {
     }
 
+    @Override
     public void afterBegin(TransactionEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeFlush(TransactionEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterFlush(TransactionEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeCommit(TransactionEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterCommit(TransactionEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterRollback(TransactionEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterStateTransitions(TransactionEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterCommitComplete(TransactionEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterRollbackComplete(TransactionEvent event) {
         eventOccurred(event);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/AttachListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/AttachListener.java
index fce876e63..27ae0b71f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/AttachListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/AttachListener.java
@@ -28,10 +28,10 @@ public interface AttachListener {
     /**
      * Invoked before the instance is attached.
      */
-    public void beforeAttach(LifecycleEvent event);
+    void beforeAttach(LifecycleEvent event);
 
     /**
      * Invoked after the instance has been attached.
      */
-    public void afterAttach(LifecycleEvent event);
+    void afterAttach(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java
index b5be696be..e0a697acf 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java
@@ -73,6 +73,7 @@ public class BeanLifecycleCallbacks
         }
     }
 
+    @Override
     public void makeCallback(Object obj, Object rel, int eventType)
         throws Exception {
         Method callback = getCallbackMethod();
@@ -85,6 +86,7 @@ public class BeanLifecycleCallbacks
             callback.invoke(_listener, new Object[]{ obj });
     }
 
+    @Override
     public void readExternal(ObjectInput in)
         throws IOException, ClassNotFoundException {
         super.readExternal(in);
@@ -92,6 +94,7 @@ public class BeanLifecycleCallbacks
         _listener = newListener(cls);
     }
 
+    @Override
     public void writeExternal(ObjectOutput out)
         throws IOException {
         super.writeExternal(out);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeginTransactionListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeginTransactionListener.java
index 412a268ef..2f4780a40 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeginTransactionListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeginTransactionListener.java
@@ -32,5 +32,5 @@ public interface BeginTransactionListener {
      *
      * @see TransactionEvent#AFTER_BEGIN
      */
-    public void afterBegin(TransactionEvent event);
+    void afterBegin(TransactionEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryEvent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryEvent.java
index 4c2ba87e2..db99a151d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryEvent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryEvent.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.kernel.BrokerFactory;
 public class BrokerFactoryEvent
     extends EventObject {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Fired after a {@link BrokerFactory} has been fully created.
      * This happens after the factory has been made read-only.
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryEventManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryEventManager.java
index 183e7ebf4..1dfd449fe 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryEventManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryEventManager.java
@@ -18,10 +18,11 @@
  */
 package org.apache.openjpa.event;
 
-import org.apache.openjpa.lib.util.concurrent.AbstractConcurrentEventManager;
-import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.lib.util.EventManager;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.concurrent.AbstractConcurrentEventManager;
 
 /**
  * {@link EventManager} responsible for notifying listeners of
@@ -32,6 +33,9 @@ import org.apache.openjpa.conf.OpenJPAConfiguration;
 public class BrokerFactoryEventManager
     extends AbstractConcurrentEventManager {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(
         BrokerFactoryEventManager.class);
 
@@ -41,6 +45,7 @@ public class BrokerFactoryEventManager
         _conf = conf;
     }
 
+    @Override
     protected void fireEvent(Object event, Object listener) {
         try {
             BrokerFactoryEvent e = (BrokerFactoryEvent) event;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryListener.java
index 35f129c5d..02fcb5852 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/BrokerFactoryListener.java
@@ -18,6 +18,9 @@
  */
 package org.apache.openjpa.event;
 
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.kernel.BrokerFactory;
+
 /**
  * Interface for listening to {@link BrokerFactoryEvent} objects. Should be
  * registered with a {@link OpenJPAConfiguration}'s
@@ -31,5 +34,5 @@ public interface BrokerFactoryListener {
      * Invoked after a {@link BrokerFactory} has been fully created.
      * This happens after the factory has been made read-only.
      */
-    public void eventFired(BrokerFactoryEvent event);
+    void eventFired(BrokerFactoryEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/CallbackModes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/CallbackModes.java
index 67751e3f4..f54949b09 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/CallbackModes.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/CallbackModes.java
@@ -29,25 +29,25 @@ public interface CallbackModes {
     /**
      * Flag to stop executing callbacks on exception immediately.
      */
-    public static final int CALLBACK_FAIL_FAST = 2 << 0;
+    int CALLBACK_FAIL_FAST = 2 << 0;
 
     /**
      * Flag to ignore exceptions made during callback.
      */
-    public static final int CALLBACK_IGNORE = 2 << 1;
+    int CALLBACK_IGNORE = 2 << 1;
 
     /**
      * Flag to log exceptions made during callback.
      */
-    public static final int CALLBACK_LOG = 2 << 2;
+    int CALLBACK_LOG = 2 << 2;
 
     /**
      * Flag to re-throw exceptions made during callback.
      */
-    public static final int CALLBACK_RETHROW = 2 << 3;
+    int CALLBACK_RETHROW = 2 << 3;
 
     /**
      * Flag to always rollback on a callback exception.
      */
-    public static final int CALLBACK_ROLLBACK = 2 << 4;
+    int CALLBACK_ROLLBACK = 2 << 4;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/ClearListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/ClearListener.java
index ea321f883..df0445c3e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/ClearListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/ClearListener.java
@@ -29,10 +29,10 @@ public interface ClearListener {
     /**
      * Invoked before state is cleared.
      */
-    public void beforeClear(LifecycleEvent event);
+    void beforeClear(LifecycleEvent event);
 
     /**
      * Invoked after state is cleared.
      */
-    public void afterClear(LifecycleEvent event);
+    void afterClear(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/DeleteListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/DeleteListener.java
index 1ca554441..5de7079de 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/DeleteListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/DeleteListener.java
@@ -29,10 +29,10 @@ public interface DeleteListener {
     /**
      * Invoked before the instance transferred to a deleted state.
      */
-    public void beforeDelete(LifecycleEvent event);
+    void beforeDelete(LifecycleEvent event);
 
     /**
      * Invoked after the instance transferred to a deleted state.
      */
-    public void afterDelete(LifecycleEvent event);
+    void afterDelete(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/DetachListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/DetachListener.java
index c0d6c8f20..7ab9bbb47 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/DetachListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/DetachListener.java
@@ -28,10 +28,10 @@ public interface DetachListener {
     /**
      * Invoked before the instance is detached.
      */
-    public void beforeDetach(LifecycleEvent event);
+    void beforeDetach(LifecycleEvent event);
 
     /**
      * Invoked after the instance has been detached.
      */
-    public void afterDetach(LifecycleEvent event);
+    void afterDetach(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/DirtyListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/DirtyListener.java
index 25a8241f3..6b17b1381 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/DirtyListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/DirtyListener.java
@@ -29,20 +29,20 @@ public interface DirtyListener {
     /**
      * Invoked before the first change is applied.
      */
-    public void beforeDirty(LifecycleEvent event);
+    void beforeDirty(LifecycleEvent event);
 
     /**
      * Invoked after the first change is applied.
      */
-    public void afterDirty(LifecycleEvent event);
+    void afterDirty(LifecycleEvent event);
 
     /**
      * Invoked before the first change is applied to a flushed instance.
      */
-    public void beforeDirtyFlushed(LifecycleEvent event);
+    void beforeDirtyFlushed(LifecycleEvent event);
 
     /**
      * Invoked after the first change is applied to a flushed instance.
      */
-    public void afterDirtyFlushed(LifecycleEvent event);
+    void afterDirtyFlushed(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/EndTransactionListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/EndTransactionListener.java
index 1e421b5d2..e24cba9fb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/EndTransactionListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/EndTransactionListener.java
@@ -32,28 +32,28 @@ public interface EndTransactionListener {
      *
      * @see TransactionEvent#BEFORE_COMMIT
      */
-    public void beforeCommit(TransactionEvent event);
+    void beforeCommit(TransactionEvent event);
 
     /**
      * Notification that a transaction has successfully committed.
      *
      * @see TransactionEvent#AFTER_COMMIT
      */
-    public void afterCommit(TransactionEvent event);
+    void afterCommit(TransactionEvent event);
 
     /**
      * Notification that a transaction has been rolled back.
      *
      * @see TransactionEvent#AFTER_ROLLBACK
      */
-    public void afterRollback(TransactionEvent event);
+    void afterRollback(TransactionEvent event);
 
     /**
      * Notification that state transitions are complete.
      *
      * @see TransactionEvent#AFTER_STATE_TRANSITIONS
      */
-    public void afterStateTransitions(TransactionEvent event);
+    void afterStateTransitions(TransactionEvent event);
 
     /**
      * Notification that a transaction has successfully committed and
@@ -61,7 +61,7 @@ public interface EndTransactionListener {
      *
      * @see TransactionEvent#AFTER_COMMIT_COMPLETE
      */
-    public void afterCommitComplete(TransactionEvent event);
+    void afterCommitComplete(TransactionEvent event);
 
     /**
      * Notification that a transaction has been rolled back and
@@ -69,5 +69,5 @@ public interface EndTransactionListener {
      *
      * @see TransactionEvent#AFTER_ROLLBACK_COMPLETE
      */
-    public void afterRollbackComplete(TransactionEvent event);
+    void afterRollbackComplete(TransactionEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/ExceptionOrphanedKeyAction.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/ExceptionOrphanedKeyAction.java
index 419df5d0c..868524014 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/ExceptionOrphanedKeyAction.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/ExceptionOrphanedKeyAction.java
@@ -35,6 +35,7 @@ public class ExceptionOrphanedKeyAction
     private static final Localizer _loc = Localizer.forPackage
         (ExceptionOrphanedKeyAction.class);
 
+    @Override
     public Object orphan(Object oid, OpenJPAStateManager sm,
         ValueMetaData vmd) {
         throw new ObjectNotFoundException(_loc.get("orphaned-key", oid, vmd));
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/FlushTransactionListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/FlushTransactionListener.java
index 0c85232b9..5ae7c0ed0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/FlushTransactionListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/FlushTransactionListener.java
@@ -32,12 +32,12 @@ public interface FlushTransactionListener {
      *
      * @see TransactionEvent#BEFORE_FLUSH
      */
-    public void beforeFlush(TransactionEvent event);
+    void beforeFlush(TransactionEvent event);
 
     /**
      * Notification that a transaction has flushed all object changes.
      *
      * @see TransactionEvent#AFTER_FLUSH
      */
-    public void afterFlush(TransactionEvent event);
+    void afterFlush(TransactionEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java
index 845b3ba5f..99a89e059 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.event;
 
 import java.util.Properties;
+
 import javax.jms.ExceptionListener;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -96,6 +97,7 @@ public class JMSRemoteCommitProvider
      * constructor for JNDI lookups. Implementation of
      * {@link GenericConfigurable}.
      */
+    @Override
     public void setInto(Options opts) {
         if (opts != null && !opts.isEmpty()) {
             _ctxProps = new Properties();
@@ -117,6 +119,7 @@ public class JMSRemoteCommitProvider
 
     // ---------- RemoteCommitProvider implementation ----------
 
+    @Override
     public void broadcast(RemoteCommitEvent event) {
         try {
             _publisher.publish(createMessage(event));
@@ -128,6 +131,7 @@ public class JMSRemoteCommitProvider
         }
     }
 
+    @Override
     public void close() {
         try {
             if (_connection != null) {
@@ -150,6 +154,7 @@ public class JMSRemoteCommitProvider
      * Subclasses that need to perform actions in
      * {@link Configurable#endConfiguration} must invoke this method.
      */
+    @Override
     public void endConfiguration() {
         super.endConfiguration();
         _appClassLoader = Thread.currentThread().getContextClassLoader();
@@ -199,6 +204,7 @@ public class JMSRemoteCommitProvider
      */
     protected MessageListener getMessageListener() {
         return new MessageListener() {
+            @Override
             public void onMessage(Message m) {
                 if (!(m instanceof ObjectMessage)) {
                     if (log.isWarnEnabled())
@@ -249,6 +255,7 @@ public class JMSRemoteCommitProvider
         return _session.createObjectMessage(event);
     }
 
+    @Override
     public void onException(JMSException ex) {
         if (log.isWarnEnabled())
             log.warn(s_loc.get("jms-listener-error", _topicName), ex);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleCallbacks.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleCallbacks.java
index 99b38c860..de8f0ba56 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleCallbacks.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleCallbacks.java
@@ -32,11 +32,11 @@ public interface LifecycleCallbacks
      * Return whether the given instance has a callback for the given
      * event type.
      */
-    public boolean hasCallback(Object obj, int eventType);
+    boolean hasCallback(Object obj, int eventType);
 
     /**
      * Invoke the callback for the given event type on the given instance.
      */
-    public void makeCallback(Object obj, Object related, int eventType)
+    void makeCallback(Object obj, Object related, int eventType)
         throws Exception;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleEvent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleEvent.java
index 260d4fde1..97833cb47 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleEvent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleEvent.java
@@ -31,6 +31,9 @@ import java.util.EventObject;
 public class LifecycleEvent
     extends EventObject {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Event type before an instance is made persistent
      */
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleEventManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleEventManager.java
index 907269772..f1f4cee8b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleEventManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LifecycleEventManager.java
@@ -27,9 +27,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.MetaDataDefaults;
-import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.InvalidStateException;
 
 /**
@@ -45,10 +45,11 @@ import org.apache.openjpa.util.InvalidStateException;
  * @author Abe White
  * @since 0.3.3
  */
-@SuppressWarnings("serial")
 public class LifecycleEventManager
     implements CallbackModes, Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     private static final Exception[] EMPTY_EXCEPTIONS = new Exception[0];
 
     private static final Localizer _loc = Localizer.forPackage(
@@ -57,9 +58,9 @@ public class LifecycleEventManager
     private Map<Class<?>, ListenerList> _classListeners = null;
     private ListenerList _listeners = null;
     // odd-element: Listener even-element: Class[]
-    private List<Object> _addListeners = new LinkedList<Object>();
-    private List<Object> _remListeners = new LinkedList<Object>();
-    private List<Exception> _exceps = new LinkedList<Exception>();
+    private List<Object> _addListeners = new LinkedList<>();
+    private List<Object> _remListeners = new LinkedList<>();
+    private List<Exception> _exceps = new LinkedList<>();
     private boolean _firing = false;
     private boolean _fail = false;
     private boolean _failFast = false;
@@ -114,10 +115,10 @@ public class LifecycleEventManager
         }
 
         if (_classListeners == null)
-            _classListeners = new HashMap<Class<?>, ListenerList>();
+            _classListeners = new HashMap<>();
         ListenerList listeners;
         for (int i = 0; i < classes.length; i++) {
-            listeners = (ListenerList) _classListeners.get(classes[i]);
+            listeners = _classListeners.get(classes[i]);
             if (listeners == null) {
                 listeners = new ListenerList(3);
                 _classListeners.put(classes[i], listeners);
@@ -141,7 +142,7 @@ public class LifecycleEventManager
             ListenerList listeners;
             for (Iterator<ListenerList> itr = _classListeners.values().iterator();
                 itr.hasNext();) {
-                listeners = (ListenerList) itr.next();
+                listeners = itr.next();
                 listeners.remove(listener);
             }
         }
@@ -258,8 +259,7 @@ public class LifecycleEventManager
         if (_classListeners != null) {
             Class<?> c = source == null ? meta.getDescribedType() : source.getClass();
             do {
-                if (fireEvent(null, source, null, type, (ListenerList)
-                    _classListeners.get(c), true, null) == Boolean.TRUE)
+                if (fireEvent(null, source, null, type, _classListeners.get(c), true, null) == Boolean.TRUE)
                     return true;
                 c = c.getSuperclass();
             } while (c != null && c != Object.class);
@@ -282,7 +282,7 @@ public class LifecycleEventManager
         ClassMetaData meta, int type) {
         boolean reentrant = _firing;
         _firing = true;
-        List<Exception> exceptions = (reentrant) ? new LinkedList<Exception>() : _exceps;
+        List<Exception> exceptions = (reentrant) ? new LinkedList<>() : _exceps;
         MetaDataDefaults def = meta.getRepository().getMetaDataFactory().
             getDefaults();
 
@@ -297,7 +297,7 @@ public class LifecycleEventManager
             Class<?> c = source == null ? meta.getDescribedType() : source.getClass();
             do {
                 ev = (LifecycleEvent) fireEvent(ev, source, related, type,
-                    (ListenerList) _classListeners.get(c), false, exceptions);
+                    _classListeners.get(c), false, exceptions);
                 c = c.getSuperclass();
             } while (c != null && c != Object.class);
         }
@@ -316,7 +316,7 @@ public class LifecycleEventManager
         if (exceptions.isEmpty())
             ret = EMPTY_EXCEPTIONS;
         else
-            ret = (Exception[]) exceptions.toArray
+            ret = exceptions.toArray
                 (new Exception[exceptions.size()]);
 
         // if this wasn't a reentrant call, catch up with calls to add
@@ -549,13 +549,13 @@ public class LifecycleEventManager
      * This is more efficient than registering as a listener for all events
      * but only responding to some.
      */
-    public static interface ListenerAdapter {
+    public interface ListenerAdapter {
 
         /**
          * Return whether this instance responds to the given event type from
          * {@link LifecycleEvent}.
          */
-        public boolean respondsTo(int eventType);
+        boolean respondsTo(int eventType);
     }
 
     /**
@@ -564,6 +564,8 @@ public class LifecycleEventManager
      */
     public static class ListenerList extends ArrayList<Object> {
 
+        
+        private static final long serialVersionUID = 1L;
         private int _types = 0;
 
         public ListenerList(int size) {
@@ -579,6 +581,7 @@ public class LifecycleEventManager
             return (_types & (2 << type)) > 0;
         }
 
+        @Override
         public boolean add(Object listener) {
             if (contains(listener))
                 return false;
@@ -587,6 +590,7 @@ public class LifecycleEventManager
             return true;
         }
 
+        @Override
         public boolean remove(Object listener) {
             if (!super.remove(listener))
                 return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LoadListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LoadListener.java
index 668c38a68..0f45adef7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LoadListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LoadListener.java
@@ -29,10 +29,10 @@ public interface LoadListener {
     /**
      * Invoked after state has been loaded into the instance.
      */
-    public void afterLoad(LifecycleEvent event);
+    void afterLoad(LifecycleEvent event);
 
     /**
      * Invoked after state has been refreshed.
      */
-    public void afterRefresh(LifecycleEvent event);
+    void afterRefresh(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LogOrphanedKeyAction.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LogOrphanedKeyAction.java
index 76b6a8610..f5a5f6751 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/LogOrphanedKeyAction.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/LogOrphanedKeyAction.java
@@ -77,6 +77,7 @@ public class LogOrphanedKeyAction
         _level = LogFactoryImpl.getLevel(level);
     }
 
+    @Override
     public Object orphan(Object oid, OpenJPAStateManager sm,
         ValueMetaData vmd) {
         Log log = vmd.getRepository().getConfiguration().getLog(_channel);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java
index af5ef2d22..e291f931b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java
@@ -77,10 +77,12 @@ public class MethodLifecycleCallbacks
         return _arg;
     }
 
+    @Override
     public boolean hasCallback(Object obj, int eventType) {
         return true;
     }
 
+    @Override
     public void makeCallback(Object obj, Object arg, int eventType)
         throws Exception {
         if (!_callback.isAccessible())
@@ -93,6 +95,7 @@ public class MethodLifecycleCallbacks
             _callback.invoke(obj, (Object[]) null);
     }
 
+    @Override
     public String toString() {
         return getClass().getName() + ":" + _callback;
     }
@@ -141,6 +144,7 @@ public class MethodLifecycleCallbacks
         return true;
     }
 
+    @Override
     public void readExternal(ObjectInput in)
         throws IOException, ClassNotFoundException {
         Class cls = (Class) in.readObject();
@@ -151,6 +155,7 @@ public class MethodLifecycleCallbacks
         _callback = getMethod(cls, methName, args);
     }
 
+    @Override
     public void writeExternal(ObjectOutput out)
         throws IOException {
         out.writeObject(_callback.getClass());
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/NoneOrphanedKeyAction.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/NoneOrphanedKeyAction.java
index 2ab837da1..7c806d175 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/NoneOrphanedKeyAction.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/NoneOrphanedKeyAction.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.meta.ValueMetaData;
 public class NoneOrphanedKeyAction
     implements OrphanedKeyAction {
 
+    @Override
     public Object orphan(Object oid, OpenJPAStateManager sm,
         ValueMetaData vmd) {
         return null;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/OrphanedKeyAction.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/OrphanedKeyAction.java
index 64461734b..5651d5b37 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/OrphanedKeyAction.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/OrphanedKeyAction.java
@@ -39,5 +39,5 @@ public interface OrphanedKeyAction {
      * @return the value to load into field <code>fmd</code>; typically
      * <code>null</code>
      */
-    public Object orphan(Object oid, OpenJPAStateManager sm, ValueMetaData vmd);
+    Object orphan(Object oid, OpenJPAStateManager sm, ValueMetaData vmd);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/PersistListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/PersistListener.java
index 17a80b2f5..7058c298b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/PersistListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/PersistListener.java
@@ -28,10 +28,10 @@ public interface PersistListener {
     /**
      * Invoked before an instance is persisted.
      */
-    public void beforePersist(LifecycleEvent event);
+    void beforePersist(LifecycleEvent event);
 
     /**
      * Invoked when an instance is persisted.
      */
-    public void afterPersist(LifecycleEvent event);
+    void afterPersist(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/PostDeleteListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/PostDeleteListener.java
index dd8e23b81..33b82049b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/PostDeleteListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/PostDeleteListener.java
@@ -29,5 +29,5 @@ public interface PostDeleteListener {
      * is called after the delete operation, whereas this is called after the
      * delete statements have been sent to the data store.
      */
-    public void afterDeletePerformed(LifecycleEvent event);
+    void afterDeletePerformed(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/PostPersistListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/PostPersistListener.java
index 7af19bb90..fd75c6b0d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/PostPersistListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/PostPersistListener.java
@@ -29,5 +29,5 @@ public interface PostPersistListener {
      * the latter is called at the end of the persist() operation itself, not
      * after the flush.
      */
-    public void afterPersistPerformed(LifecycleEvent event);
+    void afterPersistPerformed(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitEvent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitEvent.java
index b9617bda2..64e87cc55 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitEvent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitEvent.java
@@ -25,6 +25,7 @@ import java.io.ObjectOutput;
 import java.util.Collection;
 import java.util.Collections;
 
+import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.UserException;
 
@@ -172,6 +173,7 @@ public class RemoteCommitEvent
         return (_deletes == null) ? Collections.EMPTY_LIST : _deletes;
     }
 
+    @Override
     public void writeExternal(ObjectOutput out)
         throws IOException {
         out.writeInt(_payload);
@@ -182,6 +184,7 @@ public class RemoteCommitEvent
         out.writeObject(_deletes);
     }
 
+    @Override
     public void readExternal(ObjectInput in)
         throws IOException {
         try {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitEventManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitEventManager.java
index be9c4ce4f..0ff13c318 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitEventManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitEventManager.java
@@ -20,10 +20,10 @@ package org.apache.openjpa.event;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Collections;
 
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.kernel.Broker;
@@ -47,6 +47,9 @@ public class RemoteCommitEventManager
     extends AbstractConcurrentEventManager
     implements EndTransactionListener, Closeable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (RemoteCommitEventManager.class);
 
@@ -117,6 +120,7 @@ public class RemoteCommitEventManager
     /**
      * Close this manager and all registered listeners.
      */
+    @Override
     public void close() {
         if (_provider != null) {
             _provider.close();
@@ -126,6 +130,7 @@ public class RemoteCommitEventManager
         }
     }
 
+    @Override
     protected void fireEvent(Object event, Object listener) {
         RemoteCommitListener listen = (RemoteCommitListener) listener;
         RemoteCommitEvent ev = (RemoteCommitEvent) event;
@@ -149,6 +154,7 @@ public class RemoteCommitEventManager
     // TransactionListener implementation
     //////////////////////////////////////
 
+    @Override
     public void afterCommit(TransactionEvent event) {
         if (_provider != null) {
             RemoteCommitEvent rce = createRemoteCommitEvent(event);
@@ -235,18 +241,23 @@ public class RemoteCommitEventManager
         return names;
     }
 
+    @Override
     public void beforeCommit(TransactionEvent event) {
     }
 
+    @Override
     public void afterRollback(TransactionEvent event) {
     }
 
+    @Override
     public void afterCommitComplete(TransactionEvent event) {
     }
 
+    @Override
     public void afterRollbackComplete(TransactionEvent event) {
     }
 
+    @Override
     public void afterStateTransitions(TransactionEvent event)
 	{
 	}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitListener.java
index 5478a9869..c2c2697cb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitListener.java
@@ -52,10 +52,10 @@ public interface RemoteCommitListener
      * Notification that a transaction associated with a different
      * BrokerFactory has successfully committed.
      */
-    public void afterCommit(RemoteCommitEvent event);
+    void afterCommit(RemoteCommitEvent event);
 
     /**
      * Free the resources used by this listener.
      */
-    public void close();
+    @Override void close();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitProvider.java
index 2026ca56d..d311a51b2 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitProvider.java
@@ -46,17 +46,17 @@ public interface RemoteCommitProvider
      * Set the "owning" remote event manager to notify when remote events
      * are received from remote sources.
      */
-    public void setRemoteCommitEventManager(RemoteCommitEventManager mgr);
+    void setRemoteCommitEventManager(RemoteCommitEventManager mgr);
 
     /**
      * Notifies other remote event managers in this JVM and on other machines
      * of changes to the cache. This method must not notify the
      * event manager associated with the broker that originated this commit.
      */
-    public void broadcast(RemoteCommitEvent event);
+    void broadcast(RemoteCommitEvent event);
 
     /**
      * Free the resources used by this provider.
      */
-    public void close();
+    @Override void close();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/SingleJVMRemoteCommitProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/SingleJVMRemoteCommitProvider.java
index 73b030c4b..0fb290dc1 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/SingleJVMRemoteCommitProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/SingleJVMRemoteCommitProvider.java
@@ -44,6 +44,7 @@ public class SingleJVMRemoteCommitProvider
         s_providers.add(this);
     }
 
+    @Override
     public void broadcast(RemoteCommitEvent event) {
         SingleJVMRemoteCommitProvider provider;
         for (Iterator iter = s_providers.iterator(); iter.hasNext();) {
@@ -59,6 +60,7 @@ public class SingleJVMRemoteCommitProvider
         }
     }
 
+    @Override
     public void close() {
         s_providers.remove(this);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/StoreListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/StoreListener.java
index 9a53dfb60..8464845eb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/StoreListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/StoreListener.java
@@ -29,10 +29,10 @@ public interface StoreListener {
     /**
      * Invoked just prior to store.
      */
-    public void beforeStore(LifecycleEvent event);
+    void beforeStore(LifecycleEvent event);
 
     /**
      * Invoked just after store.
      */
-    public void afterStore(LifecycleEvent event);
+    void afterStore(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/TransactionEvent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/TransactionEvent.java
index 76c710377..16c358402 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/TransactionEvent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/TransactionEvent.java
@@ -34,6 +34,9 @@ import org.apache.openjpa.kernel.Broker;
 public class TransactionEvent
     extends EventObject {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Event type signifying that a transaction has just begun.
      */
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/TransactionEventManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/TransactionEventManager.java
index 861f3dfb1..68db57634 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/TransactionEventManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/TransactionEventManager.java
@@ -31,10 +31,13 @@ import org.apache.openjpa.lib.util.concurrent.AbstractConcurrentEventManager;
 public class TransactionEventManager
     extends AbstractConcurrentEventManager {
 
+    
+    private static final long serialVersionUID = 1L;
     private int _begin = 0;
     private int _flush = 0;
     private int _end = 0;
 
+    @Override
     public void addListener(Object listener) {
         super.addListener(listener);
         if (listener instanceof BeginTransactionListener)
@@ -45,6 +48,7 @@ public class TransactionEventManager
             _end++;
     }
 
+    @Override
     public boolean removeListener(Object listener) {
         if (!super.removeListener(listener))
             return false;
@@ -82,6 +86,7 @@ public class TransactionEventManager
     /**
      * Fire the given event to all registered listeners.
      */
+    @Override
     protected void fireEvent(Object event, Object listener) {
         TransactionEvent ev = (TransactionEvent) event;
         switch (ev.getType()) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/event/UpdateListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/event/UpdateListener.java
index a9f24b061..8f9981036 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/event/UpdateListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/event/UpdateListener.java
@@ -29,7 +29,7 @@ public interface UpdateListener {
      * updated and new records, whereas this is only invoked for updated
      * records.
      */
-    public void beforeUpdate(LifecycleEvent event);
+    void beforeUpdate(LifecycleEvent event);
 
     /**
      * Receives notifications before an update is performed. Differs from
@@ -38,5 +38,5 @@ public interface UpdateListener {
      * records, and that this is called after the record is actually flushed
      * to the store.
      */
-    public void afterUpdatePerformed(LifecycleEvent event);
+    void afterUpdatePerformed(LifecycleEvent event);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractDataCacheInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractDataCacheInstrument.java
index b13443bf7..187164ecf 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractDataCacheInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractDataCacheInstrument.java
@@ -60,6 +60,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         _configRef = cref;
     }
 
+    @Override
     public long getHitCount() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -67,6 +68,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getReadCount() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -74,6 +76,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getTotalHitCount() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -81,6 +84,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getTotalReadCount() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -88,6 +92,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getTotalWriteCount() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -95,6 +100,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getWriteCount() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -102,12 +108,14 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public void reset() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
             stats.reset();
     }
 
+    @Override
     public Date sinceDate() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -115,6 +123,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return null;
     }
 
+    @Override
     public Date startDate() {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -130,6 +139,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return _configRef;
     }
 
+    @Override
     public String getCacheName() {
         if (_dc != null)
             return _dc.getName();
@@ -143,6 +153,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return null;
     }
 
+    @Override
     public long getWriteCount(String c) {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -150,6 +161,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getTotalWriteCount(String c) {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -157,6 +169,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getTotalReadCount(String c) {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -164,6 +177,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getTotalHitCount(String c) {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -171,6 +185,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getReadCount(String c) {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -178,6 +193,7 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public long getHitCount(String c) {
         CacheStatistics stats = getStatistics();
         if (stats != null)
@@ -185,10 +201,12 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         return NO_STATS;
     }
 
+    @Override
     public InstrumentationLevel getLevel() {
         return InstrumentationLevel.FACTORY;
     }
 
+    @Override
     public void cache(String className, boolean enable) {
         if (enable) {
             _dcm.startCaching(className);
@@ -197,9 +215,11 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         }
     }
 
+    @Override
     public Map<String, Boolean> listKnownTypes() {
         return _dcm.listKnownTypes();
     }
+    @Override
     public void collectStatistics(boolean enable) {
         CacheStatisticsSPI stats = (CacheStatisticsSPI) _dc.getStatistics();
         if (enable) {
@@ -209,14 +229,17 @@ public abstract class AbstractDataCacheInstrument extends AbstractInstrument imp
         }
     }
 
+    @Override
     public Boolean getStatisticsEnabled() {
         CacheStatisticsSPI stats = (CacheStatisticsSPI) _dc.getStatistics();
         return stats.isEnabled();
     }
 
+    @Override
     public Map<String, long[]> getCacheStatistics() {
         return _dc.getStatistics().toMap();
     }
+    @Override
     public void clear() {
         _dc.clear();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractPreparedQueryCacheInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractPreparedQueryCacheInstrument.java
index c2e26e7c8..17adf9327 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractPreparedQueryCacheInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractPreparedQueryCacheInstrument.java
@@ -66,6 +66,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return _qc.getStatistics();
     }
 
+    @Override
     public long getExecutionCount() {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -73,6 +74,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return NO_STATS;
     }
 
+    @Override
     public long getExecutionCount(String query) {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -80,6 +82,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return NO_STATS;
     }
 
+    @Override
     public long getTotalExecutionCount() {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -87,6 +90,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return NO_STATS;
     }
 
+    @Override
     public long getTotalExecutionCount(String query) {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -94,6 +98,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return NO_STATS;
     }
 
+    @Override
     public long getHitCount() {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -101,6 +106,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return NO_STATS;
     }
 
+    @Override
     public long getHitCount(String query) {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -108,6 +114,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return NO_STATS;
     }
 
+    @Override
     public long getTotalHitCount() {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -115,6 +122,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return NO_STATS;
     }
 
+    @Override
     public long getTotalHitCount(String query) {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -122,12 +130,14 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return NO_STATS;
     }
 
+    @Override
     public void reset() {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
             stats.reset();
     }
 
+    @Override
     public Date sinceDate() {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -135,6 +145,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return null;
     }
 
+    @Override
     public Date startDate() {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -142,6 +153,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return null;
     }
 
+    @Override
     public Set<String> queries() {
         QueryStatistics<String> stats = getStatistics();
         if (stats != null)
@@ -149,6 +161,7 @@ public abstract class AbstractPreparedQueryCacheInstrument extends AbstractInstr
         return null;
     }
 
+    @Override
     public InstrumentationLevel getLevel() {
         return InstrumentationLevel.FACTORY;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractQueryCacheInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractQueryCacheInstrument.java
index 2f1dbb74d..95024d79b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractQueryCacheInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractQueryCacheInstrument.java
@@ -76,6 +76,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return _qc.getStatistics();
     }
 
+    @Override
     public long getExecutionCount() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
@@ -83,6 +84,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public long getExecutionCount(String queryKey) {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null) {
@@ -92,6 +94,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public long getTotalExecutionCount() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
@@ -99,6 +102,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public long getTotalExecutionCount(String queryKey) {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null) {
@@ -108,6 +112,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public long getHitCount() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
@@ -115,6 +120,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public long getHitCount(String queryKey) {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null) {
@@ -124,6 +130,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public long getTotalHitCount() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
@@ -131,6 +138,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public long getTotalHitCount(String queryKey) {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null) {
@@ -140,12 +148,14 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public void reset() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
             stats.reset();
     }
 
+    @Override
     public Date sinceDate() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
@@ -153,6 +163,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return null;
     }
 
+    @Override
     public Date startDate() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
@@ -163,6 +174,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
     /**
      * Returns number of total evictions since last reset
      */
+    @Override
     public long getEvictionCount() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
@@ -173,6 +185,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
     /**
      * Returns number of total eviction requests since start.
      */
+    @Override
     public long getTotalEvictionCount() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null)
@@ -183,10 +196,11 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
     /**
      * Returns all query keys currently tracked in the cache.
      */
+    @Override
     public Set<String> queryKeys() {
         QueryStatistics<QueryKey> stats = getStatistics();
         if (stats != null) {
-            Set<String> keys = new HashSet<String>();
+            Set<String> keys = new HashSet<>();
             for (QueryKey qk : stats.keys()) {
                 keys.add(qk.toString());
             }
@@ -205,6 +219,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return null;
     }
 
+    @Override
     public long count() {
         if (_qc == null) {
             return NO_STATS;
@@ -216,6 +231,7 @@ public abstract class AbstractQueryCacheInstrument extends AbstractInstrument
         return NO_STATS;
     }
 
+    @Override
     public InstrumentationLevel getLevel() {
         return InstrumentationLevel.FACTORY;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/DataCacheInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/DataCacheInstrument.java
index 8b0f8ad33..f39e59be6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/DataCacheInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/DataCacheInstrument.java
@@ -29,114 +29,114 @@ public interface DataCacheInstrument {
     /**
      * Gets number of total read requests for the given class since last reset.
      */
-    public long getReadCount(String className);
+    long getReadCount(String className);
 
     /**
      * Gets number of total read requests that has been found in cache for the given class since last reset.
      */
-    public long getHitCount(String className);
+    long getHitCount(String className);
 
     /**
      * Gets number of total write requests for the given class since last reset.
      */
-    public long getWriteCount(String className);
+    long getWriteCount(String className);
 
     /**
      * Gets number of total read requests for the given class since start.
      */
-    public long getTotalReadCount(String className);
+    long getTotalReadCount(String className);
 
     /**
      * Gets number of total read requests that has been found in cache for the given class since start.
      */
-    public long getTotalHitCount(String className);
+    long getTotalHitCount(String className);
 
     /**
      * Gets number of total write requests for the given class since start.
      */
-    public long getTotalWriteCount(String className);
+    long getTotalWriteCount(String className);
 
     /**
      * Returns the name of the cache
      */
-    public String getCacheName();
+    String getCacheName();
 
     /**
      * Returns the hit count since cache statistics were last reset
      */
-    public long getHitCount();
+    long getHitCount();
 
     /**
      * Returns the read count since cache statistics were last reset
      */
-    public long getReadCount();
+    long getReadCount();
 
     /**
      * Returns the total hits since start.
      */
-    public long getTotalHitCount();
+    long getTotalHitCount();
 
     /**
      * Returns the total reads since start.
      */
-    public long getTotalReadCount();
+    long getTotalReadCount();
 
     /**
      * Returns the total writes since start.
      */
-    public long getTotalWriteCount();
+    long getTotalWriteCount();
 
     /**
      * Returns the write count since cache statistics were last reset
      */
-    public long getWriteCount();
+    long getWriteCount();
 
     /**
      * Resets cache statistics
      */
-    public void reset();
+    void reset();
 
     /**
      * Returns date since cache statistics collection were last reset.
      */
-    public Date sinceDate();
+    Date sinceDate();
 
     /**
      * Returns date cache statistics collection started.
      */
-    public Date startDate();
+    Date startDate();
 
     /**
      * Returns the names of classes that are known to the cache and whether or not they are currently being cached.
      */
-    public Map<String, Boolean> listKnownTypes();
+    Map<String, Boolean> listKnownTypes();
 
     /**
      * Returns true if cache statistics are currently being calculated. False otherwise.
      */
-    public Boolean getStatisticsEnabled();
+    Boolean getStatisticsEnabled();
 
     /**
      *
      * @param enable - If true, the cache will start collecting statistics. Else cache statistics will not be collected.
      */
-    public void collectStatistics(boolean enable);
+    void collectStatistics(boolean enable);
 
     /**
      * This method is used to enable/disable caching for the specified className.
      */
-    public void cache(String className, boolean enable);
+    void cache(String className, boolean enable);
 
     /**
      * Returns the CacheStatistics for the cache.
      * The format for this map is:
      *  Type(String) => Enabled(Boolean),Read(Long),Hit(Long),Write(Long)
      */
-    public Map<String, long[]> getCacheStatistics();
+    Map<String, long[]> getCacheStatistics();
 
 
     /**
      * Clears all data from the DataCache.
      */
-    public void clear();
+    void clear();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/InstrumentationManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/InstrumentationManager.java
index 24fe7eb7b..5d0b5a3d4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/InstrumentationManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/InstrumentationManager.java
@@ -38,14 +38,14 @@ public interface InstrumentationManager extends Closeable {
      * @param conf the configuration to use for initialization
      * @param providers one or more providers as supplied via plugin list value
      */
-    public void initialize(OpenJPAConfiguration conf, PluginListValue providers);
+    void initialize(OpenJPAConfiguration conf, PluginListValue providers);
 
     /**
      * Manage a given provider.  This will plug the instruments managed by the
      * the provider into the life cycle of the manager
      * @param provider the instrumentation provider
      */
-    public void manageProvider(InstrumentationProvider provider);
+    void manageProvider(InstrumentationProvider provider);
 
     /**
      * Starts all instruments for all managed providers for a given level
@@ -53,7 +53,7 @@ public interface InstrumentationManager extends Closeable {
      * @param level  instrumentation level
      * @param context  instrumentation context (broker, factory, config,...)
      */
-    public void start(InstrumentationLevel level, Object context);
+    void start(InstrumentationLevel level, Object context);
 
     /**
      * Stops all instruments for all managed providers for a given level
@@ -61,11 +61,11 @@ public interface InstrumentationManager extends Closeable {
      * @param level  instrumentation level
      * @param context  instrumentation context (broker, factory, config,...)
      */
-    public void stop(InstrumentationLevel broker, Object context);
+    void stop(InstrumentationLevel broker, Object context);
 
     /**
      * Returns all providers managed by this manager.
      * @return  all providers managed by this manager
      */
-    public Set<InstrumentationProvider> getProviders();
+    Set<InstrumentationProvider> getProviders();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/InstrumentationManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/InstrumentationManagerImpl.java
index e29c2ff14..f1d1a4c12 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/InstrumentationManagerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/InstrumentationManagerImpl.java
@@ -41,6 +41,7 @@ public class InstrumentationManagerImpl implements InstrumentationManager {
     /**
      * Initializes all providers defined for the specified configuration.
      */
+    @Override
     public void initialize(OpenJPAConfiguration conf, PluginListValue pluginVal) {
         InstrumentationProvider[] providers =
             (InstrumentationProvider[])pluginVal.instantiate(InstrumentationProvider.class, conf);
@@ -51,6 +52,7 @@ public class InstrumentationManagerImpl implements InstrumentationManager {
      * Make a provider managed.  This will bind its instrumentation to
      * InstrumentationLevel type events (factory create/close, broker create/close).
      */
+    @Override
     public void manageProvider(InstrumentationProvider provider) {
         _providers.add(provider);
     }
@@ -58,6 +60,7 @@ public class InstrumentationManagerImpl implements InstrumentationManager {
     /**
      * Returns all providers as an unmodifiable set
      */
+    @Override
     public Set<InstrumentationProvider> getProviders() {
         return Collections.unmodifiableSet(_providers);
     }
@@ -65,6 +68,7 @@ public class InstrumentationManagerImpl implements InstrumentationManager {
     /**
      *  Starts all providers at a specific level and context
      */
+    @Override
     public void start(InstrumentationLevel level, Object context) {
         if (_providers == null || _providers.size() == 0) {
             return;
@@ -80,6 +84,7 @@ public class InstrumentationManagerImpl implements InstrumentationManager {
     /**
      *  Stops all providers at a specific level and context
      */
+    @Override
     public void stop(InstrumentationLevel level, Object context) {
         if (_providers == null || _providers.size() == 0) {
             return;
@@ -92,6 +97,7 @@ public class InstrumentationManagerImpl implements InstrumentationManager {
     /**
      *  Stops all providers
      */
+    @Override
     public void close() throws Exception {
         if (_closed) {
             return;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/PreparedQueryCacheInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/PreparedQueryCacheInstrument.java
index 2b9bdf15d..f75b08925 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/PreparedQueryCacheInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/PreparedQueryCacheInstrument.java
@@ -26,62 +26,62 @@ public interface PreparedQueryCacheInstrument {
     /**
      * Returns number of total exec requests since start.
      */
-    public long getTotalExecutionCount();
+    long getTotalExecutionCount();
 
     /**
      * Returns number of total exec requests since start.
      */
-    public long getTotalExecutionCount(String query);
+    long getTotalExecutionCount(String query);
 
     /**
      * Returns number of total execution requests since last reset
      */
-    public long getExecutionCount();
+    long getExecutionCount();
 
     /**
      * Returns number of total execution requests since last reset
      */
-    public long getExecutionCount(String query);
+    long getExecutionCount(String query);
 
     /**
      * Returns number of total read requests that have been found in cache since
      * last reset.
      */
-    public long getHitCount();
+    long getHitCount();
 
     /**
      * Returns number of total read requests that have been found in cache since
      * last reset.
      */
-    public long getHitCount(String query);
+    long getHitCount(String query);
 
     /**
      * Returns number of total read requests that has been found since start.
      */
-    public long getTotalHitCount();
+    long getTotalHitCount();
 
     /**
      * Returns number of total read requests that has been found since start.
      */
-    public long getTotalHitCount(String query);
+    long getTotalHitCount(String query);
 
     /**
      * Resets cache statistics
      */
-    public void reset();
+    void reset();
 
     /**
      * Returns date since cache statistics collection were last reset.
      */
-    public Date sinceDate();
+    Date sinceDate();
 
     /**
      * Returns date cache statistics collection started.
      */
-    public Date startDate();
+    Date startDate();
 
     /**
      * Returns all queries currently tracked in the cache.
      */
-    public Set<String> queries();
+    Set<String> queries();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/QueryCacheInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/QueryCacheInstrument.java
index 0c2ff7e23..0b05712b9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/QueryCacheInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/QueryCacheInstrument.java
@@ -29,82 +29,82 @@ public interface QueryCacheInstrument {
     /**
      * Returns number of total exec requests since start.
      */
-    public long getTotalExecutionCount();
+    long getTotalExecutionCount();
 
     /**
      * Returns number of total exec requests since start for
      * the specified string-ified query key.
      */
-    public long getTotalExecutionCount(String queryKey);
+    long getTotalExecutionCount(String queryKey);
 
     /**
      * Returns number of total execution requests since last reset
      */
-    public long getExecutionCount();
+    long getExecutionCount();
 
     /**
      * Returns number of total execution requests since last reset for
      * the specified string-ified query key.
      */
-    public long getExecutionCount(String queryKey);
+    long getExecutionCount(String queryKey);
 
     /**
      * Returns number of total read requests that have been found in cache since
      * last reset.
      */
-    public long getHitCount();
+    long getHitCount();
 
     /**
      * Returns number of total read requests that have been found in cache since
      * last reset for the specified string-ified query key.
      */
-    public long getHitCount(String queryKey);
+    long getHitCount(String queryKey);
 
     /**
      * Returns number of total read requests that has been found since start.
      */
-    public long getTotalHitCount();
+    long getTotalHitCount();
 
     /**
      * Returns number of total read requests that has been found since start for
      * the specified string-ified query key.
      */
-    public long getTotalHitCount(String queryKey);
+    long getTotalHitCount(String queryKey);
 
     /**
      * Resets cache statistics
      */
-    public void reset();
+    void reset();
 
     /**
      * Returns date since cache statistics collection were last reset.
      */
-    public Date sinceDate();
+    Date sinceDate();
 
     /**
      * Returns date cache statistics collection started.
      */
-    public Date startDate();
+    Date startDate();
 
     /**
      * Returns all the string-ified keys for query results in the cache.
      */
-    public Set<String> queryKeys();
+    Set<String> queryKeys();
 
     /**
      * Returns number of total evictions since last reset
      */
-    public long getEvictionCount();
+    long getEvictionCount();
 
     /**
      * Returns number of total eviction requests since start.
      */
-    public long getTotalEvictionCount();
+    long getTotalEvictionCount();
 
     /**
      * Returns the number of total entries in the cache.
      * @return entries
      */
-    public long count();
+    long count();
 
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/DataCacheJMXInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/DataCacheJMXInstrument.java
index 5c598bc47..6ac2d976c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/DataCacheJMXInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/DataCacheJMXInstrument.java
@@ -77,6 +77,7 @@ public class DataCacheJMXInstrument extends AbstractDataCacheInstrument implemen
         setContextRef(Integer.toString(System.identityHashCode(getContext())));
     }
 
+    @Override
     public ObjectName getObjectName() {
         if (_objName != null) {
             return _objName;
@@ -90,10 +91,12 @@ public class DataCacheJMXInstrument extends AbstractDataCacheInstrument implemen
         }
     }
 
+    @Override
     public void start() {
         getProvider().startInstrument(this);
     }
 
+    @Override
     public void stop() {
         getProvider().stopInstrument(this);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/JMXInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/JMXInstrument.java
index b23746895..bf981ba96 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/JMXInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/JMXInstrument.java
@@ -30,33 +30,33 @@ public interface JMXInstrument extends Instrument {
     /**
      * Returns the JMX object name for the instrument
      */
-    public ObjectName getObjectName();
+    ObjectName getObjectName();
 
     /**
      * Sets the context reference for the instrument.  Required to register
      * the instrument under a unique id.
      * @param cref the context reference for the instrument
      */
-    public void setContextRef(String cref);
+    void setContextRef(String cref);
 
     /**
      * Gets the context reference for the instrument.  Required to register
      * the instrument under a unique id.
      * @param cref the context reference for the instrument
      */
-    public String getContextRef();
+    String getContextRef();
 
     /**
      * Sets the config id for the instrument.  Required to register
      * the instrument under a unique id.
      * @return the config id of the instrument
      */
-    public String getConfigId();
+    String getConfigId();
 
     /**
      * Gets the config id for the instrument.  Required to register
      * the instrument under a unique id.
      * @param cid the config id of the instrument
      */
-    public void setConfigId(String cid);
+    void setConfigId(String cid);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/JMXProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/JMXProvider.java
index 02cdd8eb8..4606bd7e3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/JMXProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/JMXProvider.java
@@ -21,8 +21,8 @@ package org.apache.openjpa.instrumentation.jmx;
 import java.lang.management.ManagementFactory;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
@@ -71,7 +71,7 @@ public class JMXProvider
      */
     public Set<MBeanServer> getMBeanServer() {
         if (_mbs == null) {
-            _mbs =  new HashSet<MBeanServer>();
+            _mbs =  new HashSet<>();
             // Look in both of these static methods to find all MBServers. In some environments the server returned by
             // the getPlatformMBeanServer() call isn't the one used by the runtime. Might be over kill by calling both,
             // but it shouldn't hurt anything.
@@ -151,6 +151,7 @@ public class JMXProvider
     /**
      * Start an instrument.  Registers an mbean with the server.
      */
+    @Override
     public void startInstrument(Instrument instrument) {
         if (!instrument.isStarted()) {
             registerMBean((JMXInstrument)instrument);
@@ -161,6 +162,7 @@ public class JMXProvider
     /**
      * Stop an instrument.  Unregisters an mbean with the server.
      */
+    @Override
     public void stopInstrument(Instrument instrument, boolean force) {
         if (instrument.isStarted() || force) {
             Set<MBeanServer> mbs = getMBeanServer();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/PreparedQueryCacheJMXInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/PreparedQueryCacheJMXInstrument.java
index 917b05168..6c24c3af8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/PreparedQueryCacheJMXInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/PreparedQueryCacheJMXInstrument.java
@@ -65,6 +65,7 @@ public class PreparedQueryCacheJMXInstrument extends AbstractPreparedQueryCacheI
         setContextRef(Integer.toString(System.identityHashCode(getContext())));
     }
 
+    @Override
     public ObjectName getObjectName() {
         if (_objName != null) {
             return _objName;
@@ -78,10 +79,12 @@ public class PreparedQueryCacheJMXInstrument extends AbstractPreparedQueryCacheI
         }
     }
 
+    @Override
     public void start() {
         getProvider().startInstrument(this);
     }
 
+    @Override
     public void stop() {
         getProvider().stopInstrument(this);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/QueryCacheJMXInstrument.java b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/QueryCacheJMXInstrument.java
index 6db8a5097..3fc90ad38 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/QueryCacheJMXInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/jmx/QueryCacheJMXInstrument.java
@@ -66,6 +66,7 @@ public class QueryCacheJMXInstrument extends AbstractQueryCacheInstrument
         setContextRef(Integer.toString(System.identityHashCode(getContext())));
     }
 
+    @Override
     public ObjectName getObjectName() {
         if (_objName != null) {
             return _objName;
@@ -79,10 +80,12 @@ public class QueryCacheJMXInstrument extends AbstractQueryCacheInstrument
         }
     }
 
+    @Override
     public void start() {
         getProvider().startInstrument(this);
     }
 
+    @Override
     public void stop() {
         getProvider().stopInstrument(this);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
index 42eee3883..225b12936 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
@@ -41,7 +41,6 @@ import javax.transaction.TransactionManager;
 
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 import org.apache.commons.collections4.set.MapBackedSet;
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.audit.Auditor;
 import org.apache.openjpa.conf.BrokerValue;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
@@ -61,6 +60,7 @@ import org.apache.openjpa.lib.instrumentation.InstrumentationLevel;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashSet;
 import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.MetaDataRepository;
@@ -76,9 +76,8 @@ import org.apache.openjpa.util.UserException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public abstract class AbstractBrokerFactory
-    implements BrokerFactory {
+public abstract class AbstractBrokerFactory implements BrokerFactory {
+    private static final long serialVersionUID = 1L;
 
     private static final Localizer _loc = Localizer.forPackage(AbstractBrokerFactory.class);
 
@@ -98,7 +97,7 @@ public abstract class AbstractBrokerFactory
 
     // maps global transactions to associated brokers
     private transient ConcurrentHashMap<Object,Collection<Broker>>
-        _transactional = new ConcurrentHashMap<Object,Collection<Broker>>();
+        _transactional = new ConcurrentHashMap<>();
 
     // weak-ref tracking of open brokers
     private transient Set<Broker> _brokers;
@@ -147,7 +146,7 @@ public abstract class AbstractBrokerFactory
      * if none. The key must be of the form created by {@link #getPoolKey}.
      */
     public static AbstractBrokerFactory getPooledFactoryForKey(Object key) {
-        return (AbstractBrokerFactory) _pool.get(key);
+        return _pool.get(key);
     }
 
     /**
@@ -162,10 +161,12 @@ public abstract class AbstractBrokerFactory
     /**
      * Return the configuration for this factory.
      */
+    @Override
     public OpenJPAConfiguration getConfiguration() {
         return _conf;
     }
 
+    @Override
     public Broker newBroker() {
         return newBroker(_conf.getConnectionUserName(), _conf.getConnectionPassword());
     }
@@ -182,10 +183,12 @@ public abstract class AbstractBrokerFactory
         return newBroker(user, pass, managed, connRetainMode, true);
     }
 
+    @Override
     public Broker newBroker(String user, String pass, boolean managed, int connRetainMode, boolean findExisting) {
         return newBroker(user, pass, managed, connRetainMode, findExisting, "", "");
     }
 
+    @Override
     public Broker newBroker(String user, String pass, boolean managed, int connRetainMode, boolean findExisting,
         String cf1Name, String cf2Name) {
         try {
@@ -276,14 +279,14 @@ public abstract class AbstractBrokerFactory
         // cache persistent type names if not already
         ClassLoader loader = _conf.getClassResolverInstance().
             getClassLoader(getClass(), envLoader);
-        Collection<Class<?>> toRedefine = new ArrayList<Class<?>>();
+        Collection<Class<?>> toRedefine = new ArrayList<>();
         if (!_persistentTypesLoaded) {
             Collection<Class<?>> clss = _conf.getMetaDataRepositoryInstance().
                 loadPersistentTypes(false, loader, _conf.isInitializeEagerly());
             if (clss.isEmpty())
                 _pcClassNames = Collections.emptyList();
             else {
-                Collection<String> c = new ArrayList<String>(clss.size());
+                Collection<String> c = new ArrayList<>(clss.size());
                 for (Iterator<Class<?>> itr = clss.iterator(); itr.hasNext();) {
                     Class<?> cls = itr.next();
                     c.add(cls.getName());
@@ -318,18 +321,20 @@ public abstract class AbstractBrokerFactory
             && !PersistenceCapable.class.isAssignableFrom(cls);
     }
 
+    @Override
     public void addLifecycleListener(Object listener, Class<?>[] classes) {
         lock();
         try {
             assertOpen();
             if (_lifecycleListeners == null)
-                _lifecycleListeners = new HashMap<Object, Class<?>[]>(7);
+                _lifecycleListeners = new HashMap<>(7);
             _lifecycleListeners.put(listener, classes);
         } finally {
             unlock();
         }
     }
 
+    @Override
     public void removeLifecycleListener(Object listener) {
         lock();
         try {
@@ -341,18 +346,20 @@ public abstract class AbstractBrokerFactory
         }
     }
 
+    @Override
     public void addTransactionListener(Object listener) {
         lock();
         try {
             assertOpen();
             if (_transactionListeners == null)
-                _transactionListeners = new LinkedList<Object>();
+                _transactionListeners = new LinkedList<>();
             _transactionListeners.add(listener);
         } finally {
             unlock();
         }
     }
 
+    @Override
     public void removeTransactionListener(Object listener) {
         lock();
         try {
@@ -367,10 +374,12 @@ public abstract class AbstractBrokerFactory
     /**
      * Returns true if this broker factory is closed.
      */
+    @Override
     public boolean isClosed() {
         return _closed;
     }
 
+    @Override
     public void close() {
         lock();
 
@@ -412,6 +421,7 @@ public abstract class AbstractBrokerFactory
      * property listing the runtime platform, such as:
      * <code>OpenJPA JDBC Edition: Oracle Database</code>
      */
+    @Override
     public Map<String,Object> getProperties() {
         // required props are VendorName and VersionNumber
         Map<String,Object> props = _conf.toProperties(true);
@@ -421,10 +431,12 @@ public abstract class AbstractBrokerFactory
         return props;
     }
 
+    @Override
     public Set<String> getSupportedProperties() {
         return _conf.getPropertyKeys();
     }
 
+    @Override
     public Object getUserObject(Object key) {
         lock();
         try {
@@ -435,6 +447,7 @@ public abstract class AbstractBrokerFactory
         }
     }
 
+    @Override
     public Object putUserObject(Object key, Object val) {
         lock();
         try {
@@ -443,17 +456,19 @@ public abstract class AbstractBrokerFactory
                 return (_userObjects == null) ? null : _userObjects.remove(key);
 
             if (_userObjects == null)
-                _userObjects = new HashMap<Object,Object>();
+                _userObjects = new HashMap<>();
             return _userObjects.put(key, val);
         } finally {
             unlock();
         }
     }
 
+    @Override
     public void lock() {
         _lock.lock();
     }
 
+    @Override
     public void unlock() {
         _lock.unlock();
     }
@@ -469,7 +484,7 @@ public abstract class AbstractBrokerFactory
             return factory;
 
         // reset these transient fields to empty values
-        _transactional = new ConcurrentHashMap<Object,Collection<Broker>>();
+        _transactional = new ConcurrentHashMap<>();
         _brokers = newBrokerSet();
 
         // turn off logging while de-serializing BrokerFactory
@@ -492,7 +507,7 @@ public abstract class AbstractBrokerFactory
         if (FinalizingBrokerImpl.class.isAssignableFrom(bv.getTemplateBrokerType(_conf))) {
             return MapBackedSet.mapBackedSet(new ConcurrentHashMap(), new Object() { });
         } else {
-            return new ConcurrentReferenceHashSet<Broker>(ReferenceStrength.WEAK);
+            return new ConcurrentReferenceHashSet<>(ReferenceStrength.WEAK);
         }
     }
 
@@ -679,6 +694,7 @@ public abstract class AbstractBrokerFactory
      * Throw an exception if the factory is closed.  The exact message and
      * content of the exception varies whether TRACE is enabled or not.
      */
+    @Override
     public void assertOpen() {
         if (_closed) {
             if (_closedException == null)  // TRACE not enabled
@@ -704,7 +720,7 @@ public abstract class AbstractBrokerFactory
         if (_transactional.isEmpty())
             return;
 
-        excs = new ArrayList<Throwable>(_transactional.size());
+        excs = new ArrayList<>(_transactional.size());
         for (Collection<Broker> brokers : _transactional.values()) {
             for (Broker broker : brokers) {
                 excs.add(new InvalidStateException(_loc.get("active")).setFailedObject(broker));
@@ -713,7 +729,7 @@ public abstract class AbstractBrokerFactory
 
         if (!excs.isEmpty())
             throw new InvalidStateException(_loc.get("nested-exceps")).
-                setNestedThrowables((Throwable[]) excs.toArray(new Throwable[excs.size()]));
+                setNestedThrowables(excs.toArray(new Throwable[excs.size()]));
     }
 
     /**
@@ -752,7 +768,7 @@ public abstract class AbstractBrokerFactory
             Collection<Broker> brokers = _transactional.get(txKey);
 
             if (brokers == null) {
-                brokers = new ArrayList<Broker>(2);
+                brokers = new ArrayList<>(2);
                 _transactional.put(txKey, brokers);
                 trans.registerSynchronization(new RemoveTransactionSync(txKey));
             }
@@ -817,9 +833,11 @@ public abstract class AbstractBrokerFactory
             _trans = trans;
         }
 
+        @Override
         public void beforeCompletion() {
         }
 
+        @Override
         public void afterCompletion(int status) {
             _transactional.remove (_trans);
 		}
@@ -830,7 +848,7 @@ public abstract class AbstractBrokerFactory
      */
     private Collection<ClassLoader> getPcClassLoaders() {
        if (_pcClassLoaders == null)
-         _pcClassLoaders = new ConcurrentReferenceHashSet<ClassLoader>(ReferenceStrength.WEAK);
+         _pcClassLoaders = new ConcurrentReferenceHashSet<>(ReferenceStrength.WEAK);
 
        return _pcClassLoaders;
     }
@@ -865,6 +883,7 @@ public abstract class AbstractBrokerFactory
     /**
      * This method is invoked AFTER a BrokerFactory has been instantiated.
      */
+    @Override
     public void postCreationCallback() {
     	Auditor auditor = _conf.getAuditorInstance();
     	if (auditor != null) {
@@ -882,10 +901,10 @@ public abstract class AbstractBrokerFactory
             // preloading.
             MetaDataRepository mdr = _conf.getMetaDataRepositoryInstance();
             mdr.setValidate(MetaDataRepository.VALIDATE_RUNTIME, true);
-            mdr.setResolve(MetaDataRepository.MODE_MAPPING_INIT, true);
+            mdr.setResolve(MetaDataModes.MODE_MAPPING_INIT, true);
 
             // Load persistent classes and hook in subclasser
-            loadPersistentTypes((ClassLoader) AccessController.doPrivileged(J2DoPrivHelper
+            loadPersistentTypes(AccessController.doPrivileged(J2DoPrivHelper
                 .getContextClassLoaderAction()));
             mdr.preload();
         }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractFieldManager.java
index 22f056093..1133b2d09 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractFieldManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractFieldManager.java
@@ -30,82 +30,102 @@ import org.apache.openjpa.util.InternalException;
 abstract class AbstractFieldManager
     implements FieldManager {
 
+    @Override
     public boolean fetchBooleanField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public byte fetchByteField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public char fetchCharField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public double fetchDoubleField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public float fetchFloatField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public int fetchIntField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public long fetchLongField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public Object fetchObjectField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public short fetchShortField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public String fetchStringField(int field) {
         throw new InternalException();
     }
 
+    @Override
     public void storeBooleanField(int field, boolean curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeByteField(int field, byte curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeCharField(int field, char curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeDoubleField(int field, double curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeFloatField(int field, float curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeIntField(int field, int curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeLongField(int field, long curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeObjectField(int field, Object curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeShortField(int field, short curVal) {
         throw new InternalException();
     }
 
+    @Override
     public void storeStringField(int field, String curVal) {
         throw new InternalException();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractLockManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractLockManager.java
index bd37076b3..7e2b74be2 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractLockManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractLockManager.java
@@ -42,6 +42,7 @@ public abstract class AbstractLockManager
      */
     protected Log log;
 
+    @Override
     public void setContext(StoreContext ctx) {
         this.ctx = ctx;
         this.log = ctx.getConfiguration().getLog
@@ -55,6 +56,7 @@ public abstract class AbstractLockManager
     /**
      * Delegates to {@link LockManager#lock} with each element of the collection
      */
+    @Override
     public void lockAll(Collection sms, int level, int timeout,
         Object context) {
         for (Iterator<?> itr = sms.iterator(); itr.hasNext();)
@@ -64,18 +66,21 @@ public abstract class AbstractLockManager
     /**
      * Does nothing by default.
      */
+    @Override
     public void beginTransaction() {
     }
 
     /**
      * Does nothing by default.
      */
+    @Override
     public void endTransaction() {
     }
 
     /**
      * Does nothing by default.
      */
+    @Override
     public void close () {
 	}
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCData.java
index 4c772a3b1..4e628fc02 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCData.java
@@ -45,6 +45,8 @@ import org.apache.openjpa.util.Proxy;
 public abstract class AbstractPCData
     implements PCData {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final Object NULL = new Object();
     private static final Object[] EMPTY_ARRAY = new Object[0];
 
@@ -58,6 +60,7 @@ public abstract class AbstractPCData
      */
     public abstract AbstractPCData newEmbeddedPCData(OpenJPAStateManager sm);
 
+    @Override
     public boolean isLoaded(int field) {
         return getLoaded().get(field);
     }
@@ -409,6 +412,9 @@ public abstract class AbstractPCData
     private static class ProxyDataList
         extends ArrayList {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public static final ProxyDataList EMPTY_LIST = new ProxyDataList(0);
 
         public int nextSequence = 0;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCResultObjectProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCResultObjectProvider.java
index 46a171706..8cf0cd36e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCResultObjectProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCResultObjectProvider.java
@@ -55,6 +55,7 @@ public abstract class AbstractPCResultObjectProvider
         return ctx;
     }
 
+    @Override
     public void initialize(OpenJPAStateManager sm, PCState state,
         FetchConfiguration fetch)
         throws Exception {
@@ -62,6 +63,7 @@ public abstract class AbstractPCResultObjectProvider
         load(sm, fetch);
     }
 
+    @Override
     public Object getResultObject()
         throws Exception {
         Class type = getPCType();
@@ -103,6 +105,7 @@ public abstract class AbstractPCResultObjectProvider
     /**
      * Override if desired. Does nothing by default.
      */
+    @Override
     public void open()
         throws Exception {
     }
@@ -112,6 +115,7 @@ public abstract class AbstractPCResultObjectProvider
      *
      * @see ResultObjectProvider#supportsRandomAccess
      */
+    @Override
     public boolean supportsRandomAccess() {
         return false;
     }
@@ -121,6 +125,7 @@ public abstract class AbstractPCResultObjectProvider
      *
      * @see ResultObjectProvider#next
      */
+    @Override
     public abstract boolean next()
         throws Exception;
 
@@ -129,6 +134,7 @@ public abstract class AbstractPCResultObjectProvider
      *
      * @see ResultObjectProvider#absolute
      */
+    @Override
     public boolean absolute(int pos)
         throws Exception {
         throw new UnsupportedOperationException();
@@ -139,6 +145,7 @@ public abstract class AbstractPCResultObjectProvider
      *
      * @see ResultObjectProvider#size
      */
+    @Override
     public int size()
         throws Exception {
         return Integer.MAX_VALUE;
@@ -149,6 +156,7 @@ public abstract class AbstractPCResultObjectProvider
      *
      * @see ResultObjectProvider#reset
      */
+    @Override
     public void reset()
         throws Exception {
         throw new UnsupportedOperationException();
@@ -159,6 +167,7 @@ public abstract class AbstractPCResultObjectProvider
      *
      * @see ResultObjectProvider#close
      */
+    @Override
     public void close()
         throws Exception {
     }
@@ -166,6 +175,7 @@ public abstract class AbstractPCResultObjectProvider
     /**
      * Throws a {@link StoreException} by default.
      */
+    @Override
     public void handleCheckedException(Exception e) {
         throw new StoreException (e);
 	}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java
index e8e87ad32..6873daf16 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractStoreQuery.java
@@ -38,82 +38,99 @@ import org.apache.openjpa.util.UnsupportedException;
  * @author Abe White
  * @since 0.4.0
  */
-@SuppressWarnings("serial")
-public abstract class AbstractStoreQuery
-    implements StoreQuery {
-
+public abstract class AbstractStoreQuery implements StoreQuery {
+    private static final long serialVersionUID = 1L;
     protected QueryContext ctx = null;
 
+    @Override
     public QueryContext getContext() {
         return ctx;
     }
 
+    @Override
     public void setContext(QueryContext ctx) {
         this.ctx = ctx;
     }
 
+    @Override
     public boolean setQuery(Object query) {
         return false;
     }
 
+    @Override
     public FilterListener getFilterListener(String tag) {
         return null;
     }
 
+    @Override
     public AggregateListener getAggregateListener(String tag) {
         return null;
     }
 
+    @Override
     public Object newCompilationKey() {
         return null;
     }
 
+    @Override
     public Object newCompilation() {
         return null;
     }
 
+    @Override
     public Object getCompilation() {
         return null;
     }
 
+    @Override
     public void populateFromCompilation(Object comp) {
     }
 
+    @Override
     public void invalidateCompilation() {
     }
 
+    @Override
     public boolean supportsDataStoreExecution() {
         return false;
     }
 
+    @Override
     public boolean supportsInMemoryExecution() {
         return false;
     }
 
+    @Override
     public Executor newInMemoryExecutor(ClassMetaData meta, boolean subs) {
         throw new InternalException();
     }
 
+    @Override
     public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs) {
         throw new InternalException();
     }
 
+    @Override
     public boolean supportsAbstractExecutors() {
         return false;
     }
 
+    @Override
     public boolean requiresCandidateType() {
         return true;
     }
 
+    @Override
     public boolean requiresParameterDeclarations() {
         return true;
     }
 
+    @Override
     public boolean supportsParameterDeclarations() {
         return true;
     }
 
+    @Override
     public Object evaluate(Object value, Object ob, Object[] params,
         OpenJPAStateManager sm) {
         throw new UnsupportedException();
@@ -125,6 +142,7 @@ public abstract class AbstractStoreQuery
     public static abstract class AbstractExecutor
         implements Executor {
 
+        @Override
         public Number executeDelete(StoreQuery q, Object[] params) {
             try {
                 return q.getContext().deleteInMemory(q, this, params);
@@ -138,6 +156,7 @@ public abstract class AbstractStoreQuery
             }
         }
 
+        @Override
         public Number executeUpdate(StoreQuery q, Object[] params) {
             try {
                 return q.getContext().updateInMemory(q, this, params);
@@ -151,85 +170,105 @@ public abstract class AbstractStoreQuery
             }
         }
 
+        @Override
         public String[] getDataStoreActions(StoreQuery q, Object[] params,
             Range range) {
             return EMPTY_STRINGS;
         }
 
+        @Override
         public void validate(StoreQuery q) {
         }
 
 
+        @Override
         public QueryExpressions[] getQueryExpressions() {
             return null;
         }
 
+        @Override
         public ResultShape<?> getResultShape(StoreQuery q) {
             return null;
         }
 
+        @Override
         public void getRange(StoreQuery q, Object[] params, Range range) {
         }
 
+        @Override
         public Object getOrderingValue(StoreQuery q, Object[] params,
             Object resultObject, int orderIndex) {
             return null;
         }
 
+        @Override
         public boolean[] getAscending(StoreQuery q) {
             return EMPTY_BOOLEANS;
         }
 
+        @Override
         public boolean isPacking(StoreQuery q) {
             return false;
         }
 
+        @Override
         public String getAlias(StoreQuery q) {
             return null;
         }
 
+        @Override
         public String[] getProjectionAliases(StoreQuery q) {
             return EMPTY_STRINGS;
         }
 
+        @Override
         public Class<?>[] getProjectionTypes(StoreQuery q) {
             return EMPTY_CLASSES;
         }
 
+        @Override
         public ClassMetaData[] getAccessPathMetaDatas(StoreQuery q) {
             return EMPTY_METAS;
         }
 
+        @Override
         public int getOperation(StoreQuery q) {
             return OP_SELECT;
         }
 
+        @Override
         public boolean isAggregate(StoreQuery q) {
             return false;
         }
 
+        @Override
         public boolean isDistinct(StoreQuery q) {
             return false;
         }
 
+        @Override
         public boolean hasGrouping(StoreQuery q) {
             return false;
         }
 
+        @Override
         public OrderedMap<Object,Class<?>> getOrderedParameterTypes(StoreQuery q) {
             return EMPTY_ORDERED_PARAMS;
         }
 
+        @Override
         public LinkedMap getParameterTypes(StoreQuery q) {
             LinkedMap result = new LinkedMap();
             result.putAll(getOrderedParameterTypes(q));
             return result;
         }
 
+        @Override
         public Class<?> getResultClass(StoreQuery q) {
             return null;
         }
 
+        @Override
         public Map<FieldMetaData,Value> getUpdates(StoreQuery q) {
             return null;
         }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java
index bb44edd68..947ec123b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachManager.java
@@ -22,13 +22,13 @@ import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import java.util.IdentityHashMap;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.event.CallbackModes;
 import org.apache.openjpa.event.LifecycleEvent;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachStrategy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachStrategy.java
index 01213ebe0..4cefe802e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachStrategy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AttachStrategy.java
@@ -22,10 +22,10 @@ import java.lang.reflect.Array;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
-
 import java.util.Objects;
+import java.util.Set;
+
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.StateManager;
 import org.apache.openjpa.lib.util.Localizer;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AuditManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AuditManager.java
index 47beecf47..6aa196bcb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AuditManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AuditManager.java
@@ -70,11 +70,11 @@ public class AuditManager extends InMemorySavepointManager
 
 		setPreFlush(false);
 		_auditor = auditor;
-		_allTypes = new HashSet<Class<?>>();
-		_newTypes = new HashSet<Class<?>>();
-		_updateTypes = new HashSet<Class<?>>();
-		_deleteTypes = new HashSet<Class<?>>();
-		_saved = new ConcurrentHashMap<Broker, AuditCallback>();
+		_allTypes = new HashSet<>();
+		_newTypes = new HashSet<>();
+		_updateTypes = new HashSet<>();
+		_deleteTypes = new HashSet<>();
+		_saved = new ConcurrentHashMap<>();
 		PCRegistry.addRegisterClassListener(this);
 	}
 
@@ -245,7 +245,7 @@ public class AuditManager extends InMemorySavepointManager
 	private class AuditCallback implements LifecycleListener {
 		private final Broker _broker;
 		private final Map<StateManagerImpl,PersistenceCapable> _audits =
-			new ConcurrentHashMap<StateManagerImpl,PersistenceCapable>();
+			new ConcurrentHashMap<>();
 
 		AuditCallback(Broker broker) {
 			_broker = broker;
@@ -253,9 +253,9 @@ public class AuditManager extends InMemorySavepointManager
 
 		void audit() {
 			if (_audits.isEmpty()) return;
-			Collection<Audited> news = new HashSet<Audited>();
-			Collection<Audited> updates = new HashSet<Audited>();
-			Collection<Audited> deletes = new HashSet<Audited>();
+			Collection<Audited> news = new HashSet<>();
+			Collection<Audited> updates = new HashSet<>();
+			Collection<Audited> deletes = new HashSet<>();
 			for (Map.Entry<StateManagerImpl,PersistenceCapable> e : _audits.entrySet()) {
 				StateManagerImpl sm = e.getKey();
 				Audited audited = new Audited(sm, e.getValue());
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AutoClear.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AutoClear.java
index 824c242a0..009713085 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AutoClear.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AutoClear.java
@@ -29,10 +29,10 @@ public interface AutoClear {
     /**
      * Clear state when entering a datastore transaction.
      */
-    public static final int CLEAR_DATASTORE = 0;
+    int CLEAR_DATASTORE = 0;
 
     /**
      * Clear state when entering any transaction.
      */
-    public static final int CLEAR_ALL = 1;
+    int CLEAR_ALL = 1;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AutoDetach.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AutoDetach.java
index b2f4288f6..eb37a69a5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AutoDetach.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AutoDetach.java
@@ -26,29 +26,29 @@ public interface AutoDetach {
     /**
      * Detach context on close.
      */
-    public static final int DETACH_CLOSE = 2 << 0;
+    int DETACH_CLOSE = 2 << 0;
 
     /**
      * Detach context on transaction commit.
      */
-    public static final int DETACH_COMMIT = 2 << 1;
+    int DETACH_COMMIT = 2 << 1;
 
     /**
      * Detach context on any nontransctional read, such that each
      * nontransactional operation uses a new persistence context in essence.
      */
-    public static final int DETACH_NONTXREAD = 2 << 2;
+    int DETACH_NONTXREAD = 2 << 2;
 
     /**
      * Detach context on failed transaction commit / rollback.
      */
-    public static final int DETACH_ROLLBACK = 2 << 3;
+    int DETACH_ROLLBACK = 2 << 3;
 
     /**
      * Do not detach at all. Skips proxying second-class containers.
      */
-    public static final int DETACH_NONE = 2 << 4;
+    int DETACH_NONE = 2 << 4;
 
-    public static final String[] names = {"CLOSE", "COMMIT", "NONTXREAD", "ROLLBACK", "NONE"};
-    public static final int[] values = {DETACH_CLOSE, DETACH_COMMIT, DETACH_NONTXREAD, DETACH_ROLLBACK, DETACH_NONE};
+    String[] names = {"CLOSE", "COMMIT", "NONTXREAD", "ROLLBACK", "NONE"};
+    int[] values = {DETACH_CLOSE, DETACH_COMMIT, DETACH_NONTXREAD, DETACH_ROLLBACK, DETACH_NONE};
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Broker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Broker.java
index 23f0e1cab..0426e9b8b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Broker.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Broker.java
@@ -53,144 +53,144 @@ public interface Broker
      * after the first invocation with non-null arguments,
      * subsequent invocations of this method are ignored.
      */
-    public void setImplicitBehavior(OpCallbacks call,
+    void setImplicitBehavior(OpCallbacks call,
         RuntimeExceptionTranslator ex);
 
     /**
      * Return the factory that produced this broker.
      */
-    public BrokerFactory getBrokerFactory();
+    BrokerFactory getBrokerFactory();
 
     /**
      * Return the connection retain mode for this broker.
      */
-    public int getConnectionRetainMode();
+    int getConnectionRetainMode();
 
     /**
      * Return the managed runtime in use.
      */
-    public ManagedRuntime getManagedRuntime();
+    ManagedRuntime getManagedRuntime();
 
     /**
      * Return the inverse manager in use.
      *
      * @since 0.3.2
      */
-    public InverseManager getInverseManager();
+    InverseManager getInverseManager();
 
     /**
      * Whether the broker or its managed instances are used in a multithreaded
      * environment.
      */
-    public boolean getMultithreaded();
+    boolean getMultithreaded();
 
     /**
      * Whether the broker or its managed instances are used in a multithreaded
      * environment.
      */
-    public void setMultithreaded(boolean multi);
+    void setMultithreaded(boolean multi);
 
     /**
      * Whether to take into account changes in the transaction when executing
      * a query or iterating an extent.
      */
-    public boolean getIgnoreChanges();
+    boolean getIgnoreChanges();
 
     /**
      * Whether to take into account changes in the transaction when executing
      * a query or iterating an extent.
      */
-    public void setIgnoreChanges(boolean ignore);
+    void setIgnoreChanges(boolean ignore);
 
     /**
      * Whether to allow nontransactional access to persistent state.
      */
-    public boolean getNontransactionalRead();
+    boolean getNontransactionalRead();
 
     /**
      * Whether to allow nontransactional access to persistent state.
      */
-    public void setNontransactionalRead(boolean read);
+    void setNontransactionalRead(boolean read);
 
     /**
      * Whether to allow nontransactional changes to persistent state.
      */
-    public boolean getNontransactionalWrite();
+    boolean getNontransactionalWrite();
 
     /**
      * Whether to allow nontransactional changes to persistent state.
      */
-    public void setNontransactionalWrite(boolean write);
+    void setNontransactionalWrite(boolean write);
 
     /**
      * Whether to restore an object's original state on rollback.
      */
-    public int getRestoreState();
+    int getRestoreState();
 
     /**
      * Whether to restore an object's original state on rollback.
      */
-    public void setRestoreState(int restore);
+    void setRestoreState(int restore);
 
     /**
      * Whether to use optimistic transactional semantics.
      */
-    public boolean getOptimistic();
+    boolean getOptimistic();
 
     /**
      * Whether to use optimistic transactional semantics.
      */
-    public void setOptimistic(boolean opt);
+    void setOptimistic(boolean opt);
 
     /**
      * Whether objects retain their persistent state on transaction commit.
      */
-    public boolean getRetainState();
+    boolean getRetainState();
 
     /**
      * Whether objects retain their persistent state on transaction commit.
      */
-    public void setRetainState(boolean retain);
+    void setRetainState(boolean retain);
 
     /**
      * Whether objects clear when entering transactions.
      */
-    public int getAutoClear();
+    int getAutoClear();
 
     /**
      * Whether objects clear when entering transactions.
      */
-    public void setAutoClear(int clear);
+    void setAutoClear(int clear);
 
     /**
      * Whether to check for a global transaction upon every managed,
      * non-transactional operation. Defaults to false.
      */
-    public boolean getSyncWithManagedTransactions();
+    boolean getSyncWithManagedTransactions();
 
     /**
      * Whether to check for a global transaction upon every managed,
      * non-transactional operation. Defaults to false.
      */
-    public void setSyncWithManagedTransactions(boolean resync);
+    void setSyncWithManagedTransactions(boolean resync);
 
     /**
      * Bit flags marked in {@link AutoDetach} which indicate when persistent
      * managed objects should be automatically detached in-place.
      */
-    public int getAutoDetach();
+    int getAutoDetach();
 
     /**
      * Bit flags marked in {@link AutoDetach} which indicate when persistent
      * managed objects should be automatically detached in-place.
      */
-    public void setAutoDetach(int flags);
+    void setAutoDetach(int flags);
 
     /**
      * Bit flags marked in {@link AutoDetach} which indicate when persistent
      * managed objects should be automatically detached in-place.
      */
-    public void setAutoDetach(int flag, boolean on);
+    void setAutoDetach(int flag, boolean on);
 
     /**
      * Retrieve the current properties for this broker Some of these properties
@@ -200,7 +200,7 @@ public interface Broker
      *
      * @since 2.0.0
      */
-    public Map<String, Object> getProperties();
+    Map<String, Object> getProperties();
 
     /**
      * Return the supported properties for this broker as property keys. If a
@@ -208,30 +208,30 @@ public interface Broker
      *
      * @since 2.0.0
      */
-    public Set<String> getSupportedProperties();
+    Set<String> getSupportedProperties();
 
     /**
      * Whether to treat relations to detached instances during persist
      * operations as new or as pseudo-hollow instances.
      */
-    public boolean isDetachedNew();
+    boolean isDetachedNew();
 
     /**
      * Whether to treat relations to detached instances as new.
      */
-    public void setDetachedNew(boolean isNew);
+    void setDetachedNew(boolean isNew);
 
     /**
      * Whether to also evict an object from the store cache when it is
      * evicted through this broker.
      */
-    public boolean getEvictFromDataCache();
+    boolean getEvictFromDataCache();
 
     /**
      * Whether to also evict an object from the store cache when it is
      * evicted through this broker.
      */
-    public void setEvictFromDataCache(boolean evict);
+    void setEvictFromDataCache(boolean evict);
 
     /**
      * Put the specified key-value pair into the map of user objects. Use
@@ -239,47 +239,47 @@ public interface Broker
      *
      * @since 0.3.2
      */
-    public Object putUserObject(Object key, Object val);
+    Object putUserObject(Object key, Object val);
 
     /**
      * Get the value for the specified key from the map of user objects.
      *
      * @since 0.3.2
      */
-    public Object getUserObject(Object key);
+    Object getUserObject(Object key);
 
     /**
      * Register a listener for transaction-related events.
      *
      * @since 0.2.5
      */
-    public void addTransactionListener(Object listener);
+    void addTransactionListener(Object listener);
 
     /**
      * Remove a listener for transaction-related events.
      *
      * @since 0.2.5
      */
-    public void removeTransactionListener(Object listener);
+    void removeTransactionListener(Object listener);
 
     /**
      * Gets an umodifiable collection of currently registered lsteners.
      *
      * @since 2.0.0
      */
-    public Collection<Object> getTransactionListeners();
+    Collection<Object> getTransactionListeners();
 
     /**
      * The callback mode for handling exceptions from transaction event
      * listeners.
      */
-    public int getTransactionListenerCallbackMode();
+    int getTransactionListenerCallbackMode();
 
     /**
      * The callback mode for handling exceptions from transaction event
      * listeners.
      */
-    public void setTransactionListenerCallbackMode(int mode);
+    void setTransactionListenerCallbackMode(int mode);
 
     /**
      * Register a listener for lifecycle-related events on the specified
@@ -288,29 +288,29 @@ public interface Broker
      *
      * @since 0.3.3
      */
-    public void addLifecycleListener(Object listener, Class[] classes);
+    void addLifecycleListener(Object listener, Class[] classes);
 
     /**
      * Remove a listener for lifecycle-related events.
      *
      * @since 0.3.3
      */
-    public void removeLifecycleListener(Object listener);
+    void removeLifecycleListener(Object listener);
 
     /**
      * Return the lifecycle event manager associated with the broker.
      */
-    public LifecycleEventManager getLifecycleEventManager();
+    LifecycleEventManager getLifecycleEventManager();
 
     /**
      * The callback mode for handling exceptions from lifecycle event listeners.
      */
-    public int getLifecycleListenerCallbackMode();
+    int getLifecycleListenerCallbackMode();
 
     /**
      * The callback mode for handling exceptions from lifecycle event listeners.
      */
-    public void setLifecycleListenerCallbackMode(int mode);
+    void setLifecycleListenerCallbackMode(int mode);
 
 
     /**
@@ -318,7 +318,7 @@ public interface Broker
      *
      * @since 2.0.0
      */
-    public boolean getCachePreparedQuery();
+    boolean getCachePreparedQuery();
 
     /**
      * Sets whether this receiver will cache prepared queries during its
@@ -327,28 +327,28 @@ public interface Broker
      *
      * @since 2.0.0
      */
-    public void setCachePreparedQuery(boolean flag);
+    void setCachePreparedQuery(boolean flag);
 
     /**
      * Begin a transaction.
      */
-    public void begin();
+    void begin();
 
     /**
      * Commit the current transaction.
      */
-    public void commit();
+    void commit();
 
     /**
      * Rollback the current transaction.
      */
-    public void rollback();
+    void rollback();
 
     /**
      * Attempt to synchronize with a current managed transaction, returning
      * true if successful, false if no managed transaction is active.
      */
-    public boolean syncWithManagedTransaction();
+    boolean syncWithManagedTransaction();
 
     /**
      * Issue a commit and then start a new transaction. This is identical to:
@@ -360,7 +360,7 @@ public interface Broker
      * @see #begin()
      * @since 0.2.4
      */
-    public void commitAndResume();
+    void commitAndResume();
 
     /**
      * Issue a rollback and then start a new transaction. This is identical to:
@@ -372,17 +372,17 @@ public interface Broker
      * @see #begin()
      * @since 0.2.4
      */
-    public void rollbackAndResume();
+    void rollbackAndResume();
 
     /**
      * Return whether the current transaction has been marked for rollback.
      */
-    public boolean getRollbackOnly();
+    boolean getRollbackOnly();
 
     /**
      * Mark the current transaction for rollback.
      */
-    public void setRollbackOnly();
+    void setRollbackOnly();
 
     /**
      * Mark the current transaction for rollback with the specified cause
@@ -390,7 +390,7 @@ public interface Broker
      *
      * @since 0.9.7
      */
-    public void setRollbackOnly(Throwable cause);
+    void setRollbackOnly(Throwable cause);
 
     /**
      * Returns the Throwable that caused the transaction to be
@@ -400,37 +400,37 @@ public interface Broker
      *
      * @since 0.9.7
      */
-    public Throwable getRollbackCause();
+    Throwable getRollbackCause();
 
     /**
      * Set a transactional savepoint where operations after this savepoint
      * will be rolled back.
      */
-    public void setSavepoint(String name);
+    void setSavepoint(String name);
 
     /**
      * Rollback the current transaction to the last savepoint.
      * Savepoints set after this one will become invalid.
      */
-    public void rollbackToSavepoint();
+    void rollbackToSavepoint();
 
     /**
      * Rollback the current transaction to the given savepoint name.
      * Savepoints set after this one will become invalid.
      */
-    public void rollbackToSavepoint(String name);
+    void rollbackToSavepoint(String name);
 
     /**
      * Release the last set savepoint and any resources associated with it.
      * The given savepoint and any set after it will become invalid.
      */
-    public void releaseSavepoint();
+    void releaseSavepoint();
 
     /**
      * Release the savepoint and any resources associated with it.
      * The given savepoint and any set after it will become invalid.
      */
-    public void releaseSavepoint(String name);
+    void releaseSavepoint(String name);
 
     /**
      * Flush all transactional instances to the data store. This method may
@@ -439,7 +439,7 @@ public interface Broker
      *
      * @since 0.2.5
      */
-    public void flush();
+    void flush();
 
     /**
      * Run pre-flush actions on transactional objects, including
@@ -449,7 +449,7 @@ public interface Broker
      *
      * @since 0.3.3
      */
-    public void preFlush();
+    void preFlush();
 
     /**
      * Validate the changes made in this transaction, reporting any optimistic
@@ -459,17 +459,17 @@ public interface Broker
      * datastore-level transaction, however, it will only report exceptions
      * that would occur on flush, without retaining any datastore resources.
      */
-    public void validateChanges();
+    void validateChanges();
 
     /**
      * Persist the given object.
      */
-    public void persist(Object obj, OpCallbacks call);
+    void persist(Object obj, OpCallbacks call);
 
     /**
      * Persist the given objects.
      */
-    public void persistAll(Collection objs, OpCallbacks call);
+    void persistAll(Collection objs, OpCallbacks call);
 
     /**
      * Make the given instance persistent. Unlike other persist operations,
@@ -480,66 +480,66 @@ public interface Broker
      * @param id the id to give the state manager; may be null for default
      * @return the state manager for the newly persistent instance
      */
-    public OpenJPAStateManager persist(Object pc, Object id, OpCallbacks call);
+    OpenJPAStateManager persist(Object pc, Object id, OpCallbacks call);
 
     /**
      * Delete the given object.
      */
-    public void delete(Object pc, OpCallbacks call);
+    void delete(Object pc, OpCallbacks call);
 
     /**
      * Delete the given objects.
      */
-    public void deleteAll(Collection objs, OpCallbacks call);
+    void deleteAll(Collection objs, OpCallbacks call);
 
     /**
      * Release the given object from management. This operation is not
      * recursive.
      */
-    public void release(Object pc, OpCallbacks call);
+    void release(Object pc, OpCallbacks call);
 
     /**
      * Release the given objects from management. This operation is not
      * recursive.
      */
-    public void releaseAll(Collection objs, OpCallbacks call);
+    void releaseAll(Collection objs, OpCallbacks call);
 
     /**
      * Refresh the state of the given object.
      */
-    public void refresh(Object pc, OpCallbacks call);
+    void refresh(Object pc, OpCallbacks call);
 
     /**
      * Refresh the state of the given objects.
      */
-    public void refreshAll(Collection objs, OpCallbacks call);
+    void refreshAll(Collection objs, OpCallbacks call);
 
     /**
      * Evict the given object.
      */
-    public void evict(Object pc, OpCallbacks call);
+    void evict(Object pc, OpCallbacks call);
 
     /**
      * Evict the given objects.
      */
-    public void evictAll(Collection objs, OpCallbacks call);
+    void evictAll(Collection objs, OpCallbacks call);
 
     /**
      * Evict all clean objects.
      */
-    public void evictAll(OpCallbacks call);
+    void evictAll(OpCallbacks call);
 
     /**
      * Evict all persistent-clean and persistent-nontransactional
      * instances in the given {@link Extent}.
      */
-    public void evictAll(Extent extent, OpCallbacks call);
+    void evictAll(Extent extent, OpCallbacks call);
 
     /**
      * Detach all objects in place.  A flush will be performed before
      * detaching the entities.
      */
-    public void detachAll(OpCallbacks call);
+    void detachAll(OpCallbacks call);
 
     /**
      * Detach all objects in place, with the option of performing a
@@ -549,7 +549,7 @@ public interface Broker
      * flush before detaching the entities (true, do the flush;
      * false, don't do the flush)
      */
-    public void detachAll(OpCallbacks call, boolean flush);
+    void detachAll(OpCallbacks call, boolean flush);
 
     /**
      * Detach the specified object from the broker.
@@ -557,7 +557,7 @@ public interface Broker
      * @param pc the instance to detach
      * @return the detached instance
      */
-    public Object detach(Object pc, OpCallbacks call);
+    Object detach(Object pc, OpCallbacks call);
 
     /**
      * Detach the specified objects from the broker. The objects returned can
@@ -573,7 +573,7 @@ public interface Broker
      * @param objs the instances to detach
      * @return the detached instances
      */
-    public Object[] detachAll(Collection objs, OpCallbacks call);
+    Object[] detachAll(Collection objs, OpCallbacks call);
 
     /**
      * Import the specified detached object into the broker.
@@ -582,7 +582,7 @@ public interface Broker
      * @return the re-attached instance
      * @param copyNew whether to copy new instances
      */
-    public Object attach(Object pc, boolean copyNew, OpCallbacks call);
+    Object attach(Object pc, boolean copyNew, OpCallbacks call);
 
     /**
      * Import the specified objects into the broker. Instances that were
@@ -594,7 +594,7 @@ public interface Broker
      * @return the re-attached instances
      * @param copyNew whether to copy new instances
      */
-    public Object[] attachAll(Collection objs, boolean copyNew,
+    Object[] attachAll(Collection objs, boolean copyNew,
         OpCallbacks call);
 
     /**
@@ -608,43 +608,43 @@ public interface Broker
      * @throws IllegalArgumentException if <code>cls</code> is not a managed
      * type or interface.
      */
-    public Object newInstance(Class cls);
+    Object newInstance(Class cls);
 
     /**
      * Returns <code>true</code> if <code>obj</code> is a detached object
      * (one that can be reattached to a {@link Broker} via a call to
      * {@link Broker#attach}); otherwise returns <code>false</code>.
      */
-    public boolean isDetached(Object obj);
+    boolean isDetached(Object obj);
 
     /**
      * Return an extent of the given class, optionally including subclasses.
      */
-    public Extent newExtent(Class cls, boolean subs);
+    Extent newExtent(Class cls, boolean subs);
 
     /**
      * Create a new query from the given data, with the given candidate class
      * and language.
      */
-    public Query newQuery(String language, Class cls, Object query);
+    Query newQuery(String language, Class cls, Object query);
 
     /**
      * Create a new query in the given language.
      */
-    public Query newQuery(String language, Object query);
+    Query newQuery(String language, Object query);
 
     /**
      * Returns a {@link Seq} for the datastore identity values of the
      * specified persistent class, or null if the class' identity cannot be
      * represented as a sequence.
      */
-    public Seq getIdentitySequence(ClassMetaData meta);
+    Seq getIdentitySequence(ClassMetaData meta);
 
     /**
      * Returns a {@link Seq} for the generated values of the specified
      * field, or null if the field is not generated.
      */
-    public Seq getValueSequence(FieldMetaData fmd);
+    Seq getValueSequence(FieldMetaData fmd);
 
     /**
      * Ensure that the given instance is locked at the given lock level.
@@ -655,7 +655,7 @@ public interface Broker
      * giving up, or -1 for no limit
      * @since 0.3.1
      */
-    public void lock(Object pc, int level, int timeout, OpCallbacks call);
+    void lock(Object pc, int level, int timeout, OpCallbacks call);
 
     /**
      * Ensure that the given instance is locked at the current lock level, as
@@ -663,7 +663,7 @@ public interface Broker
      *
      * @since 0.3.1
      */
-    public void lock(Object pc, OpCallbacks call);
+    void lock(Object pc, OpCallbacks call);
 
     /**
      * Ensure that the given instances are locked at the given lock level.
@@ -674,7 +674,7 @@ public interface Broker
      * giving up, or -1 for no limit
      * @since 0.3.1
      */
-    public void lockAll(Collection objs, int level, int timeout,
+    void lockAll(Collection objs, int level, int timeout,
         OpCallbacks call);
 
     /**
@@ -683,7 +683,7 @@ public interface Broker
      *
      * @since 0.3.1
      */
-    public void lockAll(Collection objs, OpCallbacks call);
+    void lockAll(Collection objs, OpCallbacks call);
 
     /**
      * Cancel all pending data store statements. If statements are cancelled
@@ -693,14 +693,14 @@ public interface Broker
      * @return true if any statements were cancelled, false otherwise
      * @since 0.3.1
      */
-    public boolean cancelAll();
+    boolean cancelAll();
 
     /**
      * Mark the given class as dirty within the current transaction.
      *
      * @since 0.3.0
      */
-    public void dirtyType(Class cls);
+    void dirtyType(Class cls);
 
     /**
      * Begin a logical operation. This indicates to the broker the
@@ -712,7 +712,7 @@ public interface Broker
      * this operation requiring a re-check of global tx
      * @return whether this is the outermost operation on the stack
      */
-    public boolean beginOperation(boolean syncTrans);
+    boolean beginOperation(boolean syncTrans);
 
     /**
      * End a logical operation. This indicates to the broker the
@@ -721,43 +721,43 @@ public interface Broker
      *
      * @return whether this is the outermost operation on the stack
      */
-    public boolean endOperation();
+    boolean endOperation();
 
     /**
      * Whether the broker is closed.
      */
-    public boolean isClosed();
+    boolean isClosed();
 
     /**
      * Whether {@link #close} has been invoked, though the broker might
      * remain open until the current managed transaction completes.
      */
-    public boolean isCloseInvoked();
+    boolean isCloseInvoked();
 
     /**
      * Close the broker.
      */
-    public void close();
+    @Override void close();
 
     /**
      * Throw an exception if this broker has been closed.
      */
-    public void assertOpen();
+    void assertOpen();
 
     /**
      * Throw an exception if there is no active transaction.
      */
-    public void assertActiveTransaction();
+    void assertActiveTransaction();
 
     /**
      * Throw an exception if there is no transaction active and
      * nontransactional reading is not enabled.
 	 */
-	public void assertNontransactionalRead ();
+	void assertNontransactionalRead ();
 
 	/**
 	 * Throw an exception if a write operation is not permitted (there is
 	 * no active transaction and nontransactional writing is not enabled).
 	 */
-	public void assertWriteOperation ();
+	void assertWriteOperation ();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.java
index 9999a1e87..cd517d583 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerFactory.java
@@ -37,12 +37,12 @@ public interface BrokerFactory
     /**
      * Return the configuration for this factory.
      */
-    public OpenJPAConfiguration getConfiguration();
+    OpenJPAConfiguration getConfiguration();
 
     /**
      * Return properties describing this runtime.
      */
-    public Map<String,Object> getProperties();
+    Map<String,Object> getProperties();
 
     /**
      * Return all of the supported properties as a set of keys. If a property
@@ -50,29 +50,29 @@ public interface BrokerFactory
      *
      * @since 2.0.0
      */
-    public Set<String>  getSupportedProperties();
+    Set<String>  getSupportedProperties();
 
     /**
      * Put the specified key-value pair into the map of user objects.
      */
-    public Object putUserObject(Object key, Object val);
+    Object putUserObject(Object key, Object val);
 
     /**
      * Get the value for the specified key from the map of user objects.
      */
-    public Object getUserObject(Object key);
+    Object getUserObject(Object key);
 
     /**
      * Return a broker with default settings.
      */
-    public Broker newBroker();
+    Broker newBroker();
 
     /**
      * Return a broker using the given credentials and in the given
      * transaction and connection retain mode, optionally finding
      * existing broker in the global transaction.
      */
-    public Broker newBroker(String user, String pass, boolean managed,
+    Broker newBroker(String user, String pass, boolean managed,
         int connRetainMode, boolean findExisting);
 
     /**
@@ -95,7 +95,7 @@ public interface BrokerFactory
      * @param cf2Name  Non-JTA ConnectionFactory to use.
      * @return A Broker which matches the provided criteria.
      */
-    public Broker newBroker(String user, String pass, boolean managed,
+    Broker newBroker(String user, String pass, boolean managed,
         int connRetainMode, boolean findExisting, String cfName, String cf2Name);
 
     /**
@@ -105,14 +105,14 @@ public interface BrokerFactory
      *
      * @since 0.3.3
      */
-    public void addLifecycleListener(Object listener, Class<?>[] classes);
+    void addLifecycleListener(Object listener, Class<?>[] classes);
 
     /**
      * Remove a listener for lifecycle-related events.
      *
      * @since 0.3.3
      */
-    public void removeLifecycleListener(Object listener);
+    void removeLifecycleListener(Object listener);
 
     /**
      * Register a listener for transaction-related events on the specified
@@ -121,7 +121,7 @@ public interface BrokerFactory
      *
      * @since 1.0.0
      */
-    public void addTransactionListener(Object listener);
+    void addTransactionListener(Object listener);
 
     /**
      * Remove a listener for transaction-related events. It will no longer
@@ -129,36 +129,36 @@ public interface BrokerFactory
      *
      * @since 1.0.0
      */
-    public void removeTransactionListener(Object listener);
+    void removeTransactionListener(Object listener);
 
     /**
      * Close the factory.
      */
-    public void close();
+    @Override void close();
 
     /**
      * Returns true if this broker factory is closed.
      */
-    public boolean isClosed();
+    boolean isClosed();
 
     /**
      * Synchronizes on an internal lock.
      */
-    public void lock();
+    void lock();
 
     /**
      * Release the internal lock.
      */
-    public void unlock ();
+    void unlock ();
 
     /**
      * assert that this broker is open. If the broker has been closed an IllegalStateException will be thrown
      * with information on when the broker was closed.
      */
-    public void assertOpen();
+    void assertOpen();
 
     /**
      * This method is invoked AFTER a BrokerFactory has been instantiated.
      */
-    public void postCreationCallback();
+    void postCreationCallback();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
index f81fd1458..bfa1ef9ef 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
@@ -48,7 +48,6 @@ import org.apache.commons.collections4.iterators.IteratorChain;
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 import org.apache.commons.collections4.map.LinkedMap;
 import org.apache.commons.collections4.set.MapBackedSet;
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.Compatibility;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.datacache.DataCache;
@@ -73,6 +72,7 @@ import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.ReferenceHashMap;
 import org.apache.openjpa.lib.util.ReferenceHashSet;
 import org.apache.openjpa.lib.util.ReferenceMap;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.MetaDataRepository;
@@ -106,8 +106,8 @@ import org.apache.openjpa.validation.ValidatingLifecycleEventManager;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Incremental flush.
@@ -270,7 +270,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // that can be set by reflection. The keys are not qualified by any prefix.
     private static Set<String> _supportedPropertyNames;
     static {
-        _supportedPropertyNames = new HashSet<String>();
+        _supportedPropertyNames = new HashSet<>();
         _supportedPropertyNames.addAll(Arrays.asList(new String[] {
                 "AutoClear",
                 "AutoDetach",
@@ -405,7 +405,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     private void initializeOperatingSet() {
         if(_operatingDirty) {
             _operatingDirty = false;
-            _operating = MapBackedSet.mapBackedSet(new IdentityHashMap<Object, Object>());
+            _operating = MapBackedSet.mapBackedSet(new IdentityHashMap<>());
         }
     }
 
@@ -416,6 +416,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     	return Collections.unmodifiableSet(_operating);
     }
 
+    @Override
     public Object clone()
         throws CloneNotSupportedException {
         if (_initializeWasInvoked)
@@ -438,6 +439,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Implementation of StoreContext
     //////////////////////////////////
 
+    @Override
     public Broker getBroker() {
         return this;
     }
@@ -446,6 +448,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Properties
     //////////////
 
+    @Override
     public void setImplicitBehavior(OpCallbacks call,
         RuntimeExceptionTranslator ex) {
         if (_call == null)
@@ -458,30 +461,36 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return (_operationCount == 0) ? _extrans : null;
     }
 
+    @Override
     public BrokerFactory getBrokerFactory() {
         return _factory;
     }
 
+    @Override
     public OpenJPAConfiguration getConfiguration() {
         return _conf;
     }
 
+    @Override
     public FetchConfiguration getFetchConfiguration() {
         return _fc;
     }
 
+    @Override
     public FetchConfiguration pushFetchConfiguration() {
 		return pushFetchConfiguration(null);
     }
 
+    @Override
     public FetchConfiguration pushFetchConfiguration(FetchConfiguration fc) {
         if (_fcs == null)
-            _fcs = new LinkedList<FetchConfiguration>();
+            _fcs = new LinkedList<>();
         _fcs.add(_fc);
         _fc = (FetchConfiguration) (fc != null ? fc : _fc).clone();
         return _fc;
     }
 
+    @Override
     public void popFetchConfiguration() {
         if (_fcs == null || _fcs.isEmpty())
             throw new UserException(
@@ -489,46 +498,57 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         _fc = _fcs.removeLast();
     }
 
+    @Override
     public int getConnectionRetainMode() {
         return _connRetainMode;
     }
 
+    @Override
     public boolean isManaged() {
         return _managed;
     }
 
+    @Override
     public ManagedRuntime getManagedRuntime() {
         return _runtime;
     }
 
+    @Override
     public ClassLoader getClassLoader() {
         return _loader;
     }
 
+    @Override
     public DelegatingStoreManager getStoreManager() {
         return _store;
     }
 
+    @Override
     public LockManager getLockManager() {
         return _lm;
     }
 
+    @Override
     public InverseManager getInverseManager() {
         return _im;
     }
 
+    @Override
     public String getConnectionUserName() {
         return _user;
     }
 
+    @Override
     public String getConnectionPassword() {
         return _pass;
     }
 
+    @Override
     public boolean getMultithreaded() {
         return _multithreaded;
     }
 
+    @Override
     public void setMultithreaded(boolean multithreaded) {
         assertOpen();
         _multithreaded = multithreaded;
@@ -538,19 +558,23 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             _lock = null;
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         return _ignoreChanges;
     }
 
+    @Override
     public void setIgnoreChanges(boolean val) {
         assertOpen();
         _ignoreChanges = val;
     }
 
+    @Override
     public boolean getNontransactionalRead() {
         return _nontransRead;
     }
 
+    @Override
     public void setNontransactionalRead(boolean val) {
         assertOpen();
         if ((_flags & FLAG_PRESTORING) != 0)
@@ -565,10 +589,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         _nontransRead = val;
     }
 
+    @Override
     public boolean getNontransactionalWrite() {
         return _nontransWrite;
     }
 
+    @Override
     public void setNontransactionalWrite(boolean val) {
         assertOpen();
         if ((_flags & FLAG_PRESTORING) != 0)
@@ -577,10 +603,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         _nontransWrite = val;
     }
 
+    @Override
     public boolean getOptimistic() {
         return _optimistic;
     }
 
+    @Override
     public void setOptimistic(boolean val) {
         assertOpen();
         if ((_flags & FLAG_ACTIVE) != 0)
@@ -595,10 +623,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         _optimistic = val;
     }
 
+    @Override
     public int getRestoreState() {
         return _restoreState;
     }
 
+    @Override
     public void setRestoreState(int val) {
         assertOpen();
         if ((_flags & FLAG_ACTIVE) != 0)
@@ -608,10 +638,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         _restoreState = val;
     }
 
+    @Override
     public boolean getRetainState() {
         return _retainState;
     }
 
+    @Override
     public void setRetainState(boolean val) {
         assertOpen();
         if ((_flags & FLAG_PRESTORING) != 0)
@@ -619,15 +651,18 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         _retainState = val;
     }
 
+    @Override
     public int getAutoClear() {
         return _autoClear;
     }
 
+    @Override
     public void setAutoClear(int val) {
         assertOpen();
         _autoClear = val;
     }
 
+    @Override
     public int getAutoDetach() {
         return _autoDetach;
     }
@@ -637,12 +672,14 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
      * If the given flag contains {@link AutoDetach#DETACH_NONE} option,
      * then no other option can be specified.
      */
+    @Override
     public void setAutoDetach(int detachFlags) {
          assertOpen();
          assertAutoDetachValue(detachFlags);
          _autoDetach = detachFlags;
     }
 
+    @Override
     public void setAutoDetach(int detachFlag, boolean on) {
          assertOpen();
          assertAutoDetachValue(on ? _autoDetach | detachFlag : _autoDetach & ~detachFlag);
@@ -652,60 +689,73 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
              _autoDetach &= ~detachFlag;
     }
 
+    @Override
     public int getDetachState() {
         return _detachState;
     }
 
+    @Override
     public void setDetachState(int mode) {
         assertOpen();
         _detachState = mode;
     }
 
+    @Override
     public boolean isDetachedNew() {
         return _detachedNew;
     }
 
+    @Override
     public void setDetachedNew(boolean isNew) {
         assertOpen();
         _detachedNew = isNew;
     }
 
+    @Override
     public boolean getSyncWithManagedTransactions() {
         return _syncManaged;
     }
 
+    @Override
     public void setSyncWithManagedTransactions(boolean sync) {
         assertOpen();
         _syncManaged = sync;
     }
 
+    @Override
     public boolean getEvictFromDataCache() {
         return _evictDataCache;
     }
 
+    @Override
     public void setEvictFromDataCache(boolean evict) {
         assertOpen();
         _evictDataCache = evict;
     }
 
+    @Override
     public boolean getPopulateDataCache() {
         return _populateDataCache;
     }
 
+    @Override
     public void setPopulateDataCache(boolean cache) {
         assertOpen();
         _populateDataCache = cache;
     }
 
+    @Override
     public boolean isTrackChangesByType() {
         return _largeTransaction;
     }
 
+    @Override
     public void setTrackChangesByType(boolean largeTransaction) {
         assertOpen();
         _largeTransaction = largeTransaction;
     }
 
+    @Override
     public Object getUserObject(Object key) {
         beginOperation(false);
         try {
@@ -715,6 +765,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Object putUserObject(Object key, Object val) {
         beginOperation(false);
         try {
@@ -722,7 +773,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                 return (_userObjects == null) ? null : _userObjects.remove(key);
 
             if (_userObjects == null)
-                _userObjects = new HashMap<Object, Object>();
+                _userObjects = new HashMap<>();
             return _userObjects.put(key, val);
         } finally {
             endOperation();
@@ -735,6 +786,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
      * overwritten by values maintained by this instance such as
      * Optimistic flag.
      */
+    @Override
     public Map<String, Object> getProperties() {
         Map<String, Object> props = _conf.toProperties(true);
         for (String s : _supportedPropertyNames) {
@@ -747,6 +799,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
      * Gets the property names that can be used to corresponding setter methods of this receiver
      * to set its value.
      */
+    @Override
     public Set<String> getSupportedProperties() {
         Set<String> keys = _conf.getPropertyKeys();
         for (String s : _supportedPropertyNames)
@@ -758,6 +811,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Events
     // ////////
 
+    @Override
     public void addLifecycleListener(Object listener, Class[] classes) {
         beginOperation(false);
         try {
@@ -767,6 +821,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void removeLifecycleListener(Object listener) {
         beginOperation(false);
         try {
@@ -776,10 +831,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public int getLifecycleListenerCallbackMode() {
         return _lifeCallbackMode;
     }
 
+    @Override
     public void setLifecycleListenerCallbackMode(int mode) {
         beginOperation(false);
         try {
@@ -793,6 +850,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     /**
      * Give state managers access to the lifecycle event manager.
      */
+    @Override
     public LifecycleEventManager getLifecycleEventManager() {
         return _lifeEventManager;
     }
@@ -849,6 +907,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             throw ce;
     }
 
+    @Override
     public void addTransactionListener(Object tl) {
         beginOperation(false);
         try {
@@ -860,6 +919,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void removeTransactionListener(Object tl) {
         beginOperation(false);
         try {
@@ -871,14 +931,17 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Collection<Object> getTransactionListeners() {
         return _transEventManager.getListeners();
     }
 
+    @Override
     public int getTransactionListenerCallbackMode() {
         return _transCallbackMode;
     }
 
+    @Override
     public void setTransactionListenerCallbackMode(int mode) {
         beginOperation(false);
         try {
@@ -917,6 +980,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Lookups
     ///////////
 
+    @Override
     public Object find(Object oid, boolean validate, FindCallbacks call) {
         int flags = OID_COPY | OID_ALLOW_NEW | OID_NODELETED;
         if (!validate)
@@ -924,6 +988,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return find(oid, _fc, null, null, flags, call);
     }
 
+    @Override
     public Object find(Object oid, FetchConfiguration fetch, BitSet exclude,
         Object edata, int flags) {
         return find(oid, fetch, exclude, edata, flags, null);
@@ -1055,6 +1120,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return sm;
     }
 
+    @Override
     public Object[] findAll(Collection oids, boolean validate,
         FindCallbacks call) {
         int flags = OID_COPY | OID_ALLOW_NEW | OID_NODELETED;
@@ -1063,6 +1129,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return findAll(oids, _fc, null, null, flags, call);
     }
 
+    @Override
     public Object[] findAll(Collection oids, FetchConfiguration fetch,
         BitSet exclude, Object edata, int flags) {
         return findAll(oids, fetch, exclude, edata, flags, null);
@@ -1085,7 +1152,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         // array, so that we make sure not to create multiple sms for equivalent
         // oids if the user has duplicates in the given array
         if (_loading == null)
-            _loading = new HashMap<Object, StateManagerImpl>((int) (oids.size() * 1.33 + 1));
+            _loading = new HashMap<>((int) (oids.size() * 1.33 + 1));
 
         if (call == null)
             call = this;
@@ -1124,7 +1191,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                     if (initialized && !sm.isTransactional() && transState)
                         sm.transactional();
                     if (load == null)
-                        load = new ArrayList<OpenJPAStateManager>(oids.size() - idx);
+                        load = new ArrayList<>(oids.size() - idx);
                     load.add(sm);
                 } else if (!initialized)
                     sm.initialize(sm.getMetaData().getDescribedType(),
@@ -1227,6 +1294,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             || fetch.getReadLockLevel() != LOCK_NONE);
     }
 
+    @Override
     public Object findCached(Object oid, FindCallbacks call) {
         if (call == null)
             call = this;
@@ -1243,6 +1311,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Class<?> getObjectIdType(Class<?> cls) {
         if (cls == null)
             return null;
@@ -1266,6 +1335,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Object newObjectId(Class<?> cls, Object val) {
         if (val == null)
             return null;
@@ -1365,6 +1435,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Transaction
     ///////////////
 
+    @Override
     public void begin() {
         beginOperation(true);
         try {
@@ -1411,7 +1482,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         if (_pending != null) {
             StateManagerImpl sm;
             for (Iterator<StateManagerImpl> it = _pending.iterator(); it.hasNext();) {
-                sm = (StateManagerImpl) it.next();
+                sm = it.next();
                 sm.transactional();
                 if (sm.isDirty())
                     setDirty(sm, true);
@@ -1420,6 +1491,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void beginStore() {
         beginOperation(true);
         try {
@@ -1474,7 +1546,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                         Collection<Class<?>> up = getUpdatedTypes();
                         int size = pers.size() + del.size() + up.size();
                         if (size > 0) {
-                            Collection<Class<?>> types = new ArrayList<Class<?>>(size);
+                            Collection<Class<?>> types = new ArrayList<>(size);
                             types.addAll(pers);
                             types.addAll(del);
                             types.addAll(up);
@@ -1512,6 +1584,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return err;
     }
 
+    @Override
     public void commit() {
         beginOperation(false);
         try {
@@ -1538,6 +1611,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void rollback() {
         beginOperation(false);
         try {
@@ -1560,6 +1634,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public boolean syncWithManagedTransaction() {
         assertOpen();
         lock();
@@ -1578,10 +1653,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void commitAndResume() {
         endAndResume(true);
     }
 
+    @Override
     public void rollbackAndResume() {
         endAndResume(false);
     }
@@ -1599,6 +1676,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public boolean getRollbackOnly() {
         beginOperation(true);
         try {
@@ -1619,6 +1697,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Throwable getRollbackCause() {
         beginOperation(true);
         try {
@@ -1642,10 +1721,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void setRollbackOnly() {
         setRollbackOnly(new UserException());
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause) {
         beginOperation(true);
         try {
@@ -1681,6 +1762,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void setSavepoint(String name) {
         beginOperation(true);
         try {
@@ -1714,6 +1796,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void releaseSavepoint() {
         beginOperation(false);
         try {
@@ -1726,6 +1809,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void releaseSavepoint(String savepoint) {
         beginOperation(false);
         try {
@@ -1757,6 +1841,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void rollbackToSavepoint() {
         beginOperation(false);
         try {
@@ -1769,6 +1854,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void rollbackToSavepoint(String savepoint) {
         beginOperation(false);
         try {
@@ -1852,6 +1938,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     }
 
 
+    @Override
     public void flush() {
         beginOperation(true);
         try {
@@ -1889,6 +1976,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void preFlush() {
         beginOperation(true);
         try {
@@ -1899,6 +1987,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void validateChanges() {
         beginOperation(true);
         try {
@@ -1928,6 +2017,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public boolean isActive() {
         beginOperation(true);
         try {
@@ -1937,6 +2027,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public boolean isStoreActive() {
         // we need to lock here, because we might be in the middle of an
         // atomic transaction process (e.g., commitAndResume)
@@ -1956,6 +2047,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return (_flags & FLAG_TRANS_ENDING) != 0;
     }
 
+    @Override
     public boolean beginOperation(boolean syncTrans) {
         lock();
         try {
@@ -1978,6 +2070,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
      * Mark the operation over. If outermost caller of stack, returns true
      * and will detach managed instances if necessary.
      */
+    @Override
     public boolean endOperation() {
         try {
             if (_operationCount == 1 && (_autoDetach & DETACH_NONTXREAD) != 0
@@ -2012,6 +2105,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Implementation of Synchronization interface
     ///////////////////////////////////////////////
 
+    @Override
     public void beforeCompletion() {
         beginOperation(false);
         try {
@@ -2033,6 +2127,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void afterCompletion(int status) {
         beginOperation(false);
         try {
@@ -2282,7 +2377,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         transactional.addAll(_transAdditions);
 
         // copy the change set, then clear it for the next iteration
-        StateManagerImpl[] states = (StateManagerImpl[]) _transAdditions.
+        StateManagerImpl[] states = _transAdditions.
             toArray(new StateManagerImpl[_transAdditions.size()]);
         _transAdditions = null;
 
@@ -2301,7 +2396,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         // remember these additions in case one becomes derefed again later
         derefs.addAll(_derefAdditions);
 
-        StateManagerImpl[] states = (StateManagerImpl[]) _derefAdditions.
+        StateManagerImpl[] states = _derefAdditions.
             toArray(new StateManagerImpl[_derefAdditions.size()]);
         _derefAdditions = null;
 
@@ -2344,7 +2439,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             return null;
 
         Throwable[] t = exceps.toArray(new Throwable[exceps.size()]);
-        List<Object> failed = new ArrayList<Object>(t.length);
+        List<Object> failed = new ArrayList<>(t.length);
 
         // create fatal exception with nested exceptions for all the failed
         // objects; if all OL exceptions, throw a top-level OL exception
@@ -2492,15 +2587,18 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Object lifecycle
     ////////////////////
 
+    @Override
     public void persist(Object obj, OpCallbacks call) {
         persist(obj, null, true, call);
     }
 
+    @Override
     public OpenJPAStateManager persist(Object obj, Object id,
         OpCallbacks call) {
         return persist(obj, id, true, call);
     }
 
+    @Override
     public void persistAll(Collection objs, OpCallbacks call) {
         persistAll(objs, true, call);
     }
@@ -2545,7 +2643,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         if (o == null)
             return l;
         if (l == null)
-            l = new LinkedList<Exception>();
+            l = new LinkedList<>();
         l.add(o);
         return l;
     }
@@ -2746,6 +2844,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void deleteAll(Collection objs, OpCallbacks call) {
         beginOperation(true);
         try {
@@ -2768,6 +2867,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void delete(Object obj, OpCallbacks call) {
         if (obj == null)
             return;
@@ -2843,6 +2943,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             Exceptions.toString(obj))).setFailedObject(obj);
     }
 
+    @Override
     public void releaseAll(Collection objs, OpCallbacks call) {
         beginOperation(false);
         try {
@@ -2860,6 +2961,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void release(Object obj, OpCallbacks call) {
         if (obj == null)
             return;
@@ -2887,6 +2989,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public OpenJPAStateManager embed(Object obj, Object id,
         OpenJPAStateManager owner, ValueMetaData ownerMeta) {
         beginOperation(true);
@@ -2998,6 +3101,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void refreshAll(Collection objs, OpCallbacks call) {
         if (objs == null || objs.isEmpty())
             return;
@@ -3019,6 +3123,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void refresh(Object obj, OpCallbacks call) {
         if (obj == null)
             return;
@@ -3089,7 +3194,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                             throw newDetachedException(obj, "refresh");
                         else if (sm.beforeRefresh(true)) {
                         	if (load == null)
-                        		load = new ArrayList<OpenJPAStateManager>(objs.size());
+                        		load = new ArrayList<>(objs.size());
                             load.add(sm);
                         }
                         int level = _fc.getReadLockLevel();
@@ -3181,6 +3286,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     }
 
 
+    @Override
     public void retrieveAll(Collection objs, boolean dfgOnly,
         OpCallbacks call) {
         if (objs == null || objs.isEmpty())
@@ -3200,7 +3306,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             Object obj;
             Collection<OpenJPAStateManager> load = null;
             StateManagerImpl sm;
-            Collection<StateManagerImpl> sms = new ArrayList<StateManagerImpl>(objs.size());
+            Collection<StateManagerImpl> sms = new ArrayList<>(objs.size());
             for (Iterator<?> itr = objs.iterator(); itr.hasNext();) {
                 obj = itr.next();
                 if (obj == null)
@@ -3219,7 +3325,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                             sms.add(sm);
                             if (sm.getPCState() == PCState.HOLLOW) {
                                 if (load == null)
-                                    load = new ArrayList<OpenJPAStateManager>();
+                                    load = new ArrayList<>();
                                 load.add(sm);
                             }
                         }
@@ -3266,6 +3372,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         throwNestedExceptions(exceps, false);
     }
 
+    @Override
     public void retrieve(Object obj, boolean dfgOnly, OpCallbacks call) {
         if (obj == null)
             return;
@@ -3301,6 +3408,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void evictAll(OpCallbacks call) {
         beginOperation(false);
         try {
@@ -3318,6 +3426,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void evictAll(Collection objs, OpCallbacks call) {
         List<Exception> exceps = null;
         beginOperation(false);
@@ -3335,6 +3444,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         throwNestedExceptions(exceps, false);
     }
 
+    @Override
     public void evictAll(Extent extent, OpCallbacks call) {
         if (extent == null)
             return;
@@ -3360,6 +3470,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void evict(Object obj, OpCallbacks call) {
         if (obj == null)
             return;
@@ -3389,6 +3500,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Object detach(Object obj, OpCallbacks call) {
         if (obj == null)
             return null;
@@ -3407,6 +3519,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Object[] detachAll(Collection objs, OpCallbacks call) {
         if (objs == null)
             return null;
@@ -3427,10 +3540,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void detachAll(OpCallbacks call) {
         detachAll(call, true);
     }
 
+    @Override
     public void detachAll(OpCallbacks call, boolean flush) {
         beginOperation(true);
         try {
@@ -3503,6 +3618,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
         _dmLite.detachAll(states);
     }
+    @Override
     public Object attach(Object obj, boolean copyNew, OpCallbacks call) {
         if (obj == null)
             return null;
@@ -3527,6 +3643,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Object[] attachAll(Collection objs, boolean copyNew,
         OpCallbacks call) {
         if (objs == null)
@@ -3554,6 +3671,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void nontransactionalAll(Collection objs, OpCallbacks call) {
         beginOperation(true);
         try {
@@ -3571,6 +3689,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void nontransactional(Object obj, OpCallbacks call) {
         if (obj == null)
             return;
@@ -3595,6 +3714,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     /**
      * Make the given instances transactional.
      */
+    @Override
     public void transactionalAll(Collection objs, boolean updateVersion,
         OpCallbacks call) {
         if (objs.isEmpty())
@@ -3612,7 +3732,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             Object obj;
             StateManagerImpl sm;
             ClassMetaData meta;
-            Collection<StateManagerImpl> sms = new LinkedHashSet<StateManagerImpl>(objs.size());
+            Collection<StateManagerImpl> sms = new LinkedHashSet<>(objs.size());
             List<Exception> exceps = null;
             for (Iterator<?> itr = objs.iterator(); itr.hasNext();) {
                 obj = itr.next();
@@ -3638,7 +3758,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                         sms.add(sm);
                         if (sm.getPCState() == PCState.HOLLOW) {
                             if (load == null)
-                                load = new ArrayList<OpenJPAStateManager>();
+                                load = new ArrayList<>();
                             load.add(sm);
                         }
 
@@ -3676,6 +3796,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     /**
      * Make the given instances transactional.
      */
+    @Override
     public void transactional(Object obj, boolean updateVersion,
         OpCallbacks call) {
         if (obj == null)
@@ -3740,6 +3861,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Extent, Query
     /////////////////
 
+    @Override
     public Extent newExtent(Class type, boolean subclasses) {
         return newExtent(type, subclasses, null);
     }
@@ -3763,6 +3885,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Iterator extentIterator(Class type, boolean subclasses,
         FetchConfiguration fetch, boolean ignoreChanges) {
         Extent extent = newExtent(type, subclasses, fetch);
@@ -3770,12 +3893,14 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return extent.iterator();
     }
 
+    @Override
     public Query newQuery(String lang, Class cls, Object query) {
         Query q = newQuery(lang, query);
         q.setCandidateType(cls, true);
         return q;
     }
 
+    @Override
     public Query newQuery(String lang, Object query) {
         // common mistakes
         if (query instanceof Extent || query instanceof Class)
@@ -3820,12 +3945,14 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return new QueryImpl(this, lang, sq);
     }
 
+    @Override
     public Seq getIdentitySequence(ClassMetaData meta) {
         if (meta == null)
             return null;
         return getSequence(meta, null);
     }
 
+    @Override
     public Seq getValueSequence(FieldMetaData fmd) {
         if (fmd == null)
             return null;
@@ -3889,6 +4016,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Locking
     ///////////
 
+    @Override
     public void lock(Object obj, OpCallbacks call) {
         if (obj == null)
             return;
@@ -3901,6 +4029,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void lock(Object obj, int level, int timeout, OpCallbacks call) {
         if (obj == null)
             return;
@@ -3927,6 +4056,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void lockAll(Collection objs, OpCallbacks call) {
         if (objs.isEmpty())
             return;
@@ -3940,6 +4070,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void lockAll(Collection objs, int level, int timeout,
         OpCallbacks call) {
         if (objs.isEmpty())
@@ -3953,7 +4084,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         try {
             assertActiveTransaction();
 
-            Collection<StateManagerImpl> sms = new LinkedHashSet<StateManagerImpl>(objs.size());
+            Collection<StateManagerImpl> sms = new LinkedHashSet<>(objs.size());
             Object obj;
             StateManagerImpl sm;
             for (Iterator<?> itr = objs.iterator(); itr.hasNext();) {
@@ -3985,6 +4116,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Connection
     //////////////
 
+    @Override
     public boolean cancelAll() {
         // this method does not lock, since we want to allow a different
         // thread to be able to cancel on a locked-up persistence manager
@@ -4005,6 +4137,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Object getConnection() {
         assertOpen();
         if (!_conf.supportedOptions().contains
@@ -4014,6 +4147,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return _store.getClientConnection();
     }
 
+    @Override
     public boolean hasConnection() {
         assertOpen();
         return (_flags & FLAG_RETAINED_CONN) != 0;
@@ -4043,6 +4177,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Cache
     /////////
 
+    @Override
     public Collection getManagedObjects() {
         beginOperation(false);
         try {
@@ -4052,6 +4187,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Collection getTransactionalObjects() {
         beginOperation(false);
         try {
@@ -4061,6 +4197,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Collection getPendingTransactionalObjects() {
         beginOperation(false);
         try {
@@ -4071,6 +4208,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Collection getDirtyObjects() {
         beginOperation(false);
         try {
@@ -4080,10 +4218,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public boolean getOrderDirtyObjects() {
         return _orderDirty;
     }
 
+    @Override
     public void setOrderDirtyObjects(boolean order) {
         _orderDirty = order;
     }
@@ -4101,7 +4241,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     protected Collection<StateManagerImpl> getTransactionalStates() {
         if (!hasTransactionalObjects()) {
             // return a new empty set. Entities may be added by TransactionListeners
-            return new LinkedHashSet<StateManagerImpl>();
+            return new LinkedHashSet<>();
         }
         return _transCache.copy();
     }
@@ -4133,7 +4273,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     protected Collection getPendingTransactionalStates() {
         if (_pending == null)
             return Collections.EMPTY_SET;
-        return new LinkedHashSet<StateManagerImpl>(_pending);
+        return new LinkedHashSet<>(_pending);
     }
 
     /**
@@ -4225,7 +4365,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
 
         if (_savepoints != null && !_savepoints.isEmpty()) {
             if (_savepointCache == null)
-                _savepointCache = new HashSet<StateManagerImpl>();
+                _savepointCache = new HashSet<>();
             _savepointCache.add(sm);
         }
 
@@ -4240,15 +4380,15 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                 // also record that the class is dirty
                 if (sm.isNew()) {
                     if (_persistedClss == null)
-                        _persistedClss = new HashSet<Class<?>>();
+                        _persistedClss = new HashSet<>();
                     _persistedClss.add(sm.getMetaData().getDescribedType());
                 } else if (sm.isDeleted()) {
                     if (_deletedClss == null)
-                        _deletedClss = new HashSet<Class<?>>();
+                        _deletedClss = new HashSet<>();
                     _deletedClss.add(sm.getMetaData().getDescribedType());
                 } else {
                     if (_updatedClss == null)
-                        _updatedClss = new HashSet<Class<?>>();
+                        _updatedClss = new HashSet<>();
                     _updatedClss.add(sm.getMetaData().getDescribedType());
                 }
 
@@ -4257,7 +4397,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                 // enter the transaction during pre store
                 if ((_flags & FLAG_PRESTORING) != 0) {
                     if (_transAdditions == null)
-                        _transAdditions = new HashSet<StateManagerImpl>();
+                        _transAdditions = new HashSet<>();
                     _transAdditions.add(sm);
                 }
             } finally {
@@ -4275,7 +4415,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         lock();
         try {
             if (_pending == null)
-                _pending = new HashSet<StateManagerImpl>();
+                _pending = new HashSet<>();
             _pending.add(sm);
         } finally {
             unlock();
@@ -4309,11 +4449,11 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             // via instance callbacks, add them to the special additions set
             if ((_flags & FLAG_DEREFDELETING) != 0) {
                 if (_derefAdditions == null)
-                    _derefAdditions = new HashSet<StateManagerImpl>();
+                    _derefAdditions = new HashSet<>();
                 _derefAdditions.add(sm);
             } else {
                 if (_derefCache == null)
-                    _derefCache = new HashSet<StateManagerImpl>();
+                    _derefCache = new HashSet<>();
                 _derefCache.add(sm);
             }
         }
@@ -4342,6 +4482,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void dirtyType(Class cls) {
         if (cls == null)
             return;
@@ -4349,25 +4490,28 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         beginOperation(false);
         try {
             if (_updatedClss == null)
-                _updatedClss = new HashSet<Class<?>>();
+                _updatedClss = new HashSet<>();
             _updatedClss.add(cls);
         } finally {
             endOperation();
         }
     }
 
+    @Override
     public Collection getPersistedTypes() {
         if (_persistedClss == null || _persistedClss.isEmpty())
             return Collections.EMPTY_SET;
         return Collections.unmodifiableCollection(_persistedClss);
     }
 
+    @Override
     public Collection getUpdatedTypes() {
         if (_updatedClss == null || _updatedClss.isEmpty())
             return Collections.EMPTY_SET;
         return Collections.unmodifiableCollection(_updatedClss);
     }
 
+    @Override
     public Collection getDeletedTypes() {
         if (_deletedClss == null || _deletedClss.isEmpty())
             return Collections.EMPTY_SET;
@@ -4378,14 +4522,17 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Closing
     ///////////
 
+    @Override
     public boolean isClosed() {
         return _closed;
     }
 
+    @Override
     public boolean isCloseInvoked() {
         return _closed || (_flags & FLAG_CLOSE_INVOKED) != 0;
     }
 
+    @Override
     public void close() {
         beginOperation(false);
         try {
@@ -4483,11 +4630,13 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // Synchronization
     ///////////////////
 
+    @Override
     public void lock() {
         if (_lock != null)
             _lock.lock();
     }
 
+    @Override
     public void unlock() {
         if (_lock != null)
             _lock.unlock();
@@ -4497,6 +4646,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // State management
     ////////////////////
 
+    @Override
     public Object newInstance(Class cls) {
         assertOpen();
 
@@ -4528,6 +4678,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public Object getObjectId(Object obj) {
         assertOpen();
         if (ImplHelper.isManageable(obj)) {
@@ -4544,6 +4695,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return null;
     }
 
+    @Override
     public int getLockLevel(Object o) {
         assertOpen();
         if (o == null)
@@ -4555,6 +4707,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return getLockManager().getLockLevel(sm);
     }
 
+    @Override
     public Object getVersion(Object obj) {
         assertOpen();
         if (ImplHelper.isManageable(obj))
@@ -4562,6 +4715,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return null;
     }
 
+    @Override
     public boolean isDirty(Object obj) {
         assertOpen();
         if (ImplHelper.isManageable(obj)) {
@@ -4571,6 +4725,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return false;
     }
 
+    @Override
     public boolean isTransactional(Object obj) {
         assertOpen();
         if (ImplHelper.isManageable(obj))
@@ -4579,6 +4734,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return false;
     }
 
+    @Override
     public boolean isPersistent(Object obj) {
         assertOpen();
         if (ImplHelper.isManageable(obj))
@@ -4587,6 +4743,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return false;
     }
 
+    @Override
     public boolean isNew(Object obj) {
         assertOpen();
         if (ImplHelper.isManageable(obj))
@@ -4594,12 +4751,14 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return false;
     }
 
+    @Override
     public boolean isDeleted(Object obj) {
         assertOpen();
         if (ImplHelper.isManageable(obj))
             return (ImplHelper.toPersistenceCapable(obj, _conf)).pcIsDeleted();
         return false;
     }
+    @Override
     public boolean isDetached(Object obj) {
         return isDetached(obj, true);
     }
@@ -4635,6 +4794,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return find(oid, null, EXCLUDE_ALL, null, 0) != null;
     }
 
+    @Override
     public OpenJPAStateManager getStateManager(Object obj) {
         assertOpen();
         return getStateManagerImpl(obj, false);
@@ -4711,6 +4871,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
      * Throw an exception if the context is closed.  The exact message and
      * content of the exception varies whether TRACE is enabled or not.
      */
+    @Override
     public void assertOpen() {
         if (_closed) {
             if (_closedException == null)  // TRACE not enabled
@@ -4725,6 +4886,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void assertActiveTransaction() {
         if ((_flags & FLAG_ACTIVE) == 0)
             throw new NoTransactionException(_loc.get("not-active"));
@@ -4739,11 +4901,13 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             throw new InvalidStateException(_loc.get("not-active"));
     }
 
+    @Override
     public void assertNontransactionalRead() {
         if ((_flags & FLAG_ACTIVE) == 0 && !_nontransRead)
             throw new InvalidStateException(_loc.get("non-trans-read"));
     }
 
+    @Override
     public void assertWriteOperation() {
         if ((_flags & FLAG_ACTIVE) == 0 && (!_nontransWrite
             || (_autoDetach & DETACH_NONTXREAD) != 0))
@@ -4767,10 +4931,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     // FindCallbacks implementation
     ////////////////////////////////
 
+    @Override
     public Object processArgument(Object oid) {
         return oid;
     }
 
+    @Override
     public Object processReturn(Object oid, OpenJPAStateManager sm) {
         return (sm == null) ? null : sm.getManagedInstance();
     }
@@ -4850,6 +5016,8 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     static class TransactionalCache
         implements Set, Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         private final boolean _orderDirty;
         private Set<StateManagerImpl> _dirty = null;
         private Set<StateManagerImpl> _clean = null;
@@ -4886,7 +5054,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         public Collection copyDirty() {
             if (_dirty == null || _dirty.isEmpty())
                 return Collections.EMPTY_SET;
-            return new LinkedHashSet<StateManagerImpl>(_dirty);
+            return new LinkedHashSet<>(_dirty);
         }
 
         /**
@@ -4919,7 +5087,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                 if (_orderDirty)
                     _dirty = MapBackedSet.mapBackedSet(new LinkedMap());
                 else
-                    _dirty = new HashSet<StateManagerImpl>();
+                    _dirty = new HashSet<>();
             }
             if (_dirty.add(sm))
                 removeCleanInternal(sm);
@@ -4937,6 +5105,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             return _clean != null && _clean.remove(sm);
         }
 
+        @Override
         public Iterator iterator() {
             IteratorChain chain = new IteratorChain();
             if (_dirty != null && !_dirty.isEmpty())
@@ -4946,11 +5115,13 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             return chain;
         }
 
+        @Override
         public boolean contains(Object obj) {
             return (_dirty != null && _dirty.contains(obj))
                 || (_clean != null && _clean.contains(obj));
         }
 
+        @Override
         public boolean containsAll(Collection coll) {
             for (Iterator<?> itr = coll.iterator(); itr.hasNext();)
                 if (!contains(itr.next()))
@@ -4958,6 +5129,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             return true;
         }
 
+        @Override
         public void clear() {
             if (_dirty != null)
                 _dirty = null;
@@ -4965,11 +5137,13 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                 _clean = null;
         }
 
+        @Override
         public boolean isEmpty() {
             return (_dirty == null || _dirty.isEmpty())
                 && (_clean == null || _clean.isEmpty());
         }
 
+        @Override
         public int size() {
             int size = 0;
             if (_dirty != null)
@@ -4979,30 +5153,37 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             return size;
         }
 
+        @Override
         public boolean add(Object obj) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean addAll(Collection coll) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean remove(Object obj) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean removeAll(Collection coll) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean retainAll(Collection c) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Object[] toArray() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Object[] toArray(Object[] arr) {
             throw new UnsupportedOperationException();
         }
@@ -5015,6 +5196,9 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     public static class StateManagerId
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public static final String STRING_PREFIX = "openjpasm:";
 
         private static long _generator = 0;
@@ -5038,6 +5222,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             _id = Long.parseLong(str.substring(idx + 1));
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == this)
                 return true;
@@ -5048,10 +5233,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             return _bhash == sid._bhash && _id == sid._id;
         }
 
+        @Override
         public int hashCode() {
             return (int) (_id ^ (_id >>> 32));
         }
 
+        @Override
         public String toString() {
             return STRING_PREFIX + _bhash + ":" + _id;
         }
@@ -5074,23 +5261,28 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
             return _states;
         }
 
+        @Override
         public int size() {
             return _states.size();
         }
 
+        @Override
         public Iterator iterator() {
             return new Iterator() {
                 private final Iterator _itr = _states.iterator();
 
+                @Override
                 public boolean hasNext() {
                     return _itr.hasNext();
                 }
 
+                @Override
                 public Object next() {
                     return ((OpenJPAStateManager) _itr.next()).
                         getManagedInstance();
                 }
 
+                @Override
                 public void remove() {
                     throw new UnsupportedException();
                 }
@@ -5121,6 +5313,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
                 obj.getClass().getName(), id)).setFailedObject(obj);
     }
 
+    @Override
     public boolean getCachePreparedQuery() {
         lock();
         try {
@@ -5131,6 +5324,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public void setCachePreparedQuery(boolean flag) {
         lock();
         try {
@@ -5166,6 +5360,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     /**
      * Return the 'JTA' connectionFactoryName
      */
+    @Override
     public String getConnectionFactoryName() {
         return _connectionFactoryName;
     }
@@ -5173,6 +5368,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     /**
      * Set the 'JTA' ConnectionFactoryName. Input will be trimmed to null before being stored.
      */
+    @Override
     public void setConnectionFactoryName(String connectionFactoryName) {
         this._connectionFactoryName = StringUtil.trimToNull(connectionFactoryName);
     }
@@ -5180,6 +5376,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     /**
      * Return the 'NonJTA' ConnectionFactoryName.
      */
+    @Override
     public String getConnectionFactory2Name() {
         return _connectionFactory2Name;
     }
@@ -5187,6 +5384,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
     /**
      * Set the 'NonJTA' ConnectionFactoryName. Input will be trimmed to null before being stored.
      */
+    @Override
     public void setConnectionFactory2Name(String connectionFactory2Name) {
         this._connectionFactory2Name = StringUtil.trimToNull(connectionFactory2Name);
     }
@@ -5196,6 +5394,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
      *
      * @return the JTA connection factory or null if connectionFactoryName is blank.
      */
+    @Override
     public Object getConnectionFactory() {
         if(StringUtil.isNotBlank(_connectionFactoryName)) {
             return Configurations.lookup(_connectionFactoryName, "openjpa.ConnectionFactory", _log );
@@ -5210,6 +5409,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
      *
      * @return the NonJTA connection factory or null if connectionFactoryName is blank.
      */
+    @Override
     public Object getConnectionFactory2() {
         if(StringUtil.isNotBlank(_connectionFactory2Name)) {
             return  Configurations.lookup(_connectionFactory2Name, "openjpa.ConnectionFactory2", _log);
@@ -5219,6 +5419,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         }
     }
 
+    @Override
     public boolean isCached(List<Object> oids) {
         BitSet loaded = new BitSet(oids.size());
         //check L1 cache first
@@ -5234,10 +5435,12 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return _store.isCached(oids, loaded);
     }
 
+    @Override
     public boolean getAllowReferenceToSiblingContext() {
         return _allowReferenceToSiblingContext;
     }
 
+    @Override
     public void setAllowReferenceToSiblingContext(boolean allow) {
         _allowReferenceToSiblingContext = allow;
     }
@@ -5246,11 +5449,13 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
         return ((_flags & FLAG_FLUSHING) != 0);
     }
 
-     public boolean getPostLoadOnMerge() {
+     @Override
+    public boolean getPostLoadOnMerge() {
          return _postLoadOnMerge;
      }
 
-     public void setPostLoadOnMerge(boolean allow) {
+     @Override
+    public void setPostLoadOnMerge(boolean allow) {
          _postLoadOnMerge = allow;
      }
 
@@ -5267,7 +5472,7 @@ public class BrokerImpl implements Broker, FindCallbacks, Cloneable, Serializabl
      * Generates a user-readable String from the given integral value of AutoDetach options.
      */
     private String toAutoDetachString(int value) {
-       List<String> result = new ArrayList<String>();
+       List<String> result = new ArrayList<>();
        for (int i = 0; i < AutoDetach.values.length; i++) {
                if ((value & AutoDetach.values[i]) != 0) {
                        result.add(AutoDetach.names[i]);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ClearFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ClearFieldManager.java
index 777d42c71..e10e34170 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ClearFieldManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ClearFieldManager.java
@@ -36,42 +36,52 @@ class ClearFieldManager
     protected ClearFieldManager() {
     }
 
+    @Override
     public boolean fetchBooleanField(int field) {
         return false;
     }
 
+    @Override
     public byte fetchByteField(int field) {
         return 0;
     }
 
+    @Override
     public char fetchCharField(int field) {
         return 0;
     }
 
+    @Override
     public double fetchDoubleField(int field) {
         return 0D;
     }
 
+    @Override
     public float fetchFloatField(int field) {
         return 0F;
     }
 
+    @Override
     public int fetchIntField(int field) {
         return 0;
     }
 
+    @Override
     public long fetchLongField(int field) {
         return 0L;
     }
 
+    @Override
     public Object fetchObjectField(int field) {
         return null;
     }
 
+    @Override
     public short fetchShortField(int field) {
         return 0;
     }
 
+    @Override
     public String fetchStringField(int field) {
         return null;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ConnectionRetainModes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ConnectionRetainModes.java
index 908183f03..84b1b4357 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ConnectionRetainModes.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ConnectionRetainModes.java
@@ -29,17 +29,17 @@ public interface ConnectionRetainModes {
     /**
      * Constant indicating that connections will be obtained as needed.
      */
-    public static final int CONN_RETAIN_DEMAND = 0;
+    int CONN_RETAIN_DEMAND = 0;
 
     /**
      * Constant indicating that connections will be retained for the life
      * of each transaction.
      */
-    public static final int CONN_RETAIN_TRANS = 1;
+    int CONN_RETAIN_TRANS = 1;
 
     /**
      * Constant indicating that each broker will retain a single connection
      * that it will use for its lifespan.
      */
-    public static final int CONN_RETAIN_ALWAYS = 2;
+    int CONN_RETAIN_ALWAYS = 2;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBroker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBroker.java
index cb165971a..e0d260d75 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBroker.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBroker.java
@@ -87,10 +87,12 @@ public class DelegatingBroker
         return (_del == null) ? _broker : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -125,10 +127,12 @@ public class DelegatingBroker
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public Broker getBroker() {
         return this;
     }
 
+    @Override
     public OpenJPAConfiguration getConfiguration() {
         try {
             return _broker.getConfiguration();
@@ -137,6 +141,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public FetchConfiguration getFetchConfiguration() {
         try {
             return _broker.getFetchConfiguration();
@@ -145,6 +150,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public FetchConfiguration pushFetchConfiguration() {
         try {
             return _broker.pushFetchConfiguration();
@@ -153,6 +159,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public FetchConfiguration pushFetchConfiguration(FetchConfiguration fc) {
         try {
             return _broker.pushFetchConfiguration(fc);
@@ -161,6 +168,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void popFetchConfiguration() {
         try {
             _broker.popFetchConfiguration();
@@ -169,6 +177,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public ClassLoader getClassLoader() {
         try {
             return _broker.getClassLoader();
@@ -177,6 +186,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public LockManager getLockManager() {
         try {
             return _broker.getLockManager();
@@ -185,6 +195,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public DelegatingStoreManager getStoreManager() {
         try {
             return _broker.getStoreManager();
@@ -193,6 +204,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public String getConnectionUserName() {
         try {
             return _broker.getConnectionUserName();
@@ -201,6 +213,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public String getConnectionPassword() {
         try {
             return _broker.getConnectionPassword();
@@ -209,6 +222,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Map<String,Object> getProperties() {
         try {
             return _broker.getProperties();
@@ -217,6 +231,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Set<String> getSupportedProperties() {
         try {
             return _broker.getSupportedProperties();
@@ -225,6 +240,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object find(Object oid, boolean validate, FindCallbacks call) {
         try {
             return _broker.find(oid, validate, call);
@@ -233,6 +249,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object[] findAll(Collection oids, boolean validate,
         FindCallbacks call) {
         try {
@@ -242,6 +259,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object findCached(Object oid, FindCallbacks call) {
         try {
             return _broker.findCached(oid, call);
@@ -250,6 +268,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object find(Object oid, FetchConfiguration fetch, BitSet exclude,
         Object edata, int flags) {
         try {
@@ -259,6 +278,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object[] findAll(Collection oids, FetchConfiguration fetch,
         BitSet exclude, Object edata, int flags) {
         try {
@@ -268,6 +288,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Iterator extentIterator(Class cls, boolean subs,
         FetchConfiguration fetch, boolean ignoreChanges) {
         try {
@@ -277,6 +298,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void retrieve(Object obj, boolean fgOnly, OpCallbacks call) {
         try {
             _broker.retrieve(obj, fgOnly, call);
@@ -285,6 +307,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void retrieveAll(Collection objs, boolean fgOnly, OpCallbacks call) {
         try {
             _broker.retrieveAll(objs, fgOnly, call);
@@ -293,6 +316,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public OpenJPAStateManager embed(Object obj, Object id,
         OpenJPAStateManager owner, ValueMetaData ownerMeta) {
         try {
@@ -302,6 +326,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Class getObjectIdType(Class cls) {
         try {
             return _broker.getObjectIdType(cls);
@@ -310,6 +335,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object newObjectId(Class cls, Object val) {
         try {
             return _broker.newObjectId(cls, val);
@@ -318,6 +344,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Collection getManagedObjects() {
         try {
             return _broker.getManagedObjects();
@@ -326,6 +353,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Collection getTransactionalObjects() {
         try {
             return _broker.getTransactionalObjects();
@@ -334,6 +362,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Collection getPendingTransactionalObjects() {
         try {
             return _broker.getPendingTransactionalObjects();
@@ -342,6 +371,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Collection getDirtyObjects() {
         try {
             return _broker.getDirtyObjects();
@@ -350,6 +380,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getOrderDirtyObjects() {
         try {
             return _broker.getOrderDirtyObjects();
@@ -358,6 +389,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setOrderDirtyObjects(boolean order) {
         try {
             _broker.setOrderDirtyObjects(order);
@@ -366,6 +398,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Collection getPersistedTypes() {
         try {
             return _broker.getPersistedTypes();
@@ -374,6 +407,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Collection getUpdatedTypes() {
         try {
             return _broker.getUpdatedTypes();
@@ -382,6 +416,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Collection getDeletedTypes() {
         try {
             return _broker.getDeletedTypes();
@@ -390,6 +425,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public OpenJPAStateManager getStateManager(Object obj) {
         try {
             return _broker.getStateManager(obj);
@@ -398,6 +434,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public int getLockLevel(Object obj) {
         try {
             return _broker.getLockLevel(obj);
@@ -406,6 +443,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object getVersion(Object obj) {
         try {
             return _broker.getVersion(obj);
@@ -414,6 +452,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isDirty(Object obj) {
         try {
             return _broker.isDirty(obj);
@@ -422,6 +461,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isTransactional(Object obj) {
         try {
             return _broker.isTransactional(obj);
@@ -430,6 +470,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isPersistent(Object obj) {
         try {
             return _broker.isPersistent(obj);
@@ -438,6 +479,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isNew(Object obj) {
         try {
             return _broker.isNew(obj);
@@ -446,6 +488,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isDeleted(Object obj) {
         try {
             return _broker.isDeleted(obj);
@@ -454,6 +497,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object getObjectId(Object obj) {
         try {
             return _broker.getObjectId(obj);
@@ -462,6 +506,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isManaged() {
         try {
             return _broker.isManaged();
@@ -470,6 +515,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isActive() {
         try {
             return _broker.isActive();
@@ -478,6 +524,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isStoreActive() {
         try {
             return _broker.isStoreActive();
@@ -486,6 +533,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean hasConnection() {
         try {
             return _broker.hasConnection();
@@ -494,6 +542,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object getConnection() {
         try {
             return _broker.getConnection();
@@ -502,6 +551,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void lock() {
         try {
             _broker.lock();
@@ -510,6 +560,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void unlock() {
         try {
             _broker.unlock();
@@ -518,6 +569,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean beginOperation(boolean read) {
         try {
             return _broker.beginOperation(read);
@@ -526,6 +578,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean endOperation() {
         try {
             return _broker.endOperation();
@@ -534,6 +587,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setImplicitBehavior(OpCallbacks call,
         RuntimeExceptionTranslator ex) {
         try {
@@ -543,6 +597,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public BrokerFactory getBrokerFactory() {
         try {
             return _broker.getBrokerFactory();
@@ -551,6 +606,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public int getConnectionRetainMode() {
         try {
             return _broker.getConnectionRetainMode();
@@ -559,6 +615,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public ManagedRuntime getManagedRuntime() {
         try {
             return _broker.getManagedRuntime();
@@ -567,6 +624,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public InverseManager getInverseManager() {
         try {
             return _broker.getInverseManager();
@@ -575,6 +633,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getMultithreaded() {
         try {
             return _broker.getMultithreaded();
@@ -583,6 +642,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setMultithreaded(boolean multi) {
         try {
             _broker.setMultithreaded(multi);
@@ -591,6 +651,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         try {
             return _broker.getIgnoreChanges();
@@ -599,6 +660,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setIgnoreChanges(boolean ignore) {
         try {
             _broker.setIgnoreChanges(ignore);
@@ -607,6 +669,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getNontransactionalRead() {
         try {
             return _broker.getNontransactionalRead();
@@ -615,6 +678,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setNontransactionalRead(boolean read) {
         try {
             _broker.setNontransactionalRead(read);
@@ -623,6 +687,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getNontransactionalWrite() {
         try {
             return _broker.getNontransactionalWrite();
@@ -631,6 +696,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setNontransactionalWrite(boolean write) {
         try {
             _broker.setNontransactionalWrite(write);
@@ -639,6 +705,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public int getRestoreState() {
         try {
             return _broker.getRestoreState();
@@ -647,6 +714,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setRestoreState(int restore) {
         try {
             _broker.setRestoreState(restore);
@@ -655,6 +723,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getOptimistic() {
         try {
             return _broker.getOptimistic();
@@ -663,6 +732,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setOptimistic(boolean opt) {
         try {
             _broker.setOptimistic(opt);
@@ -671,6 +741,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getRetainState() {
         try {
             return _broker.getRetainState();
@@ -679,6 +750,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setRetainState(boolean retain) {
         try {
             _broker.setRetainState(retain);
@@ -687,6 +759,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public int getAutoClear() {
         try {
             return _broker.getAutoClear();
@@ -695,6 +768,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setAutoClear(int clear) {
         try {
             _broker.setAutoClear(clear);
@@ -703,6 +777,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public int getAutoDetach() {
         try {
             return _broker.getAutoDetach();
@@ -711,6 +786,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setAutoDetach(int flags) {
         try {
             _broker.setAutoDetach(flags);
@@ -719,6 +795,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setAutoDetach(int flag, boolean on) {
         try {
             _broker.setAutoDetach(flag, on);
@@ -727,6 +804,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public int getDetachState() {
         try {
             return _broker.getDetachState();
@@ -735,6 +813,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setDetachState(int mode) {
         try {
             _broker.setDetachState(mode);
@@ -743,6 +822,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isDetachedNew() {
         try {
             return _broker.isDetachedNew();
@@ -751,6 +831,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setDetachedNew(boolean isNew) {
         try {
             _broker.setDetachedNew(isNew);
@@ -759,6 +840,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getSyncWithManagedTransactions() {
         try {
             return _broker.getSyncWithManagedTransactions();
@@ -767,6 +849,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setSyncWithManagedTransactions(boolean sync) {
         try {
             _broker.setSyncWithManagedTransactions(sync);
@@ -775,6 +858,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getEvictFromDataCache() {
         try {
             return _broker.getEvictFromDataCache();
@@ -783,6 +867,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setEvictFromDataCache(boolean evict) {
         try {
             _broker.setEvictFromDataCache(evict);
@@ -791,6 +876,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getPopulateDataCache() {
         try {
             return _broker.getPopulateDataCache();
@@ -799,6 +885,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setPopulateDataCache(boolean cache) {
         try {
             _broker.setPopulateDataCache(cache);
@@ -807,6 +894,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isTrackChangesByType() {
         try {
             return _broker.isTrackChangesByType();
@@ -815,6 +903,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setTrackChangesByType(boolean largeTransaction) {
         try {
             _broker.setTrackChangesByType(largeTransaction);
@@ -823,6 +912,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object putUserObject(Object key, Object val) {
         try {
             return _broker.putUserObject(key, val);
@@ -831,6 +921,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object getUserObject(Object key) {
         try {
             return _broker.getUserObject(key);
@@ -839,6 +930,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void addTransactionListener(Object listener) {
         try {
             _broker.addTransactionListener(listener);
@@ -847,6 +939,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void removeTransactionListener(Object listener) {
         try {
             _broker.removeTransactionListener(listener);
@@ -855,6 +948,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Collection<Object> getTransactionListeners() {
         try {
             return _broker.getTransactionListeners();
@@ -863,6 +957,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public int getTransactionListenerCallbackMode() {
         try {
             return _broker.getTransactionListenerCallbackMode();
@@ -871,6 +966,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setTransactionListenerCallbackMode(int mode) {
         try {
             _broker.setTransactionListenerCallbackMode(mode);
@@ -879,6 +975,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void addLifecycleListener(Object listener, Class[] classes) {
         try {
             _broker.addLifecycleListener(listener, classes);
@@ -887,6 +984,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void removeLifecycleListener(Object listener) {
         try {
             _broker.removeLifecycleListener(listener);
@@ -895,6 +993,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public int getLifecycleListenerCallbackMode() {
         try {
             return _broker.getLifecycleListenerCallbackMode();
@@ -903,6 +1002,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setLifecycleListenerCallbackMode(int mode) {
         try {
             _broker.setLifecycleListenerCallbackMode(mode);
@@ -911,6 +1011,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public LifecycleEventManager getLifecycleEventManager() {
         try {
             return _broker.getLifecycleEventManager();
@@ -919,6 +1020,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void begin() {
         try {
             _broker.begin();
@@ -927,6 +1029,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void commit() {
         try {
             _broker.commit();
@@ -935,6 +1038,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void rollback() {
         try {
             _broker.rollback();
@@ -943,6 +1047,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean syncWithManagedTransaction() {
         try {
             return _broker.syncWithManagedTransaction();
@@ -951,6 +1056,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void commitAndResume() {
         try {
             _broker.commitAndResume();
@@ -959,6 +1065,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void rollbackAndResume() {
         try {
             _broker.rollbackAndResume();
@@ -967,6 +1074,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setRollbackOnly() {
         try {
             _broker.setRollbackOnly();
@@ -975,6 +1083,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause) {
         try {
             _broker.setRollbackOnly(cause);
@@ -983,6 +1092,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Throwable getRollbackCause() {
         try {
             return _broker.getRollbackCause();
@@ -991,6 +1101,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getRollbackOnly() {
         try {
             return _broker.getRollbackOnly();
@@ -999,6 +1110,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void setSavepoint(String name) {
         try {
             _broker.setSavepoint(name);
@@ -1007,6 +1119,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void rollbackToSavepoint() {
         try {
             _broker.rollbackToSavepoint();
@@ -1015,6 +1128,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void rollbackToSavepoint(String name) {
         try {
             _broker.rollbackToSavepoint(name);
@@ -1023,6 +1137,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void releaseSavepoint() {
         try {
             _broker.releaseSavepoint();
@@ -1031,6 +1146,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void releaseSavepoint(String name) {
         try {
             _broker.releaseSavepoint(name);
@@ -1039,6 +1155,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void flush() {
         try {
             _broker.flush();
@@ -1047,6 +1164,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void preFlush() {
         try {
             _broker.preFlush();
@@ -1055,6 +1173,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void validateChanges() {
         try {
             _broker.validateChanges();
@@ -1063,6 +1182,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void beginStore() {
         try {
             _broker.beginStore();
@@ -1071,6 +1191,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void persist(Object obj, OpCallbacks call) {
         try {
             _broker.persist(obj, call);
@@ -1079,6 +1200,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void persistAll(Collection objs, OpCallbacks call) {
         try {
             _broker.persistAll(objs, call);
@@ -1087,6 +1209,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public OpenJPAStateManager persist(Object obj, Object id,
         OpCallbacks call) {
         try {
@@ -1096,6 +1219,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void delete(Object obj, OpCallbacks call) {
         try {
             _broker.delete(obj, call);
@@ -1104,6 +1228,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void deleteAll(Collection objs, OpCallbacks call) {
         try {
             _broker.deleteAll(objs, call);
@@ -1112,6 +1237,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void release(Object obj, OpCallbacks call) {
         try {
             _broker.release(obj, call);
@@ -1120,6 +1246,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void releaseAll(Collection objs, OpCallbacks call) {
         try {
             _broker.releaseAll(objs, call);
@@ -1128,6 +1255,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void refresh(Object obj, OpCallbacks call) {
         try {
             _broker.refresh(obj, call);
@@ -1136,6 +1264,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void refreshAll(Collection objs, OpCallbacks call) {
         try {
             _broker.refreshAll(objs, call);
@@ -1144,6 +1273,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void evict(Object obj, OpCallbacks call) {
         try {
             _broker.evict(obj, call);
@@ -1152,6 +1282,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void evictAll(Collection objs, OpCallbacks call) {
         try {
             _broker.evictAll(objs, call);
@@ -1160,6 +1291,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void evictAll(OpCallbacks call) {
         try {
             _broker.evictAll(call);
@@ -1168,6 +1300,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void evictAll(Extent extent, OpCallbacks call) {
         try {
             _broker.evictAll(extent, call);
@@ -1176,6 +1309,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object detach(Object obj, OpCallbacks call) {
         try {
             return _broker.detach(obj, call);
@@ -1184,6 +1318,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object[] detachAll(Collection objs, OpCallbacks call) {
         try {
             return _broker.detachAll(objs, call);
@@ -1192,6 +1327,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void detachAll(OpCallbacks call) {
         try {
             _broker.detachAll(call);
@@ -1200,6 +1336,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void detachAll(OpCallbacks call, boolean flush) {
         try {
             _broker.detachAll(call, flush);
@@ -1208,6 +1345,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object attach(Object obj, boolean copyNew, OpCallbacks call) {
         try {
             return _broker.attach(obj, copyNew, call);
@@ -1216,6 +1354,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object[] attachAll(Collection objs, boolean copyNew,
         OpCallbacks call) {
         try {
@@ -1225,6 +1364,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void transactional(Object pc, boolean updateVersion, OpCallbacks
         call) {
         try {
@@ -1234,6 +1374,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void transactionalAll(Collection objs, boolean updateVersion,
         OpCallbacks call) {
         try {
@@ -1243,6 +1384,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void nontransactional(Object pc, OpCallbacks call) {
         try {
             _broker.nontransactional(pc, call);
@@ -1251,6 +1393,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void nontransactionalAll(Collection objs, OpCallbacks call) {
         try {
             _broker.nontransactionalAll(objs, call);
@@ -1259,6 +1402,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Extent newExtent(Class cls, boolean subs) {
         try {
             return _broker.newExtent(cls, subs);
@@ -1267,6 +1411,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Query newQuery(String language, Class cls, Object query) {
         try {
             return _broker.newQuery(language, cls, query);
@@ -1275,6 +1420,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Query newQuery(String language, Object query) {
         try {
             return _broker.newQuery(language, query);
@@ -1283,6 +1429,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Seq getIdentitySequence(ClassMetaData meta) {
         try {
             return _broker.getIdentitySequence(meta);
@@ -1291,6 +1438,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Seq getValueSequence(FieldMetaData fmd) {
         try {
             return _broker.getValueSequence(fmd);
@@ -1299,6 +1447,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void lock(Object obj, int level, int timeout, OpCallbacks call) {
         try {
             _broker.lock(obj, level, timeout, call);
@@ -1307,6 +1456,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void lock(Object obj, OpCallbacks call) {
         try {
             _broker.lock(obj, call);
@@ -1315,6 +1465,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void lockAll(Collection objs, int level, int timeout,
         OpCallbacks call) {
         try {
@@ -1324,6 +1475,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void lockAll(Collection objs, OpCallbacks call) {
         try {
             _broker.lockAll(objs, call);
@@ -1332,6 +1484,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean cancelAll() {
         try {
             return _broker.cancelAll();
@@ -1340,6 +1493,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void dirtyType(Class cls) {
         try {
             _broker.dirtyType(cls);
@@ -1348,6 +1502,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void close() {
         try {
             _broker.close();
@@ -1356,6 +1511,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isClosed() {
         try {
             return _broker.isClosed();
@@ -1364,6 +1520,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isCloseInvoked() {
         try {
             return _broker.isCloseInvoked();
@@ -1372,6 +1529,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void assertOpen() {
         try {
             _broker.assertOpen();
@@ -1380,6 +1538,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void assertActiveTransaction() {
         try {
             _broker.assertActiveTransaction();
@@ -1388,6 +1547,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void assertNontransactionalRead() {
         try {
             _broker.assertNontransactionalRead();
@@ -1396,6 +1556,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void assertWriteOperation() {
         try {
             _broker.assertWriteOperation();
@@ -1408,6 +1569,7 @@ public class DelegatingBroker
     // Implementation of Synchronization interface
     ///////////////////////////////////////////////
 
+    @Override
     public void beforeCompletion() {
         try {
             _broker.beforeCompletion();
@@ -1416,6 +1578,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public void afterCompletion(int status) {
         try {
             _broker.afterCompletion(status);
@@ -1424,6 +1587,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public Object newInstance(Class cls) {
         try {
             return _broker.newInstance(cls);
@@ -1432,6 +1596,7 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean isDetached(Object obj) {
         try {
             return _broker.isDetached(obj);
@@ -1440,54 +1605,67 @@ public class DelegatingBroker
         }
     }
 
+    @Override
     public boolean getCachePreparedQuery() {
         return _broker.getCachePreparedQuery();
     }
 
+    @Override
     public void setCachePreparedQuery(boolean flag) {
         _broker.setCachePreparedQuery(flag);
     }
 
+    @Override
     public String getConnectionFactoryName() {
         return _broker.getConnectionFactoryName();
     }
 
+    @Override
     public void setConnectionFactoryName(String connectionFactoryName) {
         _broker.setConnectionFactoryName(connectionFactoryName);
     }
 
+    @Override
     public String getConnectionFactory2Name() {
         return _broker.getConnectionFactory2Name();
     }
 
+    @Override
     public void setConnectionFactory2Name(String connectionFactory2Name) {
         _broker.setConnectionFactory2Name(connectionFactory2Name);
     }
 
+    @Override
     public Object getConnectionFactory() {
         return _broker.getConnectionFactory();
     }
 
+    @Override
     public Object getConnectionFactory2() {
         return _broker.getConnectionFactory2();
     }
 
+    @Override
     public boolean isCached(List<Object> oid) {
         return _broker.isCached(oid);
     }
 
+    @Override
     public boolean getAllowReferenceToSiblingContext() {
         return _broker.getAllowReferenceToSiblingContext();
     }
 
+    @Override
     public void setAllowReferenceToSiblingContext(boolean allow) {
         _broker.setAllowReferenceToSiblingContext(allow);
     }
 
+    @Override
     public boolean getPostLoadOnMerge() {
         return _broker.getPostLoadOnMerge();
     }
 
+    @Override
     public void setPostLoadOnMerge(boolean allow) {
         _broker.setPostLoadOnMerge(allow);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java
index 062e21047..c15956d54 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java
@@ -39,6 +39,8 @@ import org.apache.openjpa.util.RuntimeExceptionTranslator;
 public class DelegatingBrokerFactory
     implements BrokerFactory {
 
+    
+    private static final long serialVersionUID = 1L;
     private final BrokerFactory _factory;
     private final DelegatingBrokerFactory _del;
     private final RuntimeExceptionTranslator _trans;
@@ -77,10 +79,12 @@ public class DelegatingBrokerFactory
         return (_del == null) ? _factory : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -96,6 +100,7 @@ public class DelegatingBrokerFactory
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public OpenJPAConfiguration getConfiguration() {
         try {
             return _factory.getConfiguration();
@@ -104,6 +109,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public Map<String,Object> getProperties() {
         try {
             return _factory.getProperties();
@@ -112,6 +118,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public Set<String> getSupportedProperties() {
         try {
             return _factory.getSupportedProperties();
@@ -120,6 +127,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public Object putUserObject(Object key, Object val) {
         try {
             return _factory.putUserObject(key, val);
@@ -128,6 +136,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public Object getUserObject(Object key) {
         try {
             return _factory.getUserObject(key);
@@ -136,6 +145,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public Broker newBroker() {
         try {
             return _factory.newBroker();
@@ -144,10 +154,12 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public Broker newBroker(String user, String pass, boolean managed,
         int connRetainMode, boolean findExisting) {
         return newBroker(user, pass, managed, connRetainMode, findExisting, "", "");
     }
+    @Override
     public Broker newBroker(String user, String pass, boolean managed,
         int connRetainMode, boolean findExisting, String cfName, String cf2Name) {
         try {
@@ -158,6 +170,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public void addLifecycleListener(Object listener, Class[] classes) {
         try {
             _factory.addLifecycleListener(listener, classes);
@@ -166,6 +179,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public void removeLifecycleListener(Object listener) {
         try {
             _factory.removeLifecycleListener(listener);
@@ -174,6 +188,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public void addTransactionListener(Object listener) {
         try {
             _factory.addTransactionListener(listener);
@@ -182,6 +197,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public void removeTransactionListener(Object listener) {
         try {
             _factory.removeTransactionListener(listener);
@@ -190,6 +206,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public void close() {
         try {
             _factory.close();
@@ -198,6 +215,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public boolean isClosed() {
         try {
             return _factory.isClosed();
@@ -206,6 +224,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public void lock() {
         try {
             _factory.lock();
@@ -214,6 +233,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public void unlock() {
         try {
             _factory.unlock();
@@ -222,6 +242,7 @@ public class DelegatingBrokerFactory
 		}
 	}
 
+    @Override
     public void assertOpen() {
         try {
             _factory.assertOpen();
@@ -230,6 +251,7 @@ public class DelegatingBrokerFactory
         }
     }
 
+    @Override
     public void postCreationCallback() {
         try {
             _factory.postCreationCallback();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java
index 96203c1e7..87167c432 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingExtent.java
@@ -75,10 +75,12 @@ public class DelegatingExtent<T>
         return (_del == null) ? _extent : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -94,6 +96,7 @@ public class DelegatingExtent<T>
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public Class<T> getElementType() {
         try {
             return _extent.getElementType();
@@ -102,6 +105,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public boolean hasSubclasses() {
         try {
             return _extent.hasSubclasses();
@@ -110,6 +114,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public Broker getBroker() {
         try {
             return _extent.getBroker();
@@ -118,6 +123,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public FetchConfiguration getFetchConfiguration() {
         try {
             return _extent.getFetchConfiguration();
@@ -126,6 +132,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         try {
             return _extent.getIgnoreChanges();
@@ -134,6 +141,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public void setIgnoreChanges(boolean ignoreCache) {
         try {
             _extent.setIgnoreChanges(ignoreCache);
@@ -142,6 +150,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public List<T> list() {
         try {
             return _extent.list();
@@ -150,6 +159,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public Iterator<T> iterator() {
         try {
             return _extent.iterator();
@@ -158,6 +168,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public void closeAll() {
         try {
             _extent.closeAll();
@@ -166,6 +177,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public void lock() {
         try {
             _extent.lock();
@@ -174,6 +186,7 @@ public class DelegatingExtent<T>
         }
     }
 
+    @Override
     public void unlock() {
         try {
             _extent.unlock();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
index 68e2b2b05..2f969ae33 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingFetchConfiguration.java
@@ -41,6 +41,8 @@ import org.apache.openjpa.util.RuntimeExceptionTranslator;
 public class DelegatingFetchConfiguration
     implements FetchConfiguration {
 
+    
+    private static final long serialVersionUID = 1L;
     private final FetchConfiguration _fetch;
     private final DelegatingFetchConfiguration _del;
     private final RuntimeExceptionTranslator _trans;
@@ -79,10 +81,12 @@ public class DelegatingFetchConfiguration
         return (_del == null) ? _fetch : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -99,6 +103,7 @@ public class DelegatingFetchConfiguration
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public StoreContext getContext() {
         try {
             return _fetch.getContext();
@@ -107,6 +112,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public void setContext(StoreContext ctx) {
         try {
             _fetch.setContext(ctx);
@@ -115,6 +121,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int getFetchBatchSize() {
         try {
             return _fetch.getFetchBatchSize();
@@ -123,6 +130,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setFetchBatchSize(int fetchBatchSize) {
         try {
             _fetch.setFetchBatchSize(fetchBatchSize);
@@ -132,6 +140,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int getMaxFetchDepth() {
         try {
             return _fetch.getMaxFetchDepth();
@@ -140,6 +149,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setMaxFetchDepth(int depth) {
         try {
             _fetch.setMaxFetchDepth(depth);
@@ -149,6 +159,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public Set getRootInstances() {
         try {
             return _fetch.getRootInstances();
@@ -157,6 +168,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setRootInstances(Collection roots) {
         try {
             _fetch.setRootInstances(roots);
@@ -166,6 +178,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public Set getRootClasses() {
         try {
             return _fetch.getRootClasses();
@@ -174,6 +187,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setRootClasses(Collection roots) {
         try {
             _fetch.setRootClasses(roots);
@@ -183,6 +197,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public boolean getQueryCacheEnabled() {
         try {
             return _fetch.getQueryCacheEnabled();
@@ -191,6 +206,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setQueryCacheEnabled(boolean cache) {
         try {
             _fetch.setQueryCacheEnabled(cache);
@@ -200,6 +216,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int getFlushBeforeQueries() {
         try {
             return _fetch.getFlushBeforeQueries();
@@ -208,6 +225,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setFlushBeforeQueries(int flush) {
         try {
             _fetch.setFlushBeforeQueries(flush);
@@ -217,6 +235,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public boolean getExtendedPathLookup() {
         try {
             return _fetch.getExtendedPathLookup();
@@ -225,6 +244,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setExtendedPathLookup(boolean flag) {
         try {
             _fetch.setExtendedPathLookup(flag);
@@ -235,6 +255,7 @@ public class DelegatingFetchConfiguration
     }
 
 
+    @Override
     public Set getFetchGroups() {
         try {
             return _fetch.getFetchGroups();
@@ -243,6 +264,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public boolean hasFetchGroup(String group) {
         try {
             return _fetch.hasFetchGroup(group);
@@ -251,6 +273,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration addFetchGroup(String group) {
         try {
             _fetch.addFetchGroup(group);
@@ -260,6 +283,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration addFetchGroups(Collection groups) {
         try {
             _fetch.addFetchGroups(groups);
@@ -269,6 +293,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration removeFetchGroup(String group) {
         try {
             _fetch.removeFetchGroup(group);
@@ -278,6 +303,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration removeFetchGroups(Collection groups) {
         try {
             _fetch.removeFetchGroups(groups);
@@ -287,6 +313,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration clearFetchGroups() {
         try {
             _fetch.clearFetchGroups();
@@ -296,6 +323,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration resetFetchGroups() {
         try {
             _fetch.resetFetchGroups();
@@ -305,6 +333,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public Set getFields() {
         try {
             return _fetch.getFields();
@@ -313,6 +342,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public boolean hasField(String field) {
         try {
             return _fetch.hasField(field);
@@ -321,6 +351,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration addField(String field) {
         try {
             _fetch.addField(field);
@@ -330,6 +361,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration addFields(Collection fields) {
         try {
             _fetch.addFields(fields);
@@ -339,6 +371,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration removeField(String field) {
         try {
             _fetch.removeField(field);
@@ -348,6 +381,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration removeFields(Collection fields) {
         try {
             _fetch.removeFields(fields);
@@ -357,6 +391,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration clearFields() {
         try {
             _fetch.clearFields();
@@ -366,6 +401,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int getLockTimeout() {
         try {
             return _fetch.getLockTimeout();
@@ -374,6 +410,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setLockTimeout(int timeout) {
         try {
             _fetch.setLockTimeout(timeout);
@@ -383,6 +420,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int getQueryTimeout() {
         try {
             return _fetch.getQueryTimeout();
@@ -391,6 +429,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setQueryTimeout(int timeout) {
         try {
             _fetch.setQueryTimeout(timeout);
@@ -400,6 +439,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int getLockScope() {
         try {
             return _fetch.getLockScope();
@@ -408,6 +448,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setLockScope(int scope) {
         try {
             _fetch.setLockScope(scope);
@@ -417,6 +458,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int getReadLockLevel() {
         try {
             return _fetch.getReadLockLevel();
@@ -425,6 +467,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setReadLockLevel(int level) {
         try {
             _fetch.setReadLockLevel(level);
@@ -434,6 +477,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int getWriteLockLevel() {
         try {
             return _fetch.getWriteLockLevel();
@@ -442,6 +486,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration setWriteLockLevel(int level) {
         try {
             _fetch.setWriteLockLevel(level);
@@ -451,6 +496,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public ResultList newResultList(ResultObjectProvider rop) {
         try {
             return _fetch.newResultList(rop);
@@ -459,6 +505,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public void copy(FetchConfiguration fetch) {
         try {
             _fetch.copy(fetch);
@@ -467,6 +514,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public Object clone() {
         try {
             return _fetch.clone();
@@ -475,6 +523,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public void setHint(String name, Object value) {
         try {
             _fetch.setHint(name, value);
@@ -483,6 +532,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public void setHint(String name, Object value, Object original) {
         try {
             _fetch.setHint(name, value, original);
@@ -491,6 +541,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public boolean isHintSet(String key) {
         try {
             return _fetch.isHintSet(key);
@@ -499,6 +550,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public boolean isDefaultPUFetchGroupConfigurationOnly() {
         try {
             return _fetch.isDefaultPUFetchGroupConfigurationOnly();
@@ -507,6 +559,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public Object getHint(String name) {
         try {
             return _fetch.getHint(name);
@@ -515,6 +568,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public Map<String, Object> getHints() {
         try {
             return _fetch.getHints();
@@ -523,6 +577,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public int requiresFetch(FieldMetaData fmd) {
         try {
             return _fetch.requiresFetch(fmd);
@@ -531,6 +586,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public boolean requiresLoad() {
         try {
             return _fetch.requiresLoad();
@@ -539,6 +595,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public FetchConfiguration traverse(FieldMetaData fmd) {
         try {
             return _fetch.traverse(fmd);
@@ -547,6 +604,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public void lock() {
         try {
             _fetch.lock();
@@ -555,6 +613,7 @@ public class DelegatingFetchConfiguration
 		}
 	}
 
+    @Override
     public void unlock() {
         try {
             _fetch.unlock();
@@ -563,6 +622,7 @@ public class DelegatingFetchConfiguration
 		}
 	}
 
+    @Override
     public DataCacheRetrieveMode getCacheRetrieveMode() {
         try {
             return _fetch.getCacheRetrieveMode();
@@ -571,6 +631,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public DataCacheStoreMode getCacheStoreMode() {
         try {
             return _fetch.getCacheStoreMode();
@@ -579,6 +640,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public void setCacheRetrieveMode(DataCacheRetrieveMode mode) {
         try {
             _fetch.setCacheRetrieveMode(mode);
@@ -587,6 +649,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public void setCacheStoreMode(DataCacheStoreMode mode) {
         try {
             _fetch.setCacheStoreMode(mode);
@@ -595,6 +658,7 @@ public class DelegatingFetchConfiguration
         }
     }
 
+    @Override
     public boolean isFetchConfigurationSQLCacheAdmissible() {
         try {
             return _fetch.isFetchConfigurationSQLCacheAdmissible();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java
index db1c13785..2b7af533a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingQuery.java
@@ -42,6 +42,8 @@ public class DelegatingQuery
     // JDO and JPA facades!
     ///////////////////////////////////////////////////////////////
 
+    
+    private static final long serialVersionUID = 1L;
     private final Query _query;
     private final DelegatingQuery _del;
     private final transient RuntimeExceptionTranslator _trans;
@@ -79,10 +81,12 @@ public class DelegatingQuery
         return (_del == null) ? _query : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -98,6 +102,7 @@ public class DelegatingQuery
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public Broker getBroker() {
         try {
             return _query.getBroker();
@@ -106,10 +111,12 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Query getQuery() {
         return this;
     }
 
+    @Override
     public StoreContext getStoreContext() {
         try {
             return _query.getStoreContext();
@@ -118,6 +125,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public int getOperation() {
         try {
             return _query.getOperation();
@@ -126,6 +134,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public String getLanguage() {
         try {
             return _query.getLanguage();
@@ -134,6 +143,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public FetchConfiguration getFetchConfiguration() {
         try {
             return _query.getFetchConfiguration();
@@ -142,6 +152,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public String getQueryString() {
         try {
             return _query.getQueryString();
@@ -150,6 +161,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         try {
             return _query.getIgnoreChanges();
@@ -158,6 +170,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Object getCompilation() {
         try {
             return _query.getCompilation();
@@ -166,6 +179,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public String getAlias() {
         try {
             return _query.getAlias();
@@ -174,6 +188,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public String[] getProjectionAliases() {
         try {
             return _query.getProjectionAliases();
@@ -182,6 +197,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Class[] getProjectionTypes() {
         try {
             return _query.getProjectionTypes();
@@ -190,6 +206,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public boolean isAggregate() {
         try {
             return _query.isAggregate();
@@ -198,6 +215,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public boolean hasGrouping() {
         try {
             return _query.hasGrouping();
@@ -206,6 +224,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public ClassMetaData[] getAccessPathMetaDatas() {
         try {
             return _query.getAccessPathMetaDatas();
@@ -214,6 +233,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public FilterListener getFilterListener(String tag) {
         try {
             return _query.getFilterListener(tag);
@@ -222,6 +242,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public AggregateListener getAggregateListener(String tag) {
         try {
             return _query.getAggregateListener(tag);
@@ -230,6 +251,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Collection getFilterListeners() {
         try {
             return _query.getFilterListeners();
@@ -238,6 +260,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Collection getAggregateListeners() {
         try {
             return _query.getAggregateListeners();
@@ -246,6 +269,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Collection getCandidateCollection() {
         try {
             return _query.getCandidateCollection();
@@ -254,6 +278,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Class getCandidateType() {
         try {
             return _query.getCandidateType();
@@ -262,6 +287,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public boolean hasSubclasses() {
         try {
             return _query.hasSubclasses();
@@ -270,6 +296,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setCandidateType(Class cls, boolean subs) {
         try {
             _query.setCandidateType(cls, subs);
@@ -278,6 +305,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public boolean isReadOnly() {
         try {
             return _query.isReadOnly();
@@ -286,6 +314,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setReadOnly(boolean readOnly) {
         try {
             _query.setReadOnly(readOnly);
@@ -294,6 +323,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Class getResultMappingScope() {
         try {
             return _query.getResultMappingScope();
@@ -302,6 +332,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public String getResultMappingName() {
         try {
             return _query.getResultMappingName();
@@ -310,6 +341,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setResultMapping(Class scope, String name) {
         try {
             _query.setResultMapping(scope, name);
@@ -318,6 +350,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public boolean isUnique() {
         try {
             return _query.isUnique();
@@ -326,6 +359,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setUnique(boolean unique) {
         try {
             _query.setUnique(unique);
@@ -334,6 +368,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public boolean isDistinct() {
         try {
             return _query.isDistinct();
@@ -342,6 +377,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Class getResultType() {
         try {
             return _query.getResultType();
@@ -350,6 +386,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setResultType(Class cls) {
         try {
             _query.setResultType(cls);
@@ -358,6 +395,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public long getStartRange() {
         try {
             return _query.getStartRange();
@@ -366,6 +404,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public long getEndRange() {
         try {
             return _query.getEndRange();
@@ -374,6 +413,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setRange(long start, long end) {
         try {
             _query.setRange(start, end);
@@ -382,6 +422,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public String getParameterDeclaration() {
         try {
             return _query.getParameterDeclaration();
@@ -390,6 +431,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public OrderedMap<Object,Class<?>> getOrderedParameterTypes() {
         try {
             return _query.getOrderedParameterTypes();
@@ -398,6 +440,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public LinkedMap getParameterTypes() {
         try {
             return _query.getParameterTypes();
@@ -406,6 +449,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Map getUpdates() {
         try {
             return _query.getUpdates();
@@ -414,6 +458,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void declareParameters(String params) {
         try {
             _query.declareParameters(params);
@@ -422,6 +467,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Number deleteInMemory(StoreQuery q, StoreQuery.Executor ex,
         Object[] params) {
         try {
@@ -431,6 +477,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Number updateInMemory(StoreQuery q, StoreQuery.Executor ex,
         Object[] params) {
         try {
@@ -440,6 +487,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Class classForName(String name, String[] imports) {
         try {
             return _query.classForName(name, imports);
@@ -448,6 +496,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void lock() {
         try {
             _query.lock();
@@ -456,6 +505,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void unlock() {
         try {
             _query.unlock();
@@ -464,6 +514,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void addFilterListener(FilterListener listener) {
         try {
             _query.addFilterListener(listener);
@@ -472,6 +523,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void removeFilterListener(FilterListener listener) {
         try {
             _query.removeFilterListener(listener);
@@ -480,6 +532,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void addAggregateListener(AggregateListener listener) {
         try {
             _query.addAggregateListener(listener);
@@ -488,6 +541,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void removeAggregateListener(AggregateListener listener) {
         try {
             _query.removeAggregateListener(listener);
@@ -496,6 +550,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Extent getCandidateExtent() {
         try {
             return _query.getCandidateExtent();
@@ -504,6 +559,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setCandidateExtent(Extent extent) {
         try {
             _query.setCandidateExtent(extent);
@@ -512,6 +568,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setCandidateCollection(Collection coll) {
         try {
             _query.setCandidateCollection(coll);
@@ -520,6 +577,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void compile() {
         try {
             _query.compile();
@@ -528,6 +586,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Object execute() {
         try {
             return _query.execute();
@@ -536,6 +595,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Object execute(Map params) {
         try {
             return _query.execute(params);
@@ -544,6 +604,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public Object execute(Object[] params) {
         try {
             return _query.execute(params);
@@ -552,6 +613,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public long deleteAll() {
         try {
             return _query.deleteAll();
@@ -560,6 +622,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public long deleteAll(Object[] parameters) {
         try {
             return _query.deleteAll(parameters);
@@ -568,6 +631,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public long deleteAll(Map parameterMap) {
         try {
             return _query.deleteAll(parameterMap);
@@ -576,6 +640,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public long updateAll() {
         try {
             return _query.updateAll();
@@ -584,6 +649,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public long updateAll(Object[] parameters) {
         try {
             return _query.updateAll(parameters);
@@ -592,6 +658,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public long updateAll(Map parameterMap) {
         try {
             return _query.updateAll(parameterMap);
@@ -600,6 +667,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void closeAll() {
         try {
             _query.closeAll();
@@ -608,6 +676,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void closeResources() {
         try {
             _query.closeResources();
@@ -616,6 +685,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public String[] getDataStoreActions(Map params) {
         try {
             return _query.getDataStoreActions(params);
@@ -624,6 +694,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public boolean setQuery(Object query) {
         try {
             return _query.setQuery(query);
@@ -632,6 +703,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void setIgnoreChanges(boolean ignore) {
         try {
             _query.setIgnoreChanges(ignore);
@@ -640,6 +712,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void assertOpen() {
         try {
             _query.assertOpen();
@@ -648,6 +721,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void assertNotReadOnly() {
         try {
             _query.assertNotReadOnly();
@@ -656,6 +730,7 @@ public class DelegatingQuery
         }
     }
 
+    @Override
     public void assertNotSerialized() {
         try {
             _query.assertNotSerialized();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java
index c9f9b6d57..8b985c555 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingResultList.java
@@ -78,6 +78,7 @@ public class DelegatingResultList<T>
         return _del;
     }
 
+    @Override
     public int hashCode() {
         try {
             return getInnermostDelegate().hashCode();
@@ -86,6 +87,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -105,6 +107,7 @@ public class DelegatingResultList<T>
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public boolean isProviderOpen() {
         try {
             return _del.isProviderOpen();
@@ -113,6 +116,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public Object getUserObject() {
         try {
             return _del.getUserObject();
@@ -121,6 +125,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public void setUserObject(Object opaque) {
         try {
             _del.setUserObject(opaque);
@@ -129,6 +134,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public void close() {
         try {
             _del.close();
@@ -137,6 +143,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean isClosed() {
         try {
             return _del.isClosed();
@@ -145,6 +152,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public int size() {
         try {
             return _del.size();
@@ -153,6 +161,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean isEmpty() {
         try {
             return _del.isEmpty();
@@ -161,6 +170,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean contains(Object o) {
         try {
             return _del.contains(o);
@@ -169,10 +179,12 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public Iterator<T> iterator() {
         return listIterator();
     }
 
+    @Override
     public Object[] toArray() {
         try {
             return _del.toArray();
@@ -181,6 +193,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public Object[] toArray(Object[] a) {
         try {
             return _del.toArray(a);
@@ -189,6 +202,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean add(T o) {
         try {
             return _del.add(o);
@@ -197,6 +211,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean remove(Object o) {
         try {
             return _del.remove(o);
@@ -205,6 +220,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean containsAll(Collection<?> c) {
         try {
             return _del.containsAll(c);
@@ -213,6 +229,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean addAll(Collection<? extends T> c) {
         try {
             return _del.addAll(c);
@@ -221,6 +238,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean addAll(int index, Collection<? extends T> c) {
         try {
             return _del.addAll(index, c);
@@ -229,6 +247,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean removeAll(Collection<?> c) {
         try {
             return _del.removeAll(c);
@@ -237,6 +256,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public boolean retainAll(Collection<?> c) {
         try {
             return _del.retainAll(c);
@@ -245,6 +265,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public void clear() {
         try {
             _del.clear();
@@ -253,6 +274,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public T get(int index) {
         try {
             return _del.get(index);
@@ -261,6 +283,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public T set(int index, T element) {
         try {
             return _del.set(index, element);
@@ -269,6 +292,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public void add(int index, T element) {
         try {
             _del.add(index, element);
@@ -277,6 +301,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public T remove(int index) {
         try {
             return _del.remove(index);
@@ -285,6 +310,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public int indexOf(Object o) {
         try {
             return _del.indexOf(o);
@@ -293,6 +319,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public int lastIndexOf(Object o) {
         try {
             return _del.lastIndexOf(o);
@@ -301,22 +328,25 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public ListIterator<T> listIterator() {
         try {
-            return new DelegatingListIterator<T>(_del.listIterator());
+            return new DelegatingListIterator<>(_del.listIterator());
         } catch (RuntimeException re) {
             throw translate(re);
         }
     }
 
+    @Override
     public ListIterator<T> listIterator(int index) {
         try {
-            return new DelegatingListIterator<T>(_del.listIterator(index));
+            return new DelegatingListIterator<>(_del.listIterator(index));
         } catch (RuntimeException re) {
             throw translate(re);
         }
     }
 
+    @Override
     public List<T> subList(int fromIndex, int toIndex) {
         try {
             return _del.subList(fromIndex, toIndex);
@@ -325,6 +355,7 @@ public class DelegatingResultList<T>
         }
     }
 
+    @Override
     public String toString() {
         try {
             return _del.toString();
@@ -363,6 +394,7 @@ public class DelegatingResultList<T>
                 ? ((DelegatingListIterator<T>) _del).getInnermostDelegate() : _del;
         }
 
+        @Override
         public int hashCode() {
             try {
                 return getInnermostDelegate().hashCode();
@@ -371,6 +403,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == this)
                 return true;
@@ -383,6 +416,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public boolean hasNext() {
             try {
                 return _del.hasNext();
@@ -391,6 +425,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public T next() {
             try {
                 return _del.next();
@@ -399,6 +434,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public boolean hasPrevious() {
             try {
                 return _del.hasPrevious();
@@ -407,6 +443,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public T previous() {
             try {
                 return _del.previous();
@@ -415,6 +452,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public int nextIndex() {
             try {
                 return _del.nextIndex();
@@ -423,6 +461,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public int previousIndex() {
             try {
                 return _del.previousIndex();
@@ -431,6 +470,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public void remove() {
             try {
                 _del.remove();
@@ -439,6 +479,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public void set(T o) {
             try {
                 _del.set(o);
@@ -447,6 +488,7 @@ public class DelegatingResultList<T>
             }
         }
 
+        @Override
         public void add(T o) {
             try {
                 _del.add(o);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java
index 4052b8a1c..9c64574a0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingSeq.java
@@ -72,10 +72,12 @@ public class DelegatingSeq
         return (_del == null) ? _seq : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -91,6 +93,7 @@ public class DelegatingSeq
         return (_trans == null) ? re : _trans.translate(re);
     }
 
+    @Override
     public void setType(int type) {
         try {
             _seq.setType(type);
@@ -99,6 +102,7 @@ public class DelegatingSeq
         }
     }
 
+    @Override
     public Object next(StoreContext ctx, ClassMetaData meta) {
         try {
             return _seq.next(ctx, meta);
@@ -107,6 +111,7 @@ public class DelegatingSeq
         }
     }
 
+    @Override
     public Object current(StoreContext ctx, ClassMetaData meta) {
         try {
             return _seq.current(ctx, meta);
@@ -115,6 +120,7 @@ public class DelegatingSeq
         }
     }
 
+    @Override
     public void allocate(int additional, StoreContext ctx, ClassMetaData meta) {
         try {
             _seq.allocate(additional, ctx, meta);
@@ -123,6 +129,7 @@ public class DelegatingSeq
         }
     }
 
+    @Override
     public void close() {
         try {
             _seq.close();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingStoreManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingStoreManager.java
index 6922776d7..77f907a91 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingStoreManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingStoreManager.java
@@ -63,10 +63,12 @@ public abstract class DelegatingStoreManager
         return (_del == null) ? _store : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -75,132 +77,163 @@ public abstract class DelegatingStoreManager
         return getInnermostDelegate().equals(other);
     }
 
+    @Override
     public void setContext(StoreContext ctx) {
         _store.setContext(ctx);
     }
 
+    @Override
     public void beginOptimistic() {
         _store.beginOptimistic();
     }
 
+    @Override
     public void rollbackOptimistic() {
         _store.rollbackOptimistic();
     }
 
+    @Override
     public void begin() {
         _store.begin();
     }
 
+    @Override
     public void commit() {
         _store.commit();
     }
 
+    @Override
     public void rollback() {
         _store.rollback();
     }
 
+    @Override
     public boolean exists(OpenJPAStateManager sm, Object context) {
         return _store.exists(sm, context);
     }
 
+    @Override
     public boolean syncVersion(OpenJPAStateManager sm, Object context) {
         return _store.syncVersion(sm, context);
     }
 
+    @Override
     public boolean initialize(OpenJPAStateManager sm, PCState state,
         FetchConfiguration fetch, Object context) {
         return _store.initialize(sm, state, fetch, context);
     }
 
+    @Override
     public boolean load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, int lockLevel, Object context) {
         return _store.load(sm, fields, fetch, lockLevel, context);
     }
 
+    @Override
     public Collection<Object> loadAll(Collection<OpenJPAStateManager> sms, PCState state, int load,
         FetchConfiguration fetch, Object context) {
         return _store.loadAll(sms, state, load, fetch, context);
     }
 
+    @Override
     public void beforeStateChange(OpenJPAStateManager sm, PCState fromState,
         PCState toState) {
         _store.beforeStateChange(sm, fromState, toState);
     }
 
+    @Override
     public Collection<Exception> flush(Collection<OpenJPAStateManager> sms) {
         return _store.flush(sms);
     }
 
+    @Override
     public boolean assignObjectId(OpenJPAStateManager sm, boolean preFlush) {
         return _store.assignObjectId(sm, preFlush);
     }
 
+    @Override
     public boolean assignField(OpenJPAStateManager sm, int field,
         boolean preFlush) {
         return _store.assignField(sm, field, preFlush);
     }
 
+    @Override
     public Class<?> getManagedType(Object oid) {
         return _store.getManagedType(oid);
     }
 
+    @Override
     public Class<?> getDataStoreIdType(ClassMetaData meta) {
         return _store.getDataStoreIdType(meta);
     }
 
+    @Override
     public Object copyDataStoreId(Object oid, ClassMetaData meta) {
         return _store.copyDataStoreId(oid, meta);
     }
 
+    @Override
     public Object newDataStoreId(Object oidVal, ClassMetaData meta) {
         return _store.newDataStoreId(oidVal, meta);
     }
 
+    @Override
     public Object getClientConnection() {
         return _store.getClientConnection();
     }
 
+    @Override
     public void retainConnection() {
         _store.retainConnection();
     }
 
+    @Override
     public void releaseConnection() {
         _store.releaseConnection();
     }
 
+    @Override
     public ResultObjectProvider executeExtent(ClassMetaData meta,
         boolean subclasses, FetchConfiguration fetch) {
         return _store.executeExtent(meta, subclasses, fetch);
     }
 
+    @Override
     public StoreQuery newQuery(String language) {
         return _store.newQuery(language);
     }
 
+    @Override
     public FetchConfiguration newFetchConfiguration() {
         return _store.newFetchConfiguration();
     }
 
+    @Override
     public void close() {
         _store.close();
     }
 
+    @Override
     public int compareVersion(OpenJPAStateManager state, Object v1, Object v2) {
         return _store.compareVersion(state, v1, v2);
     }
 
+    @Override
     public Seq getDataStoreIdSequence(ClassMetaData forClass) {
         return _store.getDataStoreIdSequence(forClass);
     }
 
+    @Override
     public Seq getValueSequence(FieldMetaData fmd) {
         return _store.getValueSequence(fmd);
     }
 
+    @Override
     public boolean cancelAll() {
         return _store.cancelAll();
 	}
 
+    @Override
     public boolean isCached(List<Object> oids, BitSet edata) {
         return _store.isCached(oids, edata);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
index 7cb96b4a9..e7084f724 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
@@ -28,12 +28,12 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import java.util.IdentityHashMap;
 import org.apache.openjpa.conf.Compatibility;
 import org.apache.openjpa.conf.DetachOptions;
 import org.apache.openjpa.enhance.PersistenceCapable;
@@ -603,6 +603,7 @@ public class DetachManager
             _detSM = detSM;
         }
 
+        @Override
         protected PersistenceCapable getDetachedPersistenceCapable() {
             return _to;
         }
@@ -653,51 +654,61 @@ public class DetachManager
             }
         }
 
+        @Override
         public void storeBooleanField(int field, boolean curVal) {
             super.storeBooleanField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeByteField(int field, byte curVal) {
             super.storeByteField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeCharField(int field, char curVal) {
             super.storeCharField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeDoubleField(int field, double curVal) {
             super.storeDoubleField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeFloatField(int field, float curVal) {
             super.storeFloatField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeIntField(int field, int curVal) {
             super.storeIntField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeLongField(int field, long curVal) {
             super.storeLongField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeShortField(int field, short curVal) {
             super.storeShortField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeStringField(int field, String curVal) {
             super.storeStringField(field, curVal);
             sm.replaceField(_to, this, field);
         }
 
+        @Override
         public void storeObjectField(int field, Object curVal) {
             super.storeObjectField(field, detachField(curVal, field));
             sm.replaceField(_to, this, field);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java
index 719471333..15e632b2c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java
@@ -31,20 +31,20 @@ public interface DetachState {
      *
      * @since 0.9.8
      */
-    public static final int DETACH_FETCH_GROUPS = 0;
+    int DETACH_FETCH_GROUPS = 0;
 
     /**
      * @deprecated
      */
-    public static final int DETACH_FGS = 0;
+    @Deprecated int DETACH_FGS = 0;
 
     /**
      * Mode to detach all currently-loaded fields.
      */
-    public static final int DETACH_LOADED = 1;
+    int DETACH_LOADED = 1;
 
     /**
      * Mode to detach all fields.
      */
-    public static final int DETACH_ALL = 2;
+    int DETACH_ALL = 2;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateAttachStrategy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateAttachStrategy.java
index da2a4a376..5f2d51ba1 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateAttachStrategy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateAttachStrategy.java
@@ -26,9 +26,9 @@ import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.ValueMetaData;
 import org.apache.openjpa.util.ApplicationIds;
+import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.OptimisticException;
-import org.apache.openjpa.util.ImplHelper;
 
 /**
  * Handles attaching instances with detached state.
@@ -41,6 +41,7 @@ class DetachedStateAttachStrategy
     private static final Localizer _loc = Localizer.forPackage
         (DetachedStateAttachStrategy.class);
 
+    @Override
     protected Object getDetachedObjectId(AttachManager manager,
         Object toAttach) {
         if (toAttach == null)
@@ -68,12 +69,14 @@ class DetachedStateAttachStrategy
         }
     }
 
+    @Override
     protected void provideField(Object toAttach, StateManagerImpl sm,
         int field) {
         sm.provideField(ImplHelper.toPersistenceCapable(toAttach,
             sm.getContext().getConfiguration()), this, field);
     }
 
+    @Override
     public Object attach(AttachManager manager, Object toAttach,
         ClassMetaData meta, PersistenceCapable into, OpenJPAStateManager owner,
         ValueMetaData ownerMeta, boolean explicit) {
@@ -113,7 +116,7 @@ class DetachedStateAttachStrategy
             if (into == null) {
                 // we mark objects that were new on detach by putting an empty
                 // extra element in their detached state array
-                offset = meta.getIdentityType() == meta.ID_DATASTORE ? 1 : 0;
+                offset = meta.getIdentityType() == ClassMetaData.ID_DATASTORE ? 1 : 0;
                 boolean isNew = state.length == 3 + offset;
 
                 // attempting to attach an instance that has been deleted
@@ -143,7 +146,7 @@ class DetachedStateAttachStrategy
         manager.setAttachedCopy(pc, into);
         meta = sm.getMetaData();
         manager.fireBeforeAttach(pc, meta);
-        offset = meta.getIdentityType() == meta.ID_DATASTORE ? 1 : 0;
+        offset = meta.getIdentityType() == ClassMetaData.ID_DATASTORE ? 1 : 0;
 
         // assign the detached pc the same state manager as the object we're
         // copying into during the attach process
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
index 8f695cf1c..2b6569360 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
@@ -24,20 +24,20 @@ import java.io.Serializable;
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.openjpa.conf.Compatibility;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.StateManager;
 import org.apache.openjpa.lib.util.Localizer;
-import java.util.concurrent.locks.ReentrantLock;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.ValueMetaData;
 import org.apache.openjpa.util.Exceptions;
+import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.Proxy;
 import org.apache.openjpa.util.UnsupportedException;
-import org.apache.openjpa.util.ImplHelper;
 
 /**
  * Internal state manager for detached instances. Does not fully
@@ -104,6 +104,7 @@ public class DetachedStateManager
     // AttachStrategy implementation
     /////////////////////////////////
 
+    @Override
     public Object attach(AttachManager manager, Object toAttach,
         ClassMetaData meta, PersistenceCapable into, OpenJPAStateManager owner,
         ValueMetaData ownerMeta, boolean explicit) {
@@ -331,6 +332,7 @@ public class DetachedStateManager
         return sm.getManagedInstance();
     }
 
+    @Override
     protected Object getDetachedObjectId(AttachManager manager,
         Object toAttach) {
         return _oid;
@@ -340,6 +342,7 @@ public class DetachedStateManager
         _pc.pcProvideField(field);
     }
 
+    @Override
     protected void provideField(Object toAttach, StateManagerImpl sm,
         int field) {
         provideField(field);
@@ -376,67 +379,83 @@ public class DetachedStateManager
     // StateManager implementation
     ///////////////////////////////
 
+    @Override
     public Object getGenericContext() {
         return null;
     }
 
+    @Override
     public Object getPCPrimaryKey(Object oid, int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public StateManager replaceStateManager(StateManager sm) {
         return sm;
     }
 
+    @Override
     public Object getVersion() {
         return _version;
     }
 
+    @Override
     public void setVersion(Object version) {
         throw new UnsupportedException();
     }
 
+    @Override
     public boolean isDirty() {
         return _dirty.length() != 0;
     }
 
+    @Override
     public boolean isTransactional() {
         return false;
     }
 
+    @Override
     public boolean isPersistent() {
         return false;
     }
 
+    @Override
     public boolean isNew() {
         return false;
     }
 
+    @Override
     public boolean isDeleted() {
         return false;
     }
 
+    @Override
     public boolean isDetached() {
         return true;
     }
 
+    @Override
     public boolean isVersionUpdateRequired() {
         return false;
     }
 
+    @Override
     public boolean isVersionCheckRequired() {
         return false;
     }
 
+    @Override
     public void dirty(String field) {
         // should we store ClassMetaData?
         throw new UnsupportedException();
     }
 
+    @Override
     public Object fetchObjectId() {
         return _oid;
     }
 
+    @Override
     public void accessingField(int idx) {
         if (!_access && !_loaded.get(idx))
             // do not access the pc fields by implictly invoking _pc.toString()
@@ -445,10 +464,12 @@ public class DetachedStateManager
                Exceptions.toString(_pc)).getMessage());
     }
 
+    @Override
     public boolean serializing() {
         return false;
     }
 
+    @Override
     public boolean writeDetached(ObjectOutput out)
         throws IOException {
         out.writeObject(_pc.pcGetDetachedState());
@@ -456,6 +477,7 @@ public class DetachedStateManager
         return false;
     }
 
+    @Override
     public void proxyDetachedDeserialized(int idx) {
         lock();
         try {
@@ -468,6 +490,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingBooleanField(PersistenceCapable pc, int idx,
         boolean cur, boolean next, int set) {
         accessingField(idx);
@@ -483,6 +506,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingCharField(PersistenceCapable pc, int idx, char cur,
         char next, int set) {
         accessingField(idx);
@@ -498,6 +522,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingByteField(PersistenceCapable pc, int idx, byte cur,
         byte next, int set) {
         accessingField(idx);
@@ -513,6 +538,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingShortField(PersistenceCapable pc, int idx, short cur,
         short next, int set) {
         accessingField(idx);
@@ -528,6 +554,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingIntField(PersistenceCapable pc, int idx, int cur,
         int next, int set) {
         accessingField(idx);
@@ -543,6 +570,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingLongField(PersistenceCapable pc, int idx, long cur,
         long next, int set) {
         accessingField(idx);
@@ -558,6 +586,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingFloatField(PersistenceCapable pc, int idx, float cur,
         float next, int set) {
         accessingField(idx);
@@ -573,6 +602,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingDoubleField(PersistenceCapable pc, int idx, double cur,
         double next, int set) {
         accessingField(idx);
@@ -588,6 +618,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingStringField(PersistenceCapable pc, int idx, String cur,
         String next, int set) {
         accessingField(idx);
@@ -605,6 +636,7 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void settingObjectField(PersistenceCapable pc, int idx, Object cur,
         Object next, int set) {
         accessingField(idx);
@@ -621,88 +653,108 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void providedBooleanField(PersistenceCapable pc, int idx,
         boolean cur) {
         longval = cur ? 1 : 0;
     }
 
+    @Override
     public void providedCharField(PersistenceCapable pc, int idx, char cur) {
         longval = cur;
     }
 
+    @Override
     public void providedByteField(PersistenceCapable pc, int idx, byte cur) {
         longval = cur;
     }
 
+    @Override
     public void providedShortField(PersistenceCapable pc, int idx, short cur) {
         longval = cur;
     }
 
+    @Override
     public void providedIntField(PersistenceCapable pc, int idx, int cur) {
         longval = cur;
     }
 
+    @Override
     public void providedLongField(PersistenceCapable pc, int idx, long cur) {
         longval = cur;
     }
 
+    @Override
     public void providedFloatField(PersistenceCapable pc, int idx, float cur) {
         dblval = cur;
     }
 
+    @Override
     public void providedDoubleField(PersistenceCapable pc, int idx,
         double cur) {
         dblval = cur;
     }
 
+    @Override
     public void providedStringField(PersistenceCapable pc, int idx,
         String cur) {
         objval = cur;
     }
 
+    @Override
     public void providedObjectField(PersistenceCapable pc, int idx,
         Object cur) {
         objval = cur;
     }
 
+    @Override
     public boolean replaceBooleanField(PersistenceCapable pc, int idx) {
         return longval == 1;
     }
 
+    @Override
     public char replaceCharField(PersistenceCapable pc, int idx) {
         return (char) longval;
     }
 
+    @Override
     public byte replaceByteField(PersistenceCapable pc, int idx) {
         return (byte) longval;
     }
 
+    @Override
     public short replaceShortField(PersistenceCapable pc, int idx) {
         return (short) longval;
     }
 
+    @Override
     public int replaceIntField(PersistenceCapable pc, int idx) {
         return (int) longval;
     }
 
+    @Override
     public long replaceLongField(PersistenceCapable pc, int idx) {
         return longval;
     }
 
+    @Override
     public float replaceFloatField(PersistenceCapable pc, int idx) {
         return (float) dblval;
     }
 
+    @Override
     public double replaceDoubleField(PersistenceCapable pc, int idx) {
         return dblval;
     }
 
+    @Override
     public String replaceStringField(PersistenceCapable pc, int idx) {
         String str = (String) objval;
         objval = null;
         return str;
     }
 
+    @Override
     public Object replaceObjectField(PersistenceCapable pc, int idx) {
         Object ret = objval;
         objval = null;
@@ -713,54 +765,67 @@ public class DetachedStateManager
     // OpenJPAStateManager implementation
     //////////////////////////////////////
 
+    @Override
     public void initialize(Class forType, PCState state) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void load(FetchConfiguration fetch) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getManagedInstance() {
         return _pc;
     }
 
+    @Override
     public PersistenceCapable getPersistenceCapable() {
         return _pc;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int getOwnerIndex() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isEmbedded() {
         return _embedded;
     }
 
+    @Override
     public boolean isFlushed() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isFlushedDirty() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isProvisional() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public BitSet getLoaded() {
         return _loaded;
     }
 
+    @Override
     public BitSet getDirty() {
         return _dirty;
     }
@@ -774,102 +839,127 @@ public class DetachedStateManager
         return _useDSFForUnproxy;
     }
 
+    @Override
     public BitSet getFlushed() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public BitSet getUnloaded(FetchConfiguration fetch) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object newProxy(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object newFieldProxy(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isDefaultValue(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public StoreContext getContext() {
         return null;
     }
 
+    @Override
     public PCState getPCState() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getObjectId() {
         return _oid;
     }
 
+    @Override
     public void setObjectId(Object oid) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean assignObjectId(boolean flush) {
         return true;
     }
 
+    @Override
     public Object getId() {
         return getObjectId();
     }
 
+    @Override
     public Object getLock() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setLock(Object lock) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setNextVersion(Object version) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getImplData() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object setImplData(Object data, boolean cacheable) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isImplDataCacheable() {
         return false;
     }
 
+    @Override
     public Object getImplData(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object setImplData(int field, Object data) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isImplDataCacheable(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getIntermediate(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setIntermediate(int field, Object data) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removed(int field, Object removed, boolean key) {
         dirty(field);
     }
 
+    @Override
     public boolean beforeRefresh(boolean all) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void dirty(int field) {
         lock();
         try {
@@ -879,106 +969,132 @@ public class DetachedStateManager
         }
     }
 
+    @Override
     public void storeBoolean(int field, boolean extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeByte(int field, byte extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeChar(int field, char extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeInt(int field, int extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeShort(int field, short extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeLong(int field, long extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeFloat(int field, float extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeDouble(int field, double extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeString(int field, String extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeObject(int field, Object extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void store(int field, Object extVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeField(int field, Object value) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean fetchBoolean(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public byte fetchByte(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public char fetchChar(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public short fetchShort(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int fetchInt(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public long fetchLong(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public float fetchFloat(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public double fetchDouble(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public String fetchString(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object fetchObject(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object fetch(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object fetchField(int field, boolean transitions) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object fetchInitialField(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setRemote(int field, Object value) {
         throw new UnsupportedOperationException();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java
index 194a161bc..53e9e9cb2 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java
@@ -28,9 +28,9 @@ import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.UnsupportedException;
-import org.apache.openjpa.util.ImplHelper;
 
 /**
  * Implementation of {@link OpenJPAStateManager} designed to retrieve
@@ -62,158 +62,197 @@ public class DetachedValueStateManager
         _ctx = ctx;
     }
 
+    @Override
     public void initialize(Class forType, PCState state) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void load(FetchConfiguration fetch) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getManagedInstance() {
         return _pc;
     }
 
+    @Override
     public PersistenceCapable getPersistenceCapable() {
         return _pc;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return null;
     }
 
+    @Override
     public int getOwnerIndex() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isEmbedded() {
         return false;
     }
 
+    @Override
     public boolean isFlushed() {
         return false;
     }
 
+    @Override
     public boolean isFlushedDirty() {
         return false;
     }
 
+    @Override
     public boolean isProvisional() {
         return false;
     }
 
+    @Override
     public BitSet getLoaded() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public BitSet getDirty() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public BitSet getFlushed() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public BitSet getUnloaded(FetchConfiguration fetch) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object newProxy(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object newFieldProxy(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isDefaultValue(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public StoreContext getContext() {
         return _ctx;
     }
 
+    @Override
     public PCState getPCState() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getId() {
         return getObjectId();
     }
 
+    @Override
     public Object getObjectId() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setObjectId(Object oid) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean assignObjectId(boolean flush) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getLock() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setLock(Object lock) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getVersion() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setVersion(Object version) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setNextVersion(Object version) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isVersionUpdateRequired() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isVersionCheckRequired() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getImplData() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object setImplData(Object data, boolean cacheable) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isImplDataCacheable() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getImplData(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object setImplData(int field, Object data) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isImplDataCacheable(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getIntermediate(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setIntermediate(int field, Object value) {
         throw new UnsupportedOperationException();
     }
@@ -226,42 +265,52 @@ public class DetachedValueStateManager
         _pc.pcReplaceStateManager(null);
     }
 
+    @Override
     public boolean fetchBoolean(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public byte fetchByte(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public char fetchChar(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public double fetchDouble(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public float fetchFloat(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int fetchInt(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public long fetchLong(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object fetchObject(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public short fetchShort(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public String fetchString(int field) {
         throw new UnsupportedOperationException();
     }
@@ -275,6 +324,7 @@ public class DetachedValueStateManager
         return val;
     }
 
+    @Override
     public Object fetch(int field) {
         StateManager sm = _pc.pcGetStateManager();
         if (sm != null) {
@@ -291,6 +341,7 @@ public class DetachedValueStateManager
         return _meta.getField(field).getExternalValue(val, _ctx.getBroker());
     }
 
+    @Override
     public Object fetchField(int field, boolean transitions) {
         if (transitions)
             throw new IllegalArgumentException();
@@ -329,70 +380,87 @@ public class DetachedValueStateManager
         }
     }
 
+    @Override
     public Object fetchInitialField(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeBoolean(int field, boolean externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeByte(int field, byte externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeChar(int field, char externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeDouble(int field, double externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeFloat(int field, float externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeInt(int field, int externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeLong(int field, long externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeObject(int field, Object externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeShort(int field, short externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeString(int field, String externalVal) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void store(int field, Object value) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeField(int field, Object value) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void dirty(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removed(int field, Object removed, boolean key) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean beforeRefresh(boolean refreshAll) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setRemote(int field, Object value) {
         throw new UnsupportedOperationException();
     }
@@ -401,196 +469,241 @@ public class DetachedValueStateManager
     // StateManager implementation
     ///////////////////////////////
 
+    @Override
     public Object getGenericContext() {
         return _ctx;
     }
 
+    @Override
     public Object getPCPrimaryKey(Object oid, int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public StateManager replaceStateManager(StateManager sm) {
         return sm;
     }
 
+    @Override
     public boolean isDirty() {
         return true;
     }
 
+    @Override
     public boolean isTransactional() {
         return false;
     }
 
+    @Override
     public boolean isPersistent() {
         return true;
     }
 
+    @Override
     public boolean isNew() {
         return false;
     }
 
+    @Override
     public boolean isDeleted() {
         return false;
     }
 
+    @Override
     public boolean isDetached() {
         return true;
     }
 
+    @Override
     public void dirty(String field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object fetchObjectId() {
         return getObjectId();
     }
 
+    @Override
     public boolean serializing() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean writeDetached(ObjectOutput out) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void proxyDetachedDeserialized(int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void accessingField(int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedBooleanField(PersistenceCapable pc, int idx,
         boolean cur) {
         longval = cur ? 1 : 0;
     }
 
+    @Override
     public void providedCharField(PersistenceCapable pc, int idx, char cur) {
         longval = cur;
     }
 
+    @Override
     public void providedByteField(PersistenceCapable pc, int idx, byte cur) {
         longval = cur;
     }
 
+    @Override
     public void providedShortField(PersistenceCapable pc, int idx, short cur) {
         longval = cur;
     }
 
+    @Override
     public void providedIntField(PersistenceCapable pc, int idx, int cur) {
         longval = cur;
     }
 
+    @Override
     public void providedLongField(PersistenceCapable pc, int idx, long cur) {
         longval = cur;
     }
 
+    @Override
     public void providedFloatField(PersistenceCapable pc, int idx, float cur) {
         dblval = cur;
     }
 
+    @Override
     public void providedDoubleField(PersistenceCapable pc, int idx,
         double cur) {
         dblval = cur;
     }
 
+    @Override
     public void providedStringField(PersistenceCapable pc, int idx,
         String cur) {
         objval = cur;
     }
 
+    @Override
     public void providedObjectField(PersistenceCapable pc, int idx,
         Object cur) {
         objval = cur;
     }
 
+    @Override
     public void settingBooleanField(PersistenceCapable pc, int idx,
         boolean cur, boolean next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingCharField(PersistenceCapable pc, int idx, char cur,
         char next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingByteField(PersistenceCapable pc, int idx, byte cur,
         byte next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingShortField(PersistenceCapable pc, int idx, short cur,
         short next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingIntField(PersistenceCapable pc, int idx, int cur,
         int next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingLongField(PersistenceCapable pc, int idx, long cur,
         long next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingFloatField(PersistenceCapable pc, int idx, float cur,
         float next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingDoubleField(PersistenceCapable pc, int idx, double cur,
         double next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingStringField(PersistenceCapable pc, int idx, String cur,
         String next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingObjectField(PersistenceCapable pc, int idx, Object cur,
         Object next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean replaceBooleanField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public char replaceCharField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public byte replaceByteField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public short replaceShortField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int replaceIntField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public long replaceLongField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public float replaceFloatField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public double replaceDoubleField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public String replaceStringField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object replaceObjectField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java
index 52e4c0ed2..e80dfa0cd 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DistinctResultList.java
@@ -48,7 +48,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
     private final RuntimeExceptionTranslator _trans;
 
     public DistinctResultList(ResultList<E> list, RuntimeExceptionTranslator trans) {
-        _del = new ArrayList<E>();
+        _del = new ArrayList<>();
         _trans = trans;
         for (E e : list) {
             if (!_del.contains(e))
@@ -56,22 +56,27 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public boolean add(E o) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void add(int index, E element) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean addAll(Collection<? extends E> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean addAll(int index, Collection<? extends E> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void clear() {
         try {
             _del.clear();
@@ -80,6 +85,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public boolean contains(Object o) {
         try {
             return _del.contains(o);
@@ -88,6 +94,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public boolean containsAll(Collection<?> c) {
         try {
             return _del.containsAll(c);
@@ -96,6 +103,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public E get(int index) {
         try {
             return _del.get(index);
@@ -104,6 +112,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public int indexOf(Object o) {
         try {
             return _del.indexOf(o);
@@ -112,6 +121,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public boolean isEmpty() {
         try {
             return _del.isEmpty();
@@ -120,6 +130,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public Iterator<E> iterator() {
         try {
             return _del.iterator();
@@ -128,6 +139,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public int lastIndexOf(Object o) {
         try {
             return _del.indexOf(o);
@@ -136,6 +148,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public ListIterator<E> listIterator() {
         try {
             return _del.listIterator();
@@ -144,6 +157,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public ListIterator<E> listIterator(int index) {
         try {
             return _del.listIterator(index);
@@ -152,26 +166,32 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public boolean remove(Object o) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public E remove(int index) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean removeAll(Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean retainAll(Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public E set(int index, E element) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int size() {
         try {
             return _del.size();
@@ -180,6 +200,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public List<E> subList(int fromIndex, int toIndex) {
         try {
             return _del.subList(fromIndex, toIndex);
@@ -188,6 +209,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public Object[] toArray() {
         try {
             return _del.toArray();
@@ -196,6 +218,7 @@ public class DistinctResultList<E> implements List<E>, Serializable {
         }
     }
 
+    @Override
     public <T> T[] toArray(T[] a) {
         try {
             return _del.toArray(a);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
index 16804cb1c..548cbe697 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECleanState.java
@@ -26,65 +26,77 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class ECleanState
-    extends PCState {
+class ECleanState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
         context.setDirty(false);
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return ENONTRANS;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         return ENONTRANS;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return EDELETED;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return ENONTRANS;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState evict(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return EDIRTY;
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return EDIRTY;
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Embedded-Clean";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
index 4ace1ef07..5f33c3725 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ECopyState.java
@@ -25,9 +25,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class ECopyState
-    extends PCState {
+class ECopyState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -37,52 +36,64 @@ class ECopyState
         context.setDirty(true);
     }
 
+    @Override
     void beforeFlush(StateManagerImpl context, boolean logical,
         OpCallbacks call) {
         context.preFlush(logical, call);
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return ENONTRANS;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         return ENONTRANS;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return EDELETED;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("dirty", context);
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Embedded-Copy";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
index 0ec9627f7..a7da16af0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java
@@ -25,51 +25,61 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class EDeletedState
-    extends PCState {
+class EDeletedState extends PCState {
+    private static final long serialVersionUID = 1L;
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return ENONTRANS;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("dirty", context);
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     public boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isDeleted() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Embedded-Deleted";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java
index 932072db1..9cc191a30 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDirtyState.java
@@ -25,70 +25,83 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class EDirtyState
-    extends PCState {
+class EDirtyState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
         context.saveFields(false);
     }
 
+    @Override
     void beforeFlush(StateManagerImpl context, boolean logical,
         OpCallbacks call) {
         context.preFlush(logical, call);
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return ENONTRANS;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return ENONTRANS;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return EDELETED;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("dirty", context);
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState afterRefresh() {
         return ECLEAN;
     }
 
+    @Override
     PCState afterOptimisticRefresh() {
         return ENONTRANS;
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     public boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Embedded-Dirty";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
index f3e1973aa..e4d47725b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ENonTransState.java
@@ -26,9 +26,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class ENonTransState
-    extends PCState {
+class ENonTransState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -42,11 +41,13 @@ class ENonTransState
         context.clearSavedFields();
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return EDELETED;
     }
 
+    @Override
     PCState transactional(StateManagerImpl context) {
         // state is discarded when entering the transaction
         if (!context.getBroker().getOptimistic())
@@ -54,31 +55,38 @@ class ENonTransState
         return ECLEAN;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState evict(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState beforeRead(StateManagerImpl context, int field) {
         return error("embed-ref", context);
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return error("embed-ref", context);
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return EDIRTY;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Embedded-Nontransactional";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
index d58d2318a..a53e41fde 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExpressionStoreQuery.java
@@ -27,8 +27,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.datacache.DataCache;
@@ -86,6 +86,9 @@ import org.apache.openjpa.util.UserException;
 public class ExpressionStoreQuery
     extends AbstractStoreQuery {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (ExpressionStoreQuery.class);
 
@@ -109,22 +112,27 @@ public class ExpressionStoreQuery
      */
     public Resolver getResolver() {
         return new Resolver() {
+            @Override
             public Class classForName(String name, String[] imports) {
                 return ctx.classForName(name, imports);
             }
 
+            @Override
             public FilterListener getFilterListener(String tag) {
                 return ctx.getFilterListener(tag);
             }
 
+            @Override
             public AggregateListener getAggregateListener(String tag) {
                 return ctx.getAggregateListener(tag);
             }
 
+            @Override
             public OpenJPAConfiguration getConfiguration() {
                 return ctx.getStoreContext().getConfiguration();
             }
 
+            @Override
             public QueryContext getQueryContext() {
                 return ctx;
             }
@@ -136,11 +144,13 @@ public class ExpressionStoreQuery
      * The facade should call this method twice: once with the query string,
      * and again with the parsed state.
      */
+    @Override
     public boolean setQuery(Object query) {
         _parsed = query;
         return true;
     }
 
+    @Override
     public FilterListener getFilterListener(String tag) {
         for (int i = 0; i < _listeners.length; i++)
             if (_listeners[i].getTag().equals(tag))
@@ -148,33 +158,40 @@ public class ExpressionStoreQuery
         return null;
     }
 
+    @Override
     public Object newCompilation() {
         if (_parsed != null)
             return _parsed;
         return _parser.parse(ctx.getQueryString(), this);
     }
 
+    @Override
     public Object getCompilation() {
         return _parsed;
     }
 
+    @Override
     public void populateFromCompilation(Object comp) {
         _parser.populate(comp, this);
     }
 
+    @Override
     public void invalidateCompilation() {
         _parsed = null;
     }
 
+    @Override
     public boolean supportsInMemoryExecution() {
         return true;
     }
 
+    @Override
     public Executor newInMemoryExecutor(ClassMetaData meta, boolean subs) {
         return new InMemoryExecutor(this, meta, subs, _parser,
         		ctx.getCompilation(), new InMemoryExpressionFactory());
     }
 
+    @Override
     public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs) {
         return new DataStoreExecutor(this, meta, subs, _parser,
             ctx.getCompilation());
@@ -330,12 +347,14 @@ public class ExpressionStoreQuery
             }
         }
 
+        @Override
         public final void validate(StoreQuery q) {
             QueryExpressions exps = assertQueryExpression();
             ValidateGroupingExpressionVisitor.validate(q.getContext(), exps);
         }
 
 
+        @Override
         public void getRange(StoreQuery q, Object[] params, Range range) {
             QueryExpressions exps = assertQueryExpression();
             if (exps.range.length == 0)
@@ -360,46 +379,57 @@ public class ExpressionStoreQuery
                 q.getContext().getQueryString()));
         }
 
+        @Override
         public final Class<?> getResultClass(StoreQuery q) {
             return assertQueryExpression().resultClass;
         }
 
+        @Override
         public final ResultShape<?> getResultShape(StoreQuery q) {
             return assertQueryExpression().shape;
         }
 
+        @Override
         public final boolean[] getAscending(StoreQuery q) {
             return assertQueryExpression().ascending;
         }
 
+        @Override
         public final String getAlias(StoreQuery q) {
             return assertQueryExpression().alias;
         }
 
+        @Override
         public final String[] getProjectionAliases(StoreQuery q) {
             return assertQueryExpression().projectionAliases;
         }
 
+        @Override
         public Class<?>[] getProjectionTypes(StoreQuery q) {
             return null;
         }
 
+        @Override
         public final int getOperation(StoreQuery q) {
             return assertQueryExpression().operation;
         }
 
+        @Override
         public final boolean isAggregate(StoreQuery q) {
             return assertQueryExpression().isAggregate();
         }
 
+        @Override
         public final boolean isDistinct(StoreQuery q) {
             return assertQueryExpression().isDistinct();
         }
 
+        @Override
         public final boolean hasGrouping(StoreQuery q) {
             return assertQueryExpression().grouping.length > 0;
         }
 
+        @Override
         public final OrderedMap<Object,Class<?>> getOrderedParameterTypes(StoreQuery q) {
             return assertQueryExpression().parameterTypes;
         }
@@ -407,6 +437,7 @@ public class ExpressionStoreQuery
         /**
          * Creates a Object[] from the values of the given user parameters.
          */
+        @Override
         public Object[] toParameterArray(StoreQuery q, Map<?,?> userParams) {
             if (userParams == null || userParams.isEmpty())
                 return StoreQuery.EMPTY_OBJECTS;
@@ -469,10 +500,12 @@ public class ExpressionStoreQuery
             }
         }
 
+        @Override
         public final Map getUpdates(StoreQuery q) {
             return assertQueryExpression().updates;
         }
 
+        @Override
         public final ClassMetaData[] getAccessPathMetaDatas(StoreQuery q) {
             QueryExpressions[] exps = getQueryExpressions();
             if (exps.length == 1)
@@ -488,6 +521,7 @@ public class ExpressionStoreQuery
                 (new ClassMetaData[metas.size()]);
         }
 
+        @Override
         public boolean isPacking(StoreQuery q) {
             return false;
         }
@@ -548,6 +582,7 @@ public class ExpressionStoreQuery
                 _ctx = ctx;
             }
 
+            @Override
             public void enter(Value val) {
                 if (_grouping) {
                     if (val instanceof Path) {
@@ -566,6 +601,7 @@ public class ExpressionStoreQuery
                 }
             }
 
+            @Override
             public void exit(Value val) {
                 if (val == _agg)
                     _agg = null;
@@ -580,6 +616,8 @@ public class ExpressionStoreQuery
         extends AbstractExpressionExecutor
         implements Executor, Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         private final ClassMetaData _meta;
         private final boolean _subs;
         private final InMemoryExpressionFactory _factory;
@@ -612,10 +650,12 @@ public class ExpressionStoreQuery
             }
         }
 
+        @Override
         public QueryExpressions[] getQueryExpressions() {
             return _exps;
         }
 
+        @Override
         public ResultObjectProvider executeQuery(StoreQuery q,
             Object[] params, Range range) {
             // execute in memory for candidate collection;
@@ -673,12 +713,14 @@ public class ExpressionStoreQuery
             return rop;
         }
 
+        @Override
         public String[] getDataStoreActions(StoreQuery q, Object[] params,
             Range range) {
             // in memory queries have no datastore actions to perform
             return StoreQuery.EMPTY_STRINGS;
         }
 
+        @Override
         public Object getOrderingValue(StoreQuery q, Object[] params,
             Object resultObject, int orderIndex) {
             // if this is a projection, then we have to order on something
@@ -700,6 +742,7 @@ public class ExpressionStoreQuery
                 getStoreContext(), params);
         }
 
+        @Override
         public Class[] getProjectionTypes(StoreQuery q) {
             return _projTypes;
         }
@@ -716,6 +759,7 @@ public class ExpressionStoreQuery
                 _ctx = ctx;
             }
 
+            @Override
             public void enter(Value val) {
                 if (!val.isVariable())
                     return;
@@ -735,6 +779,8 @@ public class ExpressionStoreQuery
         extends AbstractExpressionExecutor
         implements Executor, Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         private ClassMetaData _meta;
         private ClassMetaData[] _metas;
         private boolean _subs;
@@ -773,10 +819,12 @@ public class ExpressionStoreQuery
             }
         }
 
+        @Override
         public QueryExpressions[] getQueryExpressions() {
             return _exps;
         }
 
+        @Override
         public ResultObjectProvider executeQuery(StoreQuery q,
             Object[] params, Range range) {
             range.lrs &= !isAggregate(q) && !hasGrouping(q);
@@ -784,6 +832,7 @@ public class ExpressionStoreQuery
                 _subs, _facts, _exps, params, range);
         }
 
+        @Override
         public Number executeDelete(StoreQuery q, Object[] params) {
             try {
                 Number num =
@@ -801,6 +850,7 @@ public class ExpressionStoreQuery
             }
         }
 
+        @Override
         public Number executeUpdate(StoreQuery q, Object[] params) {
             try {
                 Number num =
@@ -818,12 +868,14 @@ public class ExpressionStoreQuery
             }
         }
 
+        @Override
         public String[] getDataStoreActions(StoreQuery q, Object[] params,
             Range range) {
             return ((ExpressionStoreQuery) q).getDataStoreActions(_meta,
                 _metas, _subs, _facts, _exps, params, range);
         }
 
+        @Override
         public Object getOrderingValue(StoreQuery q, Object[] params,
             Object resultObject, int orderIndex) {
             // if this is a projection, then we have to order on something
@@ -856,6 +908,7 @@ public class ExpressionStoreQuery
                 q.getContext().getStoreContext(), params);
         }
 
+        @Override
         public Class[] getProjectionTypes(StoreQuery q) {
             return _projTypes;
 		}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java
index 7784f6a15..37b92666b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Extent.java
@@ -33,17 +33,17 @@ public interface Extent<T> {
     /**
      * Return the (mutable) fetch configuration for this extent.
      */
-    public FetchConfiguration getFetchConfiguration();
+    FetchConfiguration getFetchConfiguration();
 
     /**
      * Whether this extent will ignore changes made in the current transaction.
      */
-    public boolean getIgnoreChanges();
+    boolean getIgnoreChanges();
 
     /**
      * Whether this extent will ignore changes made in the current transaction.
      */
-    public void setIgnoreChanges(boolean ignoreChanges);
+    void setIgnoreChanges(boolean ignoreChanges);
 
     /**
      * Returns a list of all objects represented by this extent. This method
@@ -52,40 +52,40 @@ public interface Extent<T> {
      * work correctly, but if the extent represents a large data set, this
      * method may be quite slow and may consume quite a bit of memory.
      */
-    public List<T> list();
+    List<T> list();
 
     /**
      * Return an iterator over the extent members.
      */
-    public Iterator<T> iterator();
+    Iterator<T> iterator();
 
     /**
      * The broker that generated the extent.
      */
-    public Broker getBroker();
+    Broker getBroker();
 
     /**
      * The class of extent elements.
      */
-    public Class<T> getElementType();
+    Class<T> getElementType();
 
     /**
      * Whether the extent includes subclasses.
      */
-    public boolean hasSubclasses();
+    boolean hasSubclasses();
 
     /**
      * Close all open iterators.
      */
-    public void closeAll();
+    void closeAll();
 
     /**
      * Synchronizes on an internal lock.
      */
-    public void lock();
+    void lock();
 
     /**
      * Release the internal lock.
      */
-	public void unlock ();
+	void unlock ();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java
index 3caed8b2b..f1041960e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ExtentImpl.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.collections4.iterators.FilterIterator;
@@ -31,7 +32,6 @@ import org.apache.openjpa.lib.rop.ResultObjectProvider;
 import org.apache.openjpa.lib.rop.ResultObjectProviderIterator;
 import org.apache.openjpa.lib.util.Closeable;
 import org.apache.openjpa.lib.util.ReferenceHashSet;
-import java.util.concurrent.locks.ReentrantLock;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.util.GeneralException;
@@ -82,21 +82,25 @@ public class ExtentImpl<T>
             _lock = null;
     }
 
+    @Override
     public FetchConfiguration getFetchConfiguration() {
         return _fc;
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         return _ignore;
     }
 
+    @Override
     public void setIgnoreChanges(boolean ignoreChanges) {
         _broker.assertOpen();
         _ignore = ignoreChanges;
     }
 
+    @Override
     public List<T> list() {
-        List<T> list = new ArrayList<T>();
+        List<T> list = new ArrayList<>();
         Iterator<T> itr = iterator();
         try {
             while (itr.hasNext())
@@ -107,6 +111,7 @@ public class ExtentImpl<T>
         }
     }
 
+    @Override
     public Iterator<T> iterator() {
         _broker.assertNontransactionalRead();
         CloseableIterator citr = null;
@@ -165,18 +170,22 @@ public class ExtentImpl<T>
         return citr;
     }
 
+    @Override
     public Broker getBroker() {
         return _broker;
     }
 
+    @Override
     public Class<T> getElementType() {
         return _type;
     }
 
+    @Override
     public boolean hasSubclasses() {
         return _subs;
     }
 
+    @Override
     public void closeAll() {
         if (_openItrs == null)
             return;
@@ -202,11 +211,13 @@ public class ExtentImpl<T>
         }
     }
 
+    @Override
     public void lock() {
         if (_lock != null)
             _lock.lock();
     }
 
+    @Override
     public void unlock() {
         if (_lock != null)
             _lock.unlock();
@@ -215,13 +226,13 @@ public class ExtentImpl<T>
     /**
      * Closeable iterator.
      */
-    private static interface CloseableIterator<T>
+    private interface CloseableIterator<T>
         extends Closeable, Iterator<T> {
 
         /**
          * Set the extent to remove self from on close.
          */
-        public void setRemoveOnClose(ExtentImpl<T> extent);
+        void setRemoveOnClose(ExtentImpl<T> extent);
     }
 
     /**
@@ -234,24 +245,29 @@ public class ExtentImpl<T>
         private ExtentImpl<?> _extent = null;
         private boolean _closed = false;
 
+        @Override
         public boolean hasNext() {
             return (_closed) ? false : super.hasNext();
         }
 
+        @Override
         public Object next() {
             if (_closed)
                 throw new NoSuchElementException();
             return super.next();
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void setRemoveOnClose(ExtentImpl extent) {
             _extent = extent;
         }
 
+        @Override
         public void close()
             throws Exception {
             if (_extent != null && _extent._openItrs != null) {
@@ -284,24 +300,29 @@ public class ExtentImpl<T>
             setPredicate(this);
         }
 
+        @Override
         public boolean hasNext() {
             return (_closed) ? false : super.hasNext();
         }
 
+        @Override
         public Object next() {
             if (_closed)
                 throw new NoSuchElementException();
             return super.next();
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void setRemoveOnClose(ExtentImpl extent) {
             _extent = extent;
         }
 
+        @Override
         public void close()
             throws Exception {
             if (_extent != null && _extent._openItrs != null) {
@@ -317,6 +338,7 @@ public class ExtentImpl<T>
             ((Closeable) getIterator()).close();
         }
 
+        @Override
         public boolean evaluate(Object o) {
             return !_extent._broker.isDeleted(o);
         }
@@ -335,9 +357,11 @@ public class ExtentImpl<T>
             setPredicate(this);
         }
 
+        @Override
         public void close() {
         }
 
+        @Override
         public boolean evaluate(Object o) {
             if (!_broker.isNew(o))
                 return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
index 1a0c1ca60..9997a069d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
@@ -41,14 +41,14 @@ public interface FetchConfiguration
     /**
      * Constant to revert any setting back to its default value.
      */
-    public static final int DEFAULT = -99;
+    int DEFAULT = -99;
 
     /**
      * Constant indicating that a field does not require fetching.
      *
      * @see #requiresFetch
      */
-    public static final int FETCH_NONE = 0;
+    int FETCH_NONE = 0;
 
     /**
      * Constant indicating that a field requires a fetch and load of fetched
@@ -56,7 +56,7 @@ public interface FetchConfiguration
      *
      * @see #requiresFetch
      */
-    public static final int FETCH_LOAD = 1;
+    int FETCH_LOAD = 1;
 
     /**
      * Constant indicating that a reference to the field's value must be
@@ -66,14 +66,14 @@ public interface FetchConfiguration
      *
      * @see #requiresFetch
      */
-    public static final int FETCH_REF = 2;
+    int FETCH_REF = 2;
 
 
     /**
      * Return the context associated with this configuration;
      * may be null if it has not been set or this object has been serialized.
      */
-    public StoreContext getContext();
+    StoreContext getContext();
 
     /**
      * Called automatically by the system to associate the fetch configuration
@@ -82,37 +82,37 @@ public interface FetchConfiguration
      * for specific back ends cannot rely on the context's configuration
      * implementing their back end's configuration sub-interface.
      */
-    public void setContext(StoreContext ctx);
+    void setContext(StoreContext ctx);
 
     /**
      * Clone this instance.
      */
-    public Object clone();
+    Object clone();
 
     /**
      * Copy the state from the given fetch configuration to this one.
      */
-    public void copy(FetchConfiguration fetch);
+    void copy(FetchConfiguration fetch);
 
     /**
      * Return the fetch batch size for large result set support.
      * Defaults to the	<code>openjpa.FetchBatchSize</code> setting. Note
      * that this property will be ignored under some data stores.
      */
-    public int getFetchBatchSize();
+    int getFetchBatchSize();
 
     /**
      * Set the fetch batch size for large result set support.
      * Defaults to the	<code>openjpa.FetchBatchSize</code> setting. Note
      * that this property will be ignored under some data stores.
      */
-    public FetchConfiguration setFetchBatchSize(int fetchBatchSize);
+    FetchConfiguration setFetchBatchSize(int fetchBatchSize);
 
     /**
      * Return the maximum depth of fetched instance graph.
      * Defaults to <code>1</code>
      */
-    public int getMaxFetchDepth();
+    int getMaxFetchDepth();
 
     /**
      * Set the maximum depth of the fetched instance graph.
@@ -121,7 +121,7 @@ public interface FetchConfiguration
      * instance. <code>-1</code> implies no limit. <code>0</code> is not
      * permissible.
      */
-    public FetchConfiguration setMaxFetchDepth(int max);
+    FetchConfiguration setMaxFetchDepth(int max);
 
     /**
      * Return whether or not query caching is enabled. If this returns
@@ -130,73 +130,73 @@ public interface FetchConfiguration
      * returns <code>false</code>, query caching will not be used
      * even if the datacache plugin is installed.
      */
-    public boolean getQueryCacheEnabled();
+    boolean getQueryCacheEnabled();
 
     /**
      * Control whether or not query caching is enabled. This has no effect
      * if the datacache plugin is not installed, or if the query cache size
      * is set to zero.
      */
-    public FetchConfiguration setQueryCacheEnabled(boolean cache);
+    FetchConfiguration setQueryCacheEnabled(boolean cache);
 
     /**
      * The query automatic flush configuration.
      */
-    public int getFlushBeforeQueries();
+    int getFlushBeforeQueries();
 
     /**
      * The query automatic flush configuration.
      */
-    public FetchConfiguration setFlushBeforeQueries(int flush);
+    FetchConfiguration setFlushBeforeQueries(int flush);
 
     /**
      * Affirms if extended path lookup feature is active.
      *
      * @since 2.0.0
      */
-    public boolean getExtendedPathLookup();
+    boolean getExtendedPathLookup();
 
     /**
      * Sets extended path lookup feature.
      *
      * @since 2.0.0
      */
-    public FetchConfiguration setExtendedPathLookup(boolean flag);
+    FetchConfiguration setExtendedPathLookup(boolean flag);
 
     /**
      * Returns immutable set of names of the fetch groups that this component
      * will use when loading objects. Defaults to the
      * <code>openjpa.FetchGroups</code> setting.  This set is not thread safe.
      */
-    public Set<String> getFetchGroups();
+    Set<String> getFetchGroups();
 
     /**
      * Return true if the given fetch group has been added.
      */
-    public boolean hasFetchGroup(String group);
+    boolean hasFetchGroup(String group);
 
     /**
      * Adds <code>group</code> to the set of fetch group names to
      * use when loading objects.
      */
-    public FetchConfiguration addFetchGroup(String group);
+    FetchConfiguration addFetchGroup(String group);
 
     /**
      * Adds <code>groups</code> to the set of fetch group names to
      * use when loading objects.
      */
-    public FetchConfiguration addFetchGroups(Collection<String> groups);
+    FetchConfiguration addFetchGroups(Collection<String> groups);
 
     /**
      * Remove the given fetch group.
      */
-    public FetchConfiguration removeFetchGroup(String group);
+    FetchConfiguration removeFetchGroup(String group);
 
     /**
      * Removes <code>groups</code> from the set of fetch group names
      * to use when loading objects.
      */
-    public FetchConfiguration removeFetchGroups(Collection<String> groups);
+    FetchConfiguration removeFetchGroups(Collection<String> groups);
 
     /**
      * Clears the set of fetch group names to use when loading
@@ -204,54 +204,54 @@ public interface FetchConfiguration
      * the default fetch group (and any requested field) will be
      * loaded when loading an object.
      */
-    public FetchConfiguration clearFetchGroups();
+    FetchConfiguration clearFetchGroups();
 
     /**
      * Resets the set of fetch groups to the list in the global configuration.
      */
-    public FetchConfiguration resetFetchGroups();
+    FetchConfiguration resetFetchGroups();
 
     /**
      * Returns the set of fully-qualified field names that this component
      * will use when loading objects. Defaults to the empty set.  This set is
      * not thread safe.
      */
-    public Set<String> getFields();
+    Set<String> getFields();
 
     /**
      * Return true if the given fully-qualified field has been added.
      */
-    public boolean hasField(String field);
+    boolean hasField(String field);
 
     /**
      * Adds <code>field</code> to the set of fully-qualified field names to
      * use when loading objects.
      */
-    public FetchConfiguration addField(String field);
+    FetchConfiguration addField(String field);
 
     /**
      * Adds <code>fields</code> to the set of fully-qualified field names to
      * use when loading objects.
      */
-    public FetchConfiguration addFields(Collection<String> fields);
+    FetchConfiguration addFields(Collection<String> fields);
 
     /**
      * Remove the given fully-qualified field.
      */
-    public FetchConfiguration removeField(String field);
+    FetchConfiguration removeField(String field);
 
     /**
      * Removes <code>fields</code> from the set of fully-qualified field names
      * to use when loading objects.
      */
-    public FetchConfiguration removeFields(Collection<String> fields);
+    FetchConfiguration removeFields(Collection<String> fields);
 
     /**
      * Clears the set of field names to use when loading
      * data. After this operation is invoked, only those fields in
      * the configured fetch groups will be loaded when loading an object.
      */
-    public FetchConfiguration clearFields();
+    FetchConfiguration clearFields();
 
     /**
      * The number of milliseconds to wait for an object lock, or -1 for no
@@ -259,7 +259,7 @@ public interface FetchConfiguration
      *
      * @since 0.3.1
      */
-    public int getLockTimeout();
+    int getLockTimeout();
 
     /**
      * The number of milliseconds to wait for an object lock, or -1 for no
@@ -267,21 +267,21 @@ public interface FetchConfiguration
      *
      * @since 0.3.1
      */
-    public FetchConfiguration setLockTimeout(int timeout);
+    FetchConfiguration setLockTimeout(int timeout);
 
     /**
      * The lock scope for next fetch.
      *
      * @since 2.0.0
      */
-    public int getLockScope();
+    int getLockScope();
 
     /**
      * The lock scope for next fetch.
      *
      * @since 2.0.0
      */
-    public FetchConfiguration setLockScope(int scope);
+    FetchConfiguration setLockScope(int scope);
 
     /**
      * The number of milliseconds to wait for a query, or -1 for no
@@ -289,7 +289,7 @@ public interface FetchConfiguration
      *
      * @since 2.0.0
      */
-    public int getQueryTimeout();
+    int getQueryTimeout();
 
     /**
      * The number of milliseconds to wait for a query, or -1 for no
@@ -297,68 +297,68 @@ public interface FetchConfiguration
      *
      * @since 2.0.0
      */
-    public FetchConfiguration setQueryTimeout(int timeout);
+    FetchConfiguration setQueryTimeout(int timeout);
 
     /**
      * The lock level to use for locking loaded objects.
      *
      * @since 0.3.1
      */
-    public int getReadLockLevel();
+    int getReadLockLevel();
 
     /**
      * The lock level to use for locking loaded objects.
      *
      * @since 0.3.1
      */
-    public FetchConfiguration setReadLockLevel(int level);
+    FetchConfiguration setReadLockLevel(int level);
 
     /**
      * The lock level to use for locking dirtied objects.
      *
      * @since 0.3.1
      */
-    public int getWriteLockLevel();
+    int getWriteLockLevel();
 
     /**
      * Gets the current storage mode for data cache.
      *
      * @since 2.0.0
      */
-    public DataCacheStoreMode getCacheStoreMode();
+    DataCacheStoreMode getCacheStoreMode();
 
     /**
      * Sets the current storage mode for data cache.
      *
      * @since 2.0.0
      */
-    public void setCacheStoreMode(DataCacheStoreMode mode);
+    void setCacheStoreMode(DataCacheStoreMode mode);
 
     /**
      * Gets the current retrieve mode for data cache.
      *
      * @since 2.0.0
      */
-    public DataCacheRetrieveMode getCacheRetrieveMode();
+    DataCacheRetrieveMode getCacheRetrieveMode();
 
     /**
      * Sets the current retrieve mode for data cache.
      *
      * @since 2.0.0
      */
-    public void setCacheRetrieveMode(DataCacheRetrieveMode mode);
+    void setCacheRetrieveMode(DataCacheRetrieveMode mode);
 
     /**
      * The lock level to use for locking dirtied objects.
      *
      * @since 0.3.1
      */
-    public FetchConfiguration setWriteLockLevel(int level);
+    FetchConfiguration setWriteLockLevel(int level);
 
     /**
      * Return a new result list for the current fetch configuration.
      */
-    public ResultList<?> newResultList(ResultObjectProvider rop);
+    ResultList<?> newResultList(ResultObjectProvider rop);
 
     /**
      * Sets an arbitrary query hint that may be utilized during execution.
@@ -373,7 +373,7 @@ public interface FetchConfiguration
      *
      * @since 2.0.0
      */
-    public void setHint(String name, Object value, Object original);
+    void setHint(String name, Object value, Object original);
 
     /**
      * Sets an arbitrary query hint that may be utilized during execution.
@@ -390,7 +390,7 @@ public interface FetchConfiguration
      *
      * @since 2.0.0
      */
-    public void setHint(String key, Object value);
+    void setHint(String key, Object value);
 
     /**
      * Get the hint value for the specific key as originally set by the caller, or null if the hint is not specified.
@@ -398,7 +398,7 @@ public interface FetchConfiguration
 	 * @param name the hint name
 	 * @since 0.4.0
 	 */
-	public Object getHint (String key);
+	Object getHint (String key);
 
 	/**
      * Get an immutable view of the currently active hints and their values.
@@ -406,49 +406,49 @@ public interface FetchConfiguration
 	 *
 	 * @since 2.0.0
 	 */
-	public Map<String, Object> getHints();
+	Map<String, Object> getHints();
 
 	/**
 	 * Affirm if the given hint has been set in this receiver.
 	 *
 	 */
-	public boolean isHintSet(String key);
+	boolean isHintSet(String key);
 
 	/**
 	 * Affirm if the Fetch Plan currently matches the Persistence Unit's configured default.
 	 *
 	 */
-	public boolean isDefaultPUFetchGroupConfigurationOnly();
+	boolean isDefaultPUFetchGroupConfigurationOnly();
 
     /**
      * Root classes for recursive operations. This set is not thread safe.
      */
-    public Set<Class<?>> getRootClasses();
+    Set<Class<?>> getRootClasses();
 
     /**
      * Root classes for recursive operations.
      */
-    public FetchConfiguration setRootClasses(Collection<Class<?>> classes);
+    FetchConfiguration setRootClasses(Collection<Class<?>> classes);
 
     /**
      * Root instances for recursive operations. This set is not thread safe.
      */
-    public Set<Object> getRootInstances();
+    Set<Object> getRootInstances();
 
     /**
      * Root instances for recursive operations.
      */
-    public FetchConfiguration setRootInstances(Collection<?> roots);
+    FetchConfiguration setRootInstances(Collection<?> roots);
 
     /**
      * Synchronize on internal lock if multithreaded is true.
      */
-    public void lock();
+    void lock();
 
     /**
      * Release internal lock if multithreaded is true.
      */
-    public void unlock();
+    void unlock();
 
     /**
      * Affirms if the given field requires to be fetched in the context
@@ -457,14 +457,14 @@ public interface FetchConfiguration
      *
      * @since 0.4.1
      */
-    public int requiresFetch(FieldMetaData fm);
+    int requiresFetch(FieldMetaData fm);
 
     /**
      * Return false if we know that the object being fetched with this
      * configuration does not require a load, because this configuration came
      * from a traversal of a {@link #FETCH_REF} field.
      */
-    public boolean requiresLoad();
+    boolean requiresLoad();
 
     /**
      * Traverse the given field to generate (possibly) a new configuration
@@ -473,10 +473,10 @@ public interface FetchConfiguration
      * @return a new configuration state resulting out of traversal
      * @since 0.4.1
      */
-    public FetchConfiguration traverse(FieldMetaData fm);
+    FetchConfiguration traverse(FieldMetaData fm);
 
     /**
      * Whether SQL generated by the FetchConfiguration's current configuration should be cached.
      */
-    public boolean isFetchConfigurationSQLCacheAdmissible();
+    boolean isFetchConfigurationSQLCacheAdmissible();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
index e1280f1e1..c77d6e904 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
@@ -32,7 +32,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.lib.rop.EagerResultList;
 import org.apache.openjpa.lib.rop.ListResultObjectProvider;
@@ -41,6 +40,7 @@ import org.apache.openjpa.lib.rop.ResultObjectProvider;
 import org.apache.openjpa.lib.rop.SimpleResultList;
 import org.apache.openjpa.lib.rop.WindowResultList;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FetchGroup;
 import org.apache.openjpa.meta.FieldMetaData;
@@ -58,12 +58,12 @@ import org.apache.openjpa.util.UserException;
  * @author Abe White
  * @author Pinaki Poddar
  */
-@SuppressWarnings("serial")
 public class FetchConfigurationImpl
     implements FetchConfiguration, Cloneable {
 
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage(FetchConfigurationImpl.class);
-    private static Map<String, Method> _hintSetters = new HashMap<String, Method>();
+    private static Map<String, Method> _hintSetters = new HashMap<>();
 
     /**
      * Registers hint keys that have a corresponding setter method.
@@ -128,6 +128,8 @@ public class FetchConfigurationImpl
     protected static class ConfigurationState
         implements Serializable
     {
+        
+        private static final long serialVersionUID = 1L;
         public transient StoreContext ctx = null;
         public int fetchBatchSize = 0;
         public int maxFetchDepth = 1;
@@ -170,10 +172,12 @@ public class FetchConfigurationImpl
         _availableDepth = _state.maxFetchDepth;
     }
 
+    @Override
     public StoreContext getContext() {
         return _state.ctx;
     }
 
+    @Override
     public void setContext(StoreContext ctx) {
         // can't reset non-null context to another context
         if (ctx != null && _state.ctx != null && ctx != _state.ctx)
@@ -201,6 +205,7 @@ public class FetchConfigurationImpl
     /**
      * Clone this instance.
      */
+    @Override
     public Object clone() {
         FetchConfigurationImpl clone = newInstance(null);
         clone._state.ctx = _state.ctx;
@@ -223,6 +228,7 @@ public class FetchConfigurationImpl
         return new FetchConfigurationImpl(state);
     }
 
+    @Override
     public void copy(FetchConfiguration fetch) {
         setFetchBatchSize(fetch.getFetchBatchSize());
         setMaxFetchDepth(fetch.getMaxFetchDepth());
@@ -255,14 +261,16 @@ public class FetchConfigurationImpl
         if (this._state == null)
             return;
         if (this._state.hints == null)
-            this._state.hints = new HashMap<String,Object>();
+            this._state.hints = new HashMap<>();
         this._state.hints.putAll(from._state.hints);
     }
 
+    @Override
     public int getFetchBatchSize() {
         return _state.fetchBatchSize;
     }
 
+    @Override
     public FetchConfiguration setFetchBatchSize(int fetchBatchSize) {
         if (fetchBatchSize == DEFAULT && _state.ctx != null)
             fetchBatchSize = _state.ctx.getConfiguration().getFetchBatchSize();
@@ -271,10 +279,12 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getMaxFetchDepth() {
         return _state.maxFetchDepth;
     }
 
+    @Override
     public FetchConfiguration setMaxFetchDepth(int depth) {
         if (depth == DEFAULT && _state.ctx != null)
             depth = _state.ctx.getConfiguration().getMaxFetchDepth();
@@ -287,28 +297,34 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public boolean getQueryCacheEnabled() {
         return _state.queryCache;
     }
 
+    @Override
     public FetchConfiguration setQueryCacheEnabled(boolean cache) {
         _state.queryCache = cache;
         return this;
     }
 
+    @Override
     public int getFlushBeforeQueries() {
         return _state.flushQuery;
     }
 
+    @Override
     public boolean getExtendedPathLookup() {
         return _state.extendedPathLookup;
     }
 
+    @Override
     public FetchConfiguration setExtendedPathLookup(boolean flag) {
         _state.extendedPathLookup = flag;
         return this;
     }
 
+    @Override
     public FetchConfiguration setFlushBeforeQueries(int flush) {
         if (flush != DEFAULT
             && flush != QueryFlushModes.FLUSH_TRUE
@@ -325,11 +341,13 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public Set<String> getFetchGroups() {
         if (_state.fetchGroups == null) return Collections.emptySet();
         return _state.fetchGroups;
     }
 
+    @Override
     public boolean hasFetchGroup(String group) {
         return _state.fetchGroups != null
             && (_state.fetchGroups.contains(group)
@@ -346,6 +364,7 @@ public class FetchConfigurationImpl
          return _state.fetchGroupContainsAll;
      }
 
+    @Override
     public FetchConfiguration addFetchGroup(String name) {
         return addFetchGroup(name, true);
     }
@@ -357,7 +376,7 @@ public class FetchConfigurationImpl
         lock();
         try {
             if (_state.fetchGroups == null)
-                _state.fetchGroups = new HashSet<String>();
+                _state.fetchGroups = new HashSet<>();
             _state.fetchGroups.add(name);
 
             if (FetchGroup.NAME_ALL.equals(name))
@@ -373,6 +392,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration addFetchGroups(Collection<String> groups) {
         if (groups == null || groups.isEmpty())
             return this;
@@ -383,6 +403,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration removeFetchGroup(String group) {
         return removeFetchGroup(group, true);
     }
@@ -406,6 +427,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration removeFetchGroups(Collection<String> groups) {
         lock();
         try {
@@ -419,6 +441,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration clearFetchGroups() {
         return clearFetchGroups(true);
     }
@@ -429,7 +452,7 @@ public class FetchConfigurationImpl
             if (_state.fetchGroups != null) {
                 _state.fetchGroups.clear();
             } else {
-                _state.fetchGroups = new HashSet<String>();
+                _state.fetchGroups = new HashSet<>();
             }
 
             _state.fetchGroupContainsAll = false;
@@ -445,6 +468,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration resetFetchGroups() {
         String[] fetchGroupList = _state.ctx.getConfiguration().getFetchGroupsList();
         clearFetchGroups((fetchGroupList == null || fetchGroupList.length == 0));
@@ -483,10 +507,12 @@ public class FetchConfigurationImpl
         }
     }
 
+    @Override
     public boolean isDefaultPUFetchGroupConfigurationOnly() {
         return _state.fetchGroupIsPUDefault;
     }
 
+    @Override
     public boolean isFetchConfigurationSQLCacheAdmissible() {
         if (_state == null || _state.cacheNonDefaultFetchPlanQueries) {
             return false;
@@ -496,15 +522,18 @@ public class FetchConfigurationImpl
         }
     }
 
+    @Override
     public Set<String> getFields() {
         if (_state.fields == null) return Collections.emptySet();
         return _state.fields;
     }
 
+    @Override
     public boolean hasField(String field) {
         return _state.fields != null && _state.fields.contains(field);
     }
 
+    @Override
     public FetchConfiguration addField(String field) {
         if (StringUtil.isEmpty(field))
             throw new UserException(_loc.get("null-field"));
@@ -512,7 +541,7 @@ public class FetchConfigurationImpl
         lock();
         try {
             if (_state.fields == null)
-                _state.fields = new HashSet<String>();
+                _state.fields = new HashSet<>();
             _state.fields.add(field);
             _state.fetchGroupIsPUDefault = false;
         } finally {
@@ -521,6 +550,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration addFields(Collection<String> fields) {
         if (fields == null || fields.isEmpty())
             return this;
@@ -528,7 +558,7 @@ public class FetchConfigurationImpl
         lock();
         try {
             if (_state.fields == null)
-                _state.fields = new HashSet<String>();
+                _state.fields = new HashSet<>();
             _state.fields.addAll(fields);
         } finally {
             verifyDefaultPUFetchGroups();
@@ -537,6 +567,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration removeField(String field) {
         lock();
         try {
@@ -553,6 +584,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration removeFields(Collection<String> fields) {
         lock();
         try {
@@ -564,6 +596,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public FetchConfiguration clearFields() {
         lock();
         try {
@@ -576,26 +609,32 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public DataCacheRetrieveMode getCacheRetrieveMode() {
         return _state.cacheRetrieveMode;
     }
 
+    @Override
     public DataCacheStoreMode getCacheStoreMode() {
         return _state.cacheStoreMode;
     }
 
+    @Override
     public void setCacheRetrieveMode(DataCacheRetrieveMode mode) {
         _state.cacheRetrieveMode = mode;
     }
 
+    @Override
     public void setCacheStoreMode(DataCacheStoreMode mode) {
         _state.cacheStoreMode = mode;
     }
 
+    @Override
     public int getLockTimeout() {
         return _state.lockTimeout;
     }
 
+    @Override
     public FetchConfiguration setLockTimeout(int timeout) {
         if (timeout == DEFAULT && _state.ctx != null)
             _state.lockTimeout = _state.ctx.getConfiguration().getLockTimeout();
@@ -610,10 +649,12 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getQueryTimeout() {
         return _state.queryTimeout;
     }
 
+    @Override
     public FetchConfiguration setQueryTimeout(int timeout) {
         if (timeout == DEFAULT && _state.ctx != null)
             _state.queryTimeout = _state.ctx.getConfiguration().
@@ -629,10 +670,12 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getLockScope() {
         return _state.lockScope;
     }
 
+    @Override
     public FetchConfiguration setLockScope(int scope) {
         if (scope != DEFAULT
                 && scope != LockScopes.LOCKSCOPE_NORMAL
@@ -646,19 +689,21 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getReadLockLevel() {
         return _state.readLockLevel;
     }
 
+    @Override
     public FetchConfiguration setReadLockLevel(int level) {
         if (_state.ctx == null)
             return this;
 
         if (level != DEFAULT
-            && level != MixedLockLevels.LOCK_NONE
-            && level != MixedLockLevels.LOCK_READ
+            && level != LockLevels.LOCK_NONE
+            && level != LockLevels.LOCK_READ
             && level != MixedLockLevels.LOCK_OPTIMISTIC
-            && level != MixedLockLevels.LOCK_WRITE
+            && level != LockLevels.LOCK_WRITE
             && level != MixedLockLevels.LOCK_OPTIMISTIC_FORCE_INCREMENT
             && level != MixedLockLevels.LOCK_PESSIMISTIC_READ
             && level != MixedLockLevels.LOCK_PESSIMISTIC_WRITE
@@ -668,7 +713,7 @@ public class FetchConfigurationImpl
 
         lock();
         try {
-            if (level != MixedLockLevels.LOCK_NONE)
+            if (level != LockLevels.LOCK_NONE)
                 assertActiveTransaction();
             if (level == DEFAULT)
                 _state.readLockLevel = _state.ctx.getConfiguration().
@@ -681,19 +726,21 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public int getWriteLockLevel() {
         return _state.writeLockLevel;
     }
 
+    @Override
     public FetchConfiguration setWriteLockLevel(int level) {
         if (_state.ctx == null)
             return this;
 
         if (level != DEFAULT
-            && level != MixedLockLevels.LOCK_NONE
-            && level != MixedLockLevels.LOCK_READ
+            && level != LockLevels.LOCK_NONE
+            && level != LockLevels.LOCK_READ
             && level != MixedLockLevels.LOCK_OPTIMISTIC
-            && level != MixedLockLevels.LOCK_WRITE
+            && level != LockLevels.LOCK_WRITE
             && level != MixedLockLevels.LOCK_OPTIMISTIC_FORCE_INCREMENT
             && level != MixedLockLevels.LOCK_PESSIMISTIC_READ
             && level != MixedLockLevels.LOCK_PESSIMISTIC_WRITE
@@ -715,6 +762,7 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public ResultList<?> newResultList(ResultObjectProvider rop) {
         if (rop instanceof ListResultObjectProvider)
             return new SimpleResultList(rop);
@@ -743,6 +791,7 @@ public class FetchConfigurationImpl
      * that may have been actually set on the state variables of this receiver.
      *
      */
+    @Override
     public Map<String,Object> getHints() {
         if (_state.hints == null)
             return Collections.emptyMap();
@@ -752,6 +801,7 @@ public class FetchConfigurationImpl
     /**
      * Affirms if the given key is set as a hint.
      */
+    @Override
     public boolean isHintSet(String key) {
         return _state.hints != null && _state.hints.containsKey(key);
     }
@@ -776,6 +826,7 @@ public class FetchConfigurationImpl
      *
      * @see #setHint(String, Object, Object)
      */
+    @Override
     public void setHint(String key, Object value) {
         setHint(key, value, value);
     }
@@ -798,6 +849,7 @@ public class FetchConfigurationImpl
      * @exception IllegalArgumentException if the given value is not acceptable by the setter method, if one
      * exists corresponds the given hint key.
      */
+    @Override
     public void setHint(String key, Object value, Object original) {
         if (key == null)
             return;
@@ -827,13 +879,14 @@ public class FetchConfigurationImpl
         lock();
         try {
             if (_state.hints == null)
-                _state.hints = new HashMap<String,Object>();
+                _state.hints = new HashMap<>();
             _state.hints.put(name, value);
         } finally {
             unlock();
         }
     }
 
+    @Override
     public Object getHint(String name) {
         return (_state.hints == null) ? null : _state.hints.get(name);
     }
@@ -842,11 +895,13 @@ public class FetchConfigurationImpl
         return (_state.hints == null) ? null : _state.hints.remove(name);
     }
 
+    @Override
     public Set<Class<?>> getRootClasses() {
         if (_state.rootClasses == null) return Collections.emptySet();
         return _state.rootClasses;
     }
 
+    @Override
     public FetchConfiguration setRootClasses(Collection<Class<?>> classes) {
         lock();
         try {
@@ -854,7 +909,7 @@ public class FetchConfigurationImpl
                 _state.rootClasses.clear();
             if (classes != null && !classes.isEmpty()) {
                 if (_state.rootClasses == null)
-                    _state.rootClasses = new HashSet<Class<?>>(classes);
+                    _state.rootClasses = new HashSet<>(classes);
                 else
                     _state.rootClasses.addAll(classes);
             }
@@ -864,11 +919,13 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public Set<Object> getRootInstances() {
         if (_state.rootInstances == null) return Collections.emptySet();
         return _state.rootInstances;
     }
 
+    @Override
     public FetchConfiguration setRootInstances(Collection<?> instances) {
         lock();
         try {
@@ -876,7 +933,7 @@ public class FetchConfigurationImpl
                 _state.rootInstances.clear();
             if (instances != null && !instances.isEmpty()) {
                 if (_state.rootInstances == null) {
-                    _state.rootInstances = new HashSet<Object>(instances);
+                    _state.rootInstances = new HashSet<>(instances);
                 } else {
                     _state.rootInstances.addAll(instances);
                 }
@@ -887,11 +944,13 @@ public class FetchConfigurationImpl
         return this;
     }
 
+    @Override
     public void lock() {
         if (_state.ctx != null)
             _state.ctx.lock();
     }
 
+    @Override
     public void unlock() {
         if (_state.ctx != null)
             _state.ctx.unlock();
@@ -901,6 +960,7 @@ public class FetchConfigurationImpl
     // Traversal
     /////////////
 
+    @Override
     public int requiresFetch(FieldMetaData fm) {
         if (!includes(fm))
             return FETCH_NONE;
@@ -926,10 +986,12 @@ public class FetchConfigurationImpl
         return FETCH_LOAD;
     }
 
+    @Override
     public boolean requiresLoad() {
         return _load;
     }
 
+    @Override
     public FetchConfiguration traverse(FieldMetaData fm) {
         Class<?> type = fm.getRelationType();
         if (type == null)
@@ -1089,6 +1151,7 @@ public class FetchConfigurationImpl
         return path;
     }
 
+    @Override
     public String toString() {
         return "FetchConfiguration@" + System.identityHashCode(this)
             + " (" + _availableDepth + ")" + getPathString();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FillStrategy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FillStrategy.java
index 3ce3a41f9..4b9387356 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FillStrategy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FillStrategy.java
@@ -39,7 +39,7 @@ import org.apache.openjpa.lib.util.Localizer;
  *
  */
 public interface FillStrategy<T> {
-    static final Localizer _loc = Localizer.forPackage(FillStrategy.class);
+    Localizer _loc = Localizer.forPackage(FillStrategy.class);
 
     T fill(Object[] data, Class<?>[] types, String[] aliases);
 
@@ -57,6 +57,7 @@ public interface FillStrategy<T> {
             this.cls = arrayCls.getComponentType();
         }
 
+        @Override
         public T fill(Object[] values, Class<?>[] types, String[] aliases) {
             Object array = java.lang.reflect.Array.newInstance(cls, values.length);
             System.arraycopy(values, 0, array, 0, values.length);
@@ -79,6 +80,7 @@ public interface FillStrategy<T> {
             putMethod = put;
         }
 
+        @Override
         public T fill(Object[] values, Class<?>[] types, String[] aliases) {
             int i = 0;
             try {
@@ -139,6 +141,7 @@ public interface FillStrategy<T> {
             throw new RuntimeException(_loc.get("fill-ctor-none", cls, Arrays.toString(types)).getMessage());
         }
 
+        @Override
         public T fill(Object[] values, Class<?>[] types, String[] aliases) {
             if (cons == null) {
                 cons = findConstructor(cls, types);
@@ -168,6 +171,7 @@ public interface FillStrategy<T> {
             this.cls = cls;
         }
 
+        @Override
         public T fill(Object[] values, Class<?>[] types, String[] aliases) {
             int i = 0;
             try {
@@ -199,6 +203,7 @@ public interface FillStrategy<T> {
      * Populate an instance by simply assigning the 0-th element of the input values.
      */
     public static class Assign<T> implements FillStrategy<T> {
+        @Override
         public T fill(Object[] values, Class<?>[] types, String[] aliases) {
             try {
                 return (T)values[0];
@@ -228,6 +233,7 @@ public interface FillStrategy<T> {
             this.isArray = keyType == int.class || keyType == Integer.class;
         }
 
+        @Override
         public T fill(Object[] values, Class<?>[] types, String[] aliases) {
             int i = 0;
             Object key = null;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
index e38e66d9d..d41a8bc65 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
@@ -635,7 +635,7 @@ public class Filters {
         char cur;
         int start = 0;
         boolean skipSpace = false;
-        List<String> results = new ArrayList<String>(6);
+        List<String> results = new ArrayList<>(6);
         for (int i = 0; i < dec.length(); i++) {
             cur = dec.charAt(i);
             if (cur == bad)
@@ -722,7 +722,7 @@ public class Filters {
                 case '\r':
                     if (c == split && !string && parenDepth == 0 && nonspace) {
                         if (exps == null)
-                            exps = new ArrayList<String>(expected);
+                            exps = new ArrayList<>(expected);
                         exps.add(str.substring(begin, pos).trim());
                         begin = pos + 1;
                         nonspace = false;
@@ -731,7 +731,7 @@ public class Filters {
                 default:
                     if (c == split && !string && parenDepth == 0) {
                         if (exps == null)
-                            exps = new ArrayList<String>(expected);
+                            exps = new ArrayList<>(expected);
                         exps.add(str.substring(begin, pos).trim());
                         begin = pos + 1;
                     }
@@ -762,7 +762,7 @@ public class Filters {
 
         // create set of base class metadatas in access path
         if (metas == null)
-            metas = new ArrayList<ClassMetaData>();
+            metas = new ArrayList<>();
         int last = metas.size();
 
         // for every element in the path of this executor, compare it
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinalizingBrokerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinalizingBrokerImpl.java
index 85a8a5ea2..d0f25caae 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinalizingBrokerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinalizingBrokerImpl.java
@@ -29,9 +29,13 @@ package org.apache.openjpa.kernel;
 public class FinalizingBrokerImpl
     extends BrokerImpl {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Close on finalize.
      */
+    @Override
     protected void finalize()
         throws Throwable {
         super.finalize();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FindCallbacks.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FindCallbacks.java
index 76596ba5d..5643fca45 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FindCallbacks.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FindCallbacks.java
@@ -32,12 +32,12 @@ public interface FindCallbacks {
      *
      * @return the id to look up, or null to ignore this argument
      */
-    public Object processArgument(Object oid);
+    Object processArgument(Object oid);
 
     /**
      * Process operation return value.
      *
      * @return the object to return
      */
-    public Object processReturn(Object oid, OpenJPAStateManager sm);
+    Object processReturn(Object oid, OpenJPAStateManager sm);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderCache.java
index f7a75c65e..e4480869a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderCache.java
@@ -76,7 +76,7 @@ public interface FinderCache<K,V,R> extends Configurable {
      *
      * @return FinderQuery for the given mapping.
      */
-    public FinderQuery<K,V,R> get(K key, FetchConfiguration fetch);
+    FinderQuery<K,V,R> get(K key, FetchConfiguration fetch);
 
     /**
      * Cache a FinderQuery for the given key and value.
@@ -89,17 +89,17 @@ public interface FinderCache<K,V,R> extends Configurable {
      * constructed or an existing query. If the given key-value can not be
      * cached, then return null.
      */
-    public FinderQuery<K,V,R> cache(K key, V value, FetchConfiguration fetch);
+    FinderQuery<K,V,R> cache(K key, V value, FetchConfiguration fetch);
 
 	/**
 	 * Get a map view of the cached entries as strings.
 	 */
-	public Map<String, String> getMapView();
+	Map<String, String> getMapView();
 
 	/**
 	 * Remove the FinderQuery for the given key from this cache.
 	 */
-	public boolean invalidate(K key);
+	boolean invalidate(K key);
 
     /**
      * Marks the given key as not amenable to caching.
@@ -111,34 +111,34 @@ public interface FinderCache<K,V,R> extends Configurable {
      * @return finder query for the given class if it had been cached before.
      * null otherwise.
      */
-    public FinderQuery<K,V,R> markUncachable(K key);
+    FinderQuery<K,V,R> markUncachable(K key);
 
     /**
 	 * Affirms if the given key matches any of the exclusion patterns.
 	 */
-	public boolean isExcluded(K key);
+	boolean isExcluded(K key);
 
 	/**
 	 * Gets the excluded stringified keys.
 	 */
-	public List<String> getExcludes();
+	List<String> getExcludes();
 
 	/**
      * Adds the given pattern to the list of excluded patterns. Any existing
 	 * cache entry whose key matches the given pattern will be marked
 	 * non-cachable in a reversible manner.
 	 */
-	public void addExclusionPattern(String pattern);
+	void addExclusionPattern(String pattern);
 
 	/**
 	 * Removes the given pattern from the list of excluded patterns.
 	 * Any excluded entry that matches the given pattern can now be cached
 	 * again, unless it has been marked non-cachable explicitly.
 	 */
-	public void removeExclusionPattern(String pattern);
+	void removeExclusionPattern(String pattern);
 
 	/**
 	 * Gets the simple statistics for executed finder queries.
 	 */
-	public QueryStatistics<K> getStatistics();
+	QueryStatistics<K> getStatistics();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderQuery.java
index 33cd30bb1..838174941 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderQuery.java
@@ -34,13 +34,13 @@ public interface FinderQuery<K,V,R>  {
      * Gets the identifier of this receiver.
      *
      */
-    public K getIdentifier();
+    K getIdentifier();
 
     /**
      * Gets the value to which this receiver delegates its execution.
      *
      */
-    public V getDelegate();
+    V getDelegate();
 
     /**
      * Execute the query for a given instance.
@@ -53,12 +53,12 @@ public interface FinderQuery<K,V,R>  {
      * @return the result of execution.
      *
      */
-    public R execute(OpenJPAStateManager sm, StoreManager store,
+    R execute(OpenJPAStateManager sm, StoreManager store,
         FetchConfiguration fetch);
 
     /**
      * Gets the query string.
      *
      */
-    public String getQueryString();
+    String getQueryString();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
index 7863a8a53..1b16b6dc2 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/HollowState.java
@@ -28,9 +28,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class HollowState
-    extends PCState {
+class HollowState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -39,49 +38,60 @@ class HollowState
         context.setDirty(false);
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return PDELETED;
     }
 
+    @Override
     PCState transactional(StateManagerImpl context) {
         return PCLEAN;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState beforeRead(StateManagerImpl context, int field) {
         return PCLEAN;
     }
 
+    @Override
     PCState beforeOptimisticRead(StateManagerImpl context, int field) {
         return PNONTRANS;
     }
 
+    @Override
     PCState beforeNontransactionalRead(StateManagerImpl context, int field) {
         return PNONTRANS;
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return PDIRTY;
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return PDIRTY;
     }
 
+    @Override
     PCState beforeNontransactionalWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return PNONTRANS;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Hollow";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.java
index 0351b541f..2eb023045 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.java
@@ -49,6 +49,7 @@ public class InMemorySavepointManager
         _preFlush = preFlush;
     }
 
+    @Override
     public OpenJPASavepoint newSavepoint(String name, Broker broker) {
         // pre-flush after creating savepoint b/c pre-flush may add/change
         // states
@@ -58,6 +59,7 @@ public class InMemorySavepointManager
         return save;
     }
 
+    @Override
     public boolean supportsIncrementalFlush() {
         // cannot incrementally flush as saved fields may become out of synch.
         return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InverseManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InverseManager.java
index e53e06248..c71dd1426 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InverseManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InverseManager.java
@@ -115,12 +115,15 @@ public class InverseManager implements Configurable {
             throw new IllegalArgumentException(action);
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _log = conf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
         _mgr = ((OpenJPAConfiguration)conf).getDataCacheManagerInstance();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java
index 2bdd545d3..7bab6acde 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LocalManagedRuntime.java
@@ -60,16 +60,19 @@ class LocalManagedRuntime extends AbstractManagedRuntime
         _broker = broker;
     }
 
+    @Override
     public TransactionManager getTransactionManager() {
         return this;
     }
 
+    @Override
     public synchronized void begin() {
         if (_active)
             throw new InvalidStateException(_loc.get("active"));
         _active = true;
     }
 
+    @Override
     public synchronized void commit() {
         if (!_active)
             throw new InvalidStateException(_loc.get("not-active"));
@@ -114,6 +117,7 @@ class LocalManagedRuntime extends AbstractManagedRuntime
             throw err;
     }
 
+    @Override
     public synchronized void rollback() {
         if (!_active)
             throw new InvalidStateException(_loc.get("not-active"));
@@ -155,18 +159,22 @@ class LocalManagedRuntime extends AbstractManagedRuntime
         }
     }
 
+    @Override
     public synchronized void setRollbackOnly() {
         setRollbackOnly(new UserException());
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause) {
         _rollbackOnly = cause;
     }
 
+    @Override
     public Throwable getRollbackCause() {
         return _rollbackOnly;
     }
 
+    @Override
     public synchronized int getStatus() {
         if (_rollbackOnly != null)
             return Status.STATUS_MARKED_ROLLBACK;
@@ -175,35 +183,42 @@ class LocalManagedRuntime extends AbstractManagedRuntime
         return Status.STATUS_NO_TRANSACTION;
     }
 
+    @Override
     public Transaction getTransaction() {
         return this;
     }
 
+    @Override
     public void resume(Transaction tobj)
         throws SystemException {
         throw new SystemException(NotSupportedException.class.getName());
     }
 
+    @Override
     public void setTransactionTimeout(int sec)
         throws SystemException {
         throw new SystemException(NotSupportedException.class.getName());
     }
 
+    @Override
     public Transaction suspend()
         throws SystemException {
         throw new SystemException(NotSupportedException.class.getName());
     }
 
+    @Override
     public boolean delistResource(XAResource xaRes, int flag)
         throws SystemException {
         throw new SystemException(NotSupportedException.class.getName());
     }
 
+    @Override
     public boolean enlistResource(XAResource xaRes)
         throws SystemException {
         throw new SystemException(NotSupportedException.class.getName());
     }
 
+    @Override
     public synchronized void registerSynchronization(Synchronization sync) {
         if (sync == _broker)
             return;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockLevels.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockLevels.java
index 471d33d3f..78477779d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockLevels.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockLevels.java
@@ -29,15 +29,15 @@ public interface LockLevels {
     /**
      * No lock. Value of 0.
      */
-    public static final int LOCK_NONE = 0;
+    int LOCK_NONE = 0;
 
     /**
      * Generic read lock level. Value of 10.
      */
-    public static final int LOCK_READ = 10;
+    int LOCK_READ = 10;
 
     /**
      * Generic write lock level. Value of 20.
      */
-    public static final int LOCK_WRITE = 20;
+    int LOCK_WRITE = 20;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.java
index c8bc3917a..cb9556d28 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.java
@@ -37,13 +37,13 @@ public interface LockManager
      * This will be invoked in the lock manager before any other methods are
      * called.
      */
-    public void setContext(StoreContext ctx);
+    void setContext(StoreContext ctx);
 
     /**
      * Return the lock level of the specified instance, or
      * {@link LockLevels#LOCK_NONE} if not locked.
      */
-    public int getLockLevel(OpenJPAStateManager sm);
+    int getLockLevel(OpenJPAStateManager sm);
 
     /**
      * Obtain a lock on the specified object. This method may be called when
@@ -67,14 +67,14 @@ public interface LockManager
      * obtained in the given number of milliseconds
      * @see OpenJPAStateManager#setLock
      */
-    public void lock(OpenJPAStateManager sm, int level, int timeout,
+    void lock(OpenJPAStateManager sm, int level, int timeout,
         Object sdata);
 
     /**
      * Perform the same function as previous lock method and has the option
      * to perform a version check after the lock function has completed.
      */
-    public void refreshLock(OpenJPAStateManager sm, int level, int timeout,
+    void refreshLock(OpenJPAStateManager sm, int level, int timeout,
         Object sdata);
 
     /**
@@ -82,7 +82,7 @@ public interface LockManager
      *
      * @see #lock
      */
-    public void lockAll(Collection sms, int level, int timeout,
+    void lockAll(Collection sms, int level, int timeout,
         Object sdata);
 
     /**
@@ -96,23 +96,23 @@ public interface LockManager
      *
      * @see OpenJPAStateManager#setLock
      */
-    public void release(OpenJPAStateManager sm);
+    void release(OpenJPAStateManager sm);
 
     /**
      * Notification that a transaction is beginning. Locks are only obtained
      * within transactions, so an implementation might use this method to
      * initialize bookkeeping datastructures, etc.
      */
-    public void beginTransaction();
+    void beginTransaction();
 
     /**
      * Notification that the current transaction has ended. Clear all
      * datastructures, release any left over locks, etc.
      */
-    public void endTransaction();
+    void endTransaction();
 
     /**
      * Free any resources.
      */
-    public void close ();
+    @Override void close ();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockScopes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockScopes.java
index 7f1ae2c52..f3787e2b5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockScopes.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockScopes.java
@@ -29,11 +29,11 @@ public interface LockScopes {
      * Generic Normal lock scope level. Value of 0.
      *
      */
-    public static final int LOCKSCOPE_NORMAL = 0;
+    int LOCKSCOPE_NORMAL = 0;
 
     /**
      * Generic extended lock scope level. Value of 10.
      */
-    public static final int LOCKSCOPE_EXTENDED = 10;
+    int LOCKSCOPE_EXTENDED = 10;
 
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java
index ae1b6777e..d5a806e17 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java
@@ -38,6 +38,9 @@ import org.apache.openjpa.util.UserException;
  */
 class ManagedCache implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc =
         Localizer.forPackage(ManagedCache.class);
 
@@ -100,7 +103,7 @@ class ManagedCache implements Serializable {
     public void add(StateManagerImpl sm) {
         if (!sm.isIntercepting()) {
             if (_untracked == null)
-                _untracked = new HashSet<StateManagerImpl>();
+                _untracked = new HashSet<>();
             _untracked.add(sm);
         }
 
@@ -115,7 +118,7 @@ class ManagedCache implements Serializable {
         // permanent oid yet
         if (sm.isNew()) {
             if (_news == null)
-                _news = new HashMap<Object,StateManagerImpl>();
+                _news = new HashMap<>();
             _news.put(sm.getId(), sm);
             return;
         }
@@ -195,7 +198,7 @@ class ManagedCache implements Serializable {
 
             // same oid as deleted instance; put in conflict cache
             if (_conflicts == null)
-                _conflicts = new HashMap<Object,StateManagerImpl>();
+                _conflicts = new HashMap<>();
             _conflicts.put(sm.getObjectId(), sm);
         }
     }
@@ -257,7 +260,7 @@ class ManagedCache implements Serializable {
         if (size == 0)
             return Collections.EMPTY_LIST;
 
-        List<StateManagerImpl> copy = new ArrayList<StateManagerImpl>(size);
+        List<StateManagerImpl> copy = new ArrayList<>(size);
         for (StateManagerImpl sm : _main.values())
             copy.add(sm);
         if (_conflicts != null && !_conflicts.isEmpty())
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java
index 9f42c6a91..ebb00d07d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java
@@ -29,12 +29,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.rop.ListResultObjectProvider;
 import org.apache.openjpa.lib.rop.RangeResultObjectProvider;
 import org.apache.openjpa.lib.rop.ResultObjectProvider;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.OrderedMap;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.util.Exceptions;
 import org.apache.openjpa.util.ImplHelper;
@@ -49,6 +49,9 @@ import org.apache.openjpa.util.UserException;
 public class MethodStoreQuery
     extends AbstractStoreQuery {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String LANGUAGE = QueryLanguages.LANG_METHODQL;
 
     private static final Class[] ARGS_DATASTORE = new Class[]{
@@ -66,27 +69,33 @@ public class MethodStoreQuery
 
     private OrderedMap<Object, Class<?>> _params = null;
 
+    @Override
     public void invalidateCompilation() {
         if (_params != null)
             _params.clear();
     }
 
+    @Override
     public Executor newInMemoryExecutor(ClassMetaData meta, boolean subs) {
         return new MethodExecutor(this, meta, subs, true);
     }
 
+    @Override
     public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs) {
         return new MethodExecutor(this, meta, subs, false);
     }
 
+    @Override
     public boolean supportsInMemoryExecution() {
         return true;
     }
 
+    @Override
     public boolean supportsDataStoreExecution() {
         return true;
     }
 
+    @Override
     public boolean requiresCandidateType() {
         return false;
     }
@@ -105,7 +114,7 @@ public class MethodStoreQuery
 
             List decs = Filters.parseDeclaration(params, ',', "parameters");
             if (_params == null)
-                _params = new OrderedMap<Object, Class<?>>();
+                _params = new OrderedMap<>();
             String name;
             Class cls;
             for (int i = 0; i < decs.size(); i += 2) {
@@ -141,6 +150,7 @@ public class MethodStoreQuery
             _inMem = inMem;
         }
 
+        @Override
         public ResultObjectProvider executeQuery(StoreQuery q,
             Object[] params, Range range) {
             // convert the parameters into a map
@@ -219,6 +229,7 @@ public class MethodStoreQuery
             }
         }
 
+        @Override
         public void validate(StoreQuery q) {
             if (_meth != null)
                 return;
@@ -258,10 +269,12 @@ public class MethodStoreQuery
             _meth = meth;
         }
 
+        @Override
         public OrderedMap<Object, Class<?>> getOrderedParameterTypes(StoreQuery q) {
             return ((MethodStoreQuery) q).bindParameterTypes();
 		}
 
+        @Override
         public Object[] toParameterArray(StoreQuery q, Map userParams) {
             if (userParams == null || userParams.isEmpty())
                 return StoreQuery.EMPTY_OBJECTS;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MixedLockLevels.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MixedLockLevels.java
index d0d0e44e7..5115fbf13 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MixedLockLevels.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MixedLockLevels.java
@@ -30,27 +30,27 @@ public interface MixedLockLevels extends LockLevels {
      * Generic optimistic read lock level. Value of 15.
      *
      */
-    public static final int LOCK_OPTIMISTIC = LOCK_READ + 5;
+    int LOCK_OPTIMISTIC = LOCK_READ + 5;
 
     /**
      * Generic optimistic write lock level. Value of 25.
      */
-    public static final int LOCK_OPTIMISTIC_FORCE_INCREMENT =
+    int LOCK_OPTIMISTIC_FORCE_INCREMENT =
         LockLevels.LOCK_WRITE + 5;
 
     /**
      * Generic pessimistic read lock level. Value of 30.
      */
-    public static final int LOCK_PESSIMISTIC_READ = 30;
+    int LOCK_PESSIMISTIC_READ = 30;
 
     /**
      * Generic pessimistic write lock level. Value of 40.
      */
-    public static final int LOCK_PESSIMISTIC_WRITE = 40;
+    int LOCK_PESSIMISTIC_WRITE = 40;
 
     /**
      * Generic pessimistic force increment level. Value of 50.
      */
-    public static final int LOCK_PESSIMISTIC_FORCE_INCREMENT = 50;
+    int LOCK_PESSIMISTIC_FORCE_INCREMENT = 50;
 
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.java
index ed9ef9cd5..7b8187e6c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.java
@@ -26,6 +26,7 @@ package org.apache.openjpa.kernel;
 public class NoneLockManager
     extends AbstractLockManager {
 
+    @Override
     public void lock(OpenJPAStateManager sm, int level, int timeout,
         Object context) {
         // Duplicate code in the 2 lock methods to enforce proper action
@@ -33,15 +34,18 @@ public class NoneLockManager
         sm.setLock(Boolean.TRUE);
     }
 
+    @Override
     public void refreshLock(OpenJPAStateManager sm, int level, int timeout,
         Object context) {
         sm.setLock(Boolean.TRUE);
     }
 
+    @Override
     public void release(OpenJPAStateManager sm) {
         sm.setLock(null);
     }
 
+    @Override
     public int getLockLevel(OpenJPAStateManager sm) {
         return LOCK_NONE;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectFactory.java
index 906de36ba..55d8d4db7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectFactory.java
@@ -29,5 +29,5 @@ package org.apache.openjpa.kernel;
  *
  */
 public interface ObjectFactory<T> {
-    public T newInstance();
+    T newInstance();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java
index b27712a82..65cd03438 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java
@@ -27,8 +27,8 @@ import java.security.PrivilegedActionException;
 import java.util.BitSet;
 
 import org.apache.openjpa.enhance.PersistenceCapable;
-import org.apache.openjpa.enhance.StateManager;
 import org.apache.openjpa.enhance.Reflection;
+import org.apache.openjpa.enhance.StateManager;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
@@ -68,213 +68,262 @@ public class ObjectIdStateManager
         _vmd = ownerVal;
     }
 
+    @Override
     public Object getGenericContext() {
         return (_owner == null) ? null : _owner.getGenericContext();
     }
 
+    @Override
     public Object getPCPrimaryKey(Object oid, int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public StateManager replaceStateManager(StateManager sm) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getVersion() {
         return null;
     }
 
+    @Override
     public void setVersion(Object version) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isDirty() {
         return false;
     }
 
+    @Override
     public boolean isTransactional() {
         return false;
     }
 
+    @Override
     public boolean isPersistent() {
         return false;
     }
 
+    @Override
     public boolean isNew() {
         return false;
     }
 
+    @Override
     public boolean isDeleted() {
         return false;
     }
 
+    @Override
     public boolean isDetached() {
         return true;
     }
 
+    @Override
     public boolean isVersionUpdateRequired() {
         return false;
     }
 
+    @Override
     public boolean isVersionCheckRequired() {
         return false;
     }
 
+    @Override
     public void dirty(String field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object fetchObjectId() {
         return null;
     }
 
+    @Override
     public void accessingField(int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean serializing() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean writeDetached(ObjectOutput out)
         throws IOException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void proxyDetachedDeserialized(int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingBooleanField(PersistenceCapable pc, int idx,
         boolean cur, boolean next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingCharField(PersistenceCapable pc, int idx, char cur,
         char next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingByteField(PersistenceCapable pc, int idx, byte cur,
         byte next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingShortField(PersistenceCapable pc, int idx, short cur,
         short next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingIntField(PersistenceCapable pc, int idx, int cur,
         int next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingLongField(PersistenceCapable pc, int idx, long cur,
         long next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingFloatField(PersistenceCapable pc, int idx, float cur,
         float next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingDoubleField(PersistenceCapable pc, int idx, double cur,
         double next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingStringField(PersistenceCapable pc, int idx, String cur,
         String next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void settingObjectField(PersistenceCapable pc, int idx, Object cur,
         Object next, int set) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedBooleanField(PersistenceCapable pc, int idx,
         boolean cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedCharField(PersistenceCapable pc, int idx, char cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedByteField(PersistenceCapable pc, int idx, byte cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedShortField(PersistenceCapable pc, int idx, short cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedIntField(PersistenceCapable pc, int idx, int cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedLongField(PersistenceCapable pc, int idx, long cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedFloatField(PersistenceCapable pc, int idx, float cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedDoubleField(PersistenceCapable pc, int idx,
         double cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedStringField(PersistenceCapable pc, int idx,
         String cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void providedObjectField(PersistenceCapable pc, int idx,
         Object cur) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean replaceBooleanField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public char replaceCharField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public byte replaceByteField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public short replaceShortField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int replaceIntField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public long replaceLongField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public float replaceFloatField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public double replaceDoubleField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public String replaceStringField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object replaceObjectField(PersistenceCapable pc, int idx) {
         throw new UnsupportedOperationException();
     }
@@ -283,75 +332,93 @@ public class ObjectIdStateManager
     // OpenJPAStateManager implementation
     ///////////////////////////////////
 
+    @Override
     public void initialize(Class forType, PCState state) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void load(FetchConfiguration fetch) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getManagedInstance() {
         return _oid;
     }
 
+    @Override
     public PersistenceCapable getPersistenceCapable() {
         return ImplHelper.toPersistenceCapable(_oid,
             _vmd.getRepository().getConfiguration());
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _vmd.getEmbeddedMetaData();
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return _owner;
     }
 
+    @Override
     public int getOwnerIndex() {
         return _vmd.getFieldMetaData().getIndex();
     }
 
+    @Override
     public boolean isEmbedded() {
         return true;
     }
 
+    @Override
     public boolean isFlushed() {
         return false;
     }
 
+    @Override
     public boolean isFlushedDirty() {
         return false;
     }
 
+    @Override
     public boolean isProvisional() {
         return false;
     }
 
+    @Override
     public BitSet getLoaded() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public BitSet getDirty() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public BitSet getFlushed() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public BitSet getUnloaded(FetchConfiguration fetch) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object newProxy(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object newFieldProxy(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isDefaultValue(int field) {
         Object val = getValue(field);
         if (val == null)
@@ -377,126 +444,157 @@ public class ObjectIdStateManager
         }
     }
 
+    @Override
     public StoreContext getContext() {
         return (_owner == null) ? null : _owner.getContext();
     }
 
+    @Override
     public PCState getPCState() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getObjectId() {
         return null;
     }
 
+    @Override
     public void setObjectId(Object oid) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean assignObjectId(boolean flush) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getId() {
         return null;
     }
 
+    @Override
     public Object getLock() {
         return null;
     }
 
+    @Override
     public void setLock(Object lock) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setNextVersion(Object version) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object getImplData() {
         return null;
     }
 
+    @Override
     public Object setImplData(Object data, boolean cacheable) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isImplDataCacheable() {
         return false;
     }
 
+    @Override
     public Object getImplData(int field) {
         return null;
     }
 
+    @Override
     public Object setImplData(int field, Object data) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isImplDataCacheable(int field) {
         return false;
     }
 
+    @Override
     public Object getIntermediate(int field) {
         return null;
     }
 
+    @Override
     public void setIntermediate(int field, Object data) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removed(int field, Object removed, boolean key) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean beforeRefresh(boolean all) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void dirty(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void storeBoolean(int field, boolean extVal) {
         setValue(field, (extVal) ? Boolean.TRUE : Boolean.FALSE, true);
     }
 
+    @Override
     public void storeByte(int field, byte extVal) {
         setValue(field, Byte.valueOf(extVal), true);
     }
 
+    @Override
     public void storeChar(int field, char extVal) {
         setValue(field, Character.valueOf(extVal), true);
     }
 
+    @Override
     public void storeInt(int field, int extVal) {
         setValue(field, extVal, true);
     }
 
+    @Override
     public void storeShort(int field, short extVal) {
         setValue(field, Short.valueOf(extVal), true);
     }
 
+    @Override
     public void storeLong(int field, long extVal) {
         setValue(field, extVal, true);
     }
 
+    @Override
     public void storeFloat(int field, float extVal) {
         setValue(field, Float.valueOf(extVal), true);
     }
 
+    @Override
     public void storeDouble(int field, double extVal) {
         setValue(field, Double.valueOf(extVal), true);
     }
 
+    @Override
     public void storeString(int field, String extVal) {
         setValue(field, extVal, extVal != null);
     }
 
+    @Override
     public void storeObject(int field, Object extVal) {
         setValue(field, extVal, extVal != null);
     }
 
+    @Override
     public void store(int field, Object extVal) {
         boolean forceInst = true;
         if (extVal == null) {
@@ -506,90 +604,112 @@ public class ObjectIdStateManager
         setValue(field, extVal, forceInst);
     }
 
+    @Override
     public void storeBooleanField(int field, boolean extVal) {
         storeBoolean(field, extVal);
     }
 
+    @Override
     public void storeByteField(int field, byte extVal) {
         storeByte(field, extVal);
     }
 
+    @Override
     public void storeCharField(int field, char extVal) {
         storeChar(field, extVal);
     }
 
+    @Override
     public void storeIntField(int field, int extVal) {
         storeInt(field, extVal);
     }
 
+    @Override
     public void storeShortField(int field, short extVal) {
         storeShort(field, extVal);
     }
 
+    @Override
     public void storeLongField(int field, long extVal) {
         storeLong(field, extVal);
     }
 
+    @Override
     public void storeFloatField(int field, float extVal) {
         storeFloat(field, extVal);
     }
 
+    @Override
     public void storeDoubleField(int field, double extVal) {
         storeDouble(field, extVal);
     }
 
+    @Override
     public void storeStringField(int field, String extVal) {
         storeString(field, extVal);
     }
 
+    @Override
     public void storeObjectField(int field, Object extVal) {
         storeObject(field, extVal);
     }
 
+    @Override
     public void storeField(int field, Object value) {
         store(field, value);
     }
 
+    @Override
     public boolean fetchBoolean(int field) {
         return ((Boolean) getValue(field)).booleanValue();
     }
 
+    @Override
     public byte fetchByte(int field) {
         return ((Number) getValue(field)).byteValue();
     }
 
+    @Override
     public char fetchChar(int field) {
         return ((Character) getValue(field)).charValue();
     }
 
+    @Override
     public short fetchShort(int field) {
         return ((Number) getValue(field)).shortValue();
     }
 
+    @Override
     public int fetchInt(int field) {
         return ((Number) getValue(field)).intValue();
     }
 
+    @Override
     public long fetchLong(int field) {
         return ((Number) getValue(field)).longValue();
     }
 
+    @Override
     public float fetchFloat(int field) {
         return ((Number) getValue(field)).floatValue();
     }
 
+    @Override
     public double fetchDouble(int field) {
         return ((Number) getValue(field)).doubleValue();
     }
 
+    @Override
     public String fetchString(int field) {
         return (String) getValue(field);
     }
 
+    @Override
     public Object fetchObject(int field) {
         return getValue(field);
     }
 
+    @Override
     public Object fetch(int field) {
         Object ret = getValue(field);
         if (ret == null)
@@ -597,54 +717,67 @@ public class ObjectIdStateManager
         return ret;
     }
 
+    @Override
     public boolean fetchBooleanField(int field) {
         return fetchBoolean(field);
     }
 
+    @Override
     public byte fetchByteField(int field) {
         return fetchByte(field);
     }
 
+    @Override
     public char fetchCharField(int field) {
         return fetchChar(field);
     }
 
+    @Override
     public short fetchShortField(int field) {
         return fetchShort(field);
     }
 
+    @Override
     public int fetchIntField(int field) {
         return fetchInt(field);
     }
 
+    @Override
     public long fetchLongField(int field) {
         return fetchLong(field);
     }
 
+    @Override
     public float fetchFloatField(int field) {
         return fetchFloat(field);
     }
 
+    @Override
     public double fetchDoubleField(int field) {
         return fetchDouble(field);
     }
 
+    @Override
     public String fetchStringField(int field) {
         return fetchString(field);
     }
 
+    @Override
     public Object fetchObjectField(int field) {
         return fetch(field);
     }
 
+    @Override
     public Object fetchField(int field, boolean transitions) {
         return fetch(field);
     }
 
+    @Override
     public Object fetchInitialField(int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setRemote(int field, Object value) {
         store(field, value);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpCallbacks.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpCallbacks.java
index ba48a97a3..4edce1935 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpCallbacks.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpCallbacks.java
@@ -26,21 +26,21 @@ package org.apache.openjpa.kernel;
  */
 public interface OpCallbacks {
 
-    public static final int OP_PERSIST = 0;
-    public static final int OP_DELETE = 1;
-    public static final int OP_REFRESH = 2;
-    public static final int OP_RETRIEVE = 3;
-    public static final int OP_RELEASE = 4;
-    public static final int OP_EVICT = 5;
-    public static final int OP_ATTACH = 6;
-    public static final int OP_DETACH = 7;
-    public static final int OP_NONTRANSACTIONAL = 8;
-    public static final int OP_TRANSACTIONAL = 9;
-    public static final int OP_LOCK = 10;
+    int OP_PERSIST = 0;
+    int OP_DELETE = 1;
+    int OP_REFRESH = 2;
+    int OP_RETRIEVE = 3;
+    int OP_RELEASE = 4;
+    int OP_EVICT = 5;
+    int OP_ATTACH = 6;
+    int OP_DETACH = 7;
+    int OP_NONTRANSACTIONAL = 8;
+    int OP_TRANSACTIONAL = 9;
+    int OP_LOCK = 10;
 
-    public static final int ACT_NONE = 0;
-    public static final int ACT_CASCADE = 2 << 0;
-    public static final int ACT_RUN = 2 << 1;
+    int ACT_NONE = 0;
+    int ACT_CASCADE = 2 << 0;
+    int ACT_RUN = 2 << 1;
 
     /**
      * Process operation argument. Throw proper
@@ -51,5 +51,5 @@ public interface OpCallbacks {
      * @param sm the argument's state manager, or null if none
      * @return the action to take on the argument
      */
-    public int processArgument(int op, Object arg, OpenJPAStateManager sm);
+    int processArgument(int op, Object arg, OpenJPAStateManager sm);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPASavepoint.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPASavepoint.java
index 6482cc32b..1e32f4e4d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPASavepoint.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPASavepoint.java
@@ -30,9 +30,8 @@ import java.util.Map;
  * @author Steve Kim
  * @since 0.3.4
  */
-@SuppressWarnings("serial")
 public class OpenJPASavepoint implements Serializable {
-
+    private static final long serialVersionUID = 1L;
     private final Broker _broker;
     private final String _name;
     private final boolean _copy;
@@ -84,7 +83,7 @@ public class OpenJPASavepoint implements Serializable {
         if (_saved != null)
             throw new IllegalStateException();
 
-        _saved = new HashMap<StateManagerImpl, SavepointFieldManager>((int) (states.size() * 1.33 + 1));
+        _saved = new HashMap<>((int) (states.size() * 1.33 + 1));
         for (StateManagerImpl sm : states) {
             _saved.put(sm, new SavepointFieldManager(sm, _copy));
         }
@@ -114,7 +113,7 @@ public class OpenJPASavepoint implements Serializable {
         else {
             // merge all changes into one collection, allowing for later
             // SavepointFieldManagers to replace previous ones.
-            saved = new HashMap<StateManagerImpl, SavepointFieldManager>();
+            saved = new HashMap<>();
             for (OpenJPASavepoint savepoint : previous)
                 saved.putAll(savepoint.getStates());
             saved.putAll(_saved);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java
index c0bcb3118..1fc79ce27 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java
@@ -47,18 +47,18 @@ public interface OpenJPAStateManager
     /**
      * A user is setting the field.
      */
-    public static final int SET_USER = 0;
+    int SET_USER = 0;
 
     /**
      * The remote broker framework is setting the field on the server.
      */
-    public static final int SET_REMOTE = 1;
+    int SET_REMOTE = 1;
 
     /**
      * The field is being attached by a detached state manager; the value is
      * from the detached instance.
      */
-    public static final int SET_ATTACH = 2;
+    int SET_ATTACH = 2;
 
     /**
      * Initialize the state manager with a new instance of the given
@@ -71,86 +71,86 @@ public interface OpenJPAStateManager
      * @param state the initial state to which to set the instance
      * @since 0.3.1.2
      */
-    public void initialize(Class forType, PCState state);
+    void initialize(Class forType, PCState state);
 
     /**
      * Load fetch group fields.
      */
-    public void load(FetchConfiguration fetch);
+    void load(FetchConfiguration fetch);
 
     /**
      * Return the managed instance.
      */
-    public Object getManagedInstance();
+    Object getManagedInstance();
 
     /**
      * Return the {@link PersistenceCapable} instance that provides access to
      * the instance managed by this state manager. May be a proxy around
      * the actual managed instance.
      */
-    public PersistenceCapable getPersistenceCapable();
+    PersistenceCapable getPersistenceCapable();
 
     /**
      * Get the metadata for this instance.
      */
-    public ClassMetaData getMetaData();
+    ClassMetaData getMetaData();
 
     /**
      * Return the owning state if this is an embedded instance.
      */
-    public OpenJPAStateManager getOwner();
+    OpenJPAStateManager getOwner();
 
     /**
      * Return the owning value's field index
      *
      * @since 1.1.0
      */
-    public int getOwnerIndex();
+    int getOwnerIndex();
 
     /**
      * Return true if this instance has an owner, meaning it is an embedded
      * value.
      */
-    public boolean isEmbedded();
+    boolean isEmbedded();
 
     /**
      * Return whether this object has been flushed to the datastore in this
      * transaction.
      */
-    public boolean isFlushed();
+    boolean isFlushed();
 
     /**
      * Return whether this object has been flushed, then dirtied again.
      */
-    public boolean isFlushedDirty();
+    boolean isFlushedDirty();
 
     /**
      * Return whether this object is provisionally persistent.
      */
-    public boolean isProvisional();
+    boolean isProvisional();
 
     /**
      * Return a read-only mask of the indexes of all loaded fields.
      */
-    public BitSet getLoaded();
+    BitSet getLoaded();
 
     /**
      * Return a read-only mask of the indexes of all dirty fields.
      */
-    public BitSet getDirty();
+    BitSet getDirty();
 
     /**
      * Return a read-only mask of the indexes of all fields that have been
      * flushed since they were last changed.
      */
-    public BitSet getFlushed();
+    BitSet getFlushed();
 
     /**
      * Return a mutable mask of the unloaded fields that need loading based
      * on the given fetch configuration. Pass in null to retrieve all
      * unloaded fields.
      */
-    public BitSet getUnloaded(FetchConfiguration fetch);
+    BitSet getUnloaded(FetchConfiguration fetch);
 
     /**
      * Create a new hollow proxy instance for the given field. In cases where
@@ -163,7 +163,7 @@ public interface OpenJPAStateManager
      * state is initialized. Calling {@link #storeField} or {@link #store}
      * will set the proxy's owner automatically.
      */
-    public Object newProxy(int field);
+    Object newProxy(int field);
 
     /**
      * Create a new hollow proxy instance for the given field. This method
@@ -172,22 +172,22 @@ public interface OpenJPAStateManager
      *
      * @see #newProxy
      */
-    public Object newFieldProxy(int field);
+    Object newFieldProxy(int field);
 
     /**
      * Return true if the given field has a default value.
      */
-    public boolean isDefaultValue(int field);
+    boolean isDefaultValue(int field);
 
     /**
      * Return the managing context.
      */
-    public StoreContext getContext();
+    StoreContext getContext();
 
     /**
      * Return the state that this object is in.
      */
-    public PCState getPCState();
+    PCState getPCState();
 
     /**
      * Return the identifier for this state manager. This may return a
@@ -195,14 +195,14 @@ public interface OpenJPAStateManager
      * assigned an object id, or for non-persistent or embedded instances.
      * For all other instances this method is the same as {@link #getObjectId}.
      */
-    public Object getId();
+    Object getId();
 
     /**
      * Return the instance's object id. This method will return null if no
      * oid has been assigned. Oids are assigned to newly-persisted instances
      * when the user first asks for it, or on flush.
      */
-    public Object getObjectId();
+    Object getObjectId();
 
     /**
      * Set the object id for the managed instance. Some back ends may not be
@@ -211,7 +211,7 @@ public interface OpenJPAStateManager
      * application identity objects through the <code>storeXXXField</code>
      * methods will automatically change the oid.
      */
-    public void setObjectId(Object oid);
+    void setObjectId(Object oid);
 
     /**
      * Ask the store manager to assign a permanent oid to this new instance.
@@ -220,24 +220,24 @@ public interface OpenJPAStateManager
      * false, the oid may be left unassigned
      * @return true if an oid assigned, false otherwise
      */
-    public boolean assignObjectId(boolean flush);
+    boolean assignObjectId(boolean flush);
 
     /**
      * The lock object set for this instance. This object is generally
      * managed by the system lock manager.
      */
-    public Object getLock();
+    Object getLock();
 
     /**
      * The lock object set for this instance. This object is generally
      * managed by the system lock manager.
      */
-    public void setLock(Object lock);
+    void setLock(Object lock);
 
     /**
      * Return the current version indicator for this instance.
      */
-    public Object getVersion();
+    @Override Object getVersion();
 
     /**
      * Set the version indicator for this instance, as loaded from the
@@ -247,31 +247,31 @@ public interface OpenJPAStateManager
      * require vendor-specific classes, because they are transferred to
      * detached objects.
      */
-    public void setVersion(Object version);
+    void setVersion(Object version);
 
     /**
      * Set the next version indicator in the datastore pending a successful
      * flush. The {@link StoreManager} uses this method during flush.
      */
-    public void setNextVersion(Object version);
+    void setNextVersion(Object version);
 
     /**
      * Returns true if this state needs to issue a version update, possibly
      * as a result of being locked.
      */
-    public boolean isVersionUpdateRequired();
+    boolean isVersionUpdateRequired();
 
     /**
      * Returns true if this state needs to issue a version check at flush time.
      */
-    public boolean isVersionCheckRequired();
+    boolean isVersionCheckRequired();
 
     /**
      * An object that concrete back ends can associate with each instance.
      * This object is not used or modified in any way by the generic
      * persistence layer.
      */
-    public Object getImplData();
+    Object getImplData();
 
     /**
      * An object that concrete back ends can associate with each instance.
@@ -282,19 +282,19 @@ public interface OpenJPAStateManager
      * in different contexts if L2 caching is enabled
      * @return the previous impl data value, if any
      */
-    public Object setImplData(Object data, boolean cacheable);
+    Object setImplData(Object data, boolean cacheable);
 
     /**
      * Whether the instance-level impl data can be shared among instances
      * in different contexts if L2 caching is enabled.
      */
-    public boolean isImplDataCacheable();
+    boolean isImplDataCacheable();
 
     /**
      * Field-level impl data. Field-level data only applies to loaded fields,
      * and is cleared when the field is cleared.
      */
-    public Object getImplData(int field);
+    Object getImplData(int field);
 
     /**
      * Field-level impl data. Field-level data only applies to loaded fields,
@@ -304,13 +304,13 @@ public interface OpenJPAStateManager
      *
      * @return the previous impl data value, if any
      */
-    public Object setImplData(int field, Object data);
+    Object setImplData(int field, Object data);
 
     /**
      * Whether the field's impl data is loaded and can be shared among
      * instances in different contexts if L2 caching is enabled.
      */
-    public boolean isImplDataCacheable(int field);
+    boolean isImplDataCacheable(int field);
 
     /**
      * Use intermediate field data to store intermediate information that
@@ -319,7 +319,7 @@ public interface OpenJPAStateManager
      * This data should be cacheable; the datastore cache will attempt to
      * cache it if the field value is not available.
      */
-    public Object getIntermediate(int field);
+    Object getIntermediate(int field);
 
     /**
      * Use intermediate field data to store intermediate information that
@@ -328,64 +328,64 @@ public interface OpenJPAStateManager
      * This data should be cacheable; the datastore cache will attempt to
      * cache it if the field value is not available.
      */
-    public void setIntermediate(int field, Object value);
+    void setIntermediate(int field, Object value);
 
     /**
      * Return the external value of the given field.
      */
-    public boolean fetchBoolean(int field);
+    boolean fetchBoolean(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public byte fetchByte(int field);
+    byte fetchByte(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public char fetchChar(int field);
+    char fetchChar(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public double fetchDouble(int field);
+    double fetchDouble(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public float fetchFloat(int field);
+    float fetchFloat(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public int fetchInt(int field);
+    int fetchInt(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public long fetchLong(int field);
+    long fetchLong(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public Object fetchObject(int field);
+    Object fetchObject(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public short fetchShort(int field);
+    short fetchShort(int field);
 
     /**
      * Return the external value of the given field.
      */
-    public String fetchString(int field);
+    String fetchString(int field);
 
     /**
      * Return the externalized value of the field with the given index as an
      * object. If there is no externalizer, this is equivalent to
      * {@link #fetchField}.
      */
-    public Object fetch(int field);
+    Object fetch(int field);
 
     /**
      * Return the value of the field with the given index as an object.
@@ -393,7 +393,7 @@ public interface OpenJPAStateManager
      * @param transitions if true, this method will cause state transitions
      * to occur as if the field were accessed normally
      */
-    public Object fetchField(int field, boolean transitions);
+    Object fetchField(int field, boolean transitions);
 
     /**
      * Return the value of the field at the specified index as of the
@@ -401,79 +401,79 @@ public interface OpenJPAStateManager
      *
      * @since 0.3.1.1
      */
-    public Object fetchInitialField(int field);
+    Object fetchInitialField(int field);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeBoolean(int field, boolean externalVal);
+    void storeBoolean(int field, boolean externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeByte(int field, byte externalVal);
+    void storeByte(int field, byte externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeChar(int field, char externalVal);
+    void storeChar(int field, char externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeDouble(int field, double externalVal);
+    void storeDouble(int field, double externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeFloat(int field, float externalVal);
+    void storeFloat(int field, float externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeInt(int field, int externalVal);
+    void storeInt(int field, int externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeLong(int field, long externalVal);
+    void storeLong(int field, long externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeObject(int field, Object externalVal);
+    void storeObject(int field, Object externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeShort(int field, short externalVal);
+    void storeShort(int field, short externalVal);
 
     /**
      * Set the given external value back into the given field.
      */
-    public void storeString(int field, String externalVal);
+    void storeString(int field, String externalVal);
 
     /**
      * Set the value of the field with the given index as from the external
      * object value. If there is no externalizer, this is equivalent to
      * {@link #storeField}.
      */
-    public void store(int field, Object value);
+    void store(int field, Object value);
 
     /**
      * Set the value of the field with the given index as an object.
      */
-    public void storeField(int field, Object value);
+    void storeField(int field, Object value);
 
     /**
      * Mark the given field as dirty.
      */
-    public void dirty(int field);
+    void dirty(int field);
 
     /**
      * Notification that an element has been removed from the given field.
      */
-    public void removed(int field, Object removed, boolean key);
+    void removed(int field, Object removed, boolean key);
 
     /**
      * Prepare the instance for refresh
@@ -483,7 +483,7 @@ public interface OpenJPAStateManager
      * @return true if the object needs a refresh, false otherwise
      * @see Broker#refresh
      */
-    public boolean beforeRefresh(boolean refreshAll);
+    boolean beforeRefresh(boolean refreshAll);
 
     /**
      * Set the given field to the given value. Make the field dirty as
@@ -496,7 +496,7 @@ public interface OpenJPAStateManager
      *
      * @since 0.3.1
      */
-    public void setRemote (int field, Object value);
+    void setRemote (int field, Object value);
 
     /**
      * Some field types (collection proxies) support delayed loading.  Delayed loading
@@ -505,7 +505,7 @@ public interface OpenJPAStateManager
      *
      * @return true if the field is setup for delayed access
      */
-    public boolean isDelayed(int field);
+    boolean isDelayed(int field);
 
     /**
      * Some field types (collection proxies) support delayed loading.  Delayed loading
@@ -513,17 +513,17 @@ public interface OpenJPAStateManager
      * returned without actually loading it.
      *
      */
-    public void setDelayed(int field, boolean delay);
+    void setDelayed(int field, boolean delay);
 
     /**
      * If a field was marked delayed in a previous load operation this method can be
      * used to load the field.
      */
-    public void loadDelayedField(int field);
+    void loadDelayedField(int field);
 
     /**
      * Fetch an object field by index.
      */
-    public Object fetchObjectField(int field);
+    @Override Object fetchObjectField(int field);
 }
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OrderingMergedResultObjectProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OrderingMergedResultObjectProvider.java
index 09d2dde60..27a1cee2d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OrderingMergedResultObjectProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OrderingMergedResultObjectProvider.java
@@ -53,6 +53,7 @@ public class OrderingMergedResultObjectProvider
         _params = params;
     }
 
+    @Override
     protected Object getOrderingValue(Object val, int idx,
         ResultObjectProvider rop) {
         StoreQuery.Executor exec = (_execs.length == 1) ? _execs[0]
@@ -78,6 +79,7 @@ public class OrderingMergedResultObjectProvider
             _asc = asc;
         }
 
+        @Override
         public int compare(Object o1, Object o2) {
             if (_asc.length == 1)
                 return cmp(o1, o2, _asc[0]);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCData.java
index de9556bfd..44e0c0f04 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCData.java
@@ -34,32 +34,32 @@ public interface PCData
     /**
      * Return the id of this instance.
      */
-    public Object getId();
+    Object getId();
 
     /**
      * Return the type of this instance.
      */
-    public Class getType();
+    Class getType();
 
     /**
      * Returns the instance-level impl data, or null if none.
      */
-    public Object getImplData();
+    Object getImplData();
 
     /**
      * Sets the stored instance-level impl data.
      */
-    public void setImplData(Object val);
+    void setImplData(Object val);
 
     /**
      * Returns the current version object that this data was loaded from.
      */
-    public Object getVersion();
+    Object getVersion();
 
     /**
      * Sets the current version object that this data was loaded from.
      */
-    public void setVersion(Object version);
+    void setVersion(Object version);
 
     /**
      * Loads all fields that are currently stored in the cache
@@ -69,7 +69,7 @@ public interface PCData
      * @param fetch the fetch configuration to use for loading related objects
      * @param context current context information
      */
-    public void load(OpenJPAStateManager sm, FetchConfiguration fetch,
+    void load(OpenJPAStateManager sm, FetchConfiguration fetch,
         Object context);
 
     /**
@@ -82,31 +82,31 @@ public interface PCData
      * @param fetch the fetch configuration to use for loading related objects
      * @param context current context information
      */
-    public void load(OpenJPAStateManager sm, BitSet fields,
+    void load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, Object context);
 
     /**
      * Store all loaded fields of the state manager.
      */
-    public void store(OpenJPAStateManager sm);
+    void store(OpenJPAStateManager sm);
 
     /**
      * Store the given fields from the state manager.
      */
-    public void store(OpenJPAStateManager sm, BitSet fields);
+    void store(OpenJPAStateManager sm, BitSet fields);
 
     /**
      * Return the data stored in the given field index.
      */
-    public Object getData(int i);
+    Object getData(int i);
 
     /**
      * Whether the given field index has stored data.
      */
-    public boolean isLoaded(int i);
+    boolean isLoaded(int i);
 
     /**
      * Get the name of the cache where this data is stored.
      */
-    public String getCache();
+    String getCache();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java
index 280f88b77..9916c6df4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java
@@ -33,6 +33,8 @@ import org.apache.openjpa.meta.FieldMetaData;
 public class PCDataImpl
     extends AbstractPCData {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Object _oid;
     private final Class<?> _type;
     private final String _cache;
@@ -59,18 +61,22 @@ public class PCDataImpl
         _loaded = new BitSet(len);
     }
 
+    @Override
     public Object getId() {
         return _oid;
     }
 
+    @Override
     public Class<?> getType() {
         return _type;
     }
 
+    @Override
     public BitSet getLoaded() {
         return _loaded;
     }
 
+    @Override
     public Object getData(int index) {
         // make sure index is actually loaded to avoid returning an
         // intermediate value
@@ -87,10 +93,12 @@ public class PCDataImpl
         _data[index] = null;
     }
 
+    @Override
     public Object getImplData() {
         return _impl;
     }
 
+    @Override
     public void setImplData(Object val) {
         _impl = val;
     }
@@ -117,6 +125,7 @@ public class PCDataImpl
         _data[index] = val;
     }
 
+    @Override
     public boolean isLoaded(int index) {
         return _loaded.get(index);
     }
@@ -128,14 +137,17 @@ public class PCDataImpl
             _loaded.clear(index);
     }
 
+    @Override
     public Object getVersion() {
         return _version;
     }
 
+    @Override
     public void setVersion(Object version) {
         _version = version;
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, FetchConfiguration fetch,
         Object context) {
         loadVersion(sm);
@@ -154,6 +166,7 @@ public class PCDataImpl
         }
     }
 
+    @Override
     public void load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, Object context) {
         loadVersion(sm);
@@ -237,6 +250,7 @@ public class PCDataImpl
             sm.setIntermediate(index, inter);
     }
 
+    @Override
     public void store(OpenJPAStateManager sm) {
         storeVersion(sm);
         storeImplData(sm);
@@ -251,6 +265,7 @@ public class PCDataImpl
         }
     }
 
+    @Override
     public void store(OpenJPAStateManager sm, BitSet fields) {
         storeVersion(sm);
         storeImplData(sm);
@@ -284,7 +299,7 @@ public class PCDataImpl
      * Store field-level information from the given state manager.
      */
     protected void storeField(OpenJPAStateManager sm, FieldMetaData fmd) {
-        if (fmd.getManagement() != fmd.MANAGE_PERSISTENT)
+        if (fmd.getManagement() != FieldMetaData.MANAGE_PERSISTENT)
             return;
 
         int index = fmd.getIndex();
@@ -335,10 +350,12 @@ public class PCDataImpl
      * Return a new {@link PCData} implementation of the right type for
      * embedded instances. Returns a {@link PCDataImpl} by default.
      */
+    @Override
     public AbstractPCData newEmbeddedPCData(OpenJPAStateManager sm) {
         return new PCDataImpl(sm.getId (), sm.getMetaData (), _cache);
 	}
 
+    @Override
     public String getCache() {
         return _cache;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCResultObjectProvider.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCResultObjectProvider.java
index 0d10b5832..34d2c8e7b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCResultObjectProvider.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCResultObjectProvider.java
@@ -36,7 +36,7 @@ public interface PCResultObjectProvider
      *
      * @see StoreManager#initialize
      */
-    public void initialize(OpenJPAStateManager sm, PCState state,
+    void initialize(OpenJPAStateManager sm, PCState state,
         FetchConfiguration fetch)
         throws Exception;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCState.java
index 9245aa9d6..a6286e797 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCState.java
@@ -37,9 +37,8 @@ import org.apache.openjpa.util.InvalidStateException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class PCState
-    implements Serializable {
+public class PCState implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Persistent-New
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
index 8e0691c34..7ff2bae45 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCleanState.java
@@ -25,9 +25,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class PCleanState
-    extends PCState {
+class PCleanState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -37,56 +36,69 @@ class PCleanState
         context.setDirty(false);
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return PNONTRANS;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         return PNONTRANS;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return PDELETED;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return PNONTRANS;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState evict(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return PDIRTY;
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return PDIRTY;
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-Clean";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
index 2e3f5c944..a1b68898a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedFlushedState.java
@@ -25,19 +25,21 @@ package org.apache.openjpa.kernel;
  *
  * @author Patrick Linskey
  */
-@SuppressWarnings("serial")
-class PDeletedFlushedState
-    extends PDeletedState {
+class PDeletedFlushedState extends PDeletedState {
+    private static final long serialVersionUID = 1L;
 
+    @Override
     PCState flush(StateManagerImpl context) {
         return this;
     }
 
+    @Override
     PCState persist(StateManagerImpl context) {
         context.eraseFlush();
         return PNEW;
     }
 
+    @Override
     public String toString() {
         return "Persistent-Deleted-Flushed";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
index 69e7d43b4..07c9d66f7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java
@@ -25,73 +25,87 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class PDeletedState
-    extends PCState {
+class PDeletedState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
         context.saveFields(false);
     }
 
+    @Override
     PCState flush(StateManagerImpl context) {
         return PDELETEDFLUSHED;
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return PNONTRANS;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("deleted", context);
     }
 
+    @Override
     PCState persist(StateManagerImpl context) {
         return (context.getDirty().length() > 0) ? PDIRTY : PCLEAN;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isDeleted() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-Deleted";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
index 5a7d63d39..7c61fe743 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDirtyState.java
@@ -25,74 +25,88 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class PDirtyState
-    extends PCState {
+class PDirtyState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
         context.saveFields(false);
     }
 
+    @Override
     void beforeFlush(StateManagerImpl context, boolean logical,
         OpCallbacks call) {
         context.preFlush(logical, call);
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return PNONTRANS;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return PNONTRANS;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return PDELETED;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("dirty", context);
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return error("dirty", context);
     }
 
+    @Override
     boolean isVersionCheckRequired(StateManagerImpl context) {
         return !context.isFlushed() || context.isFlushedDirty();
     }
 
+    @Override
     PCState afterRefresh() {
         return PCLEAN;
     }
 
+    @Override
     PCState afterOptimisticRefresh() {
         return PNONTRANS;
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-Dirty";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
index 0c03ede45..5950fc5c4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java
@@ -25,69 +25,83 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class PNewDeletedState
-    extends PCState {
+class PNewDeletedState extends PCState {
+    private static final long serialVersionUID = 1L;
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return TRANSIENT;
     }
 
+    @Override
     PCState persist(StateManagerImpl context) {
         context.eraseFlush();
         return PNEW;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("deleted", context);
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isNew() {
         return true;
     }
 
+    @Override
     boolean isDeleted() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-New-Deleted";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
index 1bf154dd9..9676d1fe9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedFlushedState.java
@@ -25,19 +25,20 @@ package org.apache.openjpa.kernel;
  *
  * @author Patrick Linskey
  */
-@SuppressWarnings("serial")
-class PNewFlushedDeletedFlushedState
-    extends PNewFlushedDeletedState {
+class PNewFlushedDeletedFlushedState extends PNewFlushedDeletedState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
     }
 
+    @Override
     PCState persist(StateManagerImpl context) {
         context.eraseFlush();
         return PNEW;
     }
 
+    @Override
     public String toString() {
         return "Persistent-New-Flushed-Deleted-Flushed";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
index 56e8f8432..8f466ccb4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java
@@ -25,72 +25,87 @@ package org.apache.openjpa.kernel;
  *
  * @author Patrick Linskey
  */
-@SuppressWarnings("serial")
-class PNewFlushedDeletedState
-    extends PCState {
+class PNewFlushedDeletedState extends PCState {
+    private static final long serialVersionUID = 1L;
 
+    @Override
     PCState flush(StateManagerImpl context) {
         return PNEWFLUSHEDDELETEDFLUSHED;
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return TRANSIENT;
     }
 
+    @Override
     PCState persist(StateManagerImpl context) {
         return PNEW;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("deleted", context);
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isNew() {
         return true;
     }
 
+    @Override
     boolean isDeleted() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-New-Flushed-Deleted";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewProvisionalState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewProvisionalState.java
index 0a374c6ff..dc6b21470 100755
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewProvisionalState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewProvisionalState.java
@@ -26,9 +26,8 @@ package org.apache.openjpa.kernel;
  * @author Steve Kim
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class PNewProvisionalState
-    extends PCState {
+class PNewProvisionalState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -37,62 +36,76 @@ class PNewProvisionalState
         context.saveFields(false);
     }
 
+    @Override
     PCState persist(StateManagerImpl context) {
         return PNEW;
     }
 
+    @Override
     PCState nonprovisional(StateManagerImpl context, boolean logical,
         OpCallbacks call) {
         context.preFlush(logical, call);
         return PNEW;
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return TRANSIENT;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return TRANSIENT;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isNew() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     boolean isProvisional() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-New-Provisional";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
index e58ff4a37..78afc7393 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewState.java
@@ -25,9 +25,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class PNewState
-    extends PCState {
+class PNewState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -39,28 +38,34 @@ class PNewState
         context.saveFields(false);
     }
 
+    @Override
     void beforeFlush(StateManagerImpl context, boolean logical,
         OpCallbacks call) {
         context.preFlush(logical, call);
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return PNONTRANS;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return TRANSIENT;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         if (context.isFlushed())
@@ -68,34 +73,42 @@ class PNewState
         return PNEWDELETED;
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("new", context);
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return error("new", context);
     }
 
+    @Override
     boolean isVersionCheckRequired(StateManagerImpl context) {
         return context.isFlushedDirty();
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isNew() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-New";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
index eeb1749f4..42bfd13d8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDeletedState.java
@@ -24,60 +24,72 @@ package org.apache.openjpa.kernel;
  *
  * @author Steve Kim
  */
-@SuppressWarnings("serial")
-public class PNonTransDeletedState
-    extends PCState {
+public class PNonTransDeletedState extends PCState {
+    private static final long serialVersionUID = 1L;
 
+    @Override
     PCState persist(StateManagerImpl context) {
         return PNONTRANS;
     }
 
+    @Override
     PCState transactional(StateManagerImpl context) {
         return PDELETED;
     }
 
+    @Override
     PCState beforeRead(StateManagerImpl context, int field) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeNontransactionalRead(StateManagerImpl context, int field) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeOptimisticRead(StateManagerImpl context, int field) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     PCState beforeNontransactionalWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return error("deleted", context);
     }
 
+    @Override
     boolean isPendingTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isDeleted() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-Notransactional-Deleted";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
index a1f65b8b1..be8d2db48 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransDirtyState.java
@@ -26,48 +26,56 @@ package org.apache.openjpa.kernel;
  *
  * @author Steve Kim
  */
-@SuppressWarnings("serial")
-class PNonTransDirtyState
-    extends PCState {
+class PNonTransDirtyState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
         context.saveFields(false);
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         return PNONTRANSDELETED;
     }
 
+    @Override
     PCState transactional(StateManagerImpl context) {
         return PDIRTY;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return error("dirty", context);
     }
 
+    @Override
     PCState evict(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState afterNontransactionalRefresh() {
         return PNONTRANS;
     }
 
+    @Override
     boolean isPendingTransactional() {
         return true;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-Notransactional-Dirty";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
index 9b094f636..f43656aff 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransNewState.java
@@ -24,9 +24,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Steve Kim
  */
-@SuppressWarnings("serial")
-class PNonTransNewState
-    extends PCState {
+class PNonTransNewState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -34,34 +33,42 @@ class PNonTransNewState
         context.setDirty(true);
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState transactional(StateManagerImpl context) {
         return PNEW;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     boolean isNew() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     boolean isPendingTransactional() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-Notransactional-New";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
index fcbb30a6f..fdba7f444 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java
@@ -30,10 +30,8 @@ import org.apache.openjpa.lib.util.Localizer;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class PNonTransState
-    extends PCState {
-
+class PNonTransState extends PCState {
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage
         (PNonTransState.class);
 
@@ -50,6 +48,7 @@ class PNonTransState
         context.clearSavedFields();
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         context.preDelete();
         if (!context.getBroker().isActive())
@@ -57,6 +56,7 @@ class PNonTransState
         return PDELETED;
     }
 
+    @Override
     PCState transactional(StateManagerImpl context) {
         // state is discarded when entering the transaction
         if (!context.getBroker().getOptimistic()
@@ -65,24 +65,29 @@ class PNonTransState
         return PCLEAN;
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState evict(StateManagerImpl context) {
         return HOLLOW;
     }
 
+    @Override
     PCState beforeRead(StateManagerImpl context, int field) {
         // state is discarded when entering the transaction
         context.clearFields();
         return PCLEAN;
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return beforeWrite(context, field, mutate, false);
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         if (context.getBroker().getAutoClear() == AutoClear.CLEAR_ALL)
@@ -111,20 +116,23 @@ class PNonTransState
             if (context.getDirty().length() > 0)
                 context.saveFields(true);
             context.clearFields();
-            context.load(null, context.LOAD_FGS, null, null, true);
+            context.load(null, StateManagerImpl.LOAD_FGS, null, null, true);
         }
         return PDIRTY;
     }
 
+    @Override
     PCState beforeNontransactionalWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return PNONTRANSDIRTY;
     }
 
+    @Override
     boolean isPersistent() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Persistent-Notransactional";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQuery.java
index c4b40daec..db3d56f6a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQuery.java
@@ -55,22 +55,22 @@ public interface PreparedQuery  {
      * Get the immutable identifier of this receiver used for
      * * {@link PreparedQueryCache cache}.
      */
-	public String getIdentifier();
+	String getIdentifier();
 
 	/**
 	 * Get the target database query.
 	 */
-    public String getTargetQuery();
+    String getTargetQuery();
 
     /**
      * Get the original query.
      */
-    public String getOriginalQuery();
+    String getOriginalQuery();
 
     /**
      * Gets the language in which this query is expressed.
      */
-    public String getLanguage();
+    String getLanguage();
 
     /**
      * Fill in the post-compilation state of the given Query. This must be
@@ -80,7 +80,7 @@ public interface PreparedQuery  {
      * @param q A Query which has been substituted by this receiver and hence
      * does not have its post-compilation state.
      */
-	public void setInto(Query q);
+	void setInto(Query q);
 
 	/**
 	 * Initialize from the given argument.
@@ -91,12 +91,12 @@ public interface PreparedQuery  {
 	 * @return Exclusion if this receiver can initialize itself from the given
 	 * argument. false otherwise.
 	 */
-	public Exclusion initialize(Object o);
+	Exclusion initialize(Object o);
 
 	/**
 	 * Affirms if this receiver has been initialized.
 	 */
-	public boolean isInitialized();
+	boolean isInitialized();
 
 	/**
      * Get the list of parameters in a map where an entry represents a parameter
@@ -107,6 +107,6 @@ public interface PreparedQuery  {
 	 * @param user the map of parameter key and value set by the user on the
 	 * original query.
 	 */
-	public Map reparametrize(Map user, Broker broker);
+	Map reparametrize(Map user, Broker broker);
 
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQueryCache.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQueryCache.java
index 1ff6e07dc..d23311fcd 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQueryCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQueryCache.java
@@ -80,7 +80,7 @@ public interface PreparedQueryCache extends Configurable {
      *         it is known not to be cacheable from a previous attempt or
      *         a hint is given to ignore the cached version.
      */
-    public Boolean register(String key, Query query, FetchConfiguration hints);
+    Boolean register(String key, Query query, FetchConfiguration hints);
 
     /**
      * Initialize the cached Prepared Query registered with the given
@@ -96,12 +96,12 @@ public interface PreparedQueryCache extends Configurable {
      * initialize the cached, possibly hollow Prepared Query from the given
      * result, return null.
      */
-    public PreparedQuery initialize(String key, Object executionResult);
+    PreparedQuery initialize(String key, Object executionResult);
 
 	/**
 	 * Get a map view of the cached queries indexed by identifier.
 	 */
-	public Map<String, String> getMapView();
+	Map<String, String> getMapView();
 
 	/**
 	 * Cache the given PreparedQuery.
@@ -116,18 +116,18 @@ public interface PreparedQueryCache extends Configurable {
 	 * @see #setExcludes(String)
 	 * @see #addExclusionPattern(String)
 	 */
-	public boolean cache(PreparedQuery q);
+	boolean cache(PreparedQuery q);
 
 	/**
 	 * Remove the PreparedQuery with the given identifier from this cache.
 	 */
-	public boolean invalidate(String id);
+	boolean invalidate(String id);
 
 	/**
 	 * Get the PreparedQuery with the given identifier if it exists. null
 	 * otherwise.
 	 */
-	public PreparedQuery get(String id);
+	PreparedQuery get(String id);
 
 	/**
 	 * Affirms if a PreparedQuery can be cached against the given key.
@@ -139,7 +139,7 @@ public interface PreparedQueryCache extends Configurable {
 	 * this key can be cached on not.
 	 *
 	 */
-	public Boolean isCachable(String id);
+	Boolean isCachable(String id);
 
 	/**
 	 * Marks the given key as not amenable to caching.
@@ -152,33 +152,33 @@ public interface PreparedQueryCache extends Configurable {
      * @return The value for the given key if it had been cached before. null
 	 * otherwise.
 	 */
-	public PreparedQuery markUncachable(String id, Exclusion exclusion);
+	PreparedQuery markUncachable(String id, Exclusion exclusion);
 
 	/**
 	 * Returns the exclusion status of if the given query key.
 	 *
 	 * @return null implies that the key is not excluded.
 	 */
-	public Exclusion isExcluded(String id);
+	Exclusion isExcluded(String id);
 
 	/**
 	 * Gets the exclusion patterns.
 	 */
-	public List<Exclusion> getExcludes();
+	List<Exclusion> getExcludes();
 
 	/**
 	 * Sets one or more exclusion regular expression patterns separated by
      * semicolon. Any existing cache entry whose key matches any of the given
 	 * pattern will be marked non-cachable in a reversible manner.
 	 */
-	public void setExcludes(String excludes);
+	void setExcludes(String excludes);
 
 	/**
      * Adds the given pattern to the list of excluded patterns. Any existing
 	 * cache entry whose key matches the given pattern will be marked
 	 * non-cachable in a reversible manner.
 	 */
-	public void addExclusionPattern(String pattern);
+	void addExclusionPattern(String pattern);
 
 	/**
 	 * Removes the given pattern from the list of excluded patterns.
@@ -187,51 +187,51 @@ public interface PreparedQueryCache extends Configurable {
 	 *
 	 * @see #markUncachable(String, Exclusion)
 	 */
-	public void removeExclusionPattern(String pattern);
+	void removeExclusionPattern(String pattern);
 
 	/**
 	 * Clears all cached queries.
 	 */
-	public void clear();
+	void clear();
 
 	/**
 	 * Enable/disable gathering of statistics.
 	 *
 	 */
-    public void setEnableStatistics(boolean enable);
+    void setEnableStatistics(boolean enable);
 
     /**
      * Affirm if statistics is gathered.
      *
      */
-    public boolean getEnableStatistics();
+    boolean getEnableStatistics();
 
 	/**
 	 * Gets the simple statistics for executed queries.
 	 * If the statistics gathering is disabled, an empty statistics is returned.
 	 */
-	public QueryStatistics<String> getStatistics();
+	QueryStatistics<String> getStatistics();
 
 	/**
 	 * A structure to describe the strength and reason for excluding a query from the cache.
 	 *
 	 */
-	public static interface Exclusion {
+	public interface Exclusion {
 	    /**
 	     * Affirms if this exclusion is strong i.e. can never be reversed.
 	     */
-	    public boolean isStrong();
+	    boolean isStrong();
 
 	    /**
 	     * Gets the human-readable reason for excluding this query from being cached.
 	     */
-	    public String getReason();
+	    String getReason();
 
 	    /**
 	     * The pattern (either the exact query string or a regular expression) that
 	     * denotes this exclusion.
 	     */
-	    public String getPattern();
+	    String getPattern();
 
 	    /**
 	     * Affirms if this exclusion matches the given identifier.
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Query.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Query.java
index ebea12612..2c7b34ec5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Query.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Query.java
@@ -38,80 +38,80 @@ public interface Query
     /**
      * The broker that generated this query.
      */
-    public Broker getBroker();
+    Broker getBroker();
 
     /**
      * The query string or template.
      */
-    public boolean setQuery(Object query);
+    boolean setQuery(Object query);
 
     /**
      * Whether to ignore changes in the current transaction.
      */
-    public void setIgnoreChanges(boolean ignore);
+    void setIgnoreChanges(boolean ignore);
 
     /**
      * Register a filter listener for the query.
      */
-    public void addFilterListener(FilterListener listener);
+    void addFilterListener(FilterListener listener);
 
     /**
      * Remove a filter listener from the query.
      */
-    public void removeFilterListener(FilterListener listener);
+    void removeFilterListener(FilterListener listener);
 
     /**
      * Register an aggregate listener for the query.
      */
-    public void addAggregateListener(AggregateListener listener);
+    void addAggregateListener(AggregateListener listener);
 
     /**
      * Remove an aggregate listener from the query.
      */
-    public void removeAggregateListener(AggregateListener listener);
+    void removeAggregateListener(AggregateListener listener);
 
     /**
      * Return the candidate extent, or <code>null</code> if a
      * collection was specified instead of an extent.
      */
-    public Extent getCandidateExtent();
+    Extent getCandidateExtent();
 
     /**
      * Set the candidate extent.
      */
-    public void setCandidateExtent(Extent extent);
+    void setCandidateExtent(Extent extent);
 
     /**
      * Set a collection of candidates.
      */
-    public void setCandidateCollection(Collection<?> coll);
+    void setCandidateCollection(Collection<?> coll);
 
     /**
      * Compile the query.
      */
-    public void compile();
+    void compile();
 
     /**
      * Execute.
      */
-    public Object execute();
+    Object execute();
 
     /**
      * Execute with parameter map.
      */
-    public Object execute(Map<?,?> params);
+    Object execute(Map<?,?> params);
 
     /**
      * Execute with parameter array.
      */
-    public Object execute(Object[] params);
+    Object execute(Object[] params);
 
     /**
      * Deletes all of the instances that are satisfied by the query.
      *
      * @return the number of instances that were deleted
      */
-    public long deleteAll();
+    long deleteAll();
 
     /**
      * Deletes all of the instances that are satisfied by the query.
@@ -119,7 +119,7 @@ public interface Query
      * @param parameters the positional parameters for the query
      * @return the number of instances that were deleted
      */
-    public long deleteAll(Object[] parameters);
+    long deleteAll(Object[] parameters);
 
     /**
      * Deletes all of the instances that are satisfied by the query.
@@ -127,14 +127,14 @@ public interface Query
      * @param parameterMap the named parameter map
      * @return the number of instances that were deleted
      */
-    public long deleteAll(Map<?,?> parameterMap);
+    long deleteAll(Map<?,?> parameterMap);
 
     /**
      * Performs an update of the instances that are satisfied by the query.
      *
      * @return the number of instances that were update
      */
-    public long updateAll();
+    long updateAll();
 
     /**
      * Performs an update of the instances that are satisfied by the query.
@@ -142,7 +142,7 @@ public interface Query
      * @param parameters the positional parameter array
      * @return the number of instances that were update
      */
-    public long updateAll(Object[] parameters);
+    long updateAll(Object[] parameters);
 
     /**
      * Performs an update of the instances that are satisfied by the query.
@@ -150,19 +150,19 @@ public interface Query
      * @param parameterMap the named parameter map
      * @return the number of instances that were update
      */
-    public long updateAll(Map<?,?> parameterMap);
+    long updateAll(Map<?,?> parameterMap);
 
     /**
      * Close all open query results.
      */
-    public void closeAll();
+    void closeAll();
 
     /**
      * Close query results that are consuming resources. Allow results that
      * are not consuming resources to remain open so that they continue to
      * function normally.
      */
-    public void closeResources();
+    void closeResources();
 
     /**
      * Returns a description of the commands that will be sent to
@@ -172,22 +172,22 @@ public interface Query
      * @param params the named parameter map for the query invocation
      * @since 0.3.2
      */
-    public String[] getDataStoreActions(Map<?,?> params);
+    String[] getDataStoreActions(Map<?,?> params);
 
     /**
      * Assert that the query's broker is still open.
      */
-    public void assertOpen();
+    void assertOpen();
 
     /**
      * Assert that the query is not read-only.
      */
-    public void assertNotReadOnly();
+    void assertNotReadOnly();
 
     /**
      * Check that the query has not been serialized, which causes it to lose
      * its association with its Broker.
 	 */
-	public void assertNotSerialized ();
+	void assertNotSerialized ();
 }
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryContext.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryContext.java
index ff1c62c64..48f15e364 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryContext.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryContext.java
@@ -43,17 +43,17 @@ public interface QueryContext {
      * unavailable in remote contexts, and this method may throw an exception
      * to that effect.
      */
-    public Query getQuery();
+    Query getQuery();
 
     /**
      * The persistence context for the query.
      */
-    public StoreContext getStoreContext();
+    StoreContext getStoreContext();
 
     /**
      * Return the fetch configuration for this query.
      */
-    public FetchConfiguration getFetchConfiguration();
+    FetchConfiguration getFetchConfiguration();
 
     /**
      * Returns the operation that this query will be expected to perform.
@@ -61,54 +61,54 @@ public interface QueryContext {
      * @see QueryOperations
      * @since 0.4.0
      */
-    public int getOperation();
+    int getOperation();
 
     /**
      * The query language.
      */
-    public String getLanguage();
+    String getLanguage();
 
     /**
      * The query string.
      */
-    public String getQueryString();
+    String getQueryString();
 
     /**
      * Return the candidate collection, or <code>null</code> if an
      * extent was specified instead of a collection.
      */
-    public Collection<?> getCandidateCollection();
+    Collection<?> getCandidateCollection();
 
     /**
      * Return the class of the objects that this query will return,
      * or <code>null</code> if this information is not available / not relevant.
      */
-    public Class<?> getCandidateType();
+    Class<?> getCandidateType();
 
     /**
      * Whether query results will include subclasses of the candidate class.
      */
-    public boolean hasSubclasses();
+    boolean hasSubclasses();
 
     /**
      * Set the candidate type.
      */
-    public void setCandidateType(Class<?> cls, boolean subs);
+    void setCandidateType(Class<?> cls, boolean subs);
 
     /**
      * Whether the query has been marked read-only.
      */
-    public boolean isReadOnly();
+    boolean isReadOnly();
 
     /**
      * Whether the query has been marked read-only.
      */
-    public void setReadOnly(boolean readOnly);
+    void setReadOnly(boolean readOnly);
 
     /**
      * The unique flag.
      */
-    public boolean isUnique();
+    boolean isUnique();
 
     /**
      * Specify that the query will return only 1
@@ -117,55 +117,55 @@ public interface QueryContext {
      *
      * @since 0.3.0
      */
-    public void setUnique(boolean unique);
+    void setUnique(boolean unique);
 
     /**
      * Affirms if this query results are distinct instance(s).
      *
      * @since 2.0.0
      */
-    public boolean isDistinct();
+    boolean isDistinct();
 
 
     /**
      * Scope of a mapping from the result data to its object representation.
      */
-    public Class<?> getResultMappingScope();
+    Class<?> getResultMappingScope();
 
     /**
      * Name of a mapping from the result data to its object representation.
      */
-    public String getResultMappingName();
+    String getResultMappingName();
 
     /**
      * Name and scope of a mapping from the result data to its object
      * representation.
      */
-    public void setResultMapping(Class<?> scope, String name);
+    void setResultMapping(Class<?> scope, String name);
 
     /**
      * Returns the result class that has been set through
      * {@link #setResultType}, or null if none.
      */
-    public Class<?> getResultType();
+    Class<?> getResultType();
 
     /**
      * Specify the type of object in which the result of evaluating this query.
      *
      * @since 0.3.0
      */
-    public void setResultType(Class<?> cls);
+    void setResultType(Class<?> cls);
 
     /**
      * Return the 0-based start index for the returned results.
      */
-    public long getStartRange();
+    long getStartRange();
 
     /**
      * Return the 0-based exclusive end index for the returned results,
      * or {@link Long#MAX_VALUE} for no limit.
      */
-    public long getEndRange();
+    long getEndRange();
 
     /**
      * Set the range of results to return.
@@ -175,112 +175,111 @@ public interface QueryContext {
      * {@link Long#MAX_VALUE} for no limit
      * @since 0.3.2
      */
-    public void setRange(long start, long end);
+    void setRange(long start, long end);
 
     /**
      * The parameter declaration.
      */
-    public String getParameterDeclaration();
+    String getParameterDeclaration();
 
     /**
      * Declared parameters, for query languages that use them.
      */
-    public void declareParameters(String params);
+    void declareParameters(String params);
 
     /**
      * Return a map of parameter name to type for this query. The returned
      * map will iterate in the order that the parameters were declared or,
      * if they're implicit, used.
      */
-    public OrderedMap<Object,Class<?>> getOrderedParameterTypes();
+    OrderedMap<Object,Class<?>> getOrderedParameterTypes();
 
     /**
      * Return a map of parameter name to type for this query. The returned
      * map will iterate in the order that the parameters were declared or,
      * if they're implicit, used.
      */
-    @Deprecated
-    public LinkedMap getParameterTypes();
+    @Deprecated LinkedMap getParameterTypes();
 
     /**
      * If this query is a bulk update, return a map of the
      * {@link FieldMetaData}s to {@link Constant}s.
      */
-    public Map<FieldMetaData, Value> getUpdates();
+    Map<FieldMetaData, Value> getUpdates();
 
     /**
      * Whether to ignore changes in the current transaction.
      */
-    public boolean getIgnoreChanges();
+    boolean getIgnoreChanges();
 
     /**
      * Return the query's compilation state.
      */
-    public Object getCompilation();
+    Object getCompilation();
 
     /**
      * If this query is not a projection but places candidate results into a
      * result class under an alias, return that alias.
      */
-    public String getAlias();
+    String getAlias();
 
     /**
      * If this query is a projection, return the projection aliases.
      */
-    public String[] getProjectionAliases();
+    String[] getProjectionAliases();
 
     /**
      * If this query is a projection, return the projection types.
      */
-    public Class<?>[] getProjectionTypes();
+    Class<?>[] getProjectionTypes();
 
     /**
      * Return true if the query is an aggregate.
      */
-    public boolean isAggregate();
+    boolean isAggregate();
 
     /**
      * Return true if the query uses grouping.
      */
-    public boolean hasGrouping();
+    boolean hasGrouping();
 
     /**
      * Return the classes that affect this query.
      */
-    public ClassMetaData[] getAccessPathMetaDatas();
+    ClassMetaData[] getAccessPathMetaDatas();
 
     /**
      * Return the filter listener for the given tag, or null.
      */
-    public FilterListener getFilterListener(String tag);
+    FilterListener getFilterListener(String tag);
 
     /**
      * Return the filter listener for the given tag, or null.
      */
-    public AggregateListener getAggregateListener(String tag);
+    AggregateListener getAggregateListener(String tag);
 
     /**
      * The set of filter listeners.
      */
-    public Collection<FilterListener> getFilterListeners();
+    Collection<FilterListener> getFilterListeners();
 
     /**
      * The set of aggregate listeners.
      */
-    public Collection<AggregateListener> getAggregateListeners();
+    Collection<AggregateListener> getAggregateListeners();
 
     /**
      * Helper method to delete the objects found by executing a query on
      * the given executor.
      */
-    public Number deleteInMemory(StoreQuery q, StoreQuery.Executor ex,
+    Number deleteInMemory(StoreQuery q, StoreQuery.Executor ex,
         Object[] params);
 
     /**
      * Helper method to update the objects found by executing a query on
      * the given executor.
      */
-    public Number updateInMemory(StoreQuery q, StoreQuery.Executor ex,
+    Number updateInMemory(StoreQuery q, StoreQuery.Executor ex,
         Object[] params);
 
     /**
@@ -288,15 +287,15 @@ public interface QueryContext {
      * into account the query's candidate package, automatic imports, and
      * the given imports (if any). Returns null if the type cannot be found.
      */
-    public Class<?> classForName(String name, String[] imports);
+    Class<?> classForName(String name, String[] imports);
 
     /**
      * Synchronize on the query's internal lock.
      */
-    public void lock ();
+    void lock ();
 
     /**
      * Unlock the query's internal lock.
      */
-    public void unlock();
+    void unlock();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryFlushModes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryFlushModes.java
index 401a1d182..5132b0998 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryFlushModes.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryFlushModes.java
@@ -36,7 +36,7 @@ public interface QueryFlushModes {
      * {@link OpenJPAConfiguration#getFlushBeforeQueries}
      * for more info.
      */
-    public static final int FLUSH_TRUE = 0;
+    int FLUSH_TRUE = 0;
 
     /**
      * Constant denoting that queries should never flush data
@@ -44,7 +44,7 @@ public interface QueryFlushModes {
      * should instead execute queries in-memory if necessary. See
      * {@link OpenJPAConfiguration#getFlushBeforeQueries} for more info.
      */
-    public static final int FLUSH_FALSE = 1;
+    int FLUSH_FALSE = 1;
 
     /**
      * Constant denoting that queries should flush data to the
@@ -53,5 +53,5 @@ public interface QueryFlushModes {
      * context already has a dedicated connection. See
      * {@link OpenJPAConfiguration#getFlushBeforeQueries} for more info.
      */
-    public static final int FLUSH_WITH_CONNECTION = 2;
+    int FLUSH_WITH_CONNECTION = 2;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryHints.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryHints.java
index 57ea3f7df..b26c06865 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryHints.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryHints.java
@@ -26,16 +26,16 @@ public interface QueryHints {
     // Declaring a public static final String variable in this class will
     // make it register as a supported hint key
     // if you do not want that then annotate as {@link Reflectable(false)}.
-    public static final String HINT_SUBCLASSES          = "openjpa.Subclasses";
-    public static final String HINT_FILTER_LISTENER     = "openjpa.FilterListener";
-    public static final String HINT_FILTER_LISTENERS    = "openjpa.FilterListeners";
-    public static final String HINT_AGGREGATE_LISTENER  = "openjpa.AggregateListener";
-    public static final String HINT_AGGREGATE_LISTENERS = "openjpa.AggregateListeners";
+    String HINT_SUBCLASSES          = "openjpa.Subclasses";
+    String HINT_FILTER_LISTENER     = "openjpa.FilterListener";
+    String HINT_FILTER_LISTENERS    = "openjpa.FilterListeners";
+    String HINT_AGGREGATE_LISTENER  = "openjpa.AggregateListener";
+    String HINT_AGGREGATE_LISTENERS = "openjpa.AggregateListeners";
 
     /**
      * Hint to specify the number of rows to optimize for.
      */
-    public static final String HINT_RESULT_COUNT = "openjpa.hint.OptimizeResultCount";
+    String HINT_RESULT_COUNT = "openjpa.hint.OptimizeResultCount";
 
     /**
      * Hints to signal that the JPQL/SQL query string contains a parameter
@@ -43,7 +43,7 @@ public interface QueryHints {
      * to count number of parameters assuming that all <code>?</code> characters
      * designate a bind parameter. This assumption makes the parse faster.
      */
-    public static final String HINT_PARAM_MARKER_IN_QUERY = "openjpa.hint.ParameterMarkerInQuery";
+    String HINT_PARAM_MARKER_IN_QUERY = "openjpa.hint.ParameterMarkerInQuery";
 
     /**
      * A directive to invalidate any prepared SQL that might have been cached
@@ -60,7 +60,7 @@ public interface QueryHints {
      *
      * @see #HINT_IGNORE_PREPARED_QUERY
      */
-    public static final String HINT_INVALIDATE_PREPARED_QUERY = "openjpa.hint.InvalidatePreparedQuery";
+    String HINT_INVALIDATE_PREPARED_QUERY = "openjpa.hint.InvalidatePreparedQuery";
 
     /**
      * A directive to ignore any prepared SQL that might have been cached
@@ -78,34 +78,34 @@ public interface QueryHints {
      *
      * @see #HINT_INVALIDATE_PREPARED_QUERY
      */
-    public static final String HINT_IGNORE_PREPARED_QUERY = "openjpa.hint.IgnorePreparedQuery";
+    String HINT_IGNORE_PREPARED_QUERY = "openjpa.hint.IgnorePreparedQuery";
 
     /**
      * A directive to ignore any cached finder query for find() operation.
      * The cached entry, if any, remains in the cache.
      */
-    public static final String HINT_IGNORE_FINDER = "openjpa.hint.IgnoreFinder";
+    String HINT_IGNORE_FINDER = "openjpa.hint.IgnoreFinder";
 
     /**
      * A directive to invalidate any cached finder query.
      */
-    public static final String HINT_INVALIDATE_FINDER = "openjpa.hint.InvalidateFinder";
+    String HINT_INVALIDATE_FINDER = "openjpa.hint.InvalidateFinder";
 
     /**
      * A directive to overwrite a cached finder query by a new query.
      */
-    public static final String HINT_RECACHE_FINDER =
+    String HINT_RECACHE_FINDER =
         "openjpa.hint.RecacheFinder";
 
     /**
      * A boolean directive to relax checking of binding parameter value and the predicate
      * it binds to.
      */
-    public static final String HINT_RELAX_BIND_PARAM_TYPE_CHECK = "openjpa.hint.RelaxParameterTypeChecking";
+    String HINT_RELAX_BIND_PARAM_TYPE_CHECK = "openjpa.hint.RelaxParameterTypeChecking";
 
     /**
      * A boolean directive to generate literal directly into the SQL statement instead of using position parameter,
      * if possible.
      */
-    public static final String HINT_USE_LITERAL_IN_SQL = "openjpa.hint.UseLiteralInSQL";
+    String HINT_USE_LITERAL_IN_SQL = "openjpa.hint.UseLiteralInSQL";
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
index 1d9a7364d..0521a1abe 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
@@ -30,13 +30,11 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 import org.apache.commons.collections4.map.LinkedMap;
-import java.util.Objects;
-
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.kernel.exps.AggregateListener;
@@ -59,6 +57,7 @@ import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.OrderedMap;
 import org.apache.openjpa.lib.util.ReferenceHashSet;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
@@ -78,9 +77,8 @@ import org.apache.openjpa.util.UserException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-public class QueryImpl
-    implements Query {
+public class QueryImpl implements Query {
+    private static final long serialVersionUID = 1L;
 
     private static final Localizer _loc = Localizer.forPackage(QueryImpl.class);
 
@@ -155,35 +153,43 @@ public class QueryImpl
         return _storeQuery;
     }
 
+    @Override
     public Broker getBroker() {
         return _broker;
     }
 
+    @Override
     public Query getQuery() {
         return this;
     }
 
+    @Override
     public StoreContext getStoreContext() {
         return _broker;
     }
 
+    @Override
     public String getLanguage() {
         return _language;
     }
 
+    @Override
     public FetchConfiguration getFetchConfiguration() {
         return _fc;
     }
 
+    @Override
     public String getQueryString() {
         return _query;
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         assertOpen();
         return _ignoreChanges;
     }
 
+    @Override
     public void setIgnoreChanges(boolean flag) {
         lock();
         try {
@@ -195,11 +201,13 @@ public class QueryImpl
         }
     }
 
+    @Override
     public boolean isReadOnly() {
         assertOpen();
         return _readOnly;
     }
 
+    @Override
     public void setReadOnly(boolean flag) {
         lock();
         try {
@@ -210,19 +218,21 @@ public class QueryImpl
         }
     }
 
+    @Override
     public void addFilterListener(FilterListener listener) {
         lock();
         try {
             assertOpen();
             assertNotReadOnly();
             if (_filtListeners == null)
-                _filtListeners = new HashMap<String,FilterListener>(5);
+                _filtListeners = new HashMap<>(5);
             _filtListeners.put(listener.getTag(), listener);
         } finally {
             unlock();
         }
     }
 
+    @Override
     public void removeFilterListener(FilterListener listener) {
         lock();
         try {
@@ -235,6 +245,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public Collection<FilterListener> getFilterListeners() {
         if (_filtListeners == null)
             return Collections.emptyList();
@@ -242,10 +253,11 @@ public class QueryImpl
             return _filtListeners.values();
     }
 
+    @Override
     public FilterListener getFilterListener(String tag) {
         // first check listeners for this query
         if (_filtListeners != null) {
-            FilterListener listen = (FilterListener) _filtListeners.get(tag);
+            FilterListener listen = _filtListeners.get(tag);
             if (listen != null)
                 return listen;
         }
@@ -261,19 +273,21 @@ public class QueryImpl
         return _storeQuery.getFilterListener(tag);
     }
 
+    @Override
     public void addAggregateListener(AggregateListener listener) {
         lock();
         try {
             assertOpen();
             assertNotReadOnly();
             if (_aggListeners == null)
-                _aggListeners = new HashMap<String,AggregateListener>(5);
+                _aggListeners = new HashMap<>(5);
             _aggListeners.put(listener.getTag(), listener);
         } finally {
             unlock();
         }
     }
 
+    @Override
     public void removeAggregateListener(AggregateListener listener) {
         lock();
         try {
@@ -286,6 +300,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public Collection<AggregateListener> getAggregateListeners() {
         if (_aggListeners == null)
             return Collections.emptyList();
@@ -293,10 +308,11 @@ public class QueryImpl
             return _aggListeners.values();
     }
 
+    @Override
     public AggregateListener getAggregateListener(String tag) {
         // first check listeners for this query
         if (_aggListeners != null) {
-            AggregateListener listen = (AggregateListener) _aggListeners.
+            AggregateListener listen = _aggListeners.
                 get(tag);
             if (listen != null)
                 return listen;
@@ -313,6 +329,7 @@ public class QueryImpl
         return _storeQuery.getAggregateListener(tag);
     }
 
+    @Override
     public Extent getCandidateExtent() {
         // if just the class is set, fetch the corresponding extent; if the
         // extent is already set but its ignore cache setting is wrong,
@@ -336,6 +353,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public void setCandidateExtent(Extent candidateExtent) {
         lock();
         try {
@@ -370,11 +388,13 @@ public class QueryImpl
         }
     }
 
+    @Override
     public Collection<?> getCandidateCollection() {
         assertOpen();
         return _collection;
     }
 
+    @Override
     public void setCandidateCollection(Collection<?> candidateCollection) {
         if (!_storeQuery.supportsInMemoryExecution())
             throw new UnsupportedException(_loc.get("query-nosupport",
@@ -393,6 +413,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public Class getCandidateType() {
         lock();
         try {
@@ -409,6 +430,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public void setCandidateType(Class candidateClass, boolean subs) {
         lock();
         try {
@@ -423,20 +445,24 @@ public class QueryImpl
         }
     }
 
+    @Override
     public boolean hasSubclasses() {
         return _subclasses;
     }
 
+    @Override
     public String getResultMappingName() {
         assertOpen();
         return _resultMappingName;
     }
 
+    @Override
     public Class getResultMappingScope() {
         assertOpen();
         return _resultMappingScope;
     }
 
+    @Override
     public void setResultMapping(Class<?> scope, String name) {
         lock();
         try {
@@ -449,6 +475,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public boolean isUnique() {
         lock();
         try {
@@ -482,6 +509,7 @@ public class QueryImpl
         return getQueryString() != null;
     }
 
+    @Override
     public void setUnique(boolean unique) {
         lock();
         try {
@@ -493,6 +521,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public Class getResultType() {
         lock();
         try {
@@ -509,6 +538,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public void setResultType(Class cls) {
         lock();
         try {
@@ -521,16 +551,19 @@ public class QueryImpl
         }
     }
 
+    @Override
     public long getStartRange() {
         assertOpen();
         return _startIdx;
     }
 
+    @Override
     public long getEndRange() {
         assertOpen();
         return _endIdx;
     }
 
+    @Override
     public void setRange(long start, long end) {
         if (start < 0 || end < 0)
             throw new UserException(_loc.get("invalid-range",
@@ -552,6 +585,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public String getParameterDeclaration() {
         lock();
         try {
@@ -568,6 +602,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public void declareParameters(String params) {
         if (!_storeQuery.supportsParameterDeclarations())
             throw new UnsupportedException(_loc.get("query-nosupport",
@@ -584,6 +619,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public void compile() {
         lock();
         try {
@@ -596,6 +632,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public Object getCompilation() {
         lock();
         try {
@@ -791,14 +828,17 @@ public class QueryImpl
         return true;
     }
 
+    @Override
     public Object execute() {
         return execute((Object[]) null);
     }
 
+    @Override
     public Object execute(Object[] params) {
         return execute(OP_SELECT, params);
     }
 
+    @Override
     public Object execute(Map params) {
         return execute(OP_SELECT, params);
     }
@@ -889,26 +929,32 @@ public class QueryImpl
         }
     }
 
+    @Override
     public long deleteAll() {
         return deleteAll((Object[]) null);
     }
 
+    @Override
     public long deleteAll(Object[] params) {
         return ((Number) execute(OP_DELETE, params)).longValue();
     }
 
+    @Override
     public long deleteAll(Map params) {
         return ((Number) execute(OP_DELETE, params)).longValue();
     }
 
+    @Override
     public long updateAll() {
         return updateAll((Object[]) null);
     }
 
+    @Override
     public long updateAll(Object[] params) {
         return ((Number) execute(OP_UPDATE, params)).longValue();
     }
 
+    @Override
     public long updateAll(Map params) {
         return ((Number) execute(OP_UPDATE, params)).longValue();
     }
@@ -1034,6 +1080,7 @@ public class QueryImpl
         return ex.executeDelete(q, params);
     }
 
+    @Override
     public Number deleteInMemory(StoreQuery q, StoreQuery.Executor executor,
         Object[] params) {
         try {
@@ -1065,6 +1112,7 @@ public class QueryImpl
         return ex.executeUpdate(q, params);
     }
 
+    @Override
     public Number updateInMemory(StoreQuery q, StoreQuery.Executor executor,
         Object[] params) {
         try {
@@ -1094,7 +1142,7 @@ public class QueryImpl
             it.hasNext();) {
             Map.Entry e = (Map.Entry) it.next();
             Path path = (Path) e.getKey();
-            FieldMetaData fmd = (FieldMetaData) path.last();
+            FieldMetaData fmd = path.last();
             OpenJPAStateManager sm = _broker.getStateManager(ob);
 
             Object val;
@@ -1188,7 +1236,7 @@ public class QueryImpl
      * Trace log that the query is executing.
      */
     private void logExecution(int op, OrderedMap<Object, Class<?>> types, Object[] params) {
-        OrderedMap<Object, Object> pmap = new OrderedMap<Object, Object>();
+        OrderedMap<Object, Object> pmap = new OrderedMap<>();
         if (params.length > 0) {
             if (types != null && types.size() == params.length) {
                 int i = 0;
@@ -1410,10 +1458,12 @@ public class QueryImpl
         return false;
     }
 
+    @Override
     public void closeAll() {
         closeResults(true);
     }
 
+    @Override
     public void closeResources() {
         closeResults(false);
     }
@@ -1438,6 +1488,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public String[] getDataStoreActions(Map params) {
         if (params == null)
             params = Collections.EMPTY_MAP;
@@ -1463,6 +1514,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public boolean setQuery(Object query) {
         lock();
         try {
@@ -1496,15 +1548,16 @@ public class QueryImpl
             // don't share mutable objects
             _fc.copy(q._fc);
             if (q._filtListeners != null)
-                _filtListeners = new HashMap<String,FilterListener>(q._filtListeners);
+                _filtListeners = new HashMap<>(q._filtListeners);
             if (q._aggListeners != null)
-                _aggListeners = new HashMap<String,AggregateListener>(q._aggListeners);
+                _aggListeners = new HashMap<>(q._aggListeners);
             return true;
         } finally {
             unlock();
         }
     }
 
+    @Override
     public String getAlias() {
         lock();
         try {
@@ -1517,6 +1570,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public String[] getProjectionAliases() {
         lock();
         try {
@@ -1526,6 +1580,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public Class<?>[] getProjectionTypes() {
         lock();
         try {
@@ -1535,6 +1590,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public int getOperation() {
         lock();
         try {
@@ -1544,6 +1600,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public boolean isAggregate() {
         lock();
         try {
@@ -1553,6 +1610,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public boolean isDistinct() {
         lock();
         try {
@@ -1563,6 +1621,7 @@ public class QueryImpl
     }
 
 
+    @Override
     public boolean hasGrouping() {
         lock();
         try {
@@ -1572,6 +1631,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public ClassMetaData[] getAccessPathMetaDatas() {
         lock();
         try {
@@ -1583,6 +1643,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public OrderedMap<Object,Class<?>> getOrderedParameterTypes() {
         lock();
         try {
@@ -1592,6 +1653,7 @@ public class QueryImpl
         }
     }
 
+    @Override
     public LinkedMap getParameterTypes() {
         lock();
         try {
@@ -1604,6 +1666,7 @@ public class QueryImpl
     }
 
 
+    @Override
     public Map getUpdates() {
         lock();
         try {
@@ -1613,11 +1676,13 @@ public class QueryImpl
         }
     }
 
+    @Override
     public void lock() {
         if (_lock != null)
             _lock.lock();
     }
 
+    @Override
     public void unlock() {
         if (_lock != null)
             _lock.unlock();
@@ -1640,6 +1705,7 @@ public class QueryImpl
     // Utils
     /////////
 
+    @Override
     public Class classForName(String name, String[] imports) {
         // full class name or primitive type?
         Class type = toClass(name);
@@ -1707,16 +1773,19 @@ public class QueryImpl
         return null;
     }
 
+    @Override
     public void assertOpen() {
         if (_broker != null)
             _broker.assertOpen();
     }
 
+    @Override
     public void assertNotReadOnly() {
         if (_readOnly)
             throw new InvalidStateException(_loc.get("read-only"));
     }
 
+    @Override
     public void assertNotSerialized() {
         if (_broker == null)
             throw new InvalidStateException(_loc.get("serialized"));
@@ -1794,6 +1863,7 @@ public class QueryImpl
     }
 
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder(255);
         buf.append("Query: ").append(super.toString());
@@ -1808,6 +1878,8 @@ public class QueryImpl
     protected static class Compilation
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public StoreQuery.Executor memory = null;
         public StoreQuery.Executor datastore = null;
         public Object storeData = null;
@@ -1819,6 +1891,8 @@ public class QueryImpl
     private static class CompilationKey
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public Class queryType = null;
         public Class candidateType = null;
         public boolean subclasses = true;
@@ -1826,6 +1900,7 @@ public class QueryImpl
         public String language = null;
         public Object storeKey = null;
 
+        @Override
         public int hashCode() {
             int rs = 17;
             rs = 37 * rs + ((queryType == null) ? 0 : queryType.hashCode());
@@ -1837,6 +1912,7 @@ public class QueryImpl
             return rs;
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == this)
                 return true;
@@ -1888,10 +1964,12 @@ public class QueryImpl
             _executors = executors;
         }
 
+        @Override
         public QueryExpressions[] getQueryExpressions() {
             return _executors[0].getQueryExpressions();
         }
 
+        @Override
         public ResultObjectProvider executeQuery(StoreQuery q,
             Object[] params, StoreQuery.Range range) {
             if (_executors.length == 1)
@@ -1925,6 +2003,7 @@ public class QueryImpl
             return rop;
         }
 
+        @Override
         public Number executeDelete(StoreQuery q, Object[] params) {
             long num = 0;
             for (int i = 0; i < _executors.length; i++)
@@ -1932,6 +2011,7 @@ public class QueryImpl
             return num;
         }
 
+        @Override
         public Number executeUpdate(StoreQuery q, Object[] params) {
             long num = 0;
             for (int i = 0; i < _executors.length; i++)
@@ -1939,6 +2019,7 @@ public class QueryImpl
             return num;
         }
 
+        @Override
         public String[] getDataStoreActions(StoreQuery q, Object[] params,
             StoreQuery.Range range) {
             if (_executors.length == 1)
@@ -1955,15 +2036,18 @@ public class QueryImpl
             return (String[]) results.toArray(new String[results.size()]);
         }
 
+        @Override
         public void validate(StoreQuery q) {
             _executors[0].validate(q);
         }
 
+        @Override
         public void getRange(StoreQuery q, Object[] params,
             StoreQuery.Range range) {
             _executors[0].getRange(q, params, range);
         }
 
+        @Override
         public Object getOrderingValue(StoreQuery q, Object[] params,
             Object resultObject, int idx) {
             // unfortunately, at this point (must be a merged rop containing
@@ -1972,34 +2056,42 @@ public class QueryImpl
             return _executors[0].getOrderingValue(q, params, resultObject, idx);
         }
 
+        @Override
         public boolean[] getAscending(StoreQuery q) {
             return _executors[0].getAscending(q);
         }
 
+        @Override
         public String getAlias(StoreQuery q) {
             return _executors[0].getAlias(q);
         }
 
+        @Override
         public String[] getProjectionAliases(StoreQuery q) {
             return _executors[0].getProjectionAliases(q);
         }
 
+        @Override
         public Class getResultClass(StoreQuery q) {
             return _executors[0].getResultClass(q);
         }
 
+        @Override
         public ResultShape<?> getResultShape(StoreQuery q) {
             return _executors[0].getResultShape(q);
         }
 
+        @Override
         public Class[] getProjectionTypes(StoreQuery q) {
             return _executors[0].getProjectionTypes(q);
         }
 
+        @Override
         public boolean isPacking(StoreQuery q) {
             return _executors[0].isPacking(q);
         }
 
+        @Override
         public ClassMetaData[] getAccessPathMetaDatas(StoreQuery q) {
             if (_executors.length == 1)
                 return _executors[0].getAccessPathMetaDatas(q);
@@ -2015,6 +2107,7 @@ public class QueryImpl
                 (new ClassMetaData[metas.size()]);
         }
 
+        @Override
         public boolean isAggregate(StoreQuery q) {
             if (!_executors[0].isAggregate(q))
                 return false;
@@ -2025,31 +2118,38 @@ public class QueryImpl
                 q.getContext().getQueryString()));
         }
 
+        @Override
         public boolean isDistinct(StoreQuery q) {
             return _executors[0].isDistinct(q);
         }
 
+        @Override
         public int getOperation(StoreQuery q) {
             return _executors[0].getOperation(q);
         }
 
+        @Override
         public boolean hasGrouping(StoreQuery q) {
             return _executors[0].hasGrouping(q);
         }
 
+        @Override
         public OrderedMap<Object,Class<?>> getOrderedParameterTypes(StoreQuery q) {
             return _executors[0].getOrderedParameterTypes(q);
         }
 
+        @Override
         public LinkedMap getParameterTypes(StoreQuery q) {
             return _executors[0].getParameterTypes(q);
         }
 
+        @Override
         public Object[] toParameterArray(StoreQuery q, Map userParams) {
             return _executors[0].toParameterArray(q, userParams);
         }
 
 
+        @Override
         public Map getUpdates(StoreQuery q) {
             return _executors[0].getUpdates(q);
         }
@@ -2072,15 +2172,18 @@ public class QueryImpl
             _len = resultLength;
         }
 
+        @Override
         public boolean supportsRandomAccess() {
             return _delegate.supportsRandomAccess();
         }
 
+        @Override
         public void open()
             throws Exception {
             _delegate.open();
         }
 
+        @Override
         public Object getResultObject()
             throws Exception {
             Object ob = _delegate.getResultObject();
@@ -2093,31 +2196,37 @@ public class QueryImpl
             return _packer.pack((Object[]) ob);
         }
 
+        @Override
         public boolean next()
             throws Exception {
             return _delegate.next();
         }
 
+        @Override
         public boolean absolute(int pos)
             throws Exception {
             return _delegate.absolute(pos);
         }
 
+        @Override
         public int size()
             throws Exception {
             return _delegate.size();
         }
 
+        @Override
         public void reset()
             throws Exception {
             _delegate.reset();
         }
 
+        @Override
         public void close()
             throws Exception {
             _delegate.close();
         }
 
+        @Override
         public void handleCheckedException(Exception e) {
             _delegate.handleCheckedException(e);
         }
@@ -2134,6 +2243,8 @@ public class QueryImpl
     public class RemoveOnCloseResultList
         implements ResultList {
 
+        
+        private static final long serialVersionUID = 1L;
         private final ResultList _res;
 
         public RemoveOnCloseResultList(ResultList res) {
@@ -2144,22 +2255,27 @@ public class QueryImpl
             return _res;
         }
 
+        @Override
         public boolean isProviderOpen() {
             return _res.isProviderOpen();
         }
 
+        @Override
         public Object getUserObject() {
             return _res.getUserObject();
         }
 
+        @Override
         public void setUserObject(Object opaque) {
             _res.setUserObject(opaque);
         }
 
+        @Override
         public boolean isClosed() {
             return _res.isClosed();
         }
 
+        @Override
         public void close() {
             close(true);
         }
@@ -2188,106 +2304,132 @@ public class QueryImpl
             }
         }
 
+        @Override
         public int size() {
             return _res.size();
         }
 
+        @Override
         public boolean isEmpty() {
             return _res.isEmpty();
         }
 
+        @Override
         public boolean contains(Object o) {
             return _res.contains(o);
         }
 
+        @Override
         public Iterator iterator() {
             return _res.iterator();
         }
 
+        @Override
         public Object[] toArray() {
             return _res.toArray();
         }
 
+        @Override
         public Object[] toArray(Object[] a) {
             return _res.toArray(a);
         }
 
+        @Override
         public boolean add(Object o) {
             return _res.add(o);
         }
 
+        @Override
         public boolean remove(Object o) {
             return _res.remove(o);
         }
 
+        @Override
         public boolean containsAll(Collection c) {
             return _res.containsAll(c);
         }
 
+        @Override
         public boolean addAll(Collection c) {
             return _res.addAll(c);
         }
 
+        @Override
         public boolean addAll(int idx, Collection c) {
             return _res.addAll(idx, c);
         }
 
+        @Override
         public boolean removeAll(Collection c) {
             return _res.removeAll(c);
         }
 
+        @Override
         public boolean retainAll(Collection c) {
             return _res.retainAll(c);
         }
 
+        @Override
         public void clear() {
             _res.clear();
         }
 
+        @Override
         public Object get(int idx) {
             return _res.get(idx);
         }
 
+        @Override
         public Object set(int idx, Object o) {
             return _res.set(idx, o);
         }
 
+        @Override
         public void add(int idx, Object o) {
             _res.add(idx, o);
         }
 
+        @Override
         public Object remove(int idx) {
             return _res.remove(idx);
         }
 
+        @Override
         public int indexOf(Object o) {
             return _res.indexOf(o);
         }
 
+        @Override
         public int lastIndexOf(Object o) {
             return _res.lastIndexOf(o);
         }
 
+        @Override
         public ListIterator listIterator() {
             return _res.listIterator();
         }
 
+        @Override
         public ListIterator listIterator(int idx) {
             return _res.listIterator(idx);
         }
 
+        @Override
         public List subList(int start, int end) {
             return _res.subList(start, end);
         }
 
+        @Override
         public boolean equals(Object o) {
             return _res.equals(o);
         }
 
+        @Override
         public int hashCode() {
             return _res.hashCode();
         }
 
+        @Override
         public String toString ()
 		{
 			return _res.toString ();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryOperations.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryOperations.java
index 39bece66f..7159d6c1c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryOperations.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryOperations.java
@@ -31,7 +31,7 @@ public interface QueryOperations {
      *
      * @see QueryContext#getOperation
      */
-    public static final int OP_SELECT = 1;
+    int OP_SELECT = 1;
 
     /**
      * Symbolic constant that indicates that this query will be
@@ -39,7 +39,7 @@ public interface QueryOperations {
      *
      * @see QueryContext#getOperation
      */
-    public static final int OP_DELETE = 2;
+    int OP_DELETE = 2;
 
     /**
      * Symbolic constant that indicates that this query will be
@@ -47,5 +47,5 @@ public interface QueryOperations {
      *
      * @see QueryContext#getOperation
      */
-    public static final int OP_UPDATE = 3;
+    int OP_UPDATE = 3;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryStatistics.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryStatistics.java
index 891b07151..981fcb5ae 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryStatistics.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryStatistics.java
@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
-import org.apache.openjpa.lib.util.ReferenceMap;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
 
 /**
@@ -47,7 +46,7 @@ public interface QueryStatistics<T> extends Serializable {
     /**
      *  Gets all the identifier keys for the cached queries.
      */
-    public Set<T> keys();
+    Set<T> keys();
 
 	/**
 	 * Record that the given query has been executed.
@@ -62,79 +61,79 @@ public interface QueryStatistics<T> extends Serializable {
 	/**
 	 * Gets number of total query execution since last reset.
 	 */
-	public long getExecutionCount();
+	long getExecutionCount();
 
 	/**
 	 * Gets number of total query execution since start.
 	 */
-	public long getTotalExecutionCount();
+	long getTotalExecutionCount();
 
 	/**
 	 * Gets number of executions for the given query since last reset.
 	 */
-	public long getExecutionCount(T query);
+	long getExecutionCount(T query);
 
 	/**
 	 * Gets number of executions for the given query since start.
 	 */
-	public long getTotalExecutionCount(T query);
+	long getTotalExecutionCount(T query);
 
 	/**
      * Gets number of total query execution that are cached since last reset.
 	 */
-	public long getHitCount();
+	long getHitCount();
 
 	/**
 	 * Gets number of total query execution that are cached since start.
 	 */
-	public long getTotalHitCount();
+	long getTotalHitCount();
 
 	/**
 	 * Gets number of executions for the given query that are cached since
 	 * last reset.
 	 */
-	public long getHitCount(T query);
+	long getHitCount(T query);
 
 	/**
 	 * Gets number of executions for the given query that are cached since
 	 * start.
 	 */
-	public long getTotalHitCount(T query);
+	long getTotalHitCount(T query);
 
 	 /**
      * Gets number of total query evictions since last reset.
      */
-    public long getEvictionCount();
+    long getEvictionCount();
 
     /**
      * Gets number of total query evictions since start.
      */
-    public long getTotalEvictionCount();
+    long getTotalEvictionCount();
 
 	/**
 	 * Gets the time of last reset.
 	 */
-	public Date since();
+	Date since();
 
 	/**
 	 * Gets the time of start.
 	 */
-	public Date start();
+	Date start();
 
 	/**
 	 * Clears all  statistics accumulated since last reset.
 	 */
-	public void reset();
+	void reset();
 
 	/**
 	 * Clears all statistics accumulated since start.
 	 */
-	public void clear();
+	void clear();
 
 	/**
 	 * Dumps on the given output stream.
 	 */
-	public void dump(PrintStream out);
+	void dump(PrintStream out);
 
 	/**
 	 * A default implementation.
@@ -144,7 +143,9 @@ public interface QueryStatistics<T> extends Serializable {
 	 *
 	 */
 	public static class Default<T> implements QueryStatistics<T> {
-	    private static final int FIXED_SIZE = 1000;
+	    
+        private static final long serialVersionUID = 1L;
+        private static final int FIXED_SIZE = 1000;
 	    private static final float LOAD_FACTOR = 0.75f;
 	    private static final int CONCURRENCY = 16;
 
@@ -176,39 +177,48 @@ public interface QueryStatistics<T> extends Serializable {
             astats = aStatsMap;
         }
 
-		public Set<T> keys() {
+		@Override
+        public Set<T> keys() {
 		    return stats.keySet();
 		}
 
-		public long getExecutionCount() {
+		@Override
+        public long getExecutionCount() {
 			return stat[READ];
 		}
 
-		public long getTotalExecutionCount() {
+		@Override
+        public long getTotalExecutionCount() {
 			return astat[READ];
 		}
 
-		public long getExecutionCount(T query) {
+		@Override
+        public long getExecutionCount(T query) {
 			return getCount(stats, query, READ);
 		}
 
-		public long getTotalExecutionCount(T query) {
+		@Override
+        public long getTotalExecutionCount(T query) {
 			return getCount(astats, query, READ);
 		}
 
-		public long getHitCount() {
+		@Override
+        public long getHitCount() {
 			return stat[HIT];
 		}
 
-		public long getTotalHitCount() {
+		@Override
+        public long getTotalHitCount() {
 			return astat[HIT];
 		}
 
-		public long getHitCount(T query) {
+		@Override
+        public long getHitCount(T query) {
 			return getCount(stats, query, HIT);
 		}
 
-		public long getTotalHitCount(T query) {
+		@Override
+        public long getTotalHitCount(T query) {
 			return getCount(astats, query, HIT);
 		}
 
@@ -217,21 +227,25 @@ public interface QueryStatistics<T> extends Serializable {
 			return (row == null) ? 0 : row[i];
 		}
 
-		public Date since() {
+		@Override
+        public Date since() {
 			return since;
 		}
 
-		public Date start() {
+		@Override
+        public Date start() {
 			return start;
 		}
 
-		public synchronized void reset() {
+		@Override
+        public synchronized void reset() {
 			stat = new long[ARRAY_SIZE];
 			stats.clear();
 			since = new Date();
 		}
 
-	    public synchronized void clear() {
+	    @Override
+        public synchronized void clear() {
 	       astat = new long[ARRAY_SIZE];
 	       stat  = new long[ARRAY_SIZE];
 	       initializeMaps();
@@ -256,7 +270,8 @@ public interface QueryStatistics<T> extends Serializable {
 			target.put(query, row);
 		}
 
-		public void recordExecution(T query) {
+		@Override
+        public void recordExecution(T query) {
 		    if (query == null)
 		        return;
 		    boolean cached = astats.containsKey(query);
@@ -265,6 +280,7 @@ public interface QueryStatistics<T> extends Serializable {
 				addSample(query, HIT);
 		}
 
+        @Override
         public void recordEviction(T query) {
             if (query == null) {
                 return;
@@ -272,7 +288,8 @@ public interface QueryStatistics<T> extends Serializable {
             addSample(query, EVICT);
         }
 
-		public void dump(PrintStream out) {
+		@Override
+        public void dump(PrintStream out) {
             String header = "Query Statistics starting from " + start;
 			out.print(header);
 			if (since == start) {
@@ -308,10 +325,12 @@ public interface QueryStatistics<T> extends Serializable {
             return row[READ] + ":" + row[HIT] + "(" + pct(row[HIT], row[READ]) + "%)";
 		}
 
+        @Override
         public long getEvictionCount() {
             return stat[EVICT];
         }
 
+        @Override
         public long getTotalEvictionCount() {
             return astat[EVICT];
         }
@@ -325,75 +344,95 @@ public interface QueryStatistics<T> extends Serializable {
 	 * @param <T>
 	 */
 	public static class None<T> implements QueryStatistics<T> {
+        
+        private static final long serialVersionUID = 1L;
         private Date start = new Date();
         private Date since = start;
 
+        @Override
         public void clear() {
         }
 
+        @Override
         public void dump(PrintStream out) {
         }
 
+        @Override
         public long getExecutionCount() {
             return 0;
         }
 
+        @Override
         public long getExecutionCount(T query) {
             return 0;
         }
 
+        @Override
         public long getHitCount() {
             return 0;
         }
 
+        @Override
         public long getHitCount(T query) {
             return 0;
         }
 
+        @Override
         public long getTotalExecutionCount() {
             return 0;
         }
 
+        @Override
         public long getTotalExecutionCount(T query) {
             return 0;
         }
 
+        @Override
         public long getTotalHitCount() {
             return 0;
         }
 
+        @Override
         public long getTotalHitCount(T query) {
             return 0;
         }
 
+        @Override
         public long getEvictionCount() {
             return 0;
         }
 
+        @Override
         public long getTotalEvictionCount() {
             return 0;
         }
 
+        @Override
         public Set<T> keys() {
             return Collections.emptySet();
         }
 
+        @Override
         public void recordExecution(T query) {
         }
 
+        @Override
         public void reset() {
             start  = new Date();
             since  = start;
         }
 
+        @Override
         public Date since() {
             return since;
         }
 
+        @Override
         public Date start() {
             return start;
         }
 
+        @Override
         public void recordEviction(T query) {
         }
 	}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java
index 36a40bd0b..e2255bc9f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ROPStoreManager.java
@@ -36,12 +36,14 @@ class ROPStoreManager
         super(delegate);
     }
 
+    @Override
     public boolean exists(OpenJPAStateManager sm, Object context) {
         if (context instanceof PCResultObjectProvider)
             context = null;
         return super.exists(sm, context);
     }
 
+    @Override
     public boolean initialize(OpenJPAStateManager sm, PCState state,
         FetchConfiguration fetch, Object context) {
         if (context instanceof PCResultObjectProvider) {
@@ -57,6 +59,7 @@ class ROPStoreManager
         return super.initialize(sm, state, fetch, context);
     }
 
+    @Override
     public boolean syncVersion(OpenJPAStateManager sm, Object context) {
         // the only way this gets called with a rop context is if the
         // rop didn't load any version info on initialize, so just null
@@ -67,6 +70,7 @@ class ROPStoreManager
         return super.syncVersion(sm, context);
     }
 
+    @Override
     public boolean load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, int lockLevel, Object context) {
         // the only way this gets called with a rop context is if the
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/RestoreState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/RestoreState.java
index 85e159ab8..a9c96319d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/RestoreState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/RestoreState.java
@@ -29,15 +29,15 @@ public interface RestoreState {
     /**
      * Do not restore any state on rollback.
      */
-    public static final int RESTORE_NONE = 0;
+    int RESTORE_NONE = 0;
 
     /**
      * Restore immutable state on rollback; clear mutable state.
      */
-    public static final int RESTORE_IMMUTABLE = 1;
+    int RESTORE_IMMUTABLE = 1;
 
     /**
      * Restore all state on rollback.
      */
-    public static final int RESTORE_ALL = 2;
+    int RESTORE_ALL = 2;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java
index b2a9bb818..4dc318073 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java
@@ -36,9 +36,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.UserException;
 
@@ -52,7 +52,7 @@ public class ResultPacker {
 
     private static final Localizer _loc = Localizer.forPackage
         (ResultPacker.class);
-    private static final Set<Class<?>> _stdTypes = new HashSet<Class<?>>();
+    private static final Set<Class<?>> _stdTypes = new HashSet<>();
 
     static {
         _stdTypes.add(Object[].class);
@@ -207,7 +207,7 @@ public class ResultPacker {
         if (_resultClass == Object[].class)
             return new Object[]{ result };
         if (_resultClass == HashMap.class || _resultClass == Map.class) {
-            HashMap<String,Object> map = new HashMap<String,Object>(1, 1F);
+            HashMap<String,Object> map = new HashMap<>(1, 1F);
             map.put(_aliases[0], result);
             return map;
         }
@@ -248,7 +248,7 @@ public class ResultPacker {
         if (_resultClass == Object.class)
             return result[0];
         if (_resultClass == HashMap.class || _resultClass == Map.class) {
-            Map<String,Object> map = new HashMap<String,Object>(result.length);
+            Map<String,Object> map = new HashMap<>(result.length);
             for (int i = 0; i < _aliases.length; i++)
                 map.put(_aliases[i], result[i]);
             return map;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultShape.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultShape.java
index 98a4e6428..684349dc0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultShape.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultShape.java
@@ -60,8 +60,8 @@ import java.util.Set;
  * @since 2.0.0
  *
  */
-@SuppressWarnings("serial")
 public class ResultShape<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
     private final Class<T> cls;        // the type of value this shape represents or populates
     private final boolean isPrimitive; // flags this shape as primitive
     private boolean isNesting;         // flags this shape as nesting
@@ -83,7 +83,7 @@ public class ResultShape<T> implements Serializable {
      * If the shape is declared as primitive then the given class can not be an array.
      */
     public ResultShape(Class<T> cls, boolean primitive) {
-        this(cls, cls.isArray() ? new FillStrategy.Array<T>(cls) : new FillStrategy.Assign<T>(), primitive);
+        this(cls, cls.isArray() ? new FillStrategy.Array<>(cls) : new FillStrategy.Assign<T>(), primitive);
         if (cls.isArray() && primitive)
             throw new IllegalArgumentException(cls.getSimpleName() + " can not be primitive shape");
     }
@@ -105,7 +105,7 @@ public class ResultShape<T> implements Serializable {
         this.cls = cls;
         this.strategy = strategy;
         isPrimitive = primitive;
-        children = isPrimitive ? null : new ArrayList<ResultShape<?>>();
+        children = isPrimitive ? null : new ArrayList<>();
     }
 
 //    /**
@@ -158,7 +158,7 @@ public class ResultShape<T> implements Serializable {
      * {String, int, Date, Double}
      */
     public List<Class<?>> getCompositeTypes() {
-        List<Class<?>> result = new ArrayList<Class<?>>();
+        List<Class<?>> result = new ArrayList<>();
         if (isPrimitive() || children.isEmpty()) {
             result.add(cls);
         } else {
@@ -174,7 +174,7 @@ public class ResultShape<T> implements Serializable {
      * For example, a shape Foo{String,Bar{int, Date}, Double} will return {String, Bar, Double}
      */
     public List<Class<?>> getTypes() {
-        List<Class<?>> result = new ArrayList<Class<?>>();
+        List<Class<?>> result = new ArrayList<>();
         if (children.isEmpty()) {
             result.add(cls);
         } else {
@@ -222,7 +222,7 @@ public class ResultShape<T> implements Serializable {
      */
     private void addParent(ResultShape<?> p) {
         if (parents == null)
-            parents = new HashSet<ResultShape<?>>();
+            parents = new HashSet<>();
         parents.add(p);
     }
 
@@ -359,7 +359,7 @@ public class ResultShape<T> implements Serializable {
                 i++;
             }
         }
-        return (T)strategy.fill(args, argTypes, argAliases);
+        return strategy.fill(args, argTypes, argAliases);
     }
 
     /**
@@ -374,6 +374,7 @@ public class ResultShape<T> implements Serializable {
      * Gets a human-readable representation of this shape.
      *
      */
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder(cls.getSimpleName());
         if (isPrimitive() || children.isEmpty())
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java
index 9d183595c..15416a484 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java
@@ -41,6 +41,8 @@ public class SaveFieldManager
     extends ClearFieldManager
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private final StateManagerImpl _sm;
     private final BitSet _unloaded;
     private BitSet _saved = null;
@@ -67,7 +69,7 @@ public class SaveFieldManager
         else {
             _unloaded = (BitSet) dirty.clone();
             for (int i = 0; i < fields.length; i++)
-                if (fields[i].getManagement() != fields[i].MANAGE_PERSISTENT)
+                if (fields[i].getManagement() != FieldMetaData.MANAGE_PERSISTENT)
                     _unloaded.clear(i);
         }
     }
@@ -191,11 +193,13 @@ public class SaveFieldManager
         return current == old || current != null && current.equals(old);
     }
 
+    @Override
     public Object fetchObjectField(int field) {
         // return the copied field during save, or a null value during restore
         return _field;
     }
 
+    @Override
     public void storeObjectField(int field, Object curVal) {
         // copy mutable fields
         ProxyManager proxy = _sm.getBroker().getConfiguration().
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java
index 360eeca12..68437edf9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java
@@ -18,10 +18,10 @@
  */
 package org.apache.openjpa.kernel;
 
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.Date;
@@ -44,6 +44,9 @@ class SavepointFieldManager
     extends ClearFieldManager
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (SavepointFieldManager.class);
 
@@ -193,10 +196,12 @@ class SavepointFieldManager
         return false;
     }
 
+    @Override
     public Object fetchObjectField(int field) {
         return _field;
     }
 
+    @Override
     public void storeObjectField(int field, Object curVal) {
         // copy mutable fields
         ProxyManager proxy = _sm.getContext().getConfiguration().
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointManager.java
index 979a58a41..6522b727c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointManager.java
@@ -30,10 +30,10 @@ public interface SavepointManager {
      * Return whether the savepoints generated by this manager
      * can handle incremental flushes to the datastore.
      */
-    public boolean supportsIncrementalFlush();
+    boolean supportsIncrementalFlush();
 
     /**
      * Return a new savepoint for the given name, which may be null.
      */
-    public OpenJPASavepoint newSavepoint(String name, Broker broker);
+    OpenJPASavepoint newSavepoint(String name, Broker broker);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Seq.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Seq.java
index 1d53c6001..bfad00a49 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Seq.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Seq.java
@@ -29,15 +29,15 @@ import org.apache.openjpa.meta.ClassMetaData;
 public interface Seq
     extends Closeable {
 
-    public static final int TYPE_DEFAULT = 0;
-    public static final int TYPE_NONTRANSACTIONAL = 1;
-    public static final int TYPE_TRANSACTIONAL = 2;
-    public static final int TYPE_CONTIGUOUS = 3;
+    int TYPE_DEFAULT = 0;
+    int TYPE_NONTRANSACTIONAL = 1;
+    int TYPE_TRANSACTIONAL = 2;
+    int TYPE_CONTIGUOUS = 3;
 
     /**
      * Set the type of sequence.
      */
-    public void setType(int type);
+    void setType(int type);
 
     /**
      * Return the next value in the sequence.
@@ -46,7 +46,7 @@ public interface Seq
      * @param cls if this is a datastore identity sequence, the
      * persistent class the identity value is for; else null
      */
-    public Object next(StoreContext ctx, ClassMetaData cls);
+    Object next(StoreContext ctx, ClassMetaData cls);
 
     /**
      * Return the current value of the sequence, or null if not available.
@@ -55,7 +55,7 @@ public interface Seq
      * @param cls if this is a datastore identity sequence, the
      * persistent class the identity value is for; else null
      */
-    public Object current(StoreContext ctx, ClassMetaData cls);
+    Object current(StoreContext ctx, ClassMetaData cls);
 
     /**
      * Allocate additional values efficiently.
@@ -64,10 +64,10 @@ public interface Seq
      * @param cls if this is a datastore identity sequence, the
      * persistent class the identity value is for; else null
      */
-    public void allocate(int additional, StoreContext ctx, ClassMetaData cls);
+    void allocate(int additional, StoreContext ctx, ClassMetaData cls);
 
     /**
      * Free resources used by this sequence.
      */
-    public void close ();
+    @Override void close ();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
index db7223fb9..228192179 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
@@ -54,6 +54,9 @@ import org.apache.openjpa.util.UserException;
  * on the held field.
  */
 class SingleFieldManager extends TransferFieldManager implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(SingleFieldManager.class);
 
     private final StateManagerImpl _sm;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
index 5a23da8e0..361c99c4c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
@@ -84,6 +84,8 @@ import org.apache.openjpa.util.UserException;
  * @author Abe White
  */
 public class StateManagerImpl implements OpenJPAStateManager, Serializable {
+    
+    private static final long serialVersionUID = 1L;
     public static final int LOAD_FGS = 0;
     public static final int LOAD_ALL = 1;
     public static final int LOAD_SERIALIZE = 2;
@@ -307,6 +309,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
     // OpenJPAStateManager implementation
     //////////////////////////////////////
 
+    @Override
     public void initialize(Class cls, PCState state) {
         // check to see if our current object id instance is the
         // correct id type for the specified class; this is for cases
@@ -422,6 +425,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return _broker.fireLifecycleEvent(getManagedInstance(), null, _meta, type);
     }
 
+    @Override
     public void load(FetchConfiguration fetch) {
         load(fetch, LOAD_FGS, null, null, false);
     }
@@ -451,6 +455,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ret;
     }
 
+    @Override
     public Object getManagedInstance() {
         if (_pc instanceof ManagedInstanceProvider)
             return ((ManagedInstanceProvider) _pc).getManagedInstance();
@@ -458,18 +463,22 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
             return _pc;
     }
 
+    @Override
     public PersistenceCapable getPersistenceCapable() {
         return _pc;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return _owner;
     }
 
+    @Override
     public int getOwnerIndex() {
         return _ownerIndex;
     }
@@ -478,23 +487,28 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         _ownerId = oid;
     }
 
+    @Override
     public boolean isEmbedded() {
         // _owner may not be set if embed object is from query result
         return _owner != null || _state instanceof ENonTransState;
     }
 
+    @Override
     public boolean isFlushed() {
         return (_flags & FLAG_FLUSHED) > 0;
     }
 
+    @Override
     public boolean isFlushedDirty() {
         return (_flags & FLAG_FLUSHED_DIRTY) > 0;
     }
 
+    @Override
     public BitSet getLoaded() {
         return _loaded;
     }
 
+    @Override
     public BitSet getUnloaded(FetchConfiguration fetch) {
         // collect fields to load from data store based on fetch configuration
         BitSet fields = getUnloadedInternal(fetch, LOAD_FGS, null);
@@ -539,6 +553,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return fields;
     }
 
+    @Override
     public StoreContext getContext() {
         return _broker;
     }
@@ -550,10 +565,12 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return _broker;
     }
 
+    @Override
     public Object getId() {
         return _id;
     }
 
+    @Override
     public Object getObjectId() {
         StateManagerImpl sm = this;
         while (sm.getOwner() != null)
@@ -563,6 +580,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return sm._oid;
     }
 
+    @Override
     public void setObjectId(Object oid) {
         _oid = oid;
         if (_pc != null && oid instanceof OpenJPAId)
@@ -575,6 +593,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
             sm = (StateManagerImpl) sm.getOwner();
         return sm;
     }
+    @Override
     public boolean assignObjectId(boolean flush) {
         lock();
         try {
@@ -695,18 +714,22 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return !preFlushing;
     }
 
+    @Override
     public Object getLock() {
         return _lock;
     }
 
+    @Override
     public void setLock(Object lock) {
         _lock = lock;
     }
 
+    @Override
     public Object getVersion() {
         return _version;
     }
 
+    @Override
     public void setVersion(Object version) {
         _loadVersion = version;
         assignVersionField(version);
@@ -716,6 +739,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return _loadVersion;
     }
 
+    @Override
     public void setNextVersion(Object version) {
         assignVersionField(version);
     }
@@ -763,14 +787,17 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
             store(vfield.getIndex(), JavaTypes.convert(version, vfield.getTypeCode()));
     }
 
+    @Override
     public PCState getPCState() {
         return _state;
     }
 
+    @Override
     public synchronized Object getImplData() {
         return _impl;
     }
 
+    @Override
     public synchronized Object setImplData(Object data, boolean cacheable) {
         Object old = _impl;
         _impl = data;
@@ -781,18 +808,22 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return old;
     }
 
+    @Override
     public boolean isImplDataCacheable() {
         return (_flags & FLAG_IMPL_CACHE) != 0;
     }
 
+    @Override
     public Object getImplData(int field) {
         return getExtraFieldData(field, true);
     }
 
+    @Override
     public Object setImplData(int field, Object data) {
         return setExtraFieldData(field, data, true);
     }
 
+    @Override
     public synchronized boolean isImplDataCacheable(int field) {
         if (_fieldImpl == null || !_loaded.get(field))
             return false;
@@ -802,10 +833,12 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return idx != -1 && _fieldImpl[idx] != null;
     }
 
+    @Override
     public Object getIntermediate(int field) {
         return getExtraFieldData(field, false);
     }
 
+    @Override
     public void setIntermediate(int field, Object data) {
         setExtraFieldData(field, data, false);
     }
@@ -848,11 +881,13 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return old;
     }
 
+    @Override
     public Object fetch(int field) {
         Object val = fetchField(field, false);
         return _meta.getField(field).getExternalValue(val, _broker);
     }
 
+    @Override
     public Object fetchField(int field, boolean transitions) {
         FieldMetaData fmd = _meta.getField(field);
         if (fmd == null)
@@ -891,11 +926,13 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void store(int field, Object val) {
         val = _meta.getField(field).getFieldValue(val, _broker);
         storeField(field, val);
     }
 
+    @Override
     public void storeField(int field, Object val) {
         storeField(field, val, this);
     }
@@ -953,6 +990,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return true;
     }
 
+    @Override
     public Object fetchInitialField(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (_broker.getRestoreState() == RestoreState.RESTORE_NONE
@@ -1024,6 +1062,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void setRemote(int field, Object value) {
         lock();
         try {
@@ -1307,6 +1346,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public boolean beforeRefresh(boolean refreshAll) {
         // note: all logic placed here rather than in the states for
         // optimization; this method public b/c used by remote package
@@ -1470,6 +1510,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
     /**
      * @return whether or not unloaded fields should be closed.
      */
+    @Override
     public boolean serializing() {
         // if the broker is in the midst of a serialization, then no special
         // handling should be performed on the instance, and no subsequent
@@ -1489,6 +1530,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public boolean writeDetached(ObjectOutput out)
         throws IOException {
         BitSet idxs = new BitSet(_meta.getFields().length);
@@ -1515,11 +1557,13 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void proxyDetachedDeserialized(int idx) {
         // we don't serialize state manager impls
         throw new InternalException();
     }
 
+    @Override
     public boolean isTransactional() {
         // special case for TCLEAN, which we want to appear non-trans to
         // internal code, but which publicly should be transactional
@@ -1530,34 +1574,42 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return _state.isPendingTransactional();
     }
 
+    @Override
     public boolean isProvisional() {
         return _state.isProvisional();
     }
 
+    @Override
     public boolean isPersistent() {
         return _state.isPersistent();
     }
 
+    @Override
     public boolean isNew() {
         return _state.isNew();
     }
 
+    @Override
     public boolean isDeleted() {
         return _state.isDeleted();
     }
 
+    @Override
     public boolean isDirty() {
         return _state.isDirty();
     }
 
+    @Override
     public boolean isDetached() {
         return (_flags & FLAG_DETACHING) != 0;
     }
 
+    @Override
     public Object getGenericContext() {
         return _broker;
     }
 
+    @Override
     public Object fetchObjectId() {
         try {
             if (hasGeneratedKey() && _state instanceof PNewState &&
@@ -1585,6 +1637,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return false;
     }
 
+    @Override
     public Object getPCPrimaryKey(Object oid, int field) {
         FieldMetaData fmd = _meta.getField(field);
         Object pk = ApplicationIds.get(oid, fmd);
@@ -1608,10 +1661,12 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return PersistenceCapable.LOAD_REQUIRED;
     }
 
+    @Override
     public StateManager replaceStateManager(StateManager sm) {
         return sm;
     }
 
+    @Override
     public void accessingField(int field) {
         // possibly change state
         try {
@@ -1627,6 +1682,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public boolean isDelayed(int field) {
         if (_delayed == null) {
             return false;
@@ -1634,6 +1690,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return _delayed.get(field);
     }
 
+    @Override
     public void setDelayed(int field, boolean delay) {
         if (_delayed == null) {
             _delayed = new BitSet();
@@ -1648,6 +1705,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
     /**
      * Loads a delayed access field.
      */
+    @Override
     public void loadDelayedField(int field) {
         if (!isDelayed(field)) {
             return;
@@ -1698,6 +1756,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void dirty(String field) {
         FieldMetaData fmd = _meta.getField(field);
         if (fmd == null)
@@ -1708,6 +1767,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         dirty(fmd.getIndex(), null, true);
     }
 
+    @Override
     public void dirty(int field) {
         dirty(field, null, true);
     }
@@ -1818,7 +1878,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
 
                 // make sure the field's fetch group is loaded
                 if (loadFetchGroup && isPersistent()
-                    && fmd.getManagement() == fmd.MANAGE_PERSISTENT)
+                    && fmd.getManagement() == FieldMetaData.MANAGE_PERSISTENT)
                     loadField(field, lockLevel, true, true);
             }
             obtainLocks(active, true, lockLevel, null, null);
@@ -1851,6 +1911,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
             fireLifecycleEvent(LifecycleEvent.AFTER_DIRTY_FLUSHED);
     }
 
+    @Override
     public void removed(int field, Object removed, boolean key) {
         if (removed == null)
             return;
@@ -1868,6 +1929,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public Object newProxy(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -1892,6 +1954,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return null;
     }
 
+    @Override
     public Object newFieldProxy(int field) {
         FieldMetaData fmd = _meta.getField(field);
         ProxyManager mgr = _broker.getConfiguration().
@@ -1919,6 +1982,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return null;
     }
 
+    @Override
     public boolean isDefaultValue(int field) {
         lock();
         try {
@@ -1936,6 +2000,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
     // Record that the field is dirty (which might load DFG)
     /////////////////////////////////////////////////////////
 
+    @Override
     public void settingBooleanField(PersistenceCapable pc, int field,
         boolean curVal, boolean newVal, int set) {
         if (set != SET_REMOTE) {
@@ -1955,6 +2020,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingByteField(PersistenceCapable pc, int field,
         byte curVal, byte newVal, int set) {
         if (set != SET_REMOTE) {
@@ -1974,6 +2040,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingCharField(PersistenceCapable pc, int field,
         char curVal, char newVal, int set) {
         if (set != SET_REMOTE) {
@@ -1993,6 +2060,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingDoubleField(PersistenceCapable pc, int field,
         double curVal, double newVal, int set) {
         if (set != SET_REMOTE) {
@@ -2012,6 +2080,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingFloatField(PersistenceCapable pc, int field,
         float curVal, float newVal, int set) {
         if (set != SET_REMOTE) {
@@ -2031,6 +2100,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingIntField(PersistenceCapable pc, int field,
         int curVal, int newVal, int set) {
         if (set != SET_REMOTE) {
@@ -2050,6 +2120,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingLongField(PersistenceCapable pc, int field,
         long curVal, long newVal, int set) {
         if (set != SET_REMOTE) {
@@ -2069,6 +2140,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingObjectField(PersistenceCapable pc, int field,
         Object curVal, Object newVal, int set) {
         if (set != SET_REMOTE) {
@@ -2139,6 +2211,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingShortField(PersistenceCapable pc, int field,
         short curVal, short newVal, int set) {
         if (set != SET_REMOTE) {
@@ -2158,6 +2231,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void settingStringField(PersistenceCapable pc, int field,
         String curVal, String newVal, int set) {
         if (set != SET_REMOTE) {
@@ -2203,92 +2277,112 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
     // Delegate to FieldManager
     ////////////////////////////
 
+    @Override
     public void providedBooleanField(PersistenceCapable pc, int field,
         boolean curVal) {
         _fm.storeBooleanField(field, curVal);
     }
 
+    @Override
     public void providedByteField(PersistenceCapable pc, int field,
         byte curVal) {
         _fm.storeByteField(field, curVal);
     }
 
+    @Override
     public void providedCharField(PersistenceCapable pc, int field,
         char curVal) {
         _fm.storeCharField(field, curVal);
     }
 
+    @Override
     public void providedDoubleField(PersistenceCapable pc, int field,
         double curVal) {
         _fm.storeDoubleField(field, curVal);
     }
 
+    @Override
     public void providedFloatField(PersistenceCapable pc, int field,
         float curVal) {
         _fm.storeFloatField(field, curVal);
     }
 
+    @Override
     public void providedIntField(PersistenceCapable pc, int field,
         int curVal) {
         _fm.storeIntField(field, curVal);
     }
 
+    @Override
     public void providedLongField(PersistenceCapable pc, int field,
         long curVal) {
         _fm.storeLongField(field, curVal);
     }
 
+    @Override
     public void providedObjectField(PersistenceCapable pc, int field,
         Object curVal) {
         _fm.storeObjectField(field, curVal);
     }
 
+    @Override
     public void providedShortField(PersistenceCapable pc, int field,
         short curVal) {
         _fm.storeShortField(field, curVal);
     }
 
+    @Override
     public void providedStringField(PersistenceCapable pc, int field,
         String curVal) {
         _fm.storeStringField(field, curVal);
     }
 
+    @Override
     public boolean replaceBooleanField(PersistenceCapable pc, int field) {
         return _fm.fetchBooleanField(field);
     }
 
+    @Override
     public byte replaceByteField(PersistenceCapable pc, int field) {
         return _fm.fetchByteField(field);
     }
 
+    @Override
     public char replaceCharField(PersistenceCapable pc, int field) {
         return _fm.fetchCharField(field);
     }
 
+    @Override
     public double replaceDoubleField(PersistenceCapable pc, int field) {
         return _fm.fetchDoubleField(field);
     }
 
+    @Override
     public float replaceFloatField(PersistenceCapable pc, int field) {
         return _fm.fetchFloatField(field);
     }
 
+    @Override
     public int replaceIntField(PersistenceCapable pc, int field) {
         return _fm.fetchIntField(field);
     }
 
+    @Override
     public long replaceLongField(PersistenceCapable pc, int field) {
         return _fm.fetchLongField(field);
     }
 
+    @Override
     public Object replaceObjectField(PersistenceCapable pc, int field) {
         return _fm.fetchObjectField(field);
     }
 
+    @Override
     public short replaceShortField(PersistenceCapable pc, int field) {
         return _fm.fetchShortField(field);
     }
 
+    @Override
     public String replaceStringField(PersistenceCapable pc, int field) {
         return _fm.fetchStringField(field);
     }
@@ -2297,6 +2391,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
     // Implementation of FieldManager
     //////////////////////////////////
 
+    @Override
     public boolean fetchBoolean(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2306,6 +2401,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ((Boolean) fmd.getExternalValue(val, _broker)).booleanValue();
     }
 
+    @Override
     public boolean fetchBooleanField(int field) {
         lock();
         try {
@@ -2319,6 +2415,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public byte fetchByte(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2328,6 +2425,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ((Number) fmd.getExternalValue(val, _broker)).byteValue();
     }
 
+    @Override
     public byte fetchByteField(int field) {
         lock();
         try {
@@ -2341,6 +2439,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public char fetchChar(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2350,6 +2449,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ((Character) fmd.getExternalValue(val, _broker)).charValue();
     }
 
+    @Override
     public char fetchCharField(int field) {
         lock();
         try {
@@ -2363,6 +2463,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public double fetchDouble(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2372,6 +2473,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ((Number) fmd.getExternalValue(val, _broker)).doubleValue();
     }
 
+    @Override
     public double fetchDoubleField(int field) {
         lock();
         try {
@@ -2385,6 +2487,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public float fetchFloat(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2394,6 +2497,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ((Number) fmd.getExternalValue(val, _broker)).floatValue();
     }
 
+    @Override
     public float fetchFloatField(int field) {
         lock();
         try {
@@ -2407,6 +2511,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public int fetchInt(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2416,6 +2521,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ((Number) fmd.getExternalValue(val, _broker)).intValue();
     }
 
+    @Override
     public int fetchIntField(int field) {
         lock();
         try {
@@ -2429,6 +2535,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public long fetchLong(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2438,6 +2545,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ((Number) fmd.getExternalValue(val, _broker)).longValue();
     }
 
+    @Override
     public long fetchLongField(int field) {
         lock();
         try {
@@ -2451,6 +2559,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public Object fetchObject(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2460,6 +2569,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return fmd.getExternalValue(val, _broker);
     }
 
+    @Override
     public Object fetchObjectField(int field) {
         lock();
         try {
@@ -2473,6 +2583,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public short fetchShort(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2482,6 +2593,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return ((Number) fmd.getExternalValue(val, _broker)).shortValue();
     }
 
+    @Override
     public short fetchShortField(int field) {
         lock();
         try {
@@ -2495,6 +2607,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public String fetchString(int field) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2504,6 +2617,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         return (String) fmd.getExternalValue(val, _broker);
     }
 
+    @Override
     public String fetchStringField(int field) {
         lock();
         try {
@@ -2517,6 +2631,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeBoolean(int field, boolean externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2527,6 +2642,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeBooleanField(int field, boolean curVal) {
         lock();
         try {
@@ -2539,6 +2655,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeByte(int field, byte externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2548,6 +2665,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
                 _broker));
     }
 
+    @Override
     public void storeByteField(int field, byte curVal) {
         lock();
         try {
@@ -2560,6 +2678,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeChar(int field, char externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2569,6 +2688,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
                 _broker));
     }
 
+    @Override
     public void storeCharField(int field, char curVal) {
         lock();
         try {
@@ -2581,6 +2701,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeDouble(int field, double externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2589,6 +2710,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
             storeField(field, fmd.getFieldValue(Double.valueOf(externalVal), _broker));
     }
 
+    @Override
     public void storeDoubleField(int field, double curVal) {
         lock();
         try {
@@ -2601,6 +2723,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeFloat(int field, float externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2609,6 +2732,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
             storeField(field, fmd.getFieldValue(Float.valueOf(externalVal), _broker));
     }
 
+    @Override
     public void storeFloatField(int field, float curVal) {
         lock();
         try {
@@ -2621,6 +2745,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeInt(int field, int externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2630,6 +2755,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
                 _broker));
     }
 
+    @Override
     public void storeIntField(int field, int curVal) {
         lock();
         try {
@@ -2642,6 +2768,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeLong(int field, long externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2651,6 +2778,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
                 _broker));
     }
 
+    @Override
     public void storeLongField(int field, long curVal) {
         lock();
         try {
@@ -2663,6 +2791,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeObject(int field, Object externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         externalVal = fmd.order(externalVal);
@@ -2672,6 +2801,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
             storeField(field, fmd.getFieldValue(externalVal, _broker));
     }
 
+    @Override
     public void storeObjectField(int field, Object curVal) {
         lock();
         try {
@@ -2685,6 +2815,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeShort(int field, short externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2694,6 +2825,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
                 _broker));
     }
 
+    @Override
     public void storeShortField(int field, short curVal) {
         lock();
         try {
@@ -2706,6 +2838,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public void storeString(int field, String externalVal) {
         FieldMetaData fmd = _meta.getField(field);
         if (!fmd.isExternalized())
@@ -2714,6 +2847,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
             storeField(field, fmd.getFieldValue(externalVal, _broker));
     }
 
+    @Override
     public void storeStringField(int field, String curVal) {
         lock();
         try {
@@ -2799,7 +2933,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         FieldMetaData[] fmds = _meta.getFields();
         for (int i = 0; i < fmds.length; i++) {
             if (!fmds[i].isPrimaryKey()
-                && fmds[i].getManagement() == fmds[i].MANAGE_PERSISTENT)
+                && fmds[i].getManagement() == FieldMetaData.MANAGE_PERSISTENT)
                 setLoaded(i, val);
         }
         if (!val) {
@@ -3362,6 +3496,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
     /**
      * Returns whether this instance needs a version check.
      */
+    @Override
     public boolean isVersionCheckRequired() {
         // explicit flag for version check
         if ((_flags & FLAG_VERSION_CHECK) != 0)
@@ -3386,6 +3521,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
     /**
      * Returns whether this instance needs a version update.
      */
+    @Override
     public boolean isVersionUpdateRequired() {
         return (_flags & FLAG_VERSION_UPDATE) > 0;
     }
@@ -3504,6 +3640,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         _broker = ctx;
     }
 
+    @Override
     public BitSet getFlushed() {
         if (_flush == null) {
             _flush = new BitSet(_meta.getFields().length);
@@ -3527,6 +3664,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public BitSet getDirty() {
         if (_dirty == null) {
             _dirty = new BitSet(_meta.getFields().length);
@@ -3554,6 +3692,7 @@ public class StateManagerImpl implements OpenJPAStateManager, Serializable {
         }
     }
 
+    @Override
     public String toString() {
     	return "SM[" + _meta.getDescribedType().getSimpleName() + "]:" + getObjectId();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreContext.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreContext.java
index 46d9c7568..e64d17dc6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreContext.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreContext.java
@@ -39,29 +39,29 @@ public interface StoreContext {
      * Marker bitset to indicate that all field loads should be excluded in
      * the <code>find</code> methods of this interface.
      */
-    public static final BitSet EXCLUDE_ALL = new BitSet(0);
+    BitSet EXCLUDE_ALL = new BitSet(0);
 
-    public static final int OID_NOVALIDATE = 2 << 0;
-    public static final int OID_NODELETED = 2 << 1;
-    public static final int OID_COPY = 2 << 2;
-    public static final int OID_ALLOW_NEW = 2 << 3;
+    int OID_NOVALIDATE = 2 << 0;
+    int OID_NODELETED = 2 << 1;
+    int OID_COPY = 2 << 2;
+    int OID_ALLOW_NEW = 2 << 3;
 
     /**
      * Return the broker for this context, if possible. Note that a broker
      * will be unavailable in remote contexts, and this method may return null.
      */
-    public Broker getBroker();
+    Broker getBroker();
 
     /**
      * Return the configuration associated with this context.
      */
-    public OpenJPAConfiguration getConfiguration();
+    OpenJPAConfiguration getConfiguration();
 
     /**
      * Return the (mutable) fetch configuration for loading objects from this
      * context.
      */
-    public FetchConfiguration getFetchConfiguration();
+    FetchConfiguration getFetchConfiguration();
 
     /**
      * Pushes a new fetch configuration that inherits from the current
@@ -71,7 +71,7 @@ public interface StoreContext {
      * @since 1.1.0
      * @return the new fetch configuration
      */
-    public FetchConfiguration pushFetchConfiguration();
+    FetchConfiguration pushFetchConfiguration();
 
     /**
      * Pushes the fetch configuration argument onto a stack, and makes the new configuration
@@ -80,7 +80,7 @@ public interface StoreContext {
      * @since 2.1.1
      * @return the new fetch configuration
      */
-    public FetchConfiguration pushFetchConfiguration(FetchConfiguration fc);
+    FetchConfiguration pushFetchConfiguration(FetchConfiguration fc);
 
     /**
      * Pops the fetch configuration from the top of the stack, making the
@@ -91,35 +91,35 @@ public interface StoreContext {
      * @since 1.1.0
      * @throws UserException if the fetch configuration stack is empty
      */
-    public void popFetchConfiguration();
+    void popFetchConfiguration();
 
     /**
      * Return the current thread's class loader at the time this context
      * was obtained.
      */
-    public ClassLoader getClassLoader();
+    ClassLoader getClassLoader();
 
     /**
      * Return the lock manager in use.
      */
-    public LockManager getLockManager();
+    LockManager getLockManager();
 
     /**
      * Return the store manager in use. This will be a wrapper around the
      * native store manager, which you can retrieve via
      * {@link DelegatingStoreManager#getInnermostDelegate}.
      */
-    public DelegatingStoreManager getStoreManager();
+    DelegatingStoreManager getStoreManager();
 
     /**
      * Return the connection user name.
      */
-    public String getConnectionUserName();
+    String getConnectionUserName();
 
     /**
      * Return the connection password.
      */
-    public String getConnectionPassword();
+    String getConnectionPassword();
 
     /**
      * Return the instance for the given oid/object , or null if not
@@ -128,7 +128,7 @@ public interface StoreContext {
      * @param oid the object's id
      * @return the cached object, or null if not cached
      */
-    public Object findCached(Object oid, FindCallbacks call);
+    Object findCached(Object oid, FindCallbacks call);
 
     /**
      * Find the persistence object with the given oid. If
@@ -143,7 +143,7 @@ public interface StoreContext {
      * store and load fetch group fields, otherwise return
      * any cached or hollow instance
      */
-    public Object find(Object oid, boolean validate, FindCallbacks call);
+    Object find(Object oid, boolean validate, FindCallbacks call);
 
     /**
      * Return the objects with the given oids.
@@ -153,7 +153,7 @@ public interface StoreContext {
      * parameter
      * @see #find(Object,boolean,FindCallbacks)
      */
-    public Object[] findAll(Collection<Object> oids, boolean validate,
+    Object[] findAll(Collection<Object> oids, boolean validate,
         FindCallbacks call);
 
     /**
@@ -169,7 +169,7 @@ public interface StoreContext {
      * if a cached instance has been deleted concurrently. These options
      * are controllable through the given <code>OID_XXX</code> flags.
      */
-    public Object find(Object oid, FetchConfiguration fetch, BitSet exclude,
+    Object find(Object oid, FetchConfiguration fetch, BitSet exclude,
         Object edata, int flags);
 
     /**
@@ -177,7 +177,7 @@ public interface StoreContext {
      *
      * @see #find(Object,FetchConfiguration,BitSet,Object,int)
      */
-    public Object[] findAll(Collection<Object> oids, FetchConfiguration fetch,
+    Object[] findAll(Collection<Object> oids, FetchConfiguration fetch,
         BitSet exclude, Object edata, int flags);
 
     /**
@@ -186,7 +186,7 @@ public interface StoreContext {
      * when no longer needed. This method delegates to
      * {@link StoreManager#executeExtent}.
      */
-    public Iterator<Object> extentIterator(Class<?> cls, boolean subs,
+    Iterator<Object> extentIterator(Class<?> cls, boolean subs,
         FetchConfiguration fetch, boolean ignoreChanges);
 
     /**
@@ -200,7 +200,7 @@ public interface StoreContext {
      * in the current fetch groups, or all fields
      * @see #retrieve
      */
-    public void retrieve(Object pc, boolean fgOnly, OpCallbacks call);
+    void retrieve(Object pc, boolean fgOnly, OpCallbacks call);
 
     /**
      * Retrieve the given objects' persistent state. Unmanaged targets are
@@ -209,7 +209,7 @@ public interface StoreContext {
      * @param fgOnly indicator as to whether to retrieve only fields
      * @see #retrieve
      */
-    public void retrieveAll(Collection<Object> objs, boolean fgOnly, OpCallbacks call);
+    void retrieveAll(Collection<Object> objs, boolean fgOnly, OpCallbacks call);
 
     /**
      * Make the given instance embedded.
@@ -221,14 +221,14 @@ public interface StoreContext {
      * @param ownerMeta the value in which the object is embedded
      * @return the state manager for the embedded instance
      */
-    public OpenJPAStateManager embed(Object obj, Object id,
+    OpenJPAStateManager embed(Object obj, Object id,
         OpenJPAStateManager owner, ValueMetaData ownerMeta);
 
     /**
      * Return the application or datastore identity class the given persistent
      * class uses for object ids.
      */
-    public Class<?> getObjectIdType(Class<?> cls);
+    Class<?> getObjectIdType(Class<?> cls);
 
     /**
      * Create a new object id instance from the given value.
@@ -237,7 +237,7 @@ public interface StoreContext {
      * @param val an object id instance, stringified object id, or primary
      * key value
      */
-    public Object newObjectId(Class<?> cls, Object val);
+    Object newObjectId(Class<?> cls, Object val);
 
     /**
      * Return the set of classes that have been made persistent in the current
@@ -245,7 +245,7 @@ public interface StoreContext {
      *
      * @since 0.3.4
      */
-    public Collection<Class<?>> getPersistedTypes();
+    Collection<Class<?>> getPersistedTypes();
 
     /**
      * Return the set of classes that have been deleted in the current
@@ -253,7 +253,7 @@ public interface StoreContext {
      *
      * @since 0.3.4
      */
-    public Collection<Class<?>> getDeletedTypes();
+    Collection<Class<?>> getDeletedTypes();
 
     /**
      * Return the set of classes for objects that have been modified
@@ -261,67 +261,67 @@ public interface StoreContext {
      *
      * @since 0.3.4
      */
-    public Collection<Class<?>> getUpdatedTypes();
+    Collection<Class<?>> getUpdatedTypes();
 
     /**
      * Return a list of all managed instances.
      */
-    public Collection<Object> getManagedObjects();
+    Collection<Object> getManagedObjects();
 
     /**
      * Return a list of current transaction instances.
      */
-    public Collection<Object> getTransactionalObjects();
+    Collection<Object> getTransactionalObjects();
 
     /**
      * Return a list of instances which will become transactional upon
      * the next transaction.
      */
-    public Collection<Object> getPendingTransactionalObjects();
+    Collection<Object> getPendingTransactionalObjects();
 
     /**
      * Return a list of current dirty instances.
      */
-    public Collection<Object> getDirtyObjects();
+    Collection<Object> getDirtyObjects();
 
     /**
      * Whether to maintain the order in which objects are dirtied for
      * {@link #getDirtyObjects}. Default is the store manager's decision.
      */
-    public boolean getOrderDirtyObjects();
+    boolean getOrderDirtyObjects();
 
     /**
      * Whether to maintain the order in which objects are dirtied for
      * {@link #getDirtyObjects}. Default is the store manager's decision.
      */
-    public void setOrderDirtyObjects(boolean order);
+    void setOrderDirtyObjects(boolean order);
 
     /**
      * Return the state manager for the given instance. Includes objects
      * made persistent in the current transaction. If <code>obj</code> is not
      * a managed type or is managed by another context, throw an exception.
      */
-    public OpenJPAStateManager getStateManager(Object obj);
+    OpenJPAStateManager getStateManager(Object obj);
 
     /**
      * Return the lock level of the specified object.
      */
-    public int getLockLevel(Object obj);
+    int getLockLevel(Object obj);
 
     /**
      * Returns the current version indicator for <code>o</code>.
      */
-    public Object getVersion(Object obj);
+    Object getVersion(Object obj);
 
     /**
      * Return whether the given object is dirty.
      */
-    public boolean isDirty(Object obj);
+    boolean isDirty(Object obj);
 
     /**
      * Return whether the given object is transactional.
      */
-    public boolean isTransactional(Object obj);
+    boolean isTransactional(Object obj);
 
     /**
      * Make the given object transactional.
@@ -330,7 +330,7 @@ public interface StoreContext {
      * @param updateVersion if true, the instance's version will be
      * incremented at the next flush
      */
-    public void transactional(Object pc, boolean updateVersion, OpCallbacks call);
+    void transactional(Object pc, boolean updateVersion, OpCallbacks call);
 
     /**
      * Make the given objects transactional.
@@ -339,50 +339,50 @@ public interface StoreContext {
      * @param updateVersion if true, the instance's version will be
      * incremented at the next flush
      */
-    public void transactionalAll(Collection<Object> objs, boolean updateVersion, OpCallbacks call);
+    void transactionalAll(Collection<Object> objs, boolean updateVersion, OpCallbacks call);
 
     /**
      * Make the given object non-transactional.
      */
-    public void nontransactional(Object pc, OpCallbacks call);
+    void nontransactional(Object pc, OpCallbacks call);
 
     /**
      * Make the given objects nontransactional.
      */
-    public void nontransactionalAll(Collection<Object> objs, OpCallbacks call);
+    void nontransactionalAll(Collection<Object> objs, OpCallbacks call);
 
     /**
      * Return whether the given object is persistent.
      */
-    public boolean isPersistent(Object obj);
+    boolean isPersistent(Object obj);
 
     /**
      * Return whether the given object is a newly-created instance registered
      * with <code>broker</code>.
      */
-    public boolean isNew(Object obj);
+    boolean isNew(Object obj);
 
     /**
      * Return whether the given object is deleted.
      */
-    public boolean isDeleted(Object obj);
+    boolean isDeleted(Object obj);
 
     /**
      * Return the oid of the given instance.
      */
-    public Object getObjectId(Object obj);
+    Object getObjectId(Object obj);
 
     /**
      * Detach mode constant to determine which fields are part of the
      * detached graph. Defaults to {@link DetachState#DETACH_LOADED}.
      */
-    public int getDetachState();
+    int getDetachState();
 
     /**
      * Detach mode constant to determine which fields are part of the
      * detached graph. Defaults to {@link DetachState#DETACH_LOADED}.
      */
-    public void setDetachState(int mode);
+    void setDetachState(int mode);
 
     /**
      * Whether objects accessed during this transaction will be added to the
@@ -390,7 +390,7 @@ public interface StoreContext {
      *
      * @since 0.3.4
      */
-    public boolean getPopulateDataCache();
+    boolean getPopulateDataCache();
 
     /**
      * Whether to populate the store cache with objects used by this
@@ -398,7 +398,7 @@ public interface StoreContext {
      *
      * @since 0.3.4
      */
-    public void setPopulateDataCache(boolean cache);
+    void setPopulateDataCache(boolean cache);
 
     /**
      * Whether memory usage is reduced during this transaction at the expense
@@ -407,7 +407,7 @@ public interface StoreContext {
      *
      * @since 1.0.0
      */
-    public boolean isTrackChangesByType();
+    boolean isTrackChangesByType();
 
     /**
      * If a large number of objects will be created, modified, or deleted
@@ -423,84 +423,84 @@ public interface StoreContext {
      *
      * @since 1.0.0
      */
-    public void setTrackChangesByType(boolean largeTransaction);
+    void setTrackChangesByType(boolean largeTransaction);
 
     /**
      * Whether this context is using managed transactions.
      */
-    public boolean isManaged();
+    boolean isManaged();
 
     /**
      * Whether a logical transaction is active.
      */
-    public boolean isActive();
+    boolean isActive();
 
     /**
      * Whether a data store transaction is active.
      */
-    public boolean isStoreActive();
+    boolean isStoreActive();
 
     /**
      * Begin a data store transaction.
      */
-    public void beginStore();
+    void beginStore();
 
     /**
      * Whether the broker has a dedicated connection based on the configured
      * connection retain mode and transaction status.
      */
-    public boolean hasConnection();
+    boolean hasConnection();
 
     /**
      * Return the connection in use by the context, or a new connection if none.
      */
-    public Object getConnection();
+    Object getConnection();
 
     /**
      * Synchronizes on an internal lock if the
      * <code>Multithreaded</code> flag is set to true. Make sure to call
 	 * {@link #unlock} in a finally clause of the same method.
 	 */
-	public void lock ();
+	void lock ();
 
 	/**
 	 * Releases the internal lock.
 	 */
-	public void unlock ();
+	void unlock ();
 
     /**
      * Return the 'JTA' connectionFactoryName
      */
-    public String getConnectionFactoryName();
+    String getConnectionFactoryName();
 
     /**
      * Set the 'JTA' ConnectionFactoryName.
      */
-    public void setConnectionFactoryName(String connectionFactoryName);
+    void setConnectionFactoryName(String connectionFactoryName);
 
     /**
      * Return the 'NonJTA' ConnectionFactoryName.
      */
-    public String getConnectionFactory2Name();
+    String getConnectionFactory2Name();
 
     /**
      * Set the 'NonJTA' ConnectionFactoryName.
      */
-    public void setConnectionFactory2Name(String connectionFactory2Name);
+    void setConnectionFactory2Name(String connectionFactory2Name);
 
     /**
      * Return the 'JTA' ConnectionFactory, looking it up from JNDI if needed.
      *
      * @return the JTA connection factory or null if connectionFactoryName is blank.
      */
-    public Object getConnectionFactory();
+    Object getConnectionFactory();
 
     /**
      * Return the 'NonJTA' ConnectionFactory, looking it up from JNDI if needed.
      *
      * @return the NonJTA connection factory or null if connectionFactoryName is blank.
      */
-    public Object getConnectionFactory2();
+    Object getConnectionFactory2();
 
     /**
      * Indicate whether the oid can be found in the StoreContext's L1 cache or in the StoreManager cache.
@@ -508,7 +508,7 @@ public interface StoreContext {
      * @return true if the oid is available in memory (cached) otherwise false.
      * @since 2.0.0.
      */
-    public boolean isCached(List<Object> oid);
+    boolean isCached(List<Object> oid);
 
     /**
      * Affirms if this context will allow its managed instances to refer instances
@@ -520,7 +520,7 @@ public interface StoreContext {
      *
      * @since 2.1
      */
-    public void setAllowReferenceToSiblingContext(boolean flag);
+    void setAllowReferenceToSiblingContext(boolean flag);
 
     /**
      * Affirms if this context will allow its managed instances to refer instances
@@ -530,7 +530,7 @@ public interface StoreContext {
      *
      * @since 2.1
      */
-    public boolean getAllowReferenceToSiblingContext();
+    boolean getAllowReferenceToSiblingContext();
 
 
     /**
@@ -538,7 +538,7 @@ public interface StoreContext {
      * a &#064;PostLoad lifecycle event.
      * @param allow PostLoad lifecycle events to be triggered on a merge operation
      */
-    public void setPostLoadOnMerge(boolean allow);
+    void setPostLoadOnMerge(boolean allow);
 
     /**
      * Force sending a &#064;PostLoad lifecycle event while merging.
@@ -547,6 +547,6 @@ public interface StoreContext {
      *
      * @since 2.2
      */
-    public boolean getPostLoadOnMerge();
+    boolean getPostLoadOnMerge();
 
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreManager.java
index 629037fd8..754a11d50 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreManager.java
@@ -37,15 +37,15 @@ import org.apache.openjpa.meta.ValueStrategies;
 public interface StoreManager
     extends Closeable {
 
-    public static final int VERSION_LATER = 1;
-    public static final int VERSION_EARLIER = 2;
-    public static final int VERSION_SAME = 3;
-    public static final int VERSION_DIFFERENT = 4;
+    int VERSION_LATER = 1;
+    int VERSION_EARLIER = 2;
+    int VERSION_SAME = 3;
+    int VERSION_DIFFERENT = 4;
 
-    public static final int FORCE_LOAD_NONE = 0;
-    public static final int FORCE_LOAD_DFG = 1;
-    public static final int FORCE_LOAD_REFRESH = 3;
-    public static final int FORCE_LOAD_ALL = 2;
+    int FORCE_LOAD_NONE = 0;
+    int FORCE_LOAD_DFG = 1;
+    int FORCE_LOAD_REFRESH = 3;
+    int FORCE_LOAD_ALL = 2;
 
     /**
      * Set a reference to the corresponding context. This method
@@ -53,20 +53,20 @@ public interface StoreManager
      * is responsible for pulling any necessary configuration data from the
      * context, including the transaction mode and connection retain mode.
      */
-    public void setContext(StoreContext ctx);
+    void setContext(StoreContext ctx);
 
     /**
      * Notification that an optimistic transaction has started. This method
      * does not replace the {@link #begin} method, which will still be called
      * when a true data store transaction should begin.
      */
-    public void beginOptimistic();
+    void beginOptimistic();
 
     /**
      * Notification that an optimistic transaction was rolled back before
      * a data store transaction ever began.
      */
-    public void rollbackOptimistic();
+    void rollbackOptimistic();
 
     /**
      * Begin a data store transaction. After this method is called,
@@ -83,30 +83,30 @@ public interface StoreManager
      *
      * @since 0.2.5
      */
-    public void begin();
+    void begin();
 
     /**
      * Commit the current data store transaction.
      */
-    public void commit();
+    void commit();
 
     /**
      * Rollback the current data store transaction.
      */
-    public void rollback();
+    void rollback();
 
     /**
      * Verify that the given instance exists in the data store; return false
      * if it does not.
      */
-    public boolean exists(OpenJPAStateManager sm, Object edata);
+    boolean exists(OpenJPAStateManager sm, Object edata);
 
     /**
      * Verify that the given instance exists in the data store in memory; return false
      * if it does not. When an object is found in memory the corresponding element of
      * the BitSet is set to 1.
      */
-    public boolean isCached(List<Object> oids, BitSet edata);
+    boolean isCached(List<Object> oids, BitSet edata);
 
     /**
      * Update the version information in the given state manager to the
@@ -118,7 +118,7 @@ public interface StoreManager
      * @return true if the instance still exists in the
      * datastore and is up-to-date, false otherwise
      */
-    public boolean syncVersion(OpenJPAStateManager sm, Object edata);
+    boolean syncVersion(OpenJPAStateManager sm, Object edata);
 
     /**
      * Initialize the given state manager. The object id of the
@@ -146,7 +146,7 @@ public interface StoreManager
      * @return true if the matching instance exists in the data
      * store, false otherwise
      */
-    public boolean initialize(OpenJPAStateManager sm, PCState state,
+    boolean initialize(OpenJPAStateManager sm, PCState state,
         FetchConfiguration fetch, Object edata);
 
     /**
@@ -174,7 +174,7 @@ public interface StoreManager
      * @return false if the object no longer exists in the
      * database, true otherwise
      */
-    public boolean load(OpenJPAStateManager sm, BitSet fields,
+    boolean load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, int lockLevel, Object edata);
 
     /**
@@ -221,7 +221,7 @@ public interface StoreManager
      * which no data store record exists
      * @see org.apache.openjpa.util.ImplHelper#loadAll
      */
-    public Collection<Object> loadAll(Collection<OpenJPAStateManager> sms, PCState state, int load,
+    Collection<Object> loadAll(Collection<OpenJPAStateManager> sms, PCState state, int load,
         FetchConfiguration fetch, Object edata);
 
     /**
@@ -231,7 +231,7 @@ public interface StoreManager
      *
      * @since 0.3.0
      */
-    public void beforeStateChange(OpenJPAStateManager sm, PCState fromState,
+    void beforeStateChange(OpenJPAStateManager sm, PCState fromState,
         PCState toState);
 
     /**
@@ -252,7 +252,7 @@ public interface StoreManager
      *
      * @see org.apache.openjpa.util.ApplicationIds#assign()
      */
-    public Collection<Exception> flush(Collection<OpenJPAStateManager> sms);
+    Collection<Exception> flush(Collection<OpenJPAStateManager> sms);
 
     /**
      * Assign an object id to the given new instance. Return false if the
@@ -272,7 +272,7 @@ public interface StoreManager
      * @see org.apache.openjpa.util.ApplicationIds#assign()
      * @since 0.3.3
      */
-    public boolean assignObjectId(OpenJPAStateManager sm, boolean preFlush);
+    boolean assignObjectId(OpenJPAStateManager sm, boolean preFlush);
 
     /**
      * Assign a value to the given field. Return false if the value cannot
@@ -287,7 +287,7 @@ public interface StoreManager
      * @see org.apache.openjpa.util.ImplHelper#generateFieldValue
      * @since 0.4.0
      */
-    public boolean assignField(OpenJPAStateManager sm, int field,
+    boolean assignField(OpenJPAStateManager sm, int field,
         boolean preFlush);
 
     /**
@@ -296,7 +296,7 @@ public interface StoreManager
      *
      * @since 0.3.0
      */
-    public Class<?> getManagedType(Object oid);
+    Class<?> getManagedType(Object oid);
 
     /**
      * Return the class used by this StoreManager for datastore identity
@@ -304,19 +304,19 @@ public interface StoreManager
      * value should the common datastore identity class for all classes, or
      * null if this store manager does not use a common identity class.
      */
-    public Class<?> getDataStoreIdType(ClassMetaData meta);
+    Class<?> getDataStoreIdType(ClassMetaData meta);
 
     /**
      * Copy the given object id value. Use the described type of the given
      * metadata, which may be a subclass of the given oid's described type.
      */
-    public Object copyDataStoreId(Object oid, ClassMetaData meta);
+    Object copyDataStoreId(Object oid, ClassMetaData meta);
 
     /**
      * Create a new unique datastore identity for the given type from
      * the given oid value (presumably pk, stringified oid, or oid instance).
      */
-    public Object newDataStoreId(Object oidVal, ClassMetaData meta);
+    Object newDataStoreId(Object oidVal, ClassMetaData meta);
 
     /**
      * Return a connection to the data store suitable for client use. If
@@ -324,21 +324,21 @@ public interface StoreManager
      * must be transactional. If no connection is in use, this method should
      * create one to return.
      */
-    public Object getClientConnection();
+    Object getClientConnection();
 
     /**
      * Instruct the store to retain a connection for continued use. This
      * will be invoked automatically based on the user's configured connection
      * retain mode.
      */
-    public void retainConnection();
+    void retainConnection();
 
     /**
      * Instruct the store to release a retained connection. This
      * will be invoked automatically based on the user's configured connection
      * retain mode.
      */
-    public void releaseConnection();
+    void releaseConnection();
 
     /**
      * Cancel all pending data store statements.
@@ -346,7 +346,7 @@ public interface StoreManager
      * @return true if any statements cancelled, false otherwise
      * @since 0.3.1
      */
-    public boolean cancelAll();
+    boolean cancelAll();
 
     /**
      * Return a provider for all instances of the given candidate class,
@@ -354,7 +354,7 @@ public interface StoreManager
      * unmapped type with mapped subclasses. If the provider is iterated
      * within a data store transaction, returned instances should be locked.
      */
-    public ResultObjectProvider executeExtent(ClassMetaData meta,
+    ResultObjectProvider executeExtent(ClassMetaData meta,
         boolean subclasses, FetchConfiguration fetch);
 
     /**
@@ -366,13 +366,13 @@ public interface StoreManager
      *
      * @param language the query language
      */
-    public StoreQuery newQuery(String language);
+    StoreQuery newQuery(String language);
 
     /**
      * Return a fetch configuration suitable for this runtime. Typically
      * will be or extend <code>FetchConfigurationImpl</code>.
      */
-    public FetchConfiguration newFetchConfiguration();
+    FetchConfiguration newFetchConfiguration();
 
     /**
      * Compare the two version objects.
@@ -392,7 +392,7 @@ public interface StoreManager
      * difference of the versions cannot be determined</li>
      * </ul>
      */
-    public int compareVersion(OpenJPAStateManager state, Object v1, Object v2);
+    int compareVersion(OpenJPAStateManager state, Object v1, Object v2);
 
     /**
      * Return a sequence that generates datastore identity values for the
@@ -408,7 +408,7 @@ public interface StoreManager
      *
      * @since 0.4.0
      */
-    public Seq getDataStoreIdSequence(ClassMetaData forClass);
+    Seq getDataStoreIdSequence(ClassMetaData forClass);
 
     /**
      * Return a sequence that generates values for the given field. This
@@ -423,12 +423,12 @@ public interface StoreManager
      *
      * @since 0.4.0
      */
-    public Seq getValueSequence(FieldMetaData forField);
+    Seq getValueSequence(FieldMetaData forField);
 
     /**
      * Free any resources this store manager is using.
      *
      * @since 0.2.5
      */
-    public void close ();
+    @Override void close ();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java
index 62615da99..26b850d6e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java
@@ -46,77 +46,77 @@ public interface StoreQuery
 
     // linkedmap doesn't allow a size of 0, so use 1
     // This is deprecated
-    public static final LinkedMap EMPTY_PARAMS = new LinkedMap(1);
-    public static final OrderedMap<Object, Class<?>> EMPTY_ORDERED_PARAMS = new OrderedMap<Object, Class<?>>();
-    public static final ClassMetaData[] EMPTY_METAS = new ClassMetaData[0];
-    public static final String[] EMPTY_STRINGS = new String[0];
-    public static final Object[] EMPTY_OBJECTS = new Object[0];
-    public static final Class<?>[] EMPTY_CLASSES = new Class[0];
-    public static final boolean[] EMPTY_BOOLEANS = new boolean[0];
+    LinkedMap EMPTY_PARAMS = new LinkedMap(1);
+    OrderedMap<Object, Class<?>> EMPTY_ORDERED_PARAMS = new OrderedMap<>();
+    ClassMetaData[] EMPTY_METAS = new ClassMetaData[0];
+    String[] EMPTY_STRINGS = new String[0];
+    Object[] EMPTY_OBJECTS = new Object[0];
+    Class<?>[] EMPTY_CLASSES = new Class[0];
+    boolean[] EMPTY_BOOLEANS = new boolean[0];
 
     /**
      * Return the query context that has been set.
      */
-    public QueryContext getContext();
+    QueryContext getContext();
 
     /**
      * Set the current query context. This will be called before use.
      */
-    public void setContext(QueryContext ctx);
+    void setContext(QueryContext ctx);
 
     /**
      * This is invoked when the user or a facade creates a new query with
      * an object that the system does not recognize. Return true if
      * the object is recognized by the store, false otherwise.
      */
-    public boolean setQuery(Object query);
+    boolean setQuery(Object query);
 
     /**
      * Return the standard filter listener for the given tag, or null.
      */
-    public FilterListener getFilterListener(String tag);
+    FilterListener getFilterListener(String tag);
 
     /**
      * Return the standard filter listener for the given tag, or null.
      */
-    public AggregateListener getAggregateListener(String tag);
+    AggregateListener getAggregateListener(String tag);
 
     /**
      * Create a new key for caching compiled query information. May be null.
      */
-    public Object newCompilationKey();
+    Object newCompilationKey();
 
     /**
      * Create a new compilation for this query. May be null.
      */
-    public Object newCompilation();
+    Object newCompilation();
 
     /**
      * Get the current compilation for this query. If it is null, do not create.
      */
-    public Object getCompilation();
+    Object getCompilation();
 
     /**
      * Populate internal data from compilation.
      */
-    public void populateFromCompilation(Object comp);
+    void populateFromCompilation(Object comp);
 
     /**
      * Invalidate any internal compilation state.
      */
-    public void invalidateCompilation();
+    void invalidateCompilation();
 
     /**
      * True if this query supports datastore execution, false if it
      * can only run in memory.
      */
-    public boolean supportsDataStoreExecution();
+    boolean supportsDataStoreExecution();
 
     /**
      * True if this query supports in-memory execution, false if it
      * can only run against the datastore.
      */
-    public boolean supportsInMemoryExecution();
+    boolean supportsInMemoryExecution();
 
     /**
      * Return an executor for in-memory execution of this query.
@@ -130,7 +130,7 @@ public interface StoreQuery
      * @param subs whether to include dependent mapped subclasses in the
      * results; independent subclasses should never be included
      */
-    public Executor newInMemoryExecutor(ClassMetaData meta, boolean subs);
+    Executor newInMemoryExecutor(ClassMetaData meta, boolean subs);
 
     /**
      * Return an executor for datastore execution of this query.
@@ -144,7 +144,7 @@ public interface StoreQuery
      * @param subs whether to include dependent mapped subclasses in the
      * results; independent subclasses should never be included
      */
-    public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs);
+    Executor newDataStoreExecutor(ClassMetaData meta, boolean subs);
 
     /**
      * Return true if this query supports execution against abstract or
@@ -154,24 +154,24 @@ public interface StoreQuery
      * implementing classes if we execute a query for an interface for
      * abstract type.
      */
-    public boolean supportsAbstractExecutors();
+    boolean supportsAbstractExecutors();
 
     /**
      * Whether this query requires a candidate class.
      */
-    public boolean requiresCandidateType();
+    boolean requiresCandidateType();
 
     /**
      * Whether this query requires parameters to be declared.
      */
-    public boolean requiresParameterDeclarations();
+    boolean requiresParameterDeclarations();
 
     /**
      * Whether this query supports declared parameters.
      */
-    public boolean supportsParameterDeclarations();
+    boolean supportsParameterDeclarations();
 
-    public Object evaluate(Object value, Object ob, Object[] params,
+    Object evaluate(Object value, Object ob, Object[] params,
         OpenJPAStateManager sm);
 
     /**
@@ -199,7 +199,7 @@ public interface StoreQuery
      *
      * @author Marc Prud'hommeaux
      */
-    public static interface Executor {
+    public interface Executor {
 
         /**
          * Return the result of executing this query with the given parameter
@@ -212,38 +212,38 @@ public interface StoreQuery
          * aggregate and does not have grouping
          * @see #isPacking
          */
-        public ResultObjectProvider executeQuery(StoreQuery q, Object[] params,
+        ResultObjectProvider executeQuery(StoreQuery q, Object[] params,
             Range range);
 
         /**
          * Deleted the objects that result from the execution of the
          * query, retuning the number of objects that were deleted.
          */
-        public Number executeDelete(StoreQuery q, Object[] params);
+        Number executeDelete(StoreQuery q, Object[] params);
 
         /**
          * Updates the objects that result from the execution of the
          * query, retuning the number of objects that were updated.
          */
-        public Number executeUpdate(StoreQuery q, Object[] params);
+        Number executeUpdate(StoreQuery q, Object[] params);
 
         /**
          * Return a description of the commands that will be sent to
          * the datastore in order to execute the query.
          */
-        public String[] getDataStoreActions(StoreQuery q, Object[] params,
+        String[] getDataStoreActions(StoreQuery q, Object[] params,
             Range range);
 
         /**
          * Validate components of query.
          */
-        public void validate(StoreQuery q);
+        void validate(StoreQuery q);
 
         /**
          * Mutate the given range to set any range information stored in
          * the query string and/or parameters.
          */
-        public void getRange(StoreQuery q, Object[] params, Range range);
+        void getRange(StoreQuery q, Object[] params, Range range);
 
         /**
          * Extract the value of the <code>orderIndex</code>th ordering
@@ -256,14 +256,14 @@ public interface StoreQuery
          *
          * @see StoreQuery#supportsAbstractExecutors
          */
-        public Object getOrderingValue(StoreQuery q, Object[] params,
+        Object getOrderingValue(StoreQuery q, Object[] params,
             Object resultObject, int orderIndex);
 
         /**
          * Return the ordering direction for all ordering clauses, or empty
          * array if none.
          */
-        public boolean[] getAscending(StoreQuery q);
+        boolean[] getAscending(StoreQuery q);
 
         /**
          * Return true if this executor packs projections into the result
@@ -271,57 +271,57 @@ public interface StoreQuery
          * without result clauses must return true and perform the result
          * packing themselves.
          */
-        public boolean isPacking(StoreQuery q);
+        boolean isPacking(StoreQuery q);
 
         /**
          * If this is not a projection but the candidate results are placed
          * into a result class with an alias, return that alias.
          */
-        public String getAlias(StoreQuery q);
+        String getAlias(StoreQuery q);
 
         /**
          * Return the alias for each projection element, or empty array
          * if not a projection.
          */
-        public String[] getProjectionAliases(StoreQuery q);
+        String[] getProjectionAliases(StoreQuery q);
 
         /**
          * Return the expected types of the projections used by this query,
          * or an empty array if not a projection.
          */
-        public Class<?>[] getProjectionTypes(StoreQuery q);
+        Class<?>[] getProjectionTypes(StoreQuery q);
 
         /**
          * Return an array of all persistent classes used in this query, or
          * empty array if unknown.
          */
-        public ClassMetaData[] getAccessPathMetaDatas(StoreQuery q);
+        ClassMetaData[] getAccessPathMetaDatas(StoreQuery q);
 
         /**
          * Returns the operation this executor is meant to execute.
          *
          * @see QueryOperations
          */
-        public int getOperation(StoreQuery q);
+        int getOperation(StoreQuery q);
 
         /**
          * Return true if the compiled query is an aggregate.
          */
-        public boolean isAggregate(StoreQuery q);
+        boolean isAggregate(StoreQuery q);
 
-        public boolean isDistinct(StoreQuery q);
+        boolean isDistinct(StoreQuery q);
 
         /**
          * Whether the compiled query has grouping.
          */
-        public boolean hasGrouping(StoreQuery q);
+        boolean hasGrouping(StoreQuery q);
 
         /**
          * Return a map of parameter names to types. The returned
          * {@link Map#entrySet}'s {@link Iterator} must return values in the
          * order in which they were declared or used.
          */
-        public OrderedMap<Object, Class<?>> getOrderedParameterTypes(StoreQuery q);
+        OrderedMap<Object, Class<?>> getOrderedParameterTypes(StoreQuery q);
 
         /**
          * Return a map of parameter names to types. The returned
@@ -330,8 +330,7 @@ public interface StoreQuery
          *
          * <B>Warning</B>: Deprecated. Use {@linkplain #getOrderedParameterTypes(StoreQuery)} instead.
          */
-        @Deprecated
-        public LinkedMap getParameterTypes(StoreQuery q);
+        @Deprecated LinkedMap getParameterTypes(StoreQuery q);
 
         /**
          * Return an array from the given user parameter values.
@@ -345,20 +344,20 @@ public interface StoreQuery
          *
          * @since 2.0.0
          */
-        public Object[] toParameterArray(StoreQuery q, Map<?,?> userParams);
+        Object[] toParameterArray(StoreQuery q, Map<?,?> userParams);
 
         /**
          * Returns the result class, if any.
          */
-        public Class<?> getResultClass(StoreQuery q);
+        Class<?> getResultClass(StoreQuery q);
 
-        public ResultShape<?> getResultShape(StoreQuery q);
+        ResultShape<?> getResultShape(StoreQuery q);
 
         /**
          * Return a map of {@link FieldMetaData} to update
          * {@link Constant}s, in cases where this query is for a bulk update.
 	 	 */
-		public Map<FieldMetaData,Value> getUpdates (StoreQuery q);
+		Map<FieldMetaData,Value> getUpdates (StoreQuery q);
 
         /**
          * Return the parsed query expressions for our candidate types.
@@ -366,6 +365,6 @@ public interface StoreQuery
          *
          * @since 2.0.0
          */
-		public QueryExpressions[] getQueryExpressions();
+		QueryExpressions[] getQueryExpressions();
 	}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java
index 06447c908..fe819eb68 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TCleanState.java
@@ -26,9 +26,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class TCleanState
-    extends PCState {
+class TCleanState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -44,27 +43,33 @@ class TCleanState
         context.setDirty(false);
     }
 
+    @Override
     PCState persist(StateManagerImpl context) {
         return (context.getBroker().isActive()) ? PNEW : PNONTRANSNEW;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         return error("transient", context);
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     PCState beforeWrite(StateManagerImpl context, int field, boolean mutate) {
         return TDIRTY;
     }
 
+    @Override
     PCState beforeOptimisticWrite(StateManagerImpl context, int field,
         boolean mutate) {
         return TDIRTY;
     }
 
+    @Override
     public String toString() {
         return "Transient-Clean";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java
index 64cecf9b0..fdd938cb9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TDirtyState.java
@@ -25,9 +25,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class TDirtyState
-    extends PCState {
+class TDirtyState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -36,43 +35,53 @@ class TDirtyState
         context.setDirty(true);
     }
 
+    @Override
     PCState commit(StateManagerImpl context) {
         return TCLEAN;
     }
 
+    @Override
     PCState commitRetain(StateManagerImpl context) {
         return TCLEAN;
     }
 
+    @Override
     PCState rollback(StateManagerImpl context) {
         return TCLEAN;
     }
 
+    @Override
     PCState rollbackRestore(StateManagerImpl context) {
         context.restoreFields();
         return TCLEAN;
     }
 
+    @Override
     PCState persist(StateManagerImpl context) {
         return (context.getBroker().isActive()) ? PNEW : PNONTRANSNEW;
     }
 
+    @Override
     PCState delete(StateManagerImpl context) {
         return error("transient", context);
     }
 
+    @Override
     PCState nontransactional(StateManagerImpl context) {
         return error("dirty", context);
     }
 
+    @Override
     boolean isTransactional() {
         return true;
     }
 
+    @Override
     boolean isDirty() {
         return true;
     }
 
+    @Override
     public String toString() {
         return "Transient-Dirty";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java
index c6cecfa90..9e1bf2cd7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TLoadedState.java
@@ -27,19 +27,20 @@ package org.apache.openjpa.kernel;
  *
  * @author Steve Kim
  */
-@SuppressWarnings("serial")
-class TLoadedState
-    extends PCState {
+class TLoadedState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
         context.setLoaded(true);
     }
 
+    @Override
     PCState release(StateManagerImpl context) {
         return TRANSIENT;
     }
 
+    @Override
     public String toString() {
         return "Transient-Loaded";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java
index cb6c1e3b3..7ac2e22c2 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TimeSeededSeq.java
@@ -38,6 +38,7 @@ public class TimeSeededSeq
     private long _id = System.currentTimeMillis();
     private int _increment = 1;
 
+    @Override
     public void setType(int type) {
     }
 
@@ -49,18 +50,22 @@ public class TimeSeededSeq
         _increment = increment;
     }
 
+    @Override
     public synchronized Object next(StoreContext ctx, ClassMetaData meta) {
         _id += _increment;
         return _id;
     }
 
+    @Override
     public synchronized Object current(StoreContext ctx, ClassMetaData meta) {
         return _id;
     }
 
+    @Override
     public void allocate(int additional, StoreContext ctx, ClassMetaData meta) {
     }
 
+    @Override
     public void close() {
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransferFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransferFieldManager.java
index 0a6fbb406..50e0f6f84 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransferFieldManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransferFieldManager.java
@@ -33,91 +33,111 @@ class TransferFieldManager
     protected Object objval = null;
     protected int field = -1;
 
+    @Override
     public boolean fetchBooleanField(int field) {
         return longval == 1;
     }
 
+    @Override
     public byte fetchByteField(int field) {
         return (byte) longval;
     }
 
+    @Override
     public char fetchCharField(int field) {
         return (char) longval;
     }
 
+    @Override
     public double fetchDoubleField(int field) {
         return dblval;
     }
 
+    @Override
     public float fetchFloatField(int field) {
         return (float) dblval;
     }
 
+    @Override
     public int fetchIntField(int field) {
         return (int) longval;
     }
 
+    @Override
     public long fetchLongField(int field) {
         return longval;
     }
 
+    @Override
     public Object fetchObjectField(int field) {
         return objval;
     }
 
+    @Override
     public short fetchShortField(int field) {
         return (short) longval;
     }
 
+    @Override
     public String fetchStringField(int field) {
         return (String) objval;
     }
 
+    @Override
     public void storeBooleanField(int field, boolean curVal) {
         this.field = field;
         longval = (curVal) ? 1 : 0;
     }
 
+    @Override
     public void storeByteField(int field, byte curVal) {
         this.field = field;
         longval = curVal;
     }
 
+    @Override
     public void storeCharField(int field, char curVal) {
         this.field = field;
         longval = (long) curVal;
     }
 
+    @Override
     public void storeDoubleField(int field, double curVal) {
         this.field = field;
         dblval = curVal;
     }
 
+    @Override
     public void storeFloatField(int field, float curVal) {
         this.field = field;
         dblval = curVal;
     }
 
+    @Override
     public void storeIntField(int field, int curVal) {
         this.field = field;
         longval = curVal;
     }
 
+    @Override
     public void storeLongField(int field, long curVal) {
         this.field = field;
         longval = curVal;
     }
 
+    @Override
     public void storeObjectField(int field, Object curVal) {
         this.field = field;
         objval = curVal;
     }
 
+    @Override
     public void storeShortField(int field, short curVal) {
         this.field = field;
         longval = curVal;
     }
 
+    @Override
     public void storeStringField(int field, String curVal) {
         this.field = field;
         objval = curVal;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java
index 1ff61a572..ee0a2210a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransientState.java
@@ -26,9 +26,8 @@ package org.apache.openjpa.kernel;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
-class TransientState
-    extends PCState {
+class TransientState extends PCState {
+    private static final long serialVersionUID = 1L;
 
     @Override
     void initialize(StateManagerImpl context, PCState previous) {
@@ -39,6 +38,7 @@ class TransientState
             context, BrokerImpl.STATUS_TRANSIENT);
     }
 
+    @Override
     public String toString() {
         return "Transient";
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDHexSeq.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDHexSeq.java
index 99a45eaf8..6c8409ab5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDHexSeq.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDHexSeq.java
@@ -46,21 +46,26 @@ public class UUIDHexSeq
     private UUIDHexSeq() {
     }
 
+    @Override
     public void setType(int type) {
     }
 
+    @Override
     public synchronized Object next(StoreContext ctx, ClassMetaData meta) {
         _last = UUIDGenerator.nextHex(UUIDGenerator.TYPE1);
         return _last;
     }
 
+    @Override
     public synchronized Object current(StoreContext ctx, ClassMetaData meta) {
         return _last;
     }
 
+    @Override
     public void allocate(int additional, StoreContext ctx, ClassMetaData meta) {
     }
 
+    @Override
     public void close() {
 	}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDStringSeq.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDStringSeq.java
index 89e57a00a..d32ed91b1 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDStringSeq.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDStringSeq.java
@@ -46,21 +46,26 @@ public class UUIDStringSeq
     private UUIDStringSeq() {
     }
 
+    @Override
     public void setType(int type) {
     }
 
+    @Override
     public synchronized Object next(StoreContext ctx, ClassMetaData meta) {
         _last = UUIDGenerator.nextString(UUIDGenerator.TYPE1);
         return _last;
     }
 
+    @Override
     public synchronized Object current(StoreContext ctx, ClassMetaData meta) {
         return _last;
     }
 
+    @Override
     public void allocate(int additional, StoreContext ctx, ClassMetaData meta) {
     }
 
+    @Override
     public void close() {
 	}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4HexSeq.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4HexSeq.java
index a6f57c8c5..c1998aa17 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4HexSeq.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4HexSeq.java
@@ -46,21 +46,26 @@ public class UUIDType4HexSeq
     private UUIDType4HexSeq() {
     }
 
+    @Override
     public void setType(int type) {
     }
 
+    @Override
     public synchronized Object next(StoreContext ctx, ClassMetaData meta) {
         _last = UUIDGenerator.nextHex(UUIDGenerator.TYPE4);
         return _last;
     }
 
+    @Override
     public synchronized Object current(StoreContext ctx, ClassMetaData meta) {
         return _last;
     }
 
+    @Override
     public void allocate(int additional, StoreContext ctx, ClassMetaData meta) {
     }
 
+    @Override
     public void close() {
 	}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4StringSeq.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4StringSeq.java
index 95aeef9ab..66f12e5b8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4StringSeq.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4StringSeq.java
@@ -47,21 +47,26 @@ public class UUIDType4StringSeq
     private UUIDType4StringSeq() {
     }
 
+    @Override
     public void setType(int type) {
     }
 
+    @Override
     public synchronized Object next(StoreContext ctx, ClassMetaData meta) {
         _last = UUIDGenerator.nextString(UUIDGenerator.TYPE4);
         return _last;
     }
 
+    @Override
     public synchronized Object current(StoreContext ctx, ClassMetaData meta) {
         return _last;
     }
 
+    @Override
     public void allocate(int additional, StoreContext ctx, ClassMetaData meta) {
     }
 
+    @Override
     public void close() {
 	}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
index d85709db7..085032969 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
@@ -50,6 +50,7 @@ class VersionAttachStrategy
     private static final Localizer _loc = Localizer.forPackage
         (VersionAttachStrategy.class);
 
+    @Override
     protected Object getDetachedObjectId(AttachManager manager,
         Object toAttach) {
         Broker broker = manager.getBroker();
@@ -62,12 +63,14 @@ class VersionAttachStrategy
             meta);
     }
 
+    @Override
     protected void provideField(Object toAttach, StateManagerImpl sm,
         int field) {
         sm.provideField(ImplHelper.toPersistenceCapable(toAttach,
             sm.getContext().getConfiguration()), this, field);
     }
 
+    @Override
     public Object attach(AttachManager manager, Object toAttach,
         ClassMetaData meta, PersistenceCapable into, OpenJPAStateManager owner,
         ValueMetaData ownerMeta, boolean explicit) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java
index 0b310cd6b..971b0b9d3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java
@@ -38,6 +38,7 @@ public class VersionLockManager
      * lock object is a number. If the given instance is embedded, traverses
      * to its owner. Override if lock is not stored as a number.
      */
+    @Override
     public int getLockLevel(OpenJPAStateManager sm) {
         while (sm.getOwner() != null)
             sm = sm.getOwner();
@@ -56,6 +57,7 @@ public class VersionLockManager
     /**
      * Nulls given instance's lock object.
      */
+    @Override
     public void release(OpenJPAStateManager sm) {
         sm.setLock(null);
     }
@@ -66,11 +68,13 @@ public class VersionLockManager
      * is not new, and is not already locked at a higher level. After
      * locking, calls {@link #setLockLevel} with the given level.
      */
+    @Override
     public void lock(OpenJPAStateManager sm, int level, int timeout,
         Object sdata) {
         commonLock(sm, level, timeout, sdata, !_refreshing);
     }
 
+    @Override
     public void refreshLock(OpenJPAStateManager sm, int level, int timeout,
             Object sdata) {
     	try {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Abs.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Abs.java
index 9c2df280c..16575bef7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Abs.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Abs.java
@@ -29,6 +29,9 @@ import org.apache.openjpa.kernel.Filters;
 class Abs
     extends UnaryMathVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the number whose absolute value to calculate.
      */
@@ -36,6 +39,7 @@ class Abs
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         Class wrap = Filters.wrap(c);
         if (wrap == Integer.class
@@ -48,6 +52,7 @@ class Abs
         return int.class;
     }
 
+    @Override
     protected Object operate(Object o, Class c) {
         c = Filters.wrap(c);
         if (c == Integer.class)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionBuilder.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionBuilder.java
index 04b319bbe..6640edfd6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionBuilder.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionBuilder.java
@@ -27,8 +27,8 @@ import java.util.Set;
 
 import org.apache.openjpa.kernel.Filters;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.util.StringDistance;
 import org.apache.openjpa.lib.util.Localizer.Message;
+import org.apache.openjpa.lib.util.StringDistance;
 import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
@@ -72,7 +72,7 @@ public abstract class AbstractExpressionBuilder {
     protected final Resolver resolver;
     protected ExpressionFactory factory;
 
-    private final Set<ClassMetaData> _accessPath = new HashSet<ClassMetaData>();
+    private final Set<ClassMetaData> _accessPath = new HashSet<>();
     private Map<String,Value> _seenVars = null;
     private Set<Value> _boundVars = null;
 
@@ -147,7 +147,7 @@ public abstract class AbstractExpressionBuilder {
      */
     protected void bind(Value var) {
         if (_boundVars == null)
-            _boundVars = new HashSet<Value>();
+            _boundVars = new HashSet<>();
         _boundVars.add(var);
     }
 
@@ -185,7 +185,7 @@ public abstract class AbstractExpressionBuilder {
         var.setMetaData(meta);
 
         if (_seenVars == null)
-            _seenVars = new HashMap<String,Value>();
+            _seenVars = new HashMap<>();
         _seenVars.put(id, var);
 
         addVariableToContext(id, var);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionVisitor.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionVisitor.java
index d32f28912..72e16c640 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionVisitor.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionVisitor.java
@@ -27,15 +27,19 @@ package org.apache.openjpa.kernel.exps;
 public abstract class AbstractExpressionVisitor
     implements ExpressionVisitor {
 
+    @Override
     public void enter(Expression exp) {
     }
 
+    @Override
     public void exit(Expression exp) {
     }
 
+    @Override
     public void enter(Value val) {
     }
 
+    @Override
     public void exit(Value val) {
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Add.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Add.java
index 0c09573b7..7e7437bc5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Add.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Add.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.kernel.Filters;
 class Add
     extends MathVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the values to add.
      */
@@ -35,6 +38,7 @@ class Add
         super(val1, val2);
     }
 
+    @Override
     protected Object operate(Object o1, Class c1, Object o2, Class c2) {
         return Filters.add(o1, c1, o2, c2);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Aggregate.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Aggregate.java
index 041e72d4f..46a5e8608 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Aggregate.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Aggregate.java
@@ -33,6 +33,9 @@ import org.apache.openjpa.util.UserException;
 class Aggregate
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(Aggregate.class);
 
     private final AggregateListener _listener;
@@ -46,17 +49,21 @@ class Aggregate
         _arg = arg;
     }
 
+    @Override
     public boolean isAggregate() {
         return true;
     }
 
+    @Override
     public Class getType() {
         return _listener.getType(getArgTypes());
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         if (candidate == null)
@@ -70,6 +77,7 @@ class Aggregate
         throw new UserException(_loc.get("agg-in-filter"));
     }
 
+    @Override
     protected Collection eval(Collection candidates, Object orig,
         StoreContext ctx, Object[] params) {
         Collection args = null;
@@ -88,6 +96,7 @@ class Aggregate
         return new Class[]{ _arg.getType() };
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         if (_arg != null)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AggregateListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AggregateListener.java
index 58a678f8a..a9828e4b3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AggregateListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AggregateListener.java
@@ -35,7 +35,7 @@ public interface AggregateListener
     /**
      * Return the tag that this listener listens for.
      */
-    public String getTag();
+    String getTag();
 
     /**
      * Return whether this function expects to act on arguments. Some
@@ -43,7 +43,7 @@ public interface AggregateListener
      * number of objects that match a given filter might be of the form:
      * <code>count()</code>.
      */
-    public boolean expectsArguments();
+    boolean expectsArguments();
 
     /**
      * Return the value of this aggregate.
@@ -59,7 +59,7 @@ public interface AggregateListener
      * @throws org.apache.openjpa.util.UserException if this aggregate does not
      * support in-memory operation
      */
-    public Object evaluate(Collection args, Class[] argClasses,
+    Object evaluate(Collection args, Class[] argClasses,
         Collection candidates, StoreContext ctx);
 
     /**
@@ -68,5 +68,5 @@ public interface AggregateListener
      * @param argClasses the expected classes of the argument, or null if
      * no arguments
      */
-    public Class getType(Class[] argClasses);
+    Class getType(Class[] argClasses);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AggregateVal.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AggregateVal.java
index 3c90f049f..46e274bac 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AggregateVal.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AggregateVal.java
@@ -33,6 +33,9 @@ import org.apache.openjpa.util.UserException;
 abstract class AggregateVal
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (AggregateVal.class);
 
@@ -45,17 +48,21 @@ abstract class AggregateVal
         _val = val;
     }
 
+    @Override
     public boolean isAggregate() {
         return true;
     }
 
+    @Override
     public Class getType() {
         return getType(_val.getType());
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         if (candidate == null)
@@ -69,6 +76,7 @@ abstract class AggregateVal
         throw new UserException(_loc.get("agg-in-filter"));
     }
 
+    @Override
     protected Collection eval(Collection candidates, Object orig,
         StoreContext ctx, Object[] params) {
         Collection args = _val.eval(candidates, orig, ctx, params);
@@ -85,6 +93,7 @@ abstract class AggregateVal
      */
     protected abstract Object operate(Collection os, Class c);
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/All.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/All.java
index 71f16fab6..a29be196a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/All.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/All.java
@@ -34,12 +34,15 @@ import org.apache.openjpa.util.UnsupportedException;
 class All
     extends UnaryMathVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage(All.class);
 
     public All(Val val) {
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         Class wrap = Filters.wrap(c);
         if (wrap == Integer.class
@@ -52,6 +55,7 @@ class All
         return int.class;
     }
 
+    @Override
     protected Object operate(Object o, Class c) {
         throw new UnsupportedException(_loc.get("in-mem-subquery"));
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AndExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AndExpression.java
index db15e73fb..06096f5d3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AndExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AndExpression.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class AndExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp1;
     private final Exp _exp2;
 
@@ -49,18 +51,21 @@ class AndExpression
         return _exp2;
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _exp1.evaluate(candidate, orig, ctx, params)
             && _exp2.evaluate(candidate, orig, ctx, params);
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         return _exp1.evaluate(candidates, ctx, params)
             && _exp2.evaluate(candidates, ctx, params);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp1.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Any.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Any.java
index e066bcb41..30e166f78 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Any.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Any.java
@@ -34,12 +34,15 @@ import org.apache.openjpa.util.UnsupportedException;
 class Any
     extends UnaryMathVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage(Any.class);
 
     public Any(Val val) {
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         Class wrap = Filters.wrap(c);
         if (wrap == Integer.class
@@ -52,6 +55,7 @@ class Any
         return int.class;
     }
 
+    @Override
     protected Object operate(Object o, Class c) {
         throw new UnsupportedException(_loc.get("in-mem-subquery"));
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Args.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Args.java
index 5a29eb67a..75fc80731 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Args.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Args.java
@@ -32,7 +32,9 @@ class Args
     extends Val
     implements Arguments {
 
-    private final List<Value> _args = new ArrayList<Value>(3);
+    
+    private static final long serialVersionUID = 1L;
+    private final List<Value> _args = new ArrayList<>(3);
 
     /**
      * Constructor. Supply values being combined.
@@ -54,10 +56,12 @@ class Args
         }
     }
 
+    @Override
     public Value[] getValues() {
         return _args.toArray(new Value[_args.size()]);
     }
 
+    @Override
     public Class getType() {
         return Object[].class;
     }
@@ -69,9 +73,11 @@ class Args
         return c;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object[] vals = new Object[_args.size()];
@@ -80,6 +86,7 @@ class Args
         return vals;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         for (int i = 0; i < _args.size(); i++)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Arguments.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Arguments.java
index ab395496e..1e2f49aaa 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Arguments.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Arguments.java
@@ -29,5 +29,5 @@ public interface Arguments
     /**
      * Return the values that make up the arguments.
      */
-    public Value[] getValues();
+    Value[] getValues();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Avg.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Avg.java
index 892c17c84..464f3b345 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Avg.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Avg.java
@@ -31,6 +31,9 @@ import org.apache.openjpa.kernel.Filters;
 class Avg
     extends AggregateVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the value to average.
      */
@@ -38,10 +41,12 @@ class Avg
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         return c;
     }
 
+    @Override
     protected Object operate(Collection os, Class c) {
         if (os.isEmpty())
             return null;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindKeyVariableExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindKeyVariableExpression.java
index dcb2e819b..e699bc476 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindKeyVariableExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindKeyVariableExpression.java
@@ -29,6 +29,9 @@ import java.util.Map;
 class BindKeyVariableExpression
     extends BindVariableExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor.
      *
@@ -39,6 +42,7 @@ class BindKeyVariableExpression
         super(var, val);
     }
 
+    @Override
     protected Collection getCollection(Object values) {
         Map map = (Map) values;
         return (map == null) ? null : map.keySet();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindValueVariableExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindValueVariableExpression.java
index 380ef4fa5..586f938fa 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindValueVariableExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindValueVariableExpression.java
@@ -29,6 +29,9 @@ import java.util.Map;
 class BindValueVariableExpression
     extends BindVariableExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor.
      *
@@ -39,6 +42,7 @@ class BindValueVariableExpression
         super(var, val);
     }
 
+    @Override
     protected Collection getCollection(Object values) {
         Map map = (Map) values;
         return (map == null) ? null : map.values();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindVariableAndExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindVariableAndExpression.java
index 5a61ac330..9b6132e12 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindVariableAndExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindVariableAndExpression.java
@@ -34,6 +34,9 @@ import org.apache.openjpa.kernel.StoreContext;
 class BindVariableAndExpression
     extends AndExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide expression binding the variable and the
      * expression it is AND'd with.
@@ -42,6 +45,7 @@ class BindVariableAndExpression
         super(var, exp);
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         // execute the tree for every element in the variable's collection;
@@ -69,6 +73,7 @@ class BindVariableAndExpression
         return false;
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         if (candidates == null || candidates.isEmpty())
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindVariableExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindVariableExpression.java
index 3718d1f86..3715bb121 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindVariableExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BindVariableExpression.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class BindVariableExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final BoundVariable _var;
     private final Val _val;
 
@@ -66,6 +68,7 @@ class BindVariableExpression
         return (Collection) values;
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         // if the collection is empty no possible variable evals to true
@@ -75,6 +78,7 @@ class BindVariableExpression
         return true;
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         if (candidates == null || candidates.isEmpty())
@@ -83,6 +87,7 @@ class BindVariableExpression
         return eval(obj, obj, ctx, params);
 	}
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _var.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BoundVariable.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BoundVariable.java
index d69d3e854..56cb69352 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BoundVariable.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/BoundVariable.java
@@ -31,6 +31,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class BoundVariable
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private Class _type = null;
     private Object _val = null;
 
@@ -54,14 +56,17 @@ class BoundVariable
         return true;
     }
 
+    @Override
     public boolean isVariable() {
         return true;
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _type = type;
     }
@@ -77,6 +82,7 @@ class BoundVariable
         _type = type;
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _val;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CandidatePath.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CandidatePath.java
index b9d2272bd..8c88f1c0c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CandidatePath.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CandidatePath.java
@@ -21,8 +21,8 @@ package org.apache.openjpa.kernel.exps;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.ListIterator;
-
 import java.util.Objects;
+
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.Filters;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
@@ -41,6 +41,8 @@ public class CandidatePath
     extends Val
     implements Path {
 
+    
+    private static final long serialVersionUID = 1L;
     protected LinkedList _actions = null;
     protected String _correlationVar = null;
 
@@ -48,12 +50,14 @@ public class CandidatePath
      * Traverse into the given field of the current object, and update
      * the current object to that field value.
      */
+    @Override
     public void get(FieldMetaData field, boolean nullTraversal) {
         if (_actions == null)
             _actions = new LinkedList();
         _actions.add(new Traversal(field, nullTraversal));
     }
 
+    @Override
     public Class getType() {
         if (_actions == null)
             return getCandidateType();
@@ -72,9 +76,11 @@ public class CandidatePath
         return meta.getDescribedType();
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public FieldMetaData last() {
         if (_actions == null)
             return null;
@@ -98,6 +104,7 @@ public class CandidatePath
         _actions.add(type);
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         if (_actions == null)
@@ -152,10 +159,12 @@ public class CandidatePath
         return candidate;
     }
 
+    @Override
     public int hashCode() {
         return (_actions == null) ? 0 : _actions.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -177,10 +186,12 @@ public class CandidatePath
             this.nullTraversal = nullTraversal;
         }
 
+        @Override
         public int hashCode() {
             return field.hashCode();
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == this)
                 return true;
@@ -188,26 +199,33 @@ public class CandidatePath
         }
 	}
 
+    @Override
     public void get(FieldMetaData fmd, XMLMetaData meta) {
     }
 
+    @Override
     public void get(XMLMetaData meta, String name) {
     }
 
+    @Override
     public XMLMetaData getXmlMapping() {
         return null;
     }
 
+    @Override
     public void setSchemaAlias(String schemaAlias) {
     }
 
+    @Override
     public String getSchemaAlias() {
         return null;
     }
 
+    @Override
     public void setSubqueryContext(Context conext, String correlationVar) {
     }
 
+    @Override
     public String getCorrelationVar() {
         return _correlationVar;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Cast.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Cast.java
index c994f2d55..f5567d4c5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Cast.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Cast.java
@@ -33,6 +33,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class Cast
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Class _cast;
 
@@ -44,18 +46,22 @@ class Cast
         _cast = cast;
     }
 
+    @Override
     public Class getType() {
         return _cast;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return Filters.convert(_val.eval(candidate, orig, ctx, params), _cast);
     }
 
+    @Override
     protected Collection eval(Collection candidates, Object orig,
         StoreContext ctx, Object[] params) {
         Collection res = _val.eval(candidates, orig, ctx, params);
@@ -68,6 +74,7 @@ class Cast
         return casts;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Coalesce.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Coalesce.java
index a29665f25..fc8e2878c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Coalesce.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Coalesce.java
@@ -29,6 +29,8 @@ import org.apache.openjpa.kernel.StoreContext;
 public class Coalesce
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val[] _val;
 
     /**
@@ -75,6 +77,7 @@ public class Coalesce
         return _val;
     }
 
+    @Override
     public Class getType() {
         Class c1 = _val[0].getType();
         for (int i = 1; i < _val.length; i++) {
@@ -84,9 +87,11 @@ public class Coalesce
         return c1;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         for (int i = 0; i < _val.length; i++)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CollectionParam.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CollectionParam.java
index ccb27247f..a0d8d2b01 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CollectionParam.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CollectionParam.java
@@ -29,6 +29,8 @@ class CollectionParam
     extends Val
     implements Parameter {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object _key = null;
     private Class _type = null;
     private int _index = -1;
@@ -41,26 +43,32 @@ class CollectionParam
         _type = type;
     }
 
+    @Override
     public Object getParameterKey() {
         return _key;
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _type = type;
     }
 
+    @Override
     public void setIndex(int index) {
         _index = index;
     }
 
+    @Override
     public Object getValue(Object[] params) {
         return params[_index];
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return getValue(params);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CompareExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CompareExpression.java
index 977593c7c..125af9aba 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CompareExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CompareExpression.java
@@ -31,6 +31,8 @@ import org.apache.openjpa.kernel.StoreContext;
 abstract class CompareExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
 
@@ -42,6 +44,7 @@ abstract class CompareExpression
         _val2 = val2;
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object o1 = _val1.eval(candidate, orig, ctx, params);
@@ -54,6 +57,7 @@ abstract class CompareExpression
         return compare(o1, o2);
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         Collection c1 = _val1.eval(candidates, null, ctx, params);
@@ -76,6 +80,7 @@ abstract class CompareExpression
      */
     protected abstract boolean compare(Object o1, Object o2);
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Concat.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Concat.java
index 311f1f31a..56e650dba 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Concat.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Concat.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class Concat
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Val _args;
 
@@ -40,13 +42,16 @@ class Concat
         _args = args;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object str = _val.eval(candidate, orig, ctx, params);
@@ -62,6 +67,7 @@ class Concat
         return cat.toString();
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Constant.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Constant.java
index 1ae00c261..a12a75e73 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Constant.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Constant.java
@@ -28,6 +28,6 @@ public interface Constant {
     /**
      * Return the value for this constant given the specified parameters.
      */
-    public Object getValue(Object[] parameters);
+    Object getValue(Object[] parameters);
 }
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsExpression.java
index 2769d0c37..c792c2997 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsExpression.java
@@ -31,6 +31,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class ContainsExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
 
@@ -45,6 +47,7 @@ class ContainsExpression
         _val2 = val2;
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object obj = _val1.eval(candidate, orig, ctx, params);
@@ -53,6 +56,7 @@ class ContainsExpression
             && coll.contains(_val2.eval(candidate, orig, ctx, params));
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         Collection coll = _val1.eval(candidates, null, ctx, params);
@@ -76,6 +80,7 @@ class ContainsExpression
             (Collection) obj : Collections.singleton(obj);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsKeyExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsKeyExpression.java
index ccc43f529..af1232fa0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsKeyExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsKeyExpression.java
@@ -29,6 +29,9 @@ import java.util.Map;
 class ContainsKeyExpression
     extends ContainsExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor.
      *
@@ -39,6 +42,7 @@ class ContainsKeyExpression
         super(val1, val2);
     }
 
+    @Override
     protected Collection getCollection(Object obj) {
         return (obj == null) ? null : ((Map) obj).keySet();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsValueExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsValueExpression.java
index 8a4126f86..9265b0052 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsValueExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ContainsValueExpression.java
@@ -29,6 +29,9 @@ import java.util.Map;
 class ContainsValueExpression
     extends ContainsExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor.
      *
@@ -39,6 +42,7 @@ class ContainsValueExpression
         super(val1, val2);
     }
 
+    @Override
     protected Collection getCollection(Object obj) {
         return (obj == null) ? null : ((Map) obj).values();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
index ea69fb6dd..1623f78e8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Context.java
@@ -34,6 +34,8 @@ import org.apache.openjpa.meta.ClassMetaData;
  */
 public class Context implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     public final ParsedJPQL parsed;
     public ClassMetaData meta;
     public String schemaAlias;
@@ -44,9 +46,9 @@ public class Context implements Serializable {
     private List<Context> subsels = null;
     private Object select = null;
     protected int aliasCount = -1;
-    private Map<String,Value> variables = new HashMap<String,Value>();
+    private Map<String,Value> variables = new HashMap<>();
     private Map<String,ClassMetaData> schemas =
-        new HashMap<String,ClassMetaData>();
+        new HashMap<>();
 
     public Context(ParsedJPQL parsed, Subquery subquery, Context parent) {
         this.parsed = parsed;
@@ -121,7 +123,7 @@ public class Context implements Serializable {
         if (sub == null)
             return;
         if (subsels == null)
-            subsels = new ArrayList<Context>();
+            subsels = new ArrayList<>();
         subsels.add(sub);
     }
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Count.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Count.java
index 910462c7a..8ec8c05c3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Count.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Count.java
@@ -30,6 +30,9 @@ import java.util.Iterator;
 class Count
     extends AggregateVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the value to count.
      */
@@ -37,10 +40,12 @@ class Count
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         return long.class;
     }
 
+    @Override
     protected Object operate(Collection os, Class c) {
         long count = 0;
         for (Iterator itr = os.iterator(); itr.hasNext();)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CurrentDate.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CurrentDate.java
index 0d0f21e1c..e8be9f5ab 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CurrentDate.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/CurrentDate.java
@@ -29,19 +29,24 @@ import org.apache.openjpa.kernel.StoreContext;
  */
 class CurrentDate
     extends Val {
+    
+    private static final long serialVersionUID = 1L;
     private final Class<? extends Date> _type;
 
     public CurrentDate(Class<? extends Date> type) {
         _type = type;
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig, StoreContext ctx, Object[] params) {
         try {
             _type.getConstructor(long.class).newInstance(System.currentTimeMillis());
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java
index f55690bd0..8866f0b86 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Distinct.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class Distinct
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -41,13 +43,16 @@ class Distinct
         _val = val;
     }
 
+    @Override
     public Class getType() {
         return Collection.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         if (candidate == null)
@@ -57,12 +62,14 @@ class Distinct
         return eval(arg, orig, ctx, params).iterator().next();
     }
 
+    @Override
     protected Collection eval(Collection candidates, Object orig,
         StoreContext ctx, Object[] params) {
         Collection args = _val.eval(candidates, orig, ctx, params);
         return new HashSet(args);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Divide.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Divide.java
index 8ef97b5db..92f65c240 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Divide.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Divide.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.kernel.Filters;
 class Divide
     extends MathVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the values to divide.
      */
@@ -35,6 +38,7 @@ class Divide
         super(val1, val2);
     }
 
+    @Override
     protected Object operate(Object o1, Class c1, Object o2, Class c2) {
         return Filters.divide(o1, c1, o2, c2);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/EndsWithExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/EndsWithExpression.java
index d6422114d..c5079dcd5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/EndsWithExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/EndsWithExpression.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class EndsWithExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -33,6 +36,7 @@ class EndsWithExpression
         super(val1, val2);
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         if (o1 == null || o2 == null)
             return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/EqualExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/EqualExpression.java
index 42a8aaae8..58ccf350c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/EqualExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/EqualExpression.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class EqualExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -33,6 +36,7 @@ class EqualExpression
         super(val1, val2);
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         return (o1 == null && o2 == null)
             || (o1 != null && o1.equals(o2));
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Exp.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Exp.java
index 44a2992b4..d8c4407c5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Exp.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Exp.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.kernel.StoreContext;
 public class Exp
     implements Expression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Evaluate the expression for the given candidate.
      */
@@ -75,6 +78,7 @@ public class Exp
         return true;
 	}
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         visitor.exit(this);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Expression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Expression.java
index 09e16d9bb..457499fd9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Expression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Expression.java
@@ -32,5 +32,5 @@ public interface Expression
     /**
      * Accept a visit from a tree visitor.
      */
-    public void acceptVisit(ExpressionVisitor visitor);
+    void acceptVisit(ExpressionVisitor visitor);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionFactory.java
index 653e44641..8c6b86cfd 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionFactory.java
@@ -33,112 +33,112 @@ public interface ExpressionFactory {
     /**
      * Return a blank expression; this is used when the filter is empty.
      */
-    public Expression emptyExpression();
+    Expression emptyExpression();
 
     /**
      * Return the given value as an expression.
      */
-    public Expression asExpression(Value bool);
+    Expression asExpression(Value bool);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression equal(Value v1, Value v2);
+    Expression equal(Value v1, Value v2);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression notEqual(Value v1, Value v2);
+    Expression notEqual(Value v1, Value v2);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression lessThan(Value v1, Value v2);
+    Expression lessThan(Value v1, Value v2);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression greaterThan(Value v1, Value v2);
+    Expression greaterThan(Value v1, Value v2);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression lessThanEqual(Value v1, Value v2);
+    Expression lessThanEqual(Value v1, Value v2);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression greaterThanEqual(Value v1, Value v2);
+    Expression greaterThanEqual(Value v1, Value v2);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression isEmpty(Value target);
+    Expression isEmpty(Value target);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression isNotEmpty(Value target);
+    Expression isNotEmpty(Value target);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression contains(Value coll, Value arg);
+    Expression contains(Value coll, Value arg);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression containsKey(Value map, Value arg);
+    Expression containsKey(Value map, Value arg);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Expression containsValue(Value map, Value arg);
+    Expression containsValue(Value map, Value arg);
 
     /**
      * Return an expression representing the given condition.
      */
-    public Value getMapValue(Value map, Value arg);
+    Value getMapValue(Value map, Value arg);
 
     /**
      * Return whether the first value is an instance of the given class.
      */
-    public Expression isInstance(Value obj, Class c);
+    Expression isInstance(Value obj, Class c);
 
     /**
      * Return the two expressions AND'd together.
      */
-    public Expression and(Expression exp1, Expression exp2);
+    Expression and(Expression exp1, Expression exp2);
 
     /**
      * Return the two expressions OR'd together.
      */
-    public Expression or(Expression exp1, Expression exp2);
+    Expression or(Expression exp1, Expression exp2);
 
     /**
      * Return the inverse of this expression.
      */
-    public Expression not(Expression exp);
+    Expression not(Expression exp);
 
     /**
      * Bind the given variable to the given collection value.
      */
-    public Expression bindVariable(Value var, Value coll);
+    Expression bindVariable(Value var, Value coll);
 
     /**
      * Bind the given variable to the key set of the given map value.
      */
-    public Expression bindKeyVariable(Value var, Value map);
+    Expression bindKeyVariable(Value var, Value map);
 
     /**
      * Bind the given variable to the value set of the given map value.
      */
-    public Expression bindValueVariable(Value var, Value map);
+    Expression bindValueVariable(Value var, Value map);
 
     /**
      * Return whether the first string ends with the second.
      */
-    public Expression endsWith(Value str1, Value str2);
+    Expression endsWith(Value str1, Value str2);
 
     /**
      * Return whether the string matches the matching pattern.
@@ -149,7 +149,7 @@ public interface ExpressionFactory {
      * @param multi the token that signifies a multi-character match
      * @param escape the escape token that escapes the matching tokens
      */
-    public Expression matches(Value str, Value regexp,
+    Expression matches(Value str, Value regexp,
         String single, String multi, String escape);
 
     /**
@@ -161,18 +161,18 @@ public interface ExpressionFactory {
      * @param multi the token that signifies a multi-character match
      * @param escape the escape token that escapes the matching tokens
      */
-    public Expression notMatches(Value str, Value regexp, String single,
+    Expression notMatches(Value str, Value regexp, String single,
         String multi, String escape);
 
     /**
      * Return whether the first string starts with the second.
      */
-    public Expression startsWith(Value str1, Value str2);
+    Expression startsWith(Value str1, Value str2);
 
     /**
      * Returns the number of characters in the String value.
      */
-    public Value stringLength(Value str);
+    Value stringLength(Value str);
 
     /**
      * Trims the specified specified trimChar from the specified value.
@@ -183,7 +183,7 @@ public interface ExpressionFactory {
      * indicates both sides, true indicates
      * leading, and false indicates trailing
      */
-    public Value trim(Value str, Value trimChar, Boolean where);
+    Value trim(Value str, Value trimChar, Boolean where);
 
     /**
      * Return a subquery. Paths for the candidates of the subquery are
@@ -194,7 +194,7 @@ public interface ExpressionFactory {
      * @param subs whether the query includes subclasses
      * @param alias the alias given to the query candidate class
      */
-    public Subquery newSubquery(ClassMetaData candidate, boolean subs,
+    Subquery newSubquery(ClassMetaData candidate, boolean subs,
         String alias);
 
     /**
@@ -202,87 +202,87 @@ public interface ExpressionFactory {
      * of a chain of 1 or more field names starting in the namespace of the
      * candidate class.<br /> Example: <code>parent.address.city</code>
      */
-    public Path newPath();
+    Path newPath();
 
     /**
      * Return a value representing a path which will consist
      * of a chain of 1 or more field names starting in the namespace of the
      * given value.<br /> Example: <code>var.address.city</code>
      */
-    public Path newPath(Value val);
+    Path newPath(Value val);
 
     /**
      * Return a value representing the given constant, which will be
      * a {@link Number}, {@link String}, or {@link Boolean} instance.
      */
-    public Literal newLiteral(Object val, int parseType);
+    Literal newLiteral(Object val, int parseType);
 
     /**
      * Return a value representing <code>this</code>.
      */
-    public Value getThis();
+    Value getThis();
 
     /**
      * Return a value representing null.
      */
-    public Value getNull();
+    Value getNull();
 
     /**
      * Return a value representing the current date.
      */
-    public <T extends Date> Value getCurrentDate(Class<T> dateType);
+    <T extends Date> Value getCurrentDate(Class<T> dateType);
 
     /**
      * Return a value representing the current time.
      */
-    public <T extends Date> Value getCurrentTime(Class<T> timeType);
+    <T extends Date> Value getCurrentTime(Class<T> timeType);
 
     /**
      * Return a value representing the current timestamp.
      */
-    public <T extends Date> Value getCurrentTimestamp(Class<T> timestampType);
+    <T extends Date> Value getCurrentTimestamp(Class<T> timestampType);
 
     /**
      * Return a value representing a parameter for the given value. The
      * type may be <code>Object</code> if the parameter is not declared.
      */
-    public Parameter newParameter(Object name, Class type);
+    Parameter newParameter(Object name, Class type);
 
     /**
      * Return a value representing a collection-valued parameter. The
      * type may be <code>Object</code> if the parameter is not declared.
      */
-    public Parameter newCollectionValuedParameter(Object name, Class type);
+    Parameter newCollectionValuedParameter(Object name, Class type);
 
     /**
      * Return the value of the given extension.
      */
-    public Value newExtension(FilterListener listener, Value target,
+    Value newExtension(FilterListener listener, Value target,
         Value args);
 
     /**
      * Return the value of the given function.
      */
-    public Value newAggregate(AggregateListener listener, Value args);
+    Value newAggregate(AggregateListener listener, Value args);
 
     /**
      * Return a function argument list consisting of the given values, either
      * of which may itself be an argument list.
      */
-    public Arguments newArgumentList(Value arg1, Value arg2);
+    Arguments newArgumentList(Value arg1, Value arg2);
 
     /**
      * Return a function argument list consisting of the given values, any
      * of which may itself be an argument list.
      */
-    public Arguments newArgumentList(Value... values);
+    Arguments newArgumentList(Value... values);
 
     /**
      * Return an unbound variable. This method will only be called once for
      * a given named unbound variable. The type may be <code>Object</code>
      * if the variable is not declared.
      */
-    public Value newUnboundVariable(String name, Class type);
+    Value newUnboundVariable(String name, Class type);
 
     /**
      * This method will be called only once per variable bound in a
@@ -291,154 +291,154 @@ public interface ExpressionFactory {
      * filter string. The type may be <code>Object</code> if the variable is
      * not declared.
      */
-    public Value newBoundVariable(String name, Class type);
+    Value newBoundVariable(String name, Class type);
 
     /**
      * Cast the value to the given class.
      */
-    public Value cast(Value obj, Class cls);
+    Value cast(Value obj, Class cls);
 
     /**
      * Return a value representing the two values added together.
      */
-    public Value add(Value num1, Value num2);
+    Value add(Value num1, Value num2);
 
     /**
      * Return a value representing the second value subtracted from the first.
      */
-    public Value subtract(Value num1, Value num2);
+    Value subtract(Value num1, Value num2);
 
     /**
      * Return a value representing the two values multiplied together.
      */
-    public Value multiply(Value num1, Value num2);
+    Value multiply(Value num1, Value num2);
 
     /**
      * Return a value representing the first value divided by the first one.
      */
-    public Value divide(Value num1, Value num2);
+    Value divide(Value num1, Value num2);
 
     /**
      * Return a value representing the first value mod'd by the second one.
      */
-    public Value mod(Value num1, Value num2);
+    Value mod(Value num1, Value num2);
 
     /**
      * Return a value representing the absolute value of the given one.
      */
-    public Value abs(Value num);
+    Value abs(Value num);
 
     /**
      * Return a value representing the indexOf (LOCATE in JPQL) function on
      * the given target with the given args.
      * The optional second argument is one-based.
      */
-    public Value indexOf(Value str, Value args);
+    Value indexOf(Value str, Value args);
 
     /**
      * Return a value representing the concatenation of
      * the given target with the given args.
      */
-    public Value concat(Value str, Value args);
+    Value concat(Value str, Value args);
 
     /**
      * Return the square root of the given value.
      */
-    public Value sqrt(Value num);
+    Value sqrt(Value num);
 
     /**
      * Return a value representing the substring function on
      * the given target with the given args. Unlike as with {@link String#substring},
      * the start index is one-based, and the second argument is the length.
      */
-    public Value substring(Value str, Value args);
+    Value substring(Value str, Value args);
 
     /**
      * Return the upper case of the given value.
      */
-    public Value toUpperCase(Value str);
+    Value toUpperCase(Value str);
 
     /**
      * Return the upper case of the given value.
      */
-    public Value toLowerCase(Value str);
+    Value toLowerCase(Value str);
 
     /**
      * Return the average of the given value for all matches.
      */
-    public Value avg(Value num);
+    Value avg(Value num);
 
     /**
      * Return the count of the given value for all matches.
      */
-    public Value count(Value obj);
+    Value count(Value obj);
 
     /**
      * Return the max of the given value for all matches.
      */
-    public Value max(Value num);
+    Value max(Value num);
 
     /**
      * Return the max of the given value for all matches.
      */
-    public Value min(Value num);
+    Value min(Value num);
 
     /**
      * Return the max of the given value for all matches.
      */
-    public Value sum(Value num);
+    Value sum(Value num);
 
     /**
      * Return an expression representing the given condition.
      *
      * @since 0.4.0.0
      */
-    public Value any(Value target);
+    Value any(Value target);
 
     /**
      * Return an expression representing the given condition.
      *
      * @since 0.4.0.0
      */
-    public Value all(Value target);
+    Value all(Value target);
 
     /**
      * Return an expression representing the given condition.
      *
      * @since 0.4.0.0
      */
-    public Value size(Value target);
+    Value size(Value target);
 
     /**
      * Return an index/position of the given value within a collection/map.
      *
      * @since 2.0.0
      */
-    public Value index(Value target);
+    Value index(Value target);
 
     /**
      * Return the type/class of the given value.
      *
      * @since 2.0.0
      */
-    public Value type(Value target);
+    Value type(Value target);
 
     /**
      * Return the map entry of the given value.
      *
      * @since 2.0.0
      */
-    public Value mapEntry(Value key, Value val);
+    Value mapEntry(Value key, Value val);
 
     /**
      * Return the map key of the given value
      */
-    public Value mapKey(Value key, Value val);
+    Value mapKey(Value key, Value val);
 
     /**
      * Path navigation thru map key
      */
-    public Value getKey(Value val);
+    Value getKey(Value val);
 
     /**
      * Return distinct values of the given value. This is typically used
@@ -446,57 +446,57 @@ public interface ExpressionFactory {
 	 *
 	 * @since 0.4.0.0
 	 */
-	public Value distinct (Value obj);
+	Value distinct (Value obj);
 
 	/**
 	 * Return the object id of the given value.
 	 */
-	public Value getObjectId (Value val);
+	Value getObjectId (Value val);
 
     /**
      * Return a simple case expression
      */
-    public Value simpleCaseExpression(Value caseOperand,
+    Value simpleCaseExpression(Value caseOperand,
             Expression[] exp, Value val);
 
     /**
      * Return a general case expression
      */
-    public Value generalCaseExpression(Expression[] exp, Value val);
+    Value generalCaseExpression(Expression[] exp, Value val);
 
     /**
      * Return a when condidional clause
      */
-    public Expression whenCondition(Expression exp, Value val);
+    Expression whenCondition(Expression exp, Value val);
 
     /**
      * Return a when scalar_expression clause
      */
-    public Expression whenScalar(Value val1, Value val2);
+    Expression whenScalar(Value val1, Value val2);
 
     /**
      * Return a coalesce expression
      */
-    public Value coalesceExpression(Value[] val);
+    Value coalesceExpression(Value[] val);
 
     /**
      * Return a nullif expression
      */
-    public Value nullIfExpression(Value val1, Value val2);
+    Value nullIfExpression(Value val1, Value val2);
 
     /**
      * Return a value representing the given constant, which will be
      * a {@link Number}, {@link String}, or {@link Boolean} instance.
      */
-    public Literal newTypeLiteral(Object val, int parseType);
+    Literal newTypeLiteral(Object val, int parseType);
 
     /**
      * Return a value representing the given datastore function with the given arguments.
      */
-    public Value newFunction(String functionName, Class<?> resultType, Value... args);
+    Value newFunction(String functionName, Class<?> resultType, Value... args);
 
     /**
      * Return true if the Value is a Type expression and the Type uses joined table strategy.
      */
-    public boolean isVerticalType(Value val);
+    boolean isVerticalType(Value val);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionParser.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionParser.java
index 947f9e58a..430e436f4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionParser.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionParser.java
@@ -36,28 +36,28 @@ public interface ExpressionParser
     /**
      * Return a string key describing the language that this instance parses.
      */
-    public String getLanguage();
+    String getLanguage();
 
     /**
      * Return a parsed intermediate form of the given query string.
      */
-    public Object parse(String ql, ExpressionStoreQuery query);
+    Object parse(String ql, ExpressionStoreQuery query);
 
     /**
      * Use the parsed query form to set information such as candidate type,
      * result type, etc that was encoded in the query string.
      */
-    public void populate(Object parsed, ExpressionStoreQuery query);
+    void populate(Object parsed, ExpressionStoreQuery query);
 
     /**
      * Parse the given query string.
      */
-    public QueryExpressions eval(Object parsed, ExpressionStoreQuery query,
+    QueryExpressions eval(Object parsed, ExpressionStoreQuery query,
         ExpressionFactory factory, ClassMetaData candidate);
 
     /**
      * Parse the given value clauses.
      */
-    public Value[] eval(String[] vals, ExpressionStoreQuery query,
+    Value[] eval(String[] vals, ExpressionStoreQuery query,
         ExpressionFactory factory, ClassMetaData candidate);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionVisitor.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionVisitor.java
index f65baebd5..8718edae5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionVisitor.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionVisitor.java
@@ -30,20 +30,20 @@ public interface ExpressionVisitor {
      * Enter an expression.  The expression will then invoke visits on its
      * components.
      */
-    public void enter(Expression exp);
+    void enter(Expression exp);
 
     /**
      * Leave an expression.
      */
-    public void exit(Expression exp);
+    void exit(Expression exp);
 
     /**
      * Enter a value.  The value will then invoke visits on its components.
      */
-    public void enter(Value val);
+    void enter(Value val);
 
     /**
      * Leave a value.
      */
-    public void exit(Value val);
+    void exit(Value val);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Extension.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Extension.java
index b0b71490a..8c2b29619 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Extension.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Extension.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class Extension
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final FilterListener _listener;
     private final Val _target;
     private final Val _arg;
@@ -42,14 +44,17 @@ class Extension
         _arg = arg;
     }
 
+    @Override
     public Class getType() {
         Class targetClass = (_target == null) ? null : _target.getType();
         return _listener.getType(targetClass, getArgTypes());
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object target = null;
@@ -81,6 +86,7 @@ class Extension
         return new Object[]{ arg };
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         if (_target != null)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/FilterListener.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/FilterListener.java
index bc7365c3e..70ad0cae4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/FilterListener.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/FilterListener.java
@@ -34,7 +34,7 @@ public interface FilterListener
     /**
      * Return the tag that this extension listens for.
      */
-    public String getTag();
+    String getTag();
 
     /**
      * Return true if this extension expects arguments to act on. Some
@@ -42,7 +42,7 @@ public interface FilterListener
      * switch a string to upper case might be of the form:
      * <code>field.ext:toUpperCase ()</code>.
      */
-    public boolean expectsArguments();
+    boolean expectsArguments();
 
     /**
      * Return true if this extension expects a target to act on. Some
@@ -52,7 +52,7 @@ public interface FilterListener
      * <code>ext:toUpperCase (field)</code> has no target but does have an
      * argument.
      */
-    public boolean expectsTarget();
+    boolean expectsTarget();
 
     /**
      * Evaluate the given expression. This method is used when
@@ -75,7 +75,7 @@ public interface FilterListener
      * @throws org.apache.openjpa.util.UserException if this extension does not
      * support in-memory operation
      */
-    public Object evaluate(Object target, Class targetClass, Object[] args,
+    Object evaluate(Object target, Class targetClass, Object[] args,
         Class[] argClasses, Object candidate, StoreContext ctx);
 
     /**
@@ -85,5 +85,5 @@ public interface FilterListener
      * @param argClasses the expected classes of the arguments, or null if
      * no arguments
      */
-    public Class getType(Class targetClass, Class[] argClasses);
+    Class getType(Class targetClass, Class[] argClasses);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GeneralCase.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GeneralCase.java
index 63420b65e..894b76a84 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GeneralCase.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GeneralCase.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.lib.util.Localizer;
 class GeneralCase
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(
         GeneralCase.class);
 
@@ -41,6 +44,7 @@ class GeneralCase
         _val = val;
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig, StoreContext ctx,
         Object[] params) {
         for (int i = 0; i < _exp.length; i++) {
@@ -72,6 +76,7 @@ class GeneralCase
         return _val.eval(candidate, null, ctx, params);
     }
 
+    @Override
     public Class getType() {
         Class c1 = _val.getType();
         for (int i = 0; i < _exp.length; i++) {
@@ -81,9 +86,11 @@ class GeneralCase
         return c1;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         for (int i = 0; i < _exp.length; i++)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GetMapValue.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GetMapValue.java
index 8064d5480..7e65ff93b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GetMapValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GetMapValue.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class GetMapValue
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _map;
     private final Val _arg;
 
@@ -41,17 +43,21 @@ class GetMapValue
         _arg = arg;
     }
 
+    @Override
     public boolean isVariable() {
         return false;
     }
 
+    @Override
     public Class getType() {
         return Object.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return ((Map) _map.eval(candidate, orig, ctx, params)).
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GetObjectId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GetObjectId.java
index 6286feaa7..5a82b9c3c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GetObjectId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GetObjectId.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class GetObjectId
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -37,18 +39,22 @@ class GetObjectId
         _val = val;
     }
 
+    @Override
     public Class getType() {
         return Object.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return ctx.getObjectId(_val.eval(candidate, orig, ctx, params));
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GreaterThanEqualExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GreaterThanEqualExpression.java
index c92c0e4d3..7cffabdb4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GreaterThanEqualExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GreaterThanEqualExpression.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class GreaterThanEqualExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -33,6 +36,7 @@ class GreaterThanEqualExpression
         super(val1, val2);
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         if (!(o1 instanceof Comparable))
             return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GreaterThanExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GreaterThanExpression.java
index bdab818cd..9fe143724 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GreaterThanExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/GreaterThanExpression.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class GreaterThanExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -33,6 +36,7 @@ class GreaterThanExpression
         super(val1, val2);
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         if (!(o1 instanceof Comparable))
             return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java
index 495638787..1b8ca3cbd 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java
@@ -28,9 +28,9 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Objects;
 import java.util.Set;
 
-import java.util.Objects;
 import org.apache.openjpa.kernel.Extent;
 import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.lib.util.Localizer;
@@ -328,7 +328,7 @@ public class InMemoryExpressionFactory
         // no need to do distinct if not instructed to, or if these are
         // candidate objects from an extent
         int len = exps.projections.length;
-        if ((exps.distinct & exps.DISTINCT_TRUE) == 0
+        if ((exps.distinct & QueryExpressions.DISTINCT_TRUE) == 0
             || (fromExtent && len == 0))
             return matches;
 
@@ -356,66 +356,82 @@ public class InMemoryExpressionFactory
         return (distinct == null) ? matches : distinct;
     }
 
+    @Override
     public Expression emptyExpression() {
         return new Exp();
     }
 
+    @Override
     public Expression asExpression(Value v) {
         return new ValExpression((Val) v);
     }
 
+    @Override
     public Expression equal(Value v1, Value v2) {
         return new EqualExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression notEqual(Value v1, Value v2) {
         return new NotEqualExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression lessThan(Value v1, Value v2) {
         return new LessThanExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression greaterThan(Value v1, Value v2) {
         return new GreaterThanExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression lessThanEqual(Value v1, Value v2) {
         return new LessThanEqualExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression greaterThanEqual(Value v1, Value v2) {
         return new GreaterThanEqualExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression isEmpty(Value v1) {
         return new IsEmptyExpression((Val) v1);
     }
 
+    @Override
     public Expression isNotEmpty(Value v1) {
         return not(isEmpty(v1));
     }
 
+    @Override
     public Expression contains(Value v1, Value v2) {
         return new ContainsExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression containsKey(Value v1, Value v2) {
         return new ContainsKeyExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression containsValue(Value v1, Value v2) {
         return new ContainsValueExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Value getMapValue(Value map, Value arg) {
         return new GetMapValue((Val) map, (Val) arg);
     }
 
+    @Override
     public Expression isInstance(Value v1, Class c) {
         return new InstanceofExpression((Val) v1, c);
     }
 
+    @Override
     public Expression and(Expression exp1, Expression exp2) {
         if (exp1 instanceof BindVariableExpression)
             return new BindVariableAndExpression((BindVariableExpression) exp1,
@@ -423,124 +439,152 @@ public class InMemoryExpressionFactory
         return new AndExpression((Exp) exp1, (Exp) exp2);
     }
 
+    @Override
     public Expression or(Expression exp1, Expression exp2) {
         return new OrExpression((Exp) exp1, (Exp) exp2);
     }
 
+    @Override
     public Expression not(Expression exp) {
         return new NotExpression((Exp) exp);
     }
 
+    @Override
     public Expression bindVariable(Value var, Value val) {
         return new BindVariableExpression((BoundVariable) var, (Val) val);
     }
 
+    @Override
     public Expression bindKeyVariable(Value var, Value val) {
         return new BindKeyVariableExpression((BoundVariable) var, (Val) val);
     }
 
+    @Override
     public Expression bindValueVariable(Value var, Value val) {
         return new BindValueVariableExpression((BoundVariable) var, (Val) val);
     }
 
+    @Override
     public Expression endsWith(Value v1, Value v2) {
         return new EndsWithExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Expression matches(Value v1, Value v2,
         String single, String multi, String esc) {
         return new MatchesExpression((Val) v1, (Val) v2, single, multi, esc,
             true);
     }
 
+    @Override
     public Expression notMatches(Value v1, Value v2,
         String single, String multi, String esc) {
         return new MatchesExpression((Val) v1, (Val) v2, single, multi, esc,
             false);
     }
 
+    @Override
     public Expression startsWith(Value v1, Value v2) {
         return new StartsWithExpression((Val) v1, (Val) v2);
     }
 
+    @Override
     public Subquery newSubquery(ClassMetaData candidate, boolean subs,
         String alias) {
         return new SubQ(alias);
     }
 
+    @Override
     public Path newPath() {
         return new CandidatePath();
     }
 
+    @Override
     public Path newPath(Value val) {
         return new ValuePath((Val) val);
     }
 
+    @Override
     public Literal newLiteral(Object val, int parseType) {
         return new Lit(val, parseType);
     }
 
+    @Override
     public Literal newTypeLiteral(Object val, int parseType) {
         return new TypeLit(val, parseType);
     }
 
+    @Override
     public Value getThis() {
         return new This();
     }
 
+    @Override
     public Value getNull() {
         return NULL;
     }
 
+    @Override
     public <T extends Date> Value getCurrentDate(Class<T> dateType) {
         return new CurrentDate(dateType);
     }
 
+    @Override
     public  <T extends Date> Value getCurrentTime(Class<T> dateType) {
         return new CurrentDate(dateType);
     }
 
+    @Override
     public <T extends Date> Value getCurrentTimestamp(Class<T> dateType) {
         return new CurrentDate(dateType);
     }
 
+    @Override
     public Parameter newParameter(Object name, Class type) {
         return new Param(name, type);
     }
 
+    @Override
     public Parameter newCollectionValuedParameter(Object name, Class type) {
         return new CollectionParam(name, type);
     }
 
+    @Override
     public Value newExtension(FilterListener listener, Value target,
         Value arg) {
         return new Extension(listener, (Val) target, (Val) arg);
     }
 
+    @Override
     public Value newAggregate(AggregateListener listener, Value arg) {
         return new Aggregate(listener, (Val) arg);
     }
 
+    @Override
     public Arguments newArgumentList(Value val1, Value val2) {
         return new Args(val1, val2);
     }
 
+    @Override
     public Arguments newArgumentList(Value... values) {
         return new Args(values);
     }
 
+    @Override
     public Value newUnboundVariable(String name, Class type) {
         UnboundVariable var = new UnboundVariable(type);
         if (_unbounds == null)
-            _unbounds = new ArrayList<UnboundVariable>(3);
+            _unbounds = new ArrayList<>(3);
         _unbounds.add(var);
         return var;
     }
 
+    @Override
     public Value newBoundVariable(String name, Class type) {
         return new BoundVariable(type);
     }
 
+    @Override
     public Value cast(Value val, Class cls) {
         if (val instanceof CandidatePath)
             ((CandidatePath) val).castTo(cls);
@@ -551,118 +595,147 @@ public class InMemoryExpressionFactory
         return val;
     }
 
+    @Override
     public Value add(Value val1, Value val2) {
         return new Add((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value subtract(Value val1, Value val2) {
         return new Subtract((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value multiply(Value val1, Value val2) {
         return new Multiply((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value divide(Value val1, Value val2) {
         return new Divide((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value mod(Value val1, Value val2) {
         return new Mod((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value abs(Value val) {
         return new Abs((Val) val);
     }
 
+    @Override
     public Value indexOf(Value val1, Value val2) {
         return new IndexOf((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value concat(Value val1, Value val2) {
         return new Concat((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value stringLength(Value str) {
         return new StringLength((Val) str);
     }
 
+    @Override
     public Value trim(Value str, Value trimChar, Boolean where) {
         return new Trim((Val) str, (Val) trimChar, where);
     }
 
+    @Override
     public Value sqrt(Value val) {
         return new Sqrt((Val) val);
     }
 
+    @Override
     public Value substring(Value val1, Value val2) {
         return new Substring((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value toUpperCase(Value val) {
         return new ToUpperCase((Val) val);
     }
 
+    @Override
     public Value toLowerCase(Value val) {
         return new ToLowerCase((Val) val);
     }
 
+    @Override
     public Value avg(Value val) {
         return new Avg((Val) val);
     }
 
+    @Override
     public Value count(Value val) {
         return new Count((Val) val);
     }
 
+    @Override
     public Value distinct(Value val) {
         return new Distinct((Val) val);
     }
 
+    @Override
     public Value max(Value val) {
         return new Max((Val) val);
     }
 
+    @Override
     public Value min(Value val) {
         return new Min((Val) val);
     }
 
+    @Override
     public Value sum(Value val) {
         return new Sum((Val) val);
     }
 
+    @Override
     public Value any(Value val) {
         return new Any((Val) val);
     }
 
+    @Override
     public Value all(Value val) {
         return new All((Val) val);
     }
 
+    @Override
     public Value size(Value val) {
         return new Size((Val) val);
     }
 
+    @Override
     public Value index(Value val) {
         return new Index((Val) val);
     }
 
+    @Override
     public Value type(Value val) {
         return new Type((Val) val);
     }
 
+    @Override
     public Value mapEntry(Value key, Value val) {
         throw new UnsupportedException("not implemented yet");
     }
 
+    @Override
     public Value mapKey(Value key, Value val) {
         throw new UnsupportedException("not implemented yet");
     }
 
+    @Override
     public Value getKey(Value val) {
         throw new UnsupportedException("not implemented yet");
     }
 
+    @Override
     public Value getObjectId(Value val) {
         return new GetObjectId((Val) val);
     }
@@ -678,6 +751,7 @@ public class InMemoryExpressionFactory
             _arr = arr;
         }
 
+        @Override
         public int hashCode() {
             int rs = 17;
             for (int i = 0; i < _arr.length; i++)
@@ -685,6 +759,7 @@ public class InMemoryExpressionFactory
             return rs;
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == this)
                 return true;
@@ -724,6 +799,7 @@ public class InMemoryExpressionFactory
             _params = params;
         }
 
+        @Override
         public int compare(Object o1, Object o2) {
             if (_idx != -1) {
                 o1 = ((Object[]) o1)[_idx];
@@ -758,6 +834,7 @@ public class InMemoryExpressionFactory
 		}
 	}
 
+    @Override
     public Value generalCaseExpression(Expression[] exp, Value val) {
         Exp[] exps = new Exp[exp.length];
         for (int i = 0; i < exp.length; i++)
@@ -765,6 +842,7 @@ public class InMemoryExpressionFactory
         return new GeneralCase(exps, (Val) val);
     }
 
+    @Override
     public Value simpleCaseExpression(Value caseOperand, Expression[] exp,
         Value val) {
             Exp[] exps = new Exp[exp.length];
@@ -773,14 +851,17 @@ public class InMemoryExpressionFactory
             return new SimpleCase((Val) caseOperand, exps, (Val) val);
     }
 
+    @Override
     public Expression whenCondition(Expression exp, Value val) {
         return new WhenCondition((Exp) exp, (Val) val);
     }
 
+    @Override
     public Expression whenScalar(Value val1, Value val2) {
         return new WhenScalar((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value coalesceExpression(Value[] val) {
         Val[] vals = new Val[val.length];
         for (int i = 0; i < val.length; i++)
@@ -788,14 +869,17 @@ public class InMemoryExpressionFactory
         return new Coalesce(vals);
     }
 
+    @Override
     public Value nullIfExpression(Value val1, Value val2) {
         return new NullIf((Val) val1, (Val) val2);
     }
 
+    @Override
     public Value newFunction(String functionName, Class<?> resultType, Value... args) {
         throw new AbstractMethodError();
     }
 
+    @Override
     public boolean isVerticalType(Value val) {
         return false;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Index.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Index.java
index 100e6bd8e..290080536 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Index.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Index.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.util.UnsupportedException;
  */
 class Index extends UnaryMathVal {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage(Index.class);
 
     /**
@@ -37,10 +39,12 @@ class Index extends UnaryMathVal {
         super(val);
     }
 
+    @Override
     public Class getType(Class c) {
         return int.class;
     }
 
+    @Override
     protected Object operate(Object o, Class c) {
         throw new UnsupportedException(_loc.get("in-mem-index"));
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java
index 6d50c2f25..4a7db666e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IndexOf.java
@@ -29,6 +29,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class IndexOf
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Val _args;
 
@@ -41,13 +43,16 @@ class IndexOf
         _args = args;
     }
 
+    @Override
     public Class getType() {
         return int.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object str = _val.eval(candidate, orig, ctx, params);
@@ -62,6 +67,7 @@ class IndexOf
         return idx;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InstanceofExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InstanceofExpression.java
index d5a1cfb3e..c210d5053 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InstanceofExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InstanceofExpression.java
@@ -31,6 +31,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class InstanceofExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Class _cls;
 
@@ -46,6 +48,7 @@ class InstanceofExpression
      * Evaluate the expression for the given context candidate and original
      * candidate.
      */
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _cls.isInstance(_val.eval(candidate, orig, ctx, params));
@@ -54,6 +57,7 @@ class InstanceofExpression
     /**
      * Evaluate the expression for the given group.
      */
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         Collection c = _val.eval(candidates, null, ctx, params);
@@ -61,6 +65,7 @@ class InstanceofExpression
         return _cls.isInstance(o);
 	}
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IsEmptyExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IsEmptyExpression.java
index b8b5327d7..bdb87eff1 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IsEmptyExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/IsEmptyExpression.java
@@ -31,6 +31,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class IsEmptyExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -40,6 +42,7 @@ class IsEmptyExpression
         _val = val;
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object obj = _val.eval(candidate, orig, ctx, params);
@@ -52,6 +55,7 @@ class IsEmptyExpression
         return false;
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         Collection c = _val.eval(candidates, null, ctx, params);
@@ -67,6 +71,7 @@ class IsEmptyExpression
         return false;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/LessThanEqualExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/LessThanEqualExpression.java
index 9a686efc4..7911e7b9c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/LessThanEqualExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/LessThanEqualExpression.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class LessThanEqualExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -33,6 +36,7 @@ class LessThanEqualExpression
         super(val1, val2);
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         if (!(o1 instanceof Comparable))
             return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/LessThanExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/LessThanExpression.java
index 42689d2f6..997c5bf7a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/LessThanExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/LessThanExpression.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class LessThanExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -33,6 +36,7 @@ class LessThanExpression
         super(val1, val2);
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         if (!(o1 instanceof Comparable))
             return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Lit.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Lit.java
index 219254061..680c9e67c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Lit.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Lit.java
@@ -30,6 +30,8 @@ class Lit
     extends Val
     implements Literal {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object _val;
     private final int _ptype;
 
@@ -41,30 +43,37 @@ class Lit
         _ptype = ptype;
     }
 
+    @Override
     public Object getValue() {
         return _val;
     }
 
+    @Override
     public void setValue(Object val) {
         _val = val;
     }
 
+    @Override
     public int getParseType() {
         return _ptype;
     }
 
+    @Override
     public Object getValue(Object[] parameters) {
         return _val;
     }
 
+    @Override
     public Class getType() {
         return (_val == null) ? Object.class : _val.getClass();
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _val = Filters.convert(_val, type);
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _val;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Literal.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Literal.java
index 099800871..f6724f8fb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Literal.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Literal.java
@@ -26,31 +26,31 @@ package org.apache.openjpa.kernel.exps;
 public interface Literal
     extends Value, Constant {
 
-    public static final int TYPE_UNKNOWN = 0;
-    public static final int TYPE_NUMBER = 1;
-    public static final int TYPE_BOOLEAN = 2;
-    public static final int TYPE_STRING = 3;
-    public static final int TYPE_SQ_STRING = 4; // single-quoted string
-    public static final int TYPE_CLASS = 5;
-    public static final int TYPE_ENUM = 6;
-    public static final int TYPE_COLLECTION = 7;
-    public static final int TYPE_DATE = 8;
-    public static final int TYPE_TIME = 9;
-    public static final int TYPE_TIMESTAMP = 10;
+    int TYPE_UNKNOWN = 0;
+    int TYPE_NUMBER = 1;
+    int TYPE_BOOLEAN = 2;
+    int TYPE_STRING = 3;
+    int TYPE_SQ_STRING = 4; // single-quoted string
+    int TYPE_CLASS = 5;
+    int TYPE_ENUM = 6;
+    int TYPE_COLLECTION = 7;
+    int TYPE_DATE = 8;
+    int TYPE_TIME = 9;
+    int TYPE_TIMESTAMP = 10;
 
     /**
      * The value of this literal.
      */
-    public Object getValue();
+    Object getValue();
 
     /**
      * The value of this literal.
      */
-    public void setValue(Object val);
+    void setValue(Object val);
 
     /**
      * The type the literal was parsed as.
      */
-    public int getParseType();
+    int getParseType();
 }
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/MatchesExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/MatchesExpression.java
index a350191bf..b6109aad7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/MatchesExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/MatchesExpression.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.lib.util.StringUtil;
 class MatchesExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(
         MatchesExpression.class);
 
@@ -51,6 +54,7 @@ class MatchesExpression
         _affirmation = affirmation;
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         if (o1 == null || o2 == null)
             return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/MathVal.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/MathVal.java
index db5ca8d6d..1fead3410 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/MathVal.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/MathVal.java
@@ -29,6 +29,8 @@ import org.apache.openjpa.kernel.StoreContext;
 abstract class MathVal
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
 
@@ -40,15 +42,18 @@ abstract class MathVal
         _val2 = val2;
     }
 
+    @Override
     public Class getType() {
         Class c1 = _val1.getType();
         Class c2 = _val2.getType();
         return Filters.promote(c1, c2);
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object o1 = _val1.eval(candidate, orig, ctx, params);
@@ -62,6 +67,7 @@ abstract class MathVal
     protected abstract Object operate(Object o1, Class c1, Object o2,
         Class c2);
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Max.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Max.java
index 6de51d78d..2939691e7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Max.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Max.java
@@ -29,6 +29,9 @@ import java.util.Iterator;
 class Max
     extends AggregateVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the value to maximize.
      */
@@ -36,10 +39,12 @@ class Max
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         return c;
     }
 
+    @Override
     protected Object operate(Collection os, Class c) {
         Comparable max = null;
         Comparable cur;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Min.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Min.java
index bb014a70e..97a7024a4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Min.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Min.java
@@ -29,6 +29,9 @@ import java.util.Iterator;
 class Min
     extends AggregateVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the value to minimize.
      */
@@ -36,10 +39,12 @@ class Min
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         return c;
     }
 
+    @Override
     protected Object operate(Collection os, Class c) {
         Comparable min = null;
         Comparable cur;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Mod.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Mod.java
index a26a7fd38..38eb2a67a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Mod.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Mod.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.kernel.Filters;
 class Mod
     extends MathVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the values to mod.
      */
@@ -35,6 +38,7 @@ class Mod
         super(val1, val2);
     }
 
+    @Override
     protected Object operate(Object o1, Class c1, Object o2, Class c2) {
         return Filters.mod(o1, c1, o2, c2);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Multiply.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Multiply.java
index 75098e511..fb92c3f03 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Multiply.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Multiply.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.kernel.Filters;
 class Multiply
     extends MathVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the values to multiply.
      */
@@ -35,6 +38,7 @@ class Multiply
         super(val1, val2);
     }
 
+    @Override
     protected Object operate(Object o1, Class c1, Object o2, Class c2) {
         return Filters.multiply(o1, c1, o2, c2);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NotEqualExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NotEqualExpression.java
index 23f0ae5a0..d5d97da5a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NotEqualExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NotEqualExpression.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class NotEqualExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -33,6 +36,7 @@ class NotEqualExpression
         super(val1, val2);
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         return (o1 == null && o2 != null)
             || (o1 != null && !o1.equals(o2));
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NotExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NotExpression.java
index 11dd6cd19..5b52edd7c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NotExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NotExpression.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class NotExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp;
 
     /**
@@ -39,16 +41,19 @@ class NotExpression
         _exp = exp;
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return !_exp.evaluate(candidate, orig, ctx, params);
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         return !_exp.evaluate(candidates, ctx, params);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Null.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Null.java
index 83b83ecc7..343cced06 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Null.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Null.java
@@ -28,13 +28,19 @@ import org.apache.openjpa.kernel.StoreContext;
 class Null
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public Class getType() {
         return Object.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return null;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NullIf.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NullIf.java
index 8766d9545..158c6cda5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NullIf.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/NullIf.java
@@ -29,6 +29,8 @@ import org.apache.openjpa.kernel.StoreContext;
 public class NullIf
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
 
@@ -87,13 +89,16 @@ public class NullIf
         return _val2;
     }
 
+    @Override
     public Class getType() {
         return _val1.getType();
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/OrExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/OrExpression.java
index 2f2923aeb..b18af49e8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/OrExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/OrExpression.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class OrExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp1;
     private final Exp _exp2;
 
@@ -41,18 +43,21 @@ class OrExpression
         _exp2 = exp2;
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _exp1.evaluate(candidate, orig, ctx, params)
             || _exp2.evaluate(candidate, orig, ctx, params);
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         return _exp1.evaluate(candidates, ctx, params)
             || _exp2.evaluate(candidates, ctx, params);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp1.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Param.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Param.java
index 1534e32c7..ff7c277a6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Param.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Param.java
@@ -29,6 +29,8 @@ class Param
     extends Val
     implements Parameter {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object _key = null;
     private Class _type = null;
     private int _index = -1;
@@ -41,26 +43,32 @@ class Param
         _type = type;
     }
 
+    @Override
     public Object getParameterKey() {
         return _key;
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _type = type;
     }
 
+    @Override
     public void setIndex(int index) {
         _index = index;
     }
 
+    @Override
     public Object getValue(Object[] params) {
         return params[_index];
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return getValue(params);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Parameter.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Parameter.java
index ceadf31a5..3c0473a69 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Parameter.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Parameter.java
@@ -29,10 +29,10 @@ public interface Parameter
     /**
      * Set the index of this parameter.
      */
-    public void setIndex(int index);
+    void setIndex(int index);
 
     /**
      * Returns the key of the parameter.
      */
-    public Object getParameterKey();
+    Object getParameterKey();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Path.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Path.java
index b0e575dbf..86768cfb6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Path.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Path.java
@@ -36,13 +36,13 @@ public interface Path
      *
      * @param nullTraversal if true, allow traversal through a null field
      */
-    public void get(FieldMetaData field, boolean nullTraversal);
+    void get(FieldMetaData field, boolean nullTraversal);
 
     /**
      * Return the last field in the path, or null if the path does not
      * not contain a final field.
      */
-    public FieldMetaData last();
+    FieldMetaData last();
 
     /**
      * Traverse into the given field that maps to xml column, and update
@@ -51,30 +51,30 @@ public interface Path
      * @param fmd field maps to xml column
      * @param meta associated xml mapping
      */
-    public void get(FieldMetaData fmd, XMLMetaData meta);
+    void get(FieldMetaData fmd, XMLMetaData meta);
 
     /**
      * Traverse into the gevin xpath name of the current object, and update
      * the current object to that xpath field.
      *
      */
-    public void get(XMLMetaData meta, String name);
+    void get(XMLMetaData meta, String name);
 
     /**
      * Return the current XPath's xmlmapping metadata.
      * @return Return xmlmapping
      */
-    public XMLMetaData getXmlMapping();
+    XMLMetaData getXmlMapping();
 
     /**
      * Set the schema alias (the identification variable)
      * this path is begin with.
      */
-    public void setSchemaAlias(String schemaAlias);
+    void setSchemaAlias(String schemaAlias);
 
-    public String getSchemaAlias();
+    String getSchemaAlias();
 
-    public void setSubqueryContext(Context context, String correlationVar);
+    void setSubqueryContext(Context context, String correlationVar);
 
-    public String getCorrelationVar();
+    String getCorrelationVar();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/QueryExpressions.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/QueryExpressions.java
index 123597f4b..741f48592 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/QueryExpressions.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/QueryExpressions.java
@@ -29,7 +29,6 @@ import java.util.Stack;
 import org.apache.openjpa.kernel.QueryOperations;
 import org.apache.openjpa.kernel.ResultShape;
 import org.apache.openjpa.kernel.StoreQuery;
-import org.apache.openjpa.kernel.exps.Context;
 import org.apache.openjpa.lib.util.OrderedMap;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
@@ -40,10 +39,8 @@ import org.apache.openjpa.meta.FieldMetaData;
  * @author Abe White
  * @since 0.3.2
  */
-@SuppressWarnings("serial")
-public class QueryExpressions
-    implements Serializable {
-
+public class QueryExpressions implements Serializable {
+    private static final long serialVersionUID = 1L;
     public static final int DISTINCT_AUTO = 2 << 0;
     public static final int DISTINCT_TRUE = 2 << 1;
     public static final int DISTINCT_FALSE = 2 << 2;
@@ -123,7 +120,7 @@ public class QueryExpressions
      */
     public void putUpdate(Path path, Value val) {
         if (updates == Collections.EMPTY_MAP)
-            updates = new LinkedHashMap<Path, Value>();
+            updates = new LinkedHashMap<>();
         updates.put(path, val);
     }
 
@@ -148,6 +145,7 @@ public class QueryExpressions
             return v._agg;
         }
 
+        @Override
         public void enter(Value val) {
             if (_agg)
                 return;
@@ -158,6 +156,7 @@ public class QueryExpressions
                 _sub = val;
         }
 
+        @Override
         public void exit(Value val) {
             if (val == _sub)
                 _sub = null;
@@ -171,10 +170,11 @@ public class QueryExpressions
      */
     private static class ParameterExpressionVisitor extends AbstractExpressionVisitor {
         private FieldMetaData _parameterized;
-        private List<FieldMetaData> _collected = new ArrayList<FieldMetaData>();
+        private List<FieldMetaData> _collected = new ArrayList<>();
         /**
          * Enters the current node.
          */
+        @Override
         public void enter(Value val) {
             if (val instanceof Parameter) {
                 if (_parameterized != null) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Resolver.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Resolver.java
index 284c6c0af..86759835e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Resolver.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Resolver.java
@@ -35,27 +35,27 @@ public interface Resolver {
      * imports, and will properly handle primitives and java.lang types
      * as well. Returns null if the name does not match a known type.
      */
-    public Class classForName(String name, String[] imports);
+    Class classForName(String name, String[] imports);
 
     /**
      * Return the filter listener for the given tag, or null if none.
      */
-    public FilterListener getFilterListener(String tag);
+    FilterListener getFilterListener(String tag);
 
     /**
      * Return the function listener for the given tag, or null if none.
      */
-    public AggregateListener getAggregateListener(String tag);
+    AggregateListener getAggregateListener(String tag);
 
     /**
      * Return the OpenJPA configuration.
      */
-    public OpenJPAConfiguration getConfiguration ();
+    OpenJPAConfiguration getConfiguration ();
 
     /**
      * The {@link QueryContext} for which this resolver was created
      *
      * @since 1.1.0
      */
-    public QueryContext getQueryContext();
+    QueryContext getQueryContext();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/SimpleCase.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/SimpleCase.java
index 93ca0affa..4cf3aaae1 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/SimpleCase.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/SimpleCase.java
@@ -27,6 +27,8 @@ import org.apache.openjpa.kernel.StoreContext;
  * @author Catalina Wei
  */
 public class SimpleCase extends Val {
+    
+    private static final long serialVersionUID = 1L;
     private final Val _caseOperand;
     private final Exp[] _exp;
     private final Val _val;
@@ -86,6 +88,7 @@ public class SimpleCase extends Val {
             || (o1 != null && o1.equals(o2));
     }
 
+    @Override
     public Class getType() {
         Class c1 = _val.getType();
         for (int i = 0; i < _exp.length; i++) {
@@ -95,9 +98,11 @@ public class SimpleCase extends Val {
         return c1;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _caseOperand.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Size.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Size.java
index a7c2d3988..4bc4d241f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Size.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Size.java
@@ -30,14 +30,19 @@ import java.util.Map;
 class Size
     extends UnaryMathVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public Size(Val val) {
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         return int.class;
     }
 
+    @Override
     protected Object operate(Object o, Class c) {
         if (o instanceof Collection)
             return ((Collection) o).size();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sqrt.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sqrt.java
index 41ab37f2c..542fac2a0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sqrt.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sqrt.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class Sqrt
     extends UnaryMathVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the number whose square root to calculate.
      */
@@ -33,10 +36,12 @@ class Sqrt
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         return double.class;
     }
 
+    @Override
     protected Object operate(Object o, Class c) {
         return Double.valueOf(Math.sqrt(((Number) o).doubleValue()));
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StartsWithExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StartsWithExpression.java
index 7fbeef206..9952a2222 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StartsWithExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StartsWithExpression.java
@@ -26,6 +26,9 @@ package org.apache.openjpa.kernel.exps;
 class StartsWithExpression
     extends CompareExpression {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Supply values to compare.
      */
@@ -33,6 +36,7 @@ class StartsWithExpression
         super(val1, val2);
     }
 
+    @Override
     protected boolean compare(Object o1, Object o2) {
         if (o1 == null || o2 == null)
             return false;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringContains.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringContains.java
index cb5fc6da2..3a89c77d6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringContains.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringContains.java
@@ -29,23 +29,30 @@ import org.apache.openjpa.kernel.StoreContext;
  *
  * @deprecated Use <code>matches()</code> instead.
  */
+@Deprecated
 public class StringContains
     implements FilterListener {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String TAG = "stringContains";
 
+    @Override
     public String getTag() {
         return TAG;
     }
 
+    @Override
     public boolean expectsArguments() {
         return true;
     }
 
+    @Override
     public boolean expectsTarget() {
         return true;
     }
 
+    @Override
     public Object evaluate(Object target, Class targetClass, Object[] args,
         Class[] argClasses, Object candidate, StoreContext ctx) {
         if (target == null || args[0] == null)
@@ -55,6 +62,7 @@ public class StringContains
         return Boolean.FALSE;
     }
 
+    @Override
     public Class getType(Class targetClass, Class[] argClasses) {
         return boolean.class;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java
index c5862e320..e47395821 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/StringLength.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class StringLength
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private Class _cast = null;
 
@@ -38,16 +40,19 @@ class StringLength
         _val = val;
     }
 
+    @Override
     public Class getType() {
         if (_cast != null)
             return _cast;
         return int.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _cast = type;
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object eval = _val.eval(candidate, orig, ctx, params);
@@ -57,6 +62,7 @@ class StringLength
         return eval.toString().length();
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/SubQ.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/SubQ.java
index d9bf05dd1..0549c373a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/SubQ.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/SubQ.java
@@ -32,6 +32,9 @@ class SubQ
     extends Val
     implements Subquery {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(Subquery.class);
 
     private final String _alias;
@@ -43,33 +46,41 @@ class SubQ
         _subqAlias = alias;
     }
 
+    @Override
     public Object getSelect() {
         return null;
     }
 
+    @Override
     public String getCandidateAlias() {
         return _alias;
     }
 
+    @Override
     public void setSubqAlias(String subqAlias) {
         _subqAlias = subqAlias;
     }
 
+    @Override
     public String getSubqAlias() {
         return _subqAlias;
     }
 
+    @Override
     public void setQueryExpressions(QueryExpressions q) {
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _type = type;
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         throw new UnsupportedException(_loc.get("in-mem-subquery"));
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subquery.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subquery.java
index 5874bcb1b..ef24e7dec 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subquery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subquery.java
@@ -30,22 +30,22 @@ public interface Subquery
     /**
      * Return the candidate alias for this subquery.
      */
-    public String getCandidateAlias();
+    String getCandidateAlias();
 
     /*
      * Set the candidate alias for this subquery.
      */
-    public void setSubqAlias(String subqAlias);
+    void setSubqAlias(String subqAlias);
 
     /*
      * Return the subqAlias
      */
-    public String getSubqAlias();
+    String getSubqAlias();
 
     /**
      * Set the parsed subquery.
      */
-    public void setQueryExpressions(QueryExpressions query);
+    void setQueryExpressions(QueryExpressions query);
 
-    public Object getSelect();
+    Object getSelect();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Substring.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Substring.java
index 5ee617787..6efdd8ef4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Substring.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Substring.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class Substring
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Val _args;
 
@@ -40,13 +42,16 @@ class Substring
         _args = args;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object str = _val.eval(candidate, orig, ctx, params);
@@ -61,6 +66,7 @@ class Substring
         return str.toString().substring(((Number) arg).intValue() - 1);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subtract.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subtract.java
index 7bdff1ea5..687284dfa 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subtract.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Subtract.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.kernel.Filters;
 class Subtract
     extends MathVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the values to subtract.
      */
@@ -35,6 +38,7 @@ class Subtract
         super(val1, val2);
     }
 
+    @Override
     protected Object operate(Object o1, Class c1, Object o2, Class c2) {
         return Filters.subtract(o1, c1, o2, c2);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java
index 568447db7..e2dac713b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Sum.java
@@ -31,6 +31,9 @@ import org.apache.openjpa.kernel.Filters;
 class Sum
     extends AggregateVal {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constructor. Provide the value to sum.
      */
@@ -38,6 +41,7 @@ class Sum
         super(val);
     }
 
+    @Override
     protected Class getType(Class c) {
         Class wrap = Filters.wrap(c);
         if (wrap == Integer.class
@@ -47,6 +51,7 @@ class Sum
         return c;
     }
 
+    @Override
     protected Object operate(Collection os, Class c) {
         if (os.isEmpty())
             return null;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/This.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/This.java
index bf65d4518..b44ef44cd 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/This.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/This.java
@@ -28,14 +28,20 @@ import org.apache.openjpa.kernel.StoreContext;
 class This
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return orig;
     }
 
+    @Override
     public Class getType() {
         return getMetaData().getDescribedType();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToLowerCase.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToLowerCase.java
index 951d68899..ca5adf98f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToLowerCase.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToLowerCase.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class ToLowerCase
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -37,18 +39,22 @@ class ToLowerCase
         _val = val;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _val.eval(candidate, orig, ctx, params).toString().toLowerCase();
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToUpperCase.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToUpperCase.java
index 29f11126d..b4e0197a8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToUpperCase.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ToUpperCase.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class ToUpperCase
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -37,19 +39,23 @@ class ToUpperCase
         _val = val;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _val.eval(candidate, orig, ctx, params).toString().
             toUpperCase();
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Trim.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Trim.java
index 18aaa3cba..e45458847 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Trim.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Trim.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.kernel.StoreContext;
 class Trim
     extends Val {
 
+    private static final long serialVersionUID = 1L;
     private final Val _val;
     private final Val _trimChar;
     private final Boolean _where;
@@ -41,13 +42,16 @@ class Trim
         _where = where;
     }
 
+    @Override
     public Class getType() {
         return String.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object eval = _val.eval(candidate, orig, ctx, params);
@@ -72,6 +76,7 @@ class Trim
         return str;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java
index 6cba23d41..9832e7870 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
  */
 class Type extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -38,19 +40,23 @@ class Type extends Val {
         _val = val;
     }
 
+    @Override
     public Class getType() {
         return Class.class;
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         _val.eval(candidate, orig, ctx, params);
         return _val.getType();
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/TypeLit.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/TypeLit.java
index 4acd4c909..6467b603f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/TypeLit.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/TypeLit.java
@@ -30,6 +30,8 @@ class TypeLit
     extends Val
     implements Literal {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object _val;
     private final int _ptype;
 
@@ -41,30 +43,37 @@ class TypeLit
         _ptype = ptype;
     }
 
+    @Override
     public Object getValue() {
         return _val;
     }
 
+    @Override
     public void setValue(Object val) {
         _val = val;
     }
 
+    @Override
     public int getParseType() {
         return _ptype;
     }
 
+    @Override
     public Object getValue(Object[] parameters) {
         return _val;
     }
 
+    @Override
     public Class getType() {
         return (_val == null) ? Object.class : _val.getClass();
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _val = Filters.convert(_val, type);
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _val;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnaryMathVal.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnaryMathVal.java
index 994c0ba02..794ca52eb 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnaryMathVal.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnaryMathVal.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 abstract class UnaryMathVal
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -37,13 +39,16 @@ abstract class UnaryMathVal
         _val = val;
     }
 
+    @Override
     public Class getType() {
         return getType(_val.getType());
     }
 
+    @Override
     public void setImplicitType(Class type) {
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object o1 = _val.eval(candidate, orig, ctx, params);
@@ -61,6 +66,7 @@ abstract class UnaryMathVal
      */
     protected abstract Object operate(Object o, Class c);
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnboundVariable.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnboundVariable.java
index d194c47c2..a58f5ba6f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnboundVariable.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/UnboundVariable.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class UnboundVariable
     extends Val {
 
+    
+    private static final long serialVersionUID = 1L;
     private Class _type = null;
     private Object _val = null;
 
@@ -40,14 +42,17 @@ class UnboundVariable
         _type = type;
     }
 
+    @Override
     public boolean isVariable() {
         return true;
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public void setImplicitType(Class type) {
         _type = type;
     }
@@ -61,6 +66,7 @@ class UnboundVariable
         _val = value;
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         return _val;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Val.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Val.java
index a5a657a50..647bc149b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Val.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Val.java
@@ -34,6 +34,8 @@ import org.apache.openjpa.meta.ClassMetaData;
 public abstract class Val
     implements Value {
 
+    
+    private static final long serialVersionUID = 1L;
     private ClassMetaData _meta = null;
     private String _alias = null;
 
@@ -94,47 +96,58 @@ public abstract class Val
         return ret;
     }
 
+    @Override
     public ClassMetaData getMetaData() {
         return _meta;
     }
 
+    @Override
     public void setMetaData(ClassMetaData meta) {
         _meta = meta;
 	}
 
+    @Override
     public boolean isVariable() {
         return false;
     }
 
+    @Override
     public boolean isAggregate() {
         return false;
     }
 
+    @Override
     public boolean isXPath() {
         return false;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         visitor.exit(this);
     }
 
+    @Override
     public String getAlias() {
         return _alias;
     }
 
+    @Override
     public void setAlias(String alias) {
         _alias = alias;
     }
 
+    @Override
     public Value getSelectAs() {
         return _alias != null ? this : null;
     }
 
+    @Override
     public Path getPath() {
         return null;
     }
 
+    @Override
     public String getName() {
         return null;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValExpression.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValExpression.java
index 5305264c0..5e26e8e8d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValExpression.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValExpression.java
@@ -30,6 +30,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class ValExpression
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -39,12 +41,14 @@ class ValExpression
         _val = val;
     }
 
+    @Override
     protected boolean eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         Object o = _val.eval(candidate, orig, ctx, params);
         return o != null && ((Boolean) o).booleanValue();
     }
 
+    @Override
     protected boolean eval(Collection candidates, StoreContext ctx,
         Object[] params) {
         Collection c = _val.eval(candidates, null, ctx, params);
@@ -52,6 +56,7 @@ class ValExpression
         return o != null && ((Boolean) o).booleanValue();
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Value.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Value.java
index da16852a4..a68423627 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Value.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Value.java
@@ -35,61 +35,61 @@ public interface Value
      * Return the expected type for this value, or <code>Object</code> if
      * the type is unknown.
      */
-    public Class getType();
+    Class getType();
 
     /**
      * Set the implicit type of the value, based on how it is used in the
      * filter. This method is only called on values who return
      * <code>Object</code> from {@link #getType}.
      */
-    public void setImplicitType(Class type);
+    void setImplicitType(Class type);
 
     /**
      * Return true if this value is a variable.
      */
-    public boolean isVariable();
+    boolean isVariable();
 
     /**
      * Return true if this value is an aggregate.
      */
-    public boolean isAggregate();
+    boolean isAggregate();
 
     /**
      * Return true if this value is an XML Path.
      */
-    public boolean isXPath();
+    boolean isXPath();
 
     /**
      * Return any associated persistent type.
      */
-    public ClassMetaData getMetaData();
+    ClassMetaData getMetaData();
 
     /**
      * Associate a persistent type with this value.
      */
-    public void setMetaData(ClassMetaData meta);
+    void setMetaData(ClassMetaData meta);
 
     /**
      * Accept a visit from a tree visitor.
      */
-    public void acceptVisit(ExpressionVisitor visitor);
+    void acceptVisit(ExpressionVisitor visitor);
 
     /**
      * Return select item alias
      */
-    public String getAlias();
+    String getAlias();
 
     /**
      * Set select item alias
      */
-    public void setAlias(String alias);
+    void setAlias(String alias);
 
     /**
      * Return 'this' concrete class if alias is set, otherwise null
      */
-    public Value getSelectAs();
+    Value getSelectAs();
 
-    public Path getPath();
+    Path getPath();
 
-    public String getName();
+    String getName();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValuePath.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValuePath.java
index ced2dd335..079f22539 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValuePath.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ValuePath.java
@@ -28,6 +28,8 @@ import org.apache.openjpa.kernel.StoreContext;
 class ValuePath
     extends CandidatePath {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val;
 
     /**
@@ -37,10 +39,12 @@ class ValuePath
         _val = val;
     }
 
+    @Override
     public Class getCandidateType() {
         return _val.getType();
     }
 
+    @Override
     protected Object eval(Object candidate, Object orig,
         StoreContext ctx, Object[] params) {
         // evaluate with the value's value
@@ -48,6 +52,7 @@ class ValuePath
             ctx, params);
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WhenCondition.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WhenCondition.java
index 2fc8e252b..087945ca4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WhenCondition.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WhenCondition.java
@@ -21,6 +21,8 @@ package org.apache.openjpa.kernel.exps;
 public class WhenCondition
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Exp _exp;
     private final Val _val;
 
@@ -40,6 +42,7 @@ public class WhenCondition
         return _val;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _exp.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WhenScalar.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WhenScalar.java
index a00b0ecd8..dbff21157 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WhenScalar.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WhenScalar.java
@@ -21,6 +21,8 @@ package org.apache.openjpa.kernel.exps;
 public class WhenScalar
     extends Exp {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Val _val1;
     private final Val _val2;
 
@@ -40,6 +42,7 @@ public class WhenScalar
         return _val2;
     }
 
+    @Override
     public void acceptVisit(ExpressionVisitor visitor) {
         visitor.enter(this);
         _val1.acceptVisit(visitor);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WildcardMatch.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WildcardMatch.java
index 72a999691..fe8769812 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WildcardMatch.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/WildcardMatch.java
@@ -31,23 +31,30 @@ import org.apache.openjpa.lib.util.SimpleRegex;
  *
  * @deprecated Use <code>matches()</code> instead.
  */
+@Deprecated
 public class WildcardMatch
     implements FilterListener {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String TAG = "wildcardMatch";
 
+    @Override
     public String getTag() {
         return TAG;
     }
 
+    @Override
     public boolean expectsArguments() {
         return true;
     }
 
+    @Override
     public boolean expectsTarget() {
         return true;
     }
 
+    @Override
     public Object evaluate(Object target, Class targetClass, Object[] args,
         Class[] argClasses, Object candidate, StoreContext ctx) {
         if (target == null || args[0] == null)
@@ -63,6 +70,7 @@ public class WildcardMatch
         return (re.matches(target.toString())) ? Boolean.TRUE : Boolean.FALSE;
     }
 
+    @Override
     public Class getType(Class targetClass, Class[] argClasses) {
         return boolean.class;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
index 65ea0e7bf..7e277928c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
@@ -59,8 +59,8 @@ import org.apache.openjpa.kernel.exps.Value;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.util.OrderedMap;
 import org.apache.openjpa.lib.util.Localizer.Message;
+import org.apache.openjpa.lib.util.OrderedMap;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
@@ -88,7 +88,7 @@ public class JPQLExpressionBuilder
     private static final Localizer _loc = Localizer.forPackage
         (JPQLExpressionBuilder.class);
 
-    private final Stack<Context> contexts = new Stack<Context>();
+    private final Stack<Context> contexts = new Stack<>();
     private OrderedMap<Object, Class<?>> parameterTypes;
     private int aliasCount = 0;
     private boolean inAssignSubselectProjection = false;
@@ -116,10 +116,12 @@ public class JPQLExpressionBuilder
             throw new InternalException(parsedQuery + "");
     }
 
+    @Override
     protected Localizer getLocalizer() {
         return _loc;
     }
 
+    @Override
     protected ClassLoader getClassLoader() {
         // we don't resolve in the context of anything but ourselves
         return getClass().getClassLoader();
@@ -279,6 +281,7 @@ public class JPQLExpressionBuilder
         return null;
     }
 
+    @Override
     protected String currentQuery() {
         return ctx().parsed == null || root().parser == null ? null
             : root().parser.jpql;
@@ -395,7 +398,7 @@ public class JPQLExpressionBuilder
         if (count > 1) {
             // muti-selection
             resultClass = Object[].class;
-            resultShape = new ResultShape(resultClass, new FillStrategy.Array<Object[]>(Object[].class));
+            resultShape = new ResultShape(resultClass, new FillStrategy.Array<>(Object[].class));
         }
 
         for (int i = 0; i < count; i++) {
@@ -432,9 +435,9 @@ public class JPQLExpressionBuilder
                     throw parseException(EX_USER, "no-constructor",
                             new Object[]{ resultClassName }, null);
 
-                List<Value> terms = new ArrayList<Value>();
-                List<String> aliases = new ArrayList<String>();
-                List<String> clauses = new ArrayList<String>();
+                List<Value> terms = new ArrayList<>();
+                List<String> aliases = new ArrayList<>();
+                List<String> clauses = new ArrayList<>();
                 // now assign the arguments to the select clause as the projections
                 assignProjections(right(node), exps, terms, aliases, clauses);
                 FillStrategy fill = new FillStrategy.NewInstance(constructor);
@@ -613,9 +616,9 @@ public class JPQLExpressionBuilder
         // JPQL does not filter relational joins for projections
         exps.distinct &= ~QueryExpressions.DISTINCT_AUTO;
         exps.projections = new Value[selectCount];
-        List<Value> projections = new ArrayList<Value>();
-        List<String> aliases = new ArrayList<String>();
-        List<String> clauses = new ArrayList<String>();
+        List<Value> projections = new ArrayList<>();
+        List<String> aliases = new ArrayList<>();
+        List<String> clauses = new ArrayList<>();
         evalProjectionsResultShape(expNode, exps, projections, aliases, clauses);
         exps.projections = projections.toArray(new Value[projections.size()]);
         exps.projectionAliases = aliases.toArray(new String[aliases.size()]);
@@ -642,24 +645,24 @@ public class JPQLExpressionBuilder
 
         JPQLNode[] outers = root().findChildrenByID(JJTOUTERFETCHJOIN);
         for (int i = 0; outers != null && i < outers.length; i++)
-            (joins == null ? joins = new TreeSet<String>() : joins).
+            (joins == null ? joins = new TreeSet<>() : joins).
                 add(getPath(onlyChild(outers[i])).last().getFullName(false));
 
         JPQLNode[] inners = root().findChildrenByID(JJTINNERFETCHJOIN);
         for (int i = 0; inners != null && i < inners.length; i++) {
             String path = getPath(onlyChild(inners[i])).last()
                 .getFullName(false);
-            (joins == null ? joins = new TreeSet<String>() : joins).add(path);
+            (joins == null ? joins = new TreeSet<>() : joins).add(path);
             (innerJoins == null
-                    ? innerJoins = new TreeSet<String>()
+                    ? innerJoins = new TreeSet<>()
                     : innerJoins).add(path);
         }
 
         if (joins != null)
-            exps.fetchPaths = (String[]) joins.
+            exps.fetchPaths = joins.
                 toArray(new String[joins.size()]);
         if (innerJoins != null)
-            exps.fetchInnerPaths = (String[]) innerJoins.
+            exps.fetchInnerPaths = innerJoins.
                 toArray(new String[innerJoins.size()]);
 
         return filter;
@@ -767,7 +770,7 @@ public class JPQLExpressionBuilder
         JPQLNode firstChild = firstChild(node);
         Path path = null;
         if (firstChild.id == JJTQUALIFIEDPATH)
-            path = (Path) getQualifiedPath(firstChild);
+            path = getQualifiedPath(firstChild);
         else
             path = getPath(firstChild, false, inner);
 
@@ -857,6 +860,7 @@ public class JPQLExpressionBuilder
         return exp;
     }
 
+    @Override
     protected boolean isDeclaredVariable(String name) {
         // JPQL doesn't support declaring variables
         return false;
@@ -913,6 +917,7 @@ public class JPQLExpressionBuilder
      * Identification variables in JPQL are case insensitive, so lower-case
      * all variables we are going to bind.
      */
+    @Override
     protected Value getVariable(String id, boolean bind) {
         if (id == null)
             return null;
@@ -927,6 +932,7 @@ public class JPQLExpressionBuilder
         return ctx().getVariable(id);
     }
 
+    @Override
     protected boolean isSeenVariable(String var) {
         Context c = ctx().findContext(var);
         if (c != null)
@@ -1532,6 +1538,7 @@ public class JPQLExpressionBuilder
         }
     }
 
+    @Override
     public void setImplicitTypes(Value val1, Value val2,
         Class<?> expected) {
         String currQuery = currentQuery();
@@ -1637,7 +1644,7 @@ public class JPQLExpressionBuilder
     private Parameter getParameter(String id, boolean positional,
         boolean isCollectionValued) {
         if (parameterTypes == null)
-            parameterTypes = new OrderedMap<Object, Class<?>>();
+            parameterTypes = new OrderedMap<>();
         Object paramKey = positional ? Integer.parseInt(id) : id;
         if (!parameterTypes.containsKey(paramKey))
             parameterTypes.put(paramKey, TYPE_OBJECT);
@@ -1745,7 +1752,7 @@ public class JPQLExpressionBuilder
             thiz.setMetaData(cmd);
             return thiz;
         } else if (val instanceof Path) {
-            return (Path) val;
+            return val;
         } else if (val instanceof Value) {
             if (val.isVariable()) {
                 // can be an entity type literal
@@ -1763,7 +1770,7 @@ public class JPQLExpressionBuilder
                     return lit;
                 }
             }
-            return (Value) val;
+            return val;
         }
 
         throw parseException(EX_USER, "unknown-identifier",
@@ -2009,6 +2016,7 @@ public class JPQLExpressionBuilder
         return path;
     }
 
+    @Override
     protected Class<?> getDeclaredVariableType(String name) {
         ClassMetaData cmd = getMetaDataForAlias(name);
         if (cmd != null)
@@ -2058,7 +2066,7 @@ public class JPQLExpressionBuilder
         Object val = eval(lastChild(node));
         Object exp[] = new Expression[nChild - 1];
         for (int i = 0; i < nChild - 1; i++)
-            exp[i] = (Expression) eval(node.children[i]);
+            exp[i] = eval(node.children[i]);
 
         return factory.generalCaseExpression((Expression[]) exp, (Value) val);
     }
@@ -2145,14 +2153,17 @@ public class JPQLExpressionBuilder
         return null;
     }
 
+    @Override
     protected void addSchemaToContext(String id, ClassMetaData meta) {
         ctx().addSchema(id.toLowerCase(), meta);
     }
 
+    @Override
     protected void addVariableToContext(String id, Value var) {
         ctx().addVariable(id, var);
     }
 
+    @Override
     protected Value getVariable(String var) {
         Context c = ctx();
         Value v = c.getVariable(var);
@@ -2239,10 +2250,10 @@ public class JPQLExpressionBuilder
      * @see Node
      * @see SimpleNode
      */
-    @SuppressWarnings("serial")
     protected abstract static class JPQLNode
         implements Node, Serializable {
 
+        private static final long serialVersionUID = 1L;
         final int id;
         final JPQL parser;
         JPQLNode parent;
@@ -2264,7 +2275,7 @@ public class JPQLExpressionBuilder
         }
 
         JPQLNode[] findChildrenByID(int id) {
-            Collection<JPQLNode> set = new LinkedHashSet<JPQLNode>();
+            Collection<JPQLNode> set = new LinkedHashSet<>();
             findChildrenByID(id, set);
             return set.toArray(new JPQLNode[set.size()]);
         }
@@ -2348,6 +2359,7 @@ public class JPQLExpressionBuilder
             setText(t.image);
         }
 
+        @Override
         public String toString() {
             return JPQLTreeConstants.jjtNodeName[this.id];
         }
@@ -2384,7 +2396,7 @@ public class JPQLExpressionBuilder
                 + (text && this.text != null ? " [" + this.text + "]" : ""));
             if (children != null) {
                 for (int i = 0; i < children.length; ++i) {
-                    JPQLNode n = (JPQLNode) children[i];
+                    JPQLNode n = children[i];
                     if (n != null) {
                         n.dump(out, prefix + " ", text);
                     }
@@ -2396,9 +2408,8 @@ public class JPQLExpressionBuilder
     /**
      * Public for unit testing purposes.
          */
-    @SuppressWarnings("serial")
-    public static class ParsedJPQL
-        implements Serializable {
+    public static class ParsedJPQL implements Serializable {
+        private static final long serialVersionUID = 1L;
 
         // This is only ever used during parse; when ParsedJPQL instances
         // are serialized, they will have already been parsed.
@@ -2454,6 +2465,7 @@ public class JPQLExpressionBuilder
             return _candidateType;
         }
 
+        @Override
         public String toString ()
 		{
 			return this.query;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java
index 93ed2a7d8..a55298a8d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLParser.java
@@ -36,10 +36,13 @@ import org.apache.openjpa.util.UserException;
 public class JPQLParser
     implements ExpressionParser {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc =
         Localizer.forPackage(JPQLParser.class);
     public static final String LANG_JPQL = "javax.persistence.JPQL";
 
+    @Override
     public Object parse(String ql, ExpressionStoreQuery query) {
         if (query.getContext().getParameterDeclaration() != null)
             throw new UserException(_loc.get("param-decs-invalid"));
@@ -52,6 +55,7 @@ public class JPQLParser
         }
     }
 
+    @Override
     public void populate(Object parsed, ExpressionStoreQuery query) {
         if (!(parsed instanceof JPQLExpressionBuilder.ParsedJPQL))
             throw new ClassCastException(parsed == null ? null + ""
@@ -60,6 +64,7 @@ public class JPQLParser
         ((JPQLExpressionBuilder.ParsedJPQL) parsed).populate(query);
     }
 
+    @Override
     public QueryExpressions eval(Object parsed, ExpressionStoreQuery query,
         ExpressionFactory factory, ClassMetaData candidate) {
         try {
@@ -72,11 +77,13 @@ public class JPQLParser
         }
     }
 
+    @Override
     public Value[] eval(String[] vals, ExpressionStoreQuery query,
         ExpressionFactory factory, ClassMetaData candidate) {
         return null;
     }
 
+    @Override
     public String getLanguage() {
         return JPQLParser.LANG_JPQL;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/SimpleNode.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/SimpleNode.java
index 6f3287085..7b27ac508 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/SimpleNode.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/SimpleNode.java
@@ -27,6 +27,9 @@ package org.apache.openjpa.kernel.jpql;
 public class SimpleNode
     extends JPQLExpressionBuilder.JPQLNode {
 
+    
+    private static final long serialVersionUID = 1L;
+
     SimpleNode(JPQL parser, int id) {
         super(parser, id);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
index 7d29af5ed..fd7f1cdc5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
@@ -131,7 +131,7 @@ public abstract class AbstractCFMetaDataFactory
             this.urls = null;
         else {
             String[] strs = StringUtil.split(urls, ";", 0);
-            this.urls = new HashSet<URL>((int) (strs.length * 1.33 + 1));
+            this.urls = new HashSet<>((int) (strs.length * 1.33 + 1));
             try {
                 for (int i = 0; i < strs.length; i++)
                     this.urls.add(new URL(strs[i]));
@@ -155,7 +155,7 @@ public abstract class AbstractCFMetaDataFactory
     public void setResources(String rsrcs) {
         // keep list mutable so subclasses can add implicit locations
         this.rsrcs = (StringUtil.isEmpty(rsrcs)) ? null
-          : new ArrayList<String>(Arrays.asList(StringUtil.split(rsrcs, ";", 0)));
+          : new ArrayList<>(Arrays.asList(StringUtil.split(rsrcs, ";", 0)));
     }
 
     /**
@@ -173,9 +173,10 @@ public abstract class AbstractCFMetaDataFactory
     public void setClasspathScan(String cpath) {
         // keep list mutable so subclasses can add implicit locations
         this.cpath = (StringUtil.isEmpty(cpath)) ? null
-          : new ArrayList<String>(Arrays.asList(StringUtil.split(cpath, ";", 0)));
+          : new ArrayList<>(Arrays.asList(StringUtil.split(cpath, ";", 0)));
     }
 
+    @Override
     public boolean store(ClassMetaData[] metas, QueryMetaData[] queries,
         SequenceMetaData[] seqs, int mode, Map<File,String> output) {
         if (mode == MODE_NONE)
@@ -188,7 +189,7 @@ public abstract class AbstractCFMetaDataFactory
         Class<?> cls = (metas.length == 0) ? null : metas[0].getDescribedType();
         ClassLoader loader = repos.getConfiguration().
             getClassResolverInstance().getClassLoader(cls, null);
-        Map<String,ClassMetaData> clsNames = new HashMap<String,ClassMetaData>
+        Map<String,ClassMetaData> clsNames = new HashMap<>
         	((int) (metas.length * 1.33 + 1));
         for (int i = 0; i < metas.length; i++)
             clsNames.put(metas[i].getDescribedType().getName(), metas[i]);
@@ -239,9 +240,9 @@ public abstract class AbstractCFMetaDataFactory
                     && (queries[i].getSourceMode() & mode) != 0)
                     ser.addQueryMetaData(queries[i]);
 
-            int flags = ser.PRETTY;
+            int flags = MetaDataSerializer.PRETTY;
             if ((store & STORE_VERBOSE) != 0)
-                flags |= ser.VERBOSE;
+                flags |= MetaDataSerializer.VERBOSE;
             serialize(ser, output, flags);
         }
 
@@ -266,12 +267,13 @@ public abstract class AbstractCFMetaDataFactory
                 for (int i = 0; i < queries.length; i++)
                     if (queries[i].getSourceMode() == MODE_QUERY)
                         ser.addQueryMetaData(queries[i]);
-                serialize(ser, output, ser.PRETTY);
+                serialize(ser, output, MetaDataSerializer.PRETTY);
             }
         }
         return true;
     }
 
+    @Override
     public boolean drop(Class[] cls, int mode, ClassLoader envLoader) {
         if (mode == MODE_NONE)
             return true;
@@ -349,14 +351,14 @@ public abstract class AbstractCFMetaDataFactory
                 for (int i = 0; i < cls.length; i++)
                     ser.removeMetaData(pr.getMetaData(cls[i], envLoader,
                         false));
-            serialize(ser, null, Serializer.PRETTY);
+            serialize(ser, null, MetaDataSerializer.PRETTY);
         }
         if (qqs != null && !qqs.isEmpty()) {
             ser = newSerializer();
             ser.setMode(MODE_QUERY);
             for (int i = 0; i < qqs.size(); i++)
                 ser.addQueryMetaData((QueryMetaData) qqs.get(i));
-            serialize(ser, null, Serializer.PRETTY);
+            serialize(ser, null, MetaDataSerializer.PRETTY);
         }
         return true;
     }
@@ -606,6 +608,7 @@ public abstract class AbstractCFMetaDataFactory
         return null;
     }
 
+    @Override
     public Set<String> getPersistentTypeNames(boolean devpath, ClassLoader envLoader) {
         // some configured locations might be implicit in spec, so return
         // null if we don't find any classes, rather than if we don't have
@@ -642,7 +645,7 @@ public abstract class AbstractCFMetaDataFactory
         throws IOException {
         ClassArgParser cparser = newClassArgParser();
         String[] clss;
-        Set<String> names = new HashSet<String>();
+        Set<String> names = new HashSet<>();
         if (files != null) {
             File file;
             for (Iterator itr = files.iterator(); itr.hasNext();) {
@@ -873,7 +876,7 @@ public abstract class AbstractCFMetaDataFactory
                         throw new IOException("Error generating puORMUrlStr.", e.getCause());
                     }
 
-                    List<URL> urls = new ArrayList<URL>(3);
+                    List<URL> urls = new ArrayList<>(3);
                     while (mitr.hasNext()) {
                         url = (URL) mitr.next();
                         String urlString = url.toString();
@@ -1038,6 +1041,7 @@ public abstract class AbstractCFMetaDataFactory
      */
     protected abstract MetaDataFilter newMetaDataFilter();
 
+    @Override
     public void clear() {
         super.clear();
         _typeNames = null;
@@ -1046,57 +1050,57 @@ public abstract class AbstractCFMetaDataFactory
     /**
      * Internal parser interface.
      */
-    public static interface Parser
+    public interface Parser
         extends MetaDataParser {
 
         /**
          * Returns the repository for this parser. If none has been set,
          * creates a new repository and sets it.
          */
-        public MetaDataRepository getRepository();
+        MetaDataRepository getRepository();
 
         /**
          * The parse mode according to the expected document type.
          */
-        public void setMode(int mode);
+        void setMode(int mode);
     }
 
     /**
      * Internal serializer interface.
      */
-    public static interface Serializer
+    public interface Serializer
         extends MetaDataSerializer {
 
         /**
          * The serialization mode according to the expected document type. The
          * mode constants act as bit flags, and therefore can be combined.
          */
-        public void setMode(int mode);
+        void setMode(int mode);
 
         /**
          * Add a class meta data to the set to be serialized.
          */
-        public void addMetaData(ClassMetaData meta);
+        void addMetaData(ClassMetaData meta);
 
         /**
          * Remove a class meta data from the set to be serialized.
          */
-        public boolean removeMetaData(ClassMetaData meta);
+        boolean removeMetaData(ClassMetaData meta);
 
         /**
          * Add a sequence meta data to the set to be serialized.
          */
-        public void addSequenceMetaData(SequenceMetaData meta);
+        void addSequenceMetaData(SequenceMetaData meta);
 
         /**
          * Add a query meta data to the set to be serialized.
          */
-        public void addQueryMetaData(QueryMetaData meta);
+        void addQueryMetaData(QueryMetaData meta);
 
         /**
          * Add all components in the given repository to the set to be
          * serialized.
          */
-        public void addAll (MetaDataRepository repos);
+        void addAll (MetaDataRepository repos);
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
index 2e3678078..f45e2ea53 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
@@ -75,6 +75,7 @@ public abstract class AbstractMetaDataDefaults
      * The default access type for base classes with ACCESS_UNKNOWN.
      * ACCESS_FIELD by default.
      */
+    @Override
     public int getDefaultAccessType() {
         return _access;
     }
@@ -91,6 +92,7 @@ public abstract class AbstractMetaDataDefaults
      * The default identity type for unmapped classes without primary
      * key fields. ID_UNKNOWN by default.
      */
+    @Override
     public int getDefaultIdentityType() {
         return _identity;
     }
@@ -103,6 +105,7 @@ public abstract class AbstractMetaDataDefaults
         _identity = identity;
     }
 
+    @Override
     public int getCallbackMode() {
         return _callback;
     }
@@ -118,10 +121,12 @@ public abstract class AbstractMetaDataDefaults
             _callback &= ~mode;
     }
 
+    @Override
     public boolean getCallbacksBeforeListeners(int type) {
         return false;
     }
 
+    @Override
     public boolean isDeclaredInterfacePersistent() {
         return _interface;
     }
@@ -130,6 +135,7 @@ public abstract class AbstractMetaDataDefaults
         _interface = pers;
     }
 
+    @Override
     public boolean isDataStoreObjectIdFieldUnwrapped() {
         return _unwrapped;
     }
@@ -142,14 +148,17 @@ public abstract class AbstractMetaDataDefaults
         return _ignore;
     }
 
+    @Override
     public void setIgnoreNonPersistent(boolean ignore) {
         _ignore = ignore;
     }
 
+    @Override
     public void populate(ClassMetaData meta, int access) {
         populate(meta, access, false);
     }
 
+    @Override
     public void populate(ClassMetaData meta, int access, boolean ignoreTransient) {
         if (meta.getDescribedType() == Object.class)
             return;
@@ -322,6 +331,7 @@ public abstract class AbstractMetaDataDefaults
      * may be invoked during parsing phase when declaring metadata may not be
      * available.
      */
+    @Override
     public Member getBackingMember(FieldMetaData fmd) {
         if (fmd == null)
             return null;
@@ -331,6 +341,7 @@ public abstract class AbstractMetaDataDefaults
             fmd.getAccessType(), true);
     }
 
+    @Override
     public Class<?> getUnimplementedExceptionType() {
         return UnsupportedOperationException.class;
     }
@@ -401,7 +412,7 @@ public abstract class AbstractMetaDataDefaults
     }
 
     public static List<String> toNames(List<? extends Member> members) {
-    	List<String> result = new ArrayList<String>();
+    	List<String> result = new ArrayList<>();
     	for (Member m : members)
     		result.add(m.getName());
     	return result;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java
index e0a789530..c4634162a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataFactory.java
@@ -63,6 +63,7 @@ public abstract class AbstractMetaDataFactory
             : new HashSet(Arrays.asList(StringUtil.split(types, ";", 0)));
     }
 
+    @Override
     public void setRepository(MetaDataRepository repos) {
         this.repos = repos;
         if (repos != null)
@@ -70,50 +71,62 @@ public abstract class AbstractMetaDataFactory
                 (OpenJPAConfiguration.LOG_METADATA);
     }
 
+    @Override
     public void setStoreDirectory(File dir) {
         this.dir = dir;
     }
 
+    @Override
     public void setStoreMode(int store) {
         this.store = store;
     }
 
+    @Override
     public void setStrict(boolean strict) {
         this.strict = strict;
     }
 
+    @Override
     public boolean store(ClassMetaData[] metas, QueryMetaData[] queries,
         SequenceMetaData[] seqs, int mode, Map<File, String> output) {
         return false;
     }
 
+    @Override
     public boolean drop(Class[] cls, int mode, ClassLoader envLoader) {
         return false;
     }
 
+    @Override
     public Set getPersistentTypeNames(boolean devpath, ClassLoader envLoader) {
         return types;
     }
 
+    @Override
     public Class getQueryScope(String queryName, ClassLoader loader) {
         return null;
     }
 
+    @Override
     public Class getResultSetMappingScope(String resultSetMappingName,
         ClassLoader loader) {
         return null;
     }
 
+    @Override
     public ClassArgParser newClassArgParser() {
         return new ClassArgParser();
     }
 
+    @Override
     public void clear() {
     }
 
+    @Override
     public void addClassExtensionKeys(Collection exts) {
     }
 
+    @Override
     public void addFieldExtensionKeys(Collection exts) {
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
index bd682b256..77e79a79c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
@@ -37,7 +37,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.datacache.CacheDistributionPolicy;
 import org.apache.openjpa.datacache.DataCache;
@@ -51,6 +50,7 @@ import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.ClassUtil;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.xml.Commentable;
 import org.apache.openjpa.util.BigDecimalId;
 import org.apache.openjpa.util.BigIntegerId;
@@ -83,12 +83,13 @@ import org.apache.openjpa.util.UnsupportedException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class ClassMetaData
     extends Extensions
     implements Comparable<ClassMetaData>, SourceTracker, MetaDataContext,
     MetaDataModes, Commentable, ValueListener {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * Unknown identity type.
      */
@@ -158,7 +159,7 @@ public class ClassMetaData
     private Class<?> _type = Object.class;
     private int _hashCode = Object.class.getName().hashCode();
     private String _typeString = Object.class.getName();
-    private final Map<String,FieldMetaData> _fieldMap = new TreeMap<String,FieldMetaData>();
+    private final Map<String,FieldMetaData> _fieldMap = new TreeMap<>();
     private Map<String,FieldMetaData> _supFieldMap = null;
     private boolean _defSupFields = false;
     private Collection<String> _staticFields = null;
@@ -180,7 +181,7 @@ public class ClassMetaData
     private Class<?> _impl = null;
     private List<Class<?>> _interfaces = null;
     private final Map<Class<?>,Map<String,String>> _ifaceMap =
-    	new HashMap<Class<?>,Map<String,String>>();
+    	new HashMap<>();
     private Integer _identity = null;
     private int _idStrategy = ValueStrategies.NONE;
     private int _accessType = AccessCode.UNKNOWN;
@@ -251,6 +252,7 @@ public class ClassMetaData
     /**
      * Return the owning repository.
      */
+    @Override
     public MetaDataRepository getRepository() {
         return _repos;
     }
@@ -378,7 +380,7 @@ public class ClassMetaData
         _repos.processRegisteredClasses(_loader);
         if (_subs == null) {
             Collection<Class<?>> subs = _repos.getPCSubclasses(_type);
-            _subs = (Class[]) subs.toArray(new Class[subs.size()]);
+            _subs = subs.toArray(new Class[subs.size()]);
         }
         return _subs;
     }
@@ -420,11 +422,11 @@ public class ClassMetaData
                 _mapSubMetas = subs;
             else {
                 List<ClassMetaData> mapped =
-                	new ArrayList<ClassMetaData>(subs.length);
+                	new ArrayList<>(subs.length);
                 for (int i = 0; i < subs.length; i++)
                     if (subs[i].isMapped())
                         mapped.add(subs[i]);
-                _mapSubMetas = (ClassMetaData[]) mapped.toArray
+                _mapSubMetas = mapped.toArray
                     (_repos.newClassMetaDataArray(mapped.size()));
             }
         }
@@ -869,7 +871,7 @@ public class ClassMetaData
     public Class<?>[] getDeclaredInterfaces() {
         if (_interfaces == null)
             return MetaDataRepository.EMPTY_CLASSES;
-        return (Class[]) _interfaces.toArray(new Class[_interfaces.size()]);
+        return _interfaces.toArray(new Class[_interfaces.size()]);
     }
 
     /**
@@ -881,7 +883,7 @@ public class ClassMetaData
             throw new MetaDataException(_loc.get("declare-non-interface",
                 this, iface));
         if (_interfaces == null)
-            _interfaces = new ArrayList<Class<?>>();
+            _interfaces = new ArrayList<>();
         _interfaces.add(iface);
     }
 
@@ -903,7 +905,7 @@ public class ClassMetaData
         synchronized (_ifaceMap) {
             Map<String,String> fields = _ifaceMap.get(iface);
             if (fields == null) {
-                fields = new HashMap<String,String>();
+                fields = new HashMap<>();
                 _ifaceMap.put(iface, fields);
             }
             if (fields.containsKey(orig))
@@ -990,9 +992,9 @@ public class ClassMetaData
         if (getDeclaredField(field) != null)
             return true;
         if (_staticFields == null) {
-            Field[] fields = (Field[]) AccessController.doPrivileged(
+            Field[] fields = AccessController.doPrivileged(
                 J2DoPrivHelper.getDeclaredFieldsAction(_type));
-            Set<String> names = new HashSet<String>();
+            Set<String> names = new HashSet<>();
             for (int i = 0; i < fields.length; i++)
                 if (Modifier.isStatic(fields[i].getModifiers()))
                     names.add(fields[i].getName());
@@ -1021,7 +1023,7 @@ public class ClassMetaData
             if (_allFields == null) {
                 getFields();
             }
-            List<FieldMetaData> res = new ArrayList<FieldMetaData>();
+            List<FieldMetaData> res = new ArrayList<>();
             for (FieldMetaData fmd : _allFields) {
                 switch (fmd.getDeclaredTypeCode()) {
                     case JavaTypes.CALENDAR:
@@ -1047,7 +1049,7 @@ public class ClassMetaData
             if (_allFields == null) {
                 getFields();
             }
-            List<FieldMetaData> res = new ArrayList<FieldMetaData>();
+            List<FieldMetaData> res = new ArrayList<>();
             for (FieldMetaData fmd : _allFields) {
                 if(fmd.isLRS()==true){
                     res.add(fmd);
@@ -1097,7 +1099,7 @@ public class ClassMetaData
         // listing order as well
         FieldMetaData supField;
         for (int i = 0; i < len; i++) {
-            supField = (FieldMetaData) _supFieldMap.get(fields[i].getName());
+            supField = _supFieldMap.get(fields[i].getName());
             if (supField != null) {
                 fields[i] = supField;
                 supField.setIndex(i);
@@ -1124,7 +1126,7 @@ public class ClassMetaData
     public FieldMetaData[] getDeclaredFields() {
         if (_fields == null) {
             List<FieldMetaData> fields =
-            	new ArrayList<FieldMetaData>(_fieldMap.size());
+            	new ArrayList<>(_fieldMap.size());
             ;
             for (FieldMetaData fmd : _fieldMap.values()) {
                 if (fmd.getManagement() != FieldMetaData.MANAGE_NONE) {
@@ -1259,7 +1261,7 @@ public class ClassMetaData
         if (fmd != null)
             return fmd;
         if (_supFieldMap != null && _defSupFields) {
-            fmd = (FieldMetaData) _supFieldMap.get(name);
+            fmd = _supFieldMap.get(name);
             if (fmd != null)
                 return fmd;
         }
@@ -1275,7 +1277,7 @@ public class ClassMetaData
      * @return the field's metadata, or null if not found
      */
     public FieldMetaData getDeclaredField(String name) {
-        FieldMetaData field = (FieldMetaData) _fieldMap.get(name);
+        FieldMetaData field = _fieldMap.get(name);
         if (field == null || field.getManagement() == FieldMetaData.MANAGE_NONE)
             return null;
         return field;
@@ -1287,7 +1289,7 @@ public class ClassMetaData
      */
     public FieldMetaData[] getDeclaredUnmanagedFields() {
         if (_unmgdFields == null) {
-            List<FieldMetaData> unmanaged = new ArrayList<FieldMetaData>(3);
+            List<FieldMetaData> unmanaged = new ArrayList<>(3);
             ;
             for (FieldMetaData field : _fieldMap.values()) {
                 if (field.getManagement() == FieldMetaData.MANAGE_NONE)
@@ -1329,7 +1331,7 @@ public class ClassMetaData
     public FieldMetaData getDefinedSuperclassField(String name) {
         if (_supFieldMap == null)
             return null;
-        return (FieldMetaData) _supFieldMap.get(name);
+        return _supFieldMap.get(name);
     }
 
     /**
@@ -1342,7 +1344,7 @@ public class ClassMetaData
         clearAllFieldCache();
         _defSupFields = false;
         if (_supFieldMap == null)
-            _supFieldMap = new HashMap<String,FieldMetaData>();
+            _supFieldMap = new HashMap<>();
         _supFieldMap.put(name, fmd);
         return fmd;
     }
@@ -1430,13 +1432,13 @@ public class ClassMetaData
         if (_definedFields == null) {
             FieldMetaData[] fields = getFields();
             List<FieldMetaData> defined =
-            	new ArrayList<FieldMetaData>(fields.length);
+            	new ArrayList<>(fields.length);
             for (FieldMetaData fmd : fields) {
                 if (fmd.isMapped()
                     && fmd.getDefiningMetaData() == this)
                     defined.add(fmd);
             }
-            _definedFields = (FieldMetaData[]) defined.toArray
+            _definedFields = defined.toArray
                 (_repos.newFieldMetaDataArray(defined.size()));
         }
         return _definedFields;
@@ -1485,7 +1487,7 @@ public class ClassMetaData
         if (_listingFields == null) {
             FieldMetaData[] fields = getFields();
             List<FieldMetaData> defined =
-            	new ArrayList<FieldMetaData>(fields.length);
+            	new ArrayList<>(fields.length);
             for (FieldMetaData fmd : fields)
                 if (fmd.getDefiningMetaData() == this)
                     defined.add(fmd);
@@ -1493,7 +1495,7 @@ public class ClassMetaData
             FieldMetaData[] listing = _repos.newFieldMetaDataArray
                 (defined.size() + unmgd.length);
             for (int i = 0; i < defined.size(); i++)
-                listing[i] = (FieldMetaData) defined.get(i);
+                listing[i] = defined.get(i);
             System.arraycopy(unmgd, 0, listing, defined.size(), unmgd.length);
             Arrays.sort(listing, ListingOrderComparator.getInstance());
             _listingFields = listing;
@@ -1736,10 +1738,12 @@ public class ClassMetaData
         getPrimaryKeyFields();
     }
 
+    @Override
     public int hashCode() {
         return _hashCode;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -1748,13 +1752,15 @@ public class ClassMetaData
         return _type == ((ClassMetaData) other).getDescribedType();
     }
 
+    @Override
     public int compareTo(ClassMetaData other) {
         if (other == this)
             return 0;
-        return _type.getName().compareTo(((ClassMetaData) other).
+        return _type.getName().compareTo(other.
             getDescribedType().getName());
     }
 
+    @Override
     public String toString() {
         return getDescribedType().getName();
     }
@@ -2321,7 +2327,7 @@ public class ClassMetaData
     public FetchGroup[] getCustomFetchGroups() {
         if (_customFGs == null) {
             // map fetch groups to names, allowing our groups to override super
-            Map<String,FetchGroup> fgs = new HashMap<String,FetchGroup>();
+            Map<String,FetchGroup> fgs = new HashMap<>();
             ClassMetaData sup = getPCSuperclassMetaData();
             if (sup != null) {
                 FetchGroup[] supFGs = sup.getCustomFetchGroups();
@@ -2375,7 +2381,7 @@ public class ClassMetaData
     	if (StringUtil.isEmpty(name))
     		throw new MetaDataException(_loc.get("empty-fg-name", this));
         if (_fgMap == null)
-            _fgMap = new HashMap<String,FetchGroup>();
+            _fgMap = new HashMap<>();
         FetchGroup fg = _fgMap.get(name);
         if (fg == null) {
         	fg = new FetchGroup(this, name);
@@ -2404,14 +2410,17 @@ public class ClassMetaData
     // SourceTracker
     /////////////////
 
+    @Override
     public File getSourceFile() {
         return _srcFile;
     }
 
+    @Override
     public Object getSourceScope() {
         return null;
     }
 
+    @Override
     public int getSourceType() {
         return _srcType;
     }
@@ -2422,10 +2431,12 @@ public class ClassMetaData
         _srcName = srcName;
     }
 
+    @Override
     public String getResourceName() {
         return _type.getName();
     }
 
+    @Override
     public int getLineNumber() {
         return _lineNum;
     }
@@ -2434,6 +2445,7 @@ public class ClassMetaData
         _lineNum = lineNum;
     }
 
+    @Override
     public int getColNumber() {
         return _colNum;
     }
@@ -2489,10 +2501,12 @@ public class ClassMetaData
     // Commentable
     ///////////////
 
+    @Override
     public String[] getComments() {
         return (_comments == null) ? EMPTY_COMMENTS : _comments;
     }
 
+    @Override
     public void setComments(String[] comments) {
         _comments = comments;
     }
@@ -2584,6 +2598,7 @@ public class ClassMetaData
         embed.copy(dec);
     }
 
+    @Override
     protected void addExtensionKeys(Collection exts) {
         _repos.getMetaDataFactory().addClassExtensionKeys(exts);
     }
@@ -2604,6 +2619,7 @@ public class ClassMetaData
             return _instance;
         }
 
+        @Override
         public int compare(FieldMetaData f1, FieldMetaData f2) {
             if (f1 == f2)
                 return 0;
@@ -2641,6 +2657,7 @@ public class ClassMetaData
     	}
     }
 
+    @Override
     public void valueChanged(Value val) {
     	if (val != null && val.matches("DataCacheTimeout")) {
     		_cacheTimeout = Integer.MIN_VALUE;
@@ -2664,7 +2681,7 @@ public class ClassMetaData
     }
 
     String[] toNames(FieldMetaData[] fields) {
-    	List<String> result = new ArrayList<String>();
+    	List<String> result = new ArrayList<>();
     	for (FieldMetaData fmd : fields) {
     		result.add(fmd.getName());
     	}
@@ -2780,7 +2797,7 @@ public class ClassMetaData
 
     public int[] getPkAndNonPersistentManagedFmdIndexes() {
         if (_pkAndNonPersistentManagedFmdIndexes == null) {
-            List<Integer> ids = new ArrayList<Integer>();
+            List<Integer> ids = new ArrayList<>();
             for (FieldMetaData fmd : getFields()) {
                 if (fmd.isPrimaryKey() || fmd.getManagement() != FieldMetaData.MANAGE_PERSISTENT) {
                     ids.add(fmd.getIndex());
@@ -2818,7 +2835,7 @@ public class ClassMetaData
                     String mappedByIdValue = fmd.getMappedByIdValue();
                     if (mappedByIdValue != null) {
                         if (fmdArray == null) {
-                            fmdArray = new ArrayList<FieldMetaData>();
+                            fmdArray = new ArrayList<>();
                         }
                         fmdArray.add(fmd);
                     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/DelegatingMetaDataFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/DelegatingMetaDataFactory.java
index 8c453c130..708f69809 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/DelegatingMetaDataFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/DelegatingMetaDataFactory.java
@@ -59,84 +59,104 @@ public class DelegatingMetaDataFactory
         return _delegate;
     }
 
+    @Override
     public void setRepository(MetaDataRepository repos) {
         _delegate.setRepository(repos);
     }
 
+    @Override
     public void setStoreDirectory(File dir) {
         _delegate.setStoreDirectory(dir);
     }
 
+    @Override
     public void setStoreMode(int store) {
         _delegate.setStoreMode(store);
     }
 
+    @Override
     public void setStrict(boolean strict) {
         _delegate.setStrict(true);
     }
 
+    @Override
     public void load(Class cls, int mode, ClassLoader envLoader) {
         _delegate.load(cls, mode, envLoader);
     }
 
+    @Override
     public boolean store(ClassMetaData[] metas, QueryMetaData[] queries,
         SequenceMetaData[] seqs, int mode, Map output) {
         return _delegate.store(metas, queries, seqs, mode, output);
     }
 
+    @Override
     public boolean drop(Class[] cls, int mode, ClassLoader envLoader) {
         return _delegate.drop(cls, mode, envLoader);
     }
 
+    @Override
     public MetaDataDefaults getDefaults() {
         return _delegate.getDefaults();
     }
 
+    @Override
     public ClassArgParser newClassArgParser() {
         return _delegate.newClassArgParser();
     }
 
+    @Override
     public Set getPersistentTypeNames(boolean classpath,
         ClassLoader envLoader) {
         return _delegate.getPersistentTypeNames(classpath, envLoader);
     }
 
+    @Override
     public Class getQueryScope(String queryName, ClassLoader loader) {
         return _delegate.getQueryScope(queryName, loader);
     }
 
+    @Override
     public Class getResultSetMappingScope(String resultSetMappingName,
         ClassLoader loader) {
         return _delegate.getResultSetMappingScope(resultSetMappingName, loader);
     }
 
+    @Override
     public void clear() {
         _delegate.clear();
     }
 
+    @Override
     public void addClassExtensionKeys(Collection exts) {
         _delegate.addClassExtensionKeys(exts);
     }
 
+    @Override
     public void addFieldExtensionKeys(Collection exts) {
         _delegate.addFieldExtensionKeys(exts);
     }
 
+    @Override
     public void loadXMLMetaData(Class<?> cls) {
         _delegate.loadXMLMetaData(cls);
     }
 
+    @Override
     public String getMetaModelClassName(String managedClassName) {
         return _delegate.getMetaModelClassName(managedClassName);
     }
+    @Override
     public String getManagedClassName(String metamodelClassName) {
         return _delegate.getManagedClassName(metamodelClassName);
     }
 
+    @Override
     public boolean isMetaClass(Class<?> c) {
         return _delegate.isMetaClass(c);
     }
 
+    @Override
     public Class<?> getManagedClass(Class<?> c) {
         return _delegate.getManagedClass(c);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java
index 317c4c3f7..202131bfa 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Extensions.java
@@ -43,6 +43,9 @@ import org.apache.openjpa.lib.util.StringUtil;
 public abstract class Extensions
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String OPENJPA = "openjpa";
 
     private static final Localizer _loc = Localizer.forPackage
@@ -314,7 +317,7 @@ public abstract class Extensions
             return;
 
         OpenJPAConfiguration conf = getRepository().getConfiguration();
-        Log log = conf.getLog(conf.LOG_METADATA);
+        Log log = conf.getLog(OpenJPAConfiguration.LOG_METADATA);
         if (!log.isWarnEnabled())
             return;
 
@@ -421,6 +424,8 @@ public abstract class Extensions
     private static class HashKey
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public final String vendor;
         public final String key;
 
@@ -429,6 +434,7 @@ public abstract class Extensions
             this.key = key;
         }
 
+        @Override
         public int hashCode() {
             int i = 0;
             if (vendor != null)
@@ -438,6 +444,7 @@ public abstract class Extensions
             return i;
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == this)
                 return true;
@@ -453,12 +460,15 @@ public abstract class Extensions
     private static class EmbeddedExtensions
         extends Extensions {
 
+        
+        private static final long serialVersionUID = 1L;
         private final Extensions _parent;
 
         public EmbeddedExtensions(Extensions parent) {
             _parent = parent;
         }
 
+        @Override
         public MetaDataRepository getRepository ()
 		{
 			return _parent.getRepository ();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java
index 7db1fa629..85218622d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java
@@ -25,11 +25,11 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
-import org.apache.openjpa.lib.util.StringUtil;
-import java.util.Objects;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.util.MetaDataException;
 
 /**
@@ -40,10 +40,11 @@ import org.apache.openjpa.util.MetaDataException;
  *
  * Defines two <em>standard</em> fetch group named <tt>default</tt> and <tt>all</tt>.
  */
-@SuppressWarnings("serial")
 public class FetchGroup
     implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * Name of the default fetch group.
      */
@@ -117,7 +118,7 @@ public class FetchGroup
             }
         }
         if (fg._containedBy != null) {
-        	this._containedBy = new HashSet<String>(fg._containedBy);
+        	this._containedBy = new HashSet<>(fg._containedBy);
         }
         if (fg._depths != null) {
             for (Map.Entry<FieldMetaData,Number> entry : fg._depths.entrySet()) {
@@ -145,7 +146,7 @@ public class FetchGroup
         if (StringUtil.isEmpty(fgName))
             throw new MetaDataException(_loc.get("null-include-fg", this));
         if (_includes == null)
-            _includes = new ArrayList<String>();
+            _includes = new ArrayList<>();
         if (!_includes.contains(fgName))
             _includes.add(fgName);
     }
@@ -200,7 +201,7 @@ public class FetchGroup
     public boolean addContainedBy(FetchGroup parent) {
     	parent.addDeclaredInclude(this.getName());
     	if (_containedBy==null)
-    		_containedBy = new HashSet<String>();
+    		_containedBy = new HashSet<>();
     	return _containedBy.add(parent.getName());
     }
 
@@ -236,7 +237,7 @@ public class FetchGroup
             throw new MetaDataException(_loc.get("invalid-fg-depth", _name, fm,
                 depth));
         if (_depths == null)
-            _depths = new HashMap<FieldMetaData, Number>();
+            _depths = new HashMap<>();
         _depths.put(fm, depth);
     }
 
@@ -368,6 +369,7 @@ public class FetchGroup
     /**
      * Affirms equality if the other has the same name and declaring type.
      */
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -378,10 +380,12 @@ public class FetchGroup
             && Objects.equals(_meta, that._meta);
     }
 
+    @Override
     public int hashCode() {
         return _name.hashCode() + ((_meta == null) ? 0 : _meta.hashCode());
     }
 
+    @Override
     public String toString() {
         return ((_meta == null) ? "Builtin" : _meta.toString ()) + "." + _name;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
index a8120e365..c1fda395f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
@@ -59,12 +59,12 @@ import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.xml.Commentable;
 import org.apache.openjpa.util.Exceptions;
+import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.ProxyManager;
 import org.apache.openjpa.util.UnsupportedException;
-import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.UserException;
 
 
@@ -73,7 +73,6 @@ import org.apache.openjpa.util.UserException;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class FieldMetaData
     extends Extensions
     implements ValueMetaData, MetaDataContext, MetaDataModes, Commentable {
@@ -298,6 +297,7 @@ public class FieldMetaData
     /**
      * The metadata repository.
      */
+    @Override
     public MetaDataRepository getRepository() {
         return _owner.getRepository();
     }
@@ -349,6 +349,7 @@ public class FieldMetaData
      * The field name, qualified by the owning class.
      * @deprecated Use getFullName(boolean) instead.
      */
+    @Deprecated
     public String getFullName() {
         return getFullName(false);
     }
@@ -727,7 +728,7 @@ public class FieldMetaData
                 || isPrimaryKey() || isVersion())
                 _fgs = new String[0];
             else
-                _fgs = (String[]) _fgSet.toArray(new String[_fgSet.size()]);
+                _fgs = _fgSet.toArray(new String[_fgSet.size()]);
         }
         return _fgs;
     }
@@ -781,7 +782,7 @@ public class FieldMetaData
         if (_owner.getFetchGroup(fg) == null)
             throw new MetaDataException(_loc.get("unknown-fg", fg, this));
         if (in && _fgSet == null)
-            _fgSet = new HashSet<String>();
+            _fgSet = new HashSet<>();
         if ((in && _fgSet.add(fg))
             || (!in && _fgSet != null && _fgSet.remove(fg)))
             _fgs = null;
@@ -957,7 +958,7 @@ public class FieldMetaData
                     // inverses must be
                     if (field.getTypeCode() == JavaTypes.PC
                         || field.getElement().getTypeCode() == JavaTypes.PC) {
-                        inverses = new ArrayList<FieldMetaData>(3);
+                        inverses = new ArrayList<>(3);
                         inverses.add(field);
                     }
                 } else if (inv != null) {
@@ -965,7 +966,7 @@ public class FieldMetaData
                     if (field == null)
                         throw new MetaDataException(_loc.get("no-inverse",
                             this, inv));
-                    inverses = new ArrayList<FieldMetaData>(3);
+                    inverses = new ArrayList<>(3);
                     inverses.add(field);
                 }
 
@@ -995,7 +996,7 @@ public class FieldMetaData
                     if (_name.equals(fields[i].getMappedBy())
                         || _name.equals(fields[i].getInverse())) {
                         if (inverses == null)
-                            inverses = new ArrayList<FieldMetaData>(3);
+                            inverses = new ArrayList<>(3);
                         if (!inverses.contains(fields[i]))
                             inverses.add(fields[i]);
                     }
@@ -1260,7 +1261,7 @@ public class FieldMetaData
                 curComp = orders[i].getComparator();
                 if (curComp != null) {
                     if (comps == null)
-                        comps = new ArrayList<Comparator<?>>(orders.length);
+                        comps = new ArrayList<>(orders.length);
                     if (i != comps.size())
                         throw new MetaDataException(_loc.get
                             ("mixed-inmem-ordering", this));
@@ -1802,6 +1803,7 @@ public class FieldMetaData
         return StoreContext.class.getName().equals(type.getName());
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -1811,6 +1813,7 @@ public class FieldMetaData
             getFullName(true));
     }
 
+    @Override
     public int hashCode() {
         return getFullName(true).hashCode();
     }
@@ -1822,6 +1825,7 @@ public class FieldMetaData
             getFullName(true));
     }
 
+    @Override
     public String toString() {
         return getFullName(true);
     }
@@ -1833,6 +1837,7 @@ public class FieldMetaData
     /**
      * Resolve mode for this field.
      */
+    @Override
     public int getResolve() {
         return _resMode;
     }
@@ -1840,6 +1845,7 @@ public class FieldMetaData
     /**
      * Resolve mode for this field.
      */
+    @Override
     public void setResolve(int mode) {
         _resMode = mode;
     }
@@ -1847,6 +1853,7 @@ public class FieldMetaData
     /**
      * Resolve mode for this field.
      */
+    @Override
     public void setResolve(int mode, boolean on) {
         if (mode == MODE_NONE)
             _resMode = mode;
@@ -1859,6 +1866,7 @@ public class FieldMetaData
     /**
      * Resolve and validate metadata. Return true if already resolved.
      */
+    @Override
     public boolean resolve(int mode) {
         if ((_resMode & mode) == mode)
             return true;
@@ -2070,6 +2078,7 @@ public class FieldMetaData
         _elem.copy(field.getElement());
     }
 
+    @Override
     protected void addExtensionKeys(Collection exts) {
         getRepository().getMetaDataFactory().addFieldExtensionKeys(exts);
     }
@@ -2078,10 +2087,12 @@ public class FieldMetaData
     // Commentable
     ///////////////
 
+    @Override
     public String[] getComments() {
         return (_comments == null) ? EMPTY_COMMENTS : _comments;
     }
 
+    @Override
     public void setComments(String[] comments) {
         _comments = comments;
     }
@@ -2090,14 +2101,17 @@ public class FieldMetaData
     // ValueMetaData implementation
     ////////////////////////////////
 
+    @Override
     public FieldMetaData getFieldMetaData() {
         return this;
     }
 
+    @Override
     public Class getType() {
         return _val.getType();
     }
 
+    @Override
     public void setType(Class type) {
         _val.setType(type);
         if (type.isArray())
@@ -2108,26 +2122,32 @@ public class FieldMetaData
         }
     }
 
+    @Override
     public int getTypeCode() {
         return _val.getTypeCode();
     }
 
+    @Override
     public void setTypeCode(int code) {
         _val.setTypeCode(code);
     }
 
+    @Override
     public boolean isTypePC() {
         return _val.isTypePC();
     }
 
+    @Override
     public ClassMetaData getTypeMetaData() {
         return _val.getTypeMetaData();
     }
 
+    @Override
     public Class getDeclaredType() {
         return _val.getDeclaredType();
     }
 
+    @Override
     public void setDeclaredType(Class type) {
         _val.setDeclaredType(type);
         if (type.isArray())
@@ -2138,118 +2158,147 @@ public class FieldMetaData
         }
     }
 
+    @Override
     public int getDeclaredTypeCode() {
         return _val.getDeclaredTypeCode();
     }
 
+    @Override
     public void setDeclaredTypeCode(int type) {
         _val.setDeclaredTypeCode(type);
     }
 
+    @Override
     public boolean isDeclaredTypePC() {
         return _val.isDeclaredTypePC();
     }
 
+    @Override
     public ClassMetaData getDeclaredTypeMetaData() {
         return _val.getDeclaredTypeMetaData();
     }
 
+    @Override
     public boolean isEmbedded() {
         return _val.isEmbedded();
     }
 
+    @Override
     public void setEmbedded(boolean embedded) {
         _val.setEmbedded(embedded);
     }
 
+    @Override
     public boolean isEmbeddedPC() {
         return _val.isEmbeddedPC();
     }
 
+    @Override
     public ClassMetaData getEmbeddedMetaData() {
         return _val.getEmbeddedMetaData();
     }
 
+    @Override
     public ClassMetaData addEmbeddedMetaData(int access) {
         return _val.addEmbeddedMetaData(access);
     }
+    @Override
     public ClassMetaData addEmbeddedMetaData() {
         return _val.addEmbeddedMetaData();
     }
 
+    @Override
     public int getCascadeDelete() {
         return _val.getCascadeDelete();
     }
 
+    @Override
     public void setCascadeDelete(int delete) {
         _val.setCascadeDelete(delete);
     }
 
+    @Override
     public int getCascadePersist() {
         return _val.getCascadePersist();
     }
 
+    @Override
     public void setCascadePersist(int persist) {
         _val.setCascadePersist(persist);
     }
 
+    @Override
     public void setCascadePersist(int cascade, boolean checkPUDefault) {
         _val.setCascadePersist(cascade, checkPUDefault);
     }
 
+    @Override
     public int getCascadeAttach() {
         return _val.getCascadeAttach();
     }
 
+    @Override
     public void setCascadeAttach(int attach) {
         _val.setCascadeAttach(attach);
     }
 
+    @Override
     public int getCascadeDetach() {
         return _val.getCascadeDetach();
     }
 
+    @Override
     public void setCascadeDetach(int detach) {
         _val.setCascadeDetach(detach);
     }
 
+    @Override
     public int getCascadeRefresh() {
         return _val.getCascadeRefresh();
     }
 
+    @Override
     public void setCascadeRefresh(int refresh) {
         _val.setCascadeRefresh(refresh);
     }
 
+    @Override
     public boolean isSerialized() {
         return _val.isSerialized();
     }
 
+    @Override
     public void setSerialized(boolean serialized) {
         _val.setSerialized(serialized);
     }
 
+    @Override
     public String getValueMappedBy() {
         return _val.getValueMappedBy();
     }
 
+    @Override
     public void setValueMappedBy(String mapped) {
         _val.setValueMappedBy(mapped);
     }
 
+    @Override
     public FieldMetaData getValueMappedByMetaData () {
 		return _val.getValueMappedByMetaData ();
 	}
 
-	public Class<?> getTypeOverride () {
+	@Override
+    public Class<?> getTypeOverride () {
 		return _val.getTypeOverride ();
 	}
 
-	public void setTypeOverride(Class type) {
+	@Override
+    public void setTypeOverride(Class type) {
 		_val.setTypeOverride (type);
 	}
 
-	public void copy (ValueMetaData vmd) {
+	@Override
+    public void copy (ValueMetaData vmd) {
 		_val.copy (vmd);
 	}
 
@@ -2295,6 +2344,7 @@ public class FieldMetaData
             return _member;
         }
 
+        @Override
         public void readExternal(ObjectInput in)
             throws IOException, ClassNotFoundException {
             boolean isField = in.readBoolean();
@@ -2323,6 +2373,7 @@ public class FieldMetaData
             }
         }
 
+        @Override
         public void writeExternal(ObjectOutput out)
             throws IOException {
             boolean isField = _member instanceof Field;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryRelatedFieldOrder.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryRelatedFieldOrder.java
index 64f4145b7..898abe5ff 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryRelatedFieldOrder.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryRelatedFieldOrder.java
@@ -20,9 +20,9 @@ package org.apache.openjpa.meta;
 
 import java.util.Comparator;
 
+import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
-import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.util.ImplHelper;
 
 /**
@@ -33,6 +33,8 @@ import org.apache.openjpa.util.ImplHelper;
 class InMemoryRelatedFieldOrder
     implements Order, Comparator {
 
+    
+    private static final long serialVersionUID = 1L;
     private final FieldMetaData _rel;
     private final boolean _asc;
     private final OpenJPAConfiguration _conf;
@@ -44,18 +46,22 @@ class InMemoryRelatedFieldOrder
         _conf = conf;
     }
 
+    @Override
     public String getName() {
         return _rel.getName();
     }
 
+    @Override
     public boolean isAscending() {
         return _asc;
     }
 
+    @Override
     public Comparator getComparator() {
         return this;
     }
 
+    @Override
     public int compare(Object o1, Object o2) {
         if (o1 == o2)
             return 0;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryValueOrder.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryValueOrder.java
index 228364cdb..b61a8ec52 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryValueOrder.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InMemoryValueOrder.java
@@ -20,11 +20,11 @@ package org.apache.openjpa.meta;
 
 import java.util.Comparator;
 
+import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.util.ApplicationIds;
 import org.apache.openjpa.util.ImplHelper;
-import org.apache.openjpa.conf.OpenJPAConfiguration;
 
 /**
  * Order by the field value in memory. If the field contains
@@ -37,6 +37,8 @@ import org.apache.openjpa.conf.OpenJPAConfiguration;
 class InMemoryValueOrder
     implements Order, Comparator {
 
+    
+    private static final long serialVersionUID = 1L;
     private final boolean _asc;
     private final OpenJPAConfiguration _conf;
 
@@ -45,18 +47,22 @@ class InMemoryValueOrder
         _conf = conf;
     }
 
+    @Override
     public String getName() {
         return Order.ELEMENT;
     }
 
+    @Override
     public boolean isAscending() {
         return _asc;
     }
 
+    @Override
     public Comparator getComparator() {
         return this;
     }
 
+    @Override
     public int compare(Object o1, Object o2) {
         if (o1 == o2)
             return 0;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java
index ecac39189..995362870 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java
@@ -29,6 +29,8 @@ import java.util.Comparator;
 public class InheritanceComparator
     implements Comparator, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private Class _base = Object.class;
 
     /**
@@ -50,6 +52,7 @@ public class InheritanceComparator
         return (Class) elem;
     }
 
+    @Override
     public int compare(Object o1, Object o2) {
         if (o1 == o2)
             return 0;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java
index 73755fbe2..078739e2d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java
@@ -18,20 +18,21 @@
  */
 package org.apache.openjpa.meta;
 
-import java.lang.reflect.Method;
 import java.io.ByteArrayInputStream;
+import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.WeakHashMap;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.enhance.PCEnhancer;
-import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.util.InternalException;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.BCClassLoader;
 import serp.bytecode.BCField;
@@ -52,7 +53,7 @@ class InterfaceImplGenerator {
     private static final String POSTFIX = "openjpaimpl";
 
     private final MetaDataRepository _repos;
-    private final Map<Class<?>,Class<?>> _impls = new WeakHashMap<Class<?>,Class<?>>();
+    private final Map<Class<?>,Class<?>> _impls = new WeakHashMap<>();
     private final Project _project = new Project();
 
     // distinct project / loader for enhanced version of class
@@ -98,7 +99,7 @@ class InterfaceImplGenerator {
         }
 
         FieldMetaData[] fields = meta.getDeclaredFields();
-        Set<Method> methods = new HashSet<Method>();
+        Set<Method> methods = new HashSet<>();
         for (int i = 0; i < fields.length; i++)
             addField(bc, iface, fields[i], methods);
         invalidateNonBeanMethods(bc, iface, methods);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java
index 1a3a3d9f3..c2ffd07d9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/JavaTypes.java
@@ -86,7 +86,7 @@ public class JavaTypes {
 
     private static final Localizer _loc = Localizer.forPackage(JavaTypes.class);
 
-    private static final Map<Class<?>, Integer> _typeCodes = new HashMap<Class<?>, Integer>();
+    private static final Map<Class<?>, Integer> _typeCodes = new HashMap<>();
 
     static {
         _typeCodes.put(String.class, STRING);
@@ -459,11 +459,11 @@ public class JavaTypes {
             // if an object array, use built-in list function
             l = Arrays.asList((T[]) val);
             if (mutable)
-                l = new ArrayList<T>(l);
+                l = new ArrayList<>(l);
         } else {
             // convert to list of wrapper objects
             int length = Array.getLength(val);
-            l = new ArrayList<T>(length);
+            l = new ArrayList<>(length);
             for (int i = 0; i < length; i++)
                 l.add((T)Array.get(val, i));
         }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java
index be3bb6d6d..1a0303e0a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/LifecycleMetaData.java
@@ -35,6 +35,8 @@ import org.apache.openjpa.util.InternalException;
 public class LifecycleMetaData
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final int IGNORE_NONE = 0;
     public static final int IGNORE_HIGH = 2 << 0;
     public static final int IGNORE_LOW = 2 << 1;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataContext.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataContext.java
index 466ac8782..32b65c295 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataContext.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataContext.java
@@ -28,5 +28,5 @@ public interface MetaDataContext {
     /**
      * Access metadata repository.
      */
-    public MetaDataRepository getRepository();
+    MetaDataRepository getRepository();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java
index f5301eec6..3146cdea7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataDefaults.java
@@ -35,62 +35,62 @@ public interface MetaDataDefaults
      * Return the default access type for a base persistent class with
      * {@link ClassMetaData#ACCESS_UNKNOWN} access type.
      */
-    public int getDefaultAccessType();
+    int getDefaultAccessType();
 
     /**
      * Return the default identity type for unmapped classes without primary
      * key fields.
      */
-    public int getDefaultIdentityType();
+    int getDefaultIdentityType();
 
     /**
      * What to do on lifecycle callback exceptions.
      */
-    public int getCallbackMode();
+    int getCallbackMode();
 
     /**
      * If callbacks are fired before listeners for the given
      * event type. Defaults to false.
      */
-    public boolean getCallbacksBeforeListeners(int type);
+    boolean getCallbacksBeforeListeners(int type);
 
     /**
      * Whether declared interfaces of a class are treated as persistent
      * types. Defaults to true.
      */
-    public boolean isDeclaredInterfacePersistent();
+    boolean isDeclaredInterfacePersistent();
 
     /**
      * Whether the field in the object id class corresponding to a
      * datastore id persistence-capable primary key field is the simple
      * datastore id value of the related instance.  Defaults to false.
      */
-    public boolean isDataStoreObjectIdFieldUnwrapped();
+    boolean isDataStoreObjectIdFieldUnwrapped();
 
     /**
      * Whether to ignore members which are not persistent by default
      * during metadata population. Defaults to true.
      */
-    public void setIgnoreNonPersistent(boolean ignore);
+    void setIgnoreNonPersistent(boolean ignore);
 
     /**
      * Populate the given metadata with default settings.
      *
      * @param access access type constant from {@link ClassMetaData}
      */
-    public void populate(ClassMetaData meta, int access);
+    void populate(ClassMetaData meta, int access);
 
     /**
      * Populate the given metadata with default settings.
      *
      * @param access access type constant from {@link ClassMetaData}
      */
-    public void populate(ClassMetaData meta, int access, boolean ignoreTransient);
+    void populate(ClassMetaData meta, int access, boolean ignoreTransient);
 
     /**
      * Return the backing member for the given field metadata.
      */
-    public Member getBackingMember(FieldMetaData field);
+    Member getBackingMember(FieldMetaData field);
 
     /**
      * Get the field or getter for the given attribute of the given class.
@@ -105,44 +105,44 @@ public interface MetaDataDefaults
      *
      * @since 2.0.0
      */
-    public Member getMemberByProperty(ClassMetaData meta, String attribute,
+    Member getMemberByProperty(ClassMetaData meta, String attribute,
     	int access, boolean scanAnnotation);
 
     /**
      * Return a runtime exception class to throw for un-implemented
      * managed interface methods.
      */
-    public Class getUnimplementedExceptionType();
+    Class getUnimplementedExceptionType();
 
     /**
      * Whether the relationship in MappedSuper class must be
      * uni-directional.
      * @since 2.0.0
      */
-    public boolean isAbstractMappingUniDirectional(OpenJPAConfiguration conf);
+    boolean isAbstractMappingUniDirectional(OpenJPAConfiguration conf);
 
     /**
      * Whether non-default mapping is allowed.
      * @since 2.0.0
      */
-    public boolean isNonDefaultMappingAllowed(OpenJPAConfiguration conf);
+    boolean isNonDefaultMappingAllowed(OpenJPAConfiguration conf);
 
     /**
      * Whether cascade-persist was declared in the persistence unit defaults.
      */
-    public Boolean isDefaultCascadePersistEnabled();
+    Boolean isDefaultCascadePersistEnabled();
 
-    public void setDefaultCascadePersistEnabled(Boolean bool);
+    void setDefaultCascadePersistEnabled(Boolean bool);
 
     /**
      * Returns the default schema.
      * @since 2.2.3
      */
-    public String getDefaultSchema();
+    String getDefaultSchema();
 
     /**
      * Sets the default schema.
      * @since 2.2.3
      */
-    public void setDefaultSchema(String schema);
+    void setDefaultSchema(String schema);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataFactory.java
index f682bc5b0..0b2245964 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataFactory.java
@@ -36,31 +36,31 @@ import org.apache.openjpa.lib.meta.ClassArgParser;
 public interface MetaDataFactory
     extends MetaDataModes {
 
-    public static final int STORE_DEFAULT = 0;
-    public static final int STORE_PER_CLASS = 1;
-    public static final int STORE_VERBOSE = 2;
+    int STORE_DEFAULT = 0;
+    int STORE_PER_CLASS = 1;
+    int STORE_VERBOSE = 2;
 
     /**
      * Set the repository to load metadata into.
      * This method will be called before use.
      */
-    public void setRepository(MetaDataRepository repos);
+    void setRepository(MetaDataRepository repos);
 
     /**
      * Base directory for storing metadata. May not be called.
      */
-    public void setStoreDirectory(File dir);
+    void setStoreDirectory(File dir);
 
     /**
      * Storage mode. May not be called.
      */
-    public void setStoreMode(int store);
+    void setStoreMode(int store);
 
     /**
      * If true, I/O's must exactly obey the mode directives given, and may
      * not load additional information.
      */
-    public void setStrict(boolean strict);
+    void setStrict(boolean strict);
 
     /**
      * Load metadata for the given class in the given mode(s). If loading
@@ -75,7 +75,7 @@ public interface MetaDataFactory
      * {@link MetaDataModes#MODE_META MODE_META}, so long as
      * the <code>strict</code> property hasn't been set
      */
-    public void load(Class<?> cls, int mode, ClassLoader envLoader);
+    void load(Class<?> cls, int mode, ClassLoader envLoader);
 
     /**
      * Store the given metadata.
@@ -87,7 +87,7 @@ public interface MetaDataFactory
      * destination in string form
      * @return false if this factory is unable to store metadata
      */
-    public boolean store(ClassMetaData[] metas, QueryMetaData[] queries,
+    boolean store(ClassMetaData[] metas, QueryMetaData[] queries,
         SequenceMetaData[] seqs, int mode, Map<File, String> output);
 
     /**
@@ -95,12 +95,12 @@ public interface MetaDataFactory
      *
      * @return false if any metadata could not be dropped
      */
-    public boolean drop(Class<?>[] cls, int mode, ClassLoader envLoader);
+    boolean drop(Class<?>[] cls, int mode, ClassLoader envLoader);
 
     /**
      * Return the metadata defaults for this factory.
      */
-    public MetaDataDefaults getDefaults();
+    MetaDataDefaults getDefaults();
 
     /**
      * Return all persistent class names, using the metadata locations supplied
@@ -112,46 +112,46 @@ public interface MetaDataFactory
      * @see MetaDataRepository#getPersistentTypeNames
      * @see MetaDataRepository#loadPersistentTypes
      */
-    public Set<String> getPersistentTypeNames(boolean devpath,
+    Set<String> getPersistentTypeNames(boolean devpath,
     		ClassLoader envLoader);
 
     /**
      * Return the type defining the given query name, if any.
      */
-    public Class<?> getQueryScope(String queryName, ClassLoader loader);
+    Class<?> getQueryScope(String queryName, ClassLoader loader);
 
     /**
      * Return the type defining the given result set mapping name, if any.
      */
-    public Class<?> getResultSetMappingScope(String resultSetMappingName,
+    Class<?> getResultSetMappingScope(String resultSetMappingName,
         ClassLoader loader);
 
     /**
      * Return a properly-configured class arg parser for our expected
      * metadata format.
      */
-    public ClassArgParser newClassArgParser();
+    ClassArgParser newClassArgParser();
 
     /**
      * Clear any internal caches.
      */
-    public void clear();
+    void clear();
 
     /**
      * Add any extension keys used by this instance to the given set.
      */
-    public void addClassExtensionKeys(Collection<?> exts);
+    void addClassExtensionKeys(Collection<?> exts);
 
     /**
      * Add any extension keys used by this instance to the given set.
      */
-    public void addFieldExtensionKeys (Collection<?> exts);
+    void addFieldExtensionKeys (Collection<?> exts);
 
     /**
      * Load XMLClassMetadata for the given class. Loaded
      * metadata should be added directly to the repository.
      */
-    public void loadXMLMetaData(Class<?> cls);
+    void loadXMLMetaData(Class<?> cls);
 
     /**
      * Gets the name of the meta-model class for the given fully-qualified
@@ -159,7 +159,7 @@ public interface MetaDataFactory
      *
      * @since 2.0.0
      */
-    public String getMetaModelClassName(String managedClassName);
+    String getMetaModelClassName(String managedClassName);
 
     /**
      * Gets the name of the managed class for the given fully-qualified
@@ -167,14 +167,14 @@ public interface MetaDataFactory
      *
      * @since 2.0.0
      */
-    public String getManagedClassName(String metamodelClassName);
+    String getManagedClassName(String metamodelClassName);
 
     /**
      * Affirms if the given class is a meta-class.
      *
      * @since 2.0.0
      */
-    public boolean isMetaClass(Class<?> c);
+    boolean isMetaClass(Class<?> c);
 
     /**
      * Gets the managed class corresponding to the given meta-class.
@@ -183,6 +183,6 @@ public interface MetaDataFactory
      *
      * @since 2.0.0
      */
-    public Class<?> getManagedClass(Class<?> c);
+    Class<?> getManagedClass(Class<?> c);
 
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataInheritanceComparator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataInheritanceComparator.java
index 28afd2402..08a0566f8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataInheritanceComparator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataInheritanceComparator.java
@@ -27,12 +27,17 @@ package org.apache.openjpa.meta;
 public class MetaDataInheritanceComparator
     extends InheritanceComparator {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     protected Class toClass(Object elem) {
         if (elem == null)
             return null;
         return ((ClassMetaData) elem).getDescribedType();
     }
 
+    @Override
     public int compare(Object o1, Object o2) {
         if (o1 == o2)
             return 0;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataModes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataModes.java
index 37f4e64d9..c55fb152b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataModes.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataModes.java
@@ -27,13 +27,13 @@ package org.apache.openjpa.meta;
  */
 public interface MetaDataModes {
 
-    public static final int MODE_NONE = 0;
-    public static final int MODE_META = 1;
-    public static final int MODE_MAPPING = 2;
-    public static final int MODE_QUERY = 4;
-    public static final int MODE_MAPPING_INIT = 8;
-    public static final int MODE_ANN_MAPPING = 16;
+    int MODE_NONE = 0;
+    int MODE_META = 1;
+    int MODE_MAPPING = 2;
+    int MODE_QUERY = 4;
+    int MODE_MAPPING_INIT = 8;
+    int MODE_ANN_MAPPING = 16;
 
-    public static final int MODE_ALL = MODE_META | MODE_MAPPING | MODE_QUERY
+    int MODE_ALL = MODE_META | MODE_MAPPING | MODE_QUERY
         | MODE_MAPPING_INIT | MODE_ANN_MAPPING;
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
index 33720ae88..7bc33b984 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
@@ -67,10 +67,11 @@ import org.apache.openjpa.util.OpenJPAId;
  * @author Abe White
  * @author Steve Kim (query metadata)
  */
-@SuppressWarnings("serial")
 public class MetaDataRepository implements PCRegistry.RegisterClassListener, Configurable, Closeable, MetaDataModes,
     Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * Constant to not validate any metadata.
      */
@@ -109,14 +110,14 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     private SequenceMetaData _sysSeq = null;
     // cache of parsed metadata, oid class to class, and interface class
     // to metadatas
-    private Map<Class<?>, ClassMetaData> _metas = new HashMap<Class<?>, ClassMetaData>();
-    private Map<String, ClassMetaData> _metaStringMap = new ConcurrentHashMap<String, ClassMetaData>();
+    private Map<Class<?>, ClassMetaData> _metas = new HashMap<>();
+    private Map<String, ClassMetaData> _metaStringMap = new ConcurrentHashMap<>();
     private Map<Class<?>, Class<?>> _oids = Collections.synchronizedMap(new HashMap<Class<?>, Class<?>>());
     private Map<Class<?>, Collection<Class<?>>> _impls =
         Collections.synchronizedMap(new HashMap<Class<?>, Collection<Class<?>>>());
     private Map<Class<?>, Class<?>> _ifaces = Collections.synchronizedMap(new HashMap<Class<?>, Class<?>>());
-    private Map<String, QueryMetaData> _queries = new HashMap<String, QueryMetaData>();
-    private Map<String, SequenceMetaData> _seqs = new HashMap<String, SequenceMetaData>();
+    private Map<String, QueryMetaData> _queries = new HashMap<>();
+    private Map<String, SequenceMetaData> _seqs = new HashMap<>();
     private Map<String, List<Class<?>>> _aliases = Collections.synchronizedMap(new HashMap<String, List<Class<?>>>());
     private Map<Class<?>, NonPersistentMetaData> _pawares =
         Collections.synchronizedMap(new HashMap<Class<?>, NonPersistentMetaData>());
@@ -129,7 +130,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
 
     // xml mapping
     protected final XMLMetaData[] EMPTY_XMLMETAS;
-    private final Map<Class<?>, XMLMetaData> _xmlmetas = new HashMap<Class<?>, XMLMetaData>();
+    private final Map<Class<?>, XMLMetaData> _xmlmetas = new HashMap<>();
 
     private transient OpenJPAConfiguration _conf = null;
     private transient Log _log = null;
@@ -142,12 +143,12 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
 
     // we buffer up any classes that register themselves to prevent
     // reentrancy errors if classes register during a current parse (common)
-    private final Collection<Class<?>> _registered = new HashSet<Class<?>>();
+    private final Collection<Class<?>> _registered = new HashSet<>();
 
     // set of metadatas we're in the process of resolving
-    private final List<ClassMetaData> _resolving = new ArrayList<ClassMetaData>();
-    private final List<ClassMetaData> _mapping = new ArrayList<ClassMetaData>();
-    private final List<RuntimeException> _errs = new LinkedList<RuntimeException>();
+    private final List<ClassMetaData> _resolving = new ArrayList<>();
+    private final List<ClassMetaData> _mapping = new ArrayList<>();
+    private final List<RuntimeException> _errs = new LinkedList<>();
 
     // system listeners
     private LifecycleEventManager.ListenerList _listeners = new LifecycleEventManager.ListenerList(3);
@@ -340,7 +341,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
             _log.trace(_loc.get("repos-initializeEager-found", classes));
         }
 
-        List<Class<?>> loaded = new ArrayList<Class<?>>();
+        List<Class<?>> loaded = new ArrayList<>();
         for (String c : classes) {
             try {
                 Class<?> cls = AccessController.doPrivileged((J2DoPrivHelper.getForNameAction(c, true, multi)));
@@ -522,7 +523,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     }
 
     private Collection<String> getAliasNamesInternal() {
-        Collection<String> aliases = new HashSet<String>();
+        Collection<String> aliases = new HashSet<>();
         for(Map.Entry<String, List<Class<?>>> e : _aliases.entrySet()){
             if (e.getValue() != null) {
                 aliases.add(e.getKey());
@@ -540,7 +541,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
 
         // check cache for existing metadata, or give up if no metadata and
         // our list of configured persistent types doesn't include the class
-        ClassMetaData meta = (ClassMetaData) _metas.get(cls);
+        ClassMetaData meta = _metas.get(cls);
         if (meta != null && ((meta.getSourceMode() & MODE_META) != 0 || (_sourceMode & MODE_META) == 0))
             return meta;
 
@@ -589,7 +590,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
 
         // check cache again
         if (meta == null)
-            meta = (ClassMetaData) _metas.get(cls);
+            meta = _metas.get(cls);
         if (meta != null && ((meta.getSourceMode() & MODE_META) != 0 || (_sourceMode & MODE_META) == 0))
             return meta;
 
@@ -673,7 +674,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
                 re = _errs.get(0);
             } else {
                 re = new MetaDataException(_loc.get("resolve-errs"))
-                    .setNestedThrowables((Throwable[]) _errs
+                    .setNestedThrowables(_errs
                     .toArray(new Exception[_errs.size()]));
             }
             _errs.clear();
@@ -788,7 +789,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
         // initialize mapping for runtime use
         if ((_resMode & MODE_MAPPING_INIT) != 0) {
             for (int i = 0; i < mapped.size(); i++) {
-                meta = (ClassMetaData) mapped.get(i);
+                meta = mapped.get(i);
                 try {
                     meta.resolve(MODE_MAPPING_INIT);
                 } catch (RuntimeException re) {
@@ -822,7 +823,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
         // that each processing call might place more metas in the buffer as
         // one class tries to access metadata for another
         ClassMetaData buffered;
-        List<ClassMetaData> processed = new ArrayList<ClassMetaData>(5);
+        List<ClassMetaData> processed = new ArrayList<>(5);
         while (!buffer.isEmpty()) {
             buffered = buffer.get(0);
             try {
@@ -865,12 +866,12 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     private ClassMetaData[] getMetaDatasInternal() {
             // prevent concurrent mod errors when resolving one metadata
             // introduces others
-            ClassMetaData[] metas = (ClassMetaData[]) _metas.values().toArray(new ClassMetaData[_metas.size()]);
+            ClassMetaData[] metas = _metas.values().toArray(new ClassMetaData[_metas.size()]);
             for (int i = 0; i < metas.length; i++)
                 if (metas[i] != null)
                     getMetaData(metas[i].getDescribedType(), metas[i].getEnvClassLoader(), true);
 
-            List<ClassMetaData> resolved = new ArrayList<ClassMetaData>(_metas.size());
+            List<ClassMetaData> resolved = new ArrayList<>(_metas.size());
             for (ClassMetaData meta : _metas.values()) {
                 if (meta != null)
                     resolved.add(meta);
@@ -884,7 +885,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
      * Return the cached metadata for the given class, without any resolution. Return null if none.
      */
     public ClassMetaData getCachedMetaData(Class<?> cls) {
-        return (ClassMetaData) _metas.get(cls);
+        return _metas.get(cls);
     }
 
     /**
@@ -1138,7 +1139,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
                 // will only register concrete superclass in PCRegistry
                 sup.clearSubclassCache();
                 addToCollection(_subs, sup.getDescribedType(), impl, true);
-                sup = (ClassMetaData) sup.getPCSuperclassMetaData();
+                sup = sup.getPCSuperclassMetaData();
         }
     }
 
@@ -1278,7 +1279,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
 
     private ClassMetaData[] getImplementorMetaDatasInternal(Collection<Class<?>> classes, ClassLoader envLoader,
         boolean mustExist) {
-        Collection<ClassMetaData> mapped = new ArrayList<ClassMetaData>(classes.size());
+        Collection<ClassMetaData> mapped = new ArrayList<>(classes.size());
         ClassMetaData meta = null;
         for (Class<?> c : classes) {
             meta = getMetaData(c, envLoader, true);
@@ -1293,7 +1294,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
      * given class is not registered as persistence-aware.
      */
     public NonPersistentMetaData getPersistenceAware(Class<?> cls) {
-        return (NonPersistentMetaData) _pawares.get(cls);
+        return _pawares.get(cls);
     }
 
     /**
@@ -1314,7 +1315,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     private NonPersistentMetaData[] getPersistenceAwaresInternal() {
             if (_pawares.isEmpty())
                 return EMPTY_NON_PERSISTENT;
-            return (NonPersistentMetaData[]) _pawares.values().toArray(new NonPersistentMetaData[_pawares.size()]);
+            return _pawares.values().toArray(new NonPersistentMetaData[_pawares.size()]);
     }
 
     /**
@@ -1337,7 +1338,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
 
     private NonPersistentMetaData addPersistenceAwareInternal(Class<?> cls) {
             if (_pawares.containsKey(cls))
-                return (NonPersistentMetaData) _pawares.get(cls);
+                return _pawares.get(cls);
             if (getCachedMetaData(cls) != null)
                 throw new MetaDataException(_loc.get("pc-and-aware", cls));
             NonPersistentMetaData meta =
@@ -1360,7 +1361,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
      * interface is not registered as persistence-aware.
      */
     public NonPersistentMetaData getNonMappedInterface(Class<?> iface) {
-        return (NonPersistentMetaData) _nonMapped.get(iface);
+        return _nonMapped.get(iface);
     }
 
     /**
@@ -1381,7 +1382,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     private NonPersistentMetaData[] getNonMappedInterfacesInternal() {
             if (_nonMapped.isEmpty())
                 return EMPTY_NON_PERSISTENT;
-            return (NonPersistentMetaData[]) _nonMapped.values().toArray(new NonPersistentMetaData[_nonMapped.size()]);
+            return _nonMapped.values().toArray(new NonPersistentMetaData[_nonMapped.size()]);
     }
 
     /**
@@ -1406,7 +1407,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
 
     private NonPersistentMetaData addNonMappedInterfaceInternal(Class<?> iface) {
             if (_nonMapped.containsKey(iface))
-                return (NonPersistentMetaData) _nonMapped.get(iface);
+                return _nonMapped.get(iface);
             if (getCachedMetaData(iface) != null)
                 throw new MetaDataException(_loc.get("non-mapped-pc", iface));
             NonPersistentMetaData meta =
@@ -1529,7 +1530,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
 
             // attempt to load classes so that they get processed
             ClassLoader clsLoader = _conf.getClassResolverInstance().getClassLoader(getClass(), envLoader);
-            List<Class<?>> classes = new ArrayList<Class<?>>(names.size());
+            List<Class<?>> classes = new ArrayList<>(names.size());
             Class<?> cls;
             for (String className : names) {
                 cls = classForName(className, clsLoader);
@@ -1598,6 +1599,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     // RegisterClassListener implementation
     // //////////////////////////////////////
 
+    @Override
     public void register(Class<?> cls) {
         // buffer registered classes until an oid metadata request is made,
         // at which point we'll parse everything in the buffer
@@ -1686,7 +1688,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
                 if (_log.isWarnEnabled())
                     _log.warn(_loc.get("failed-registered", reg[i]), t);
                 if (failed == null)
-                    failed = new ArrayList<Class<?>>();
+                    failed = new ArrayList<>();
                 failed.add(reg[i]);
             }
         }
@@ -1718,7 +1720,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
             ClassMetaData meta;
             for (Class<?> anc = cls; (anc = PCRegistry.getPersistentSuperclass(anc)) != null;) {
                 addToCollection(_subs, anc, cls, true);
-                meta = (ClassMetaData) _metas.get(anc);
+                meta = _metas.get(anc);
                 if (meta != null)
                     meta.clearSubclassCache();
                 leastDerived = anc;
@@ -1781,7 +1783,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
             if (alias != null) {
                 List<Class<?>> classes = _aliases.get(alias);
                 if (classes == null)
-                    classes = new ArrayList<Class<?>>(3);
+                    classes = new ArrayList<>(3);
                 if (!classes.contains(cls)) {
                     classes.add(cls);
                     _aliases.put(alias, classes);
@@ -1911,27 +1913,30 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     // Configurable implementation
     // /////////////////////////////
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = (OpenJPAConfiguration) conf;
         _log = _conf.getLog(OpenJPAConfiguration.LOG_METADATA);
         _filterRegisteredClasses = _conf.getCompatibilityInstance().getFilterPCRegistryClasses();
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
         initializeMetaDataFactory();
 		if (_implGen == null)
 			_implGen = new InterfaceImplGenerator(this);
         if (_preload == true) {
-            _oids = new HashMap<Class<?>, Class<?>>();
-            _impls = new HashMap<Class<?>, Collection<Class<?>>>();
-            _ifaces = new HashMap<Class<?>, Class<?>>();
-            _aliases = new HashMap<String, List<Class<?>>>();
-            _pawares = new HashMap<Class<?>, NonPersistentMetaData>();
-            _nonMapped = new HashMap<Class<?>, NonPersistentMetaData>();
-            _subs = new HashMap<Class<?>, List<Class<?>>>();
+            _oids = new HashMap<>();
+            _impls = new HashMap<>();
+            _ifaces = new HashMap<>();
+            _aliases = new HashMap<>();
+            _pawares = new HashMap<>();
+            _nonMapped = new HashMap<>();
+            _subs = new HashMap<>();
             // Wait till we're done loading MetaData to flip _lock boolean.
         }
     }
@@ -2048,10 +2053,10 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     public QueryMetaData getCachedQueryMetaData(String name) {
         if (_locking) {
             synchronized (this) {
-                return (QueryMetaData) _queries.get(name);
+                return _queries.get(name);
             }
         } else {
-            return (QueryMetaData) _queries.get(name);
+            return _queries.get(name);
         }
     }
 
@@ -2232,10 +2237,10 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     public SequenceMetaData[] getSequenceMetaDatas() {
         if (_locking) {
             synchronized (this) {
-                return (SequenceMetaData[]) _seqs.values().toArray(new SequenceMetaData[_seqs.size()]);
+                return _seqs.values().toArray(new SequenceMetaData[_seqs.size()]);
             }
         } else {
-            return (SequenceMetaData[]) _seqs.values().toArray(new SequenceMetaData[_seqs.size()]);
+            return _seqs.values().toArray(new SequenceMetaData[_seqs.size()]);
         }
     }
 
@@ -2245,10 +2250,10 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     public SequenceMetaData getCachedSequenceMetaData(String name) {
         if (_locking) {
             synchronized (this) {
-                return (SequenceMetaData) _seqs.get(name);
+                return _seqs.get(name);
             }
         } else {
-            return (SequenceMetaData) _seqs.get(name);
+            return _seqs.get(name);
         }
     }
 
@@ -2371,6 +2376,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
     /**
      * Free the resources used by this repository. Closes all user sequences.
      */
+    @Override
     public void close() {
         if (_locking) {
             synchronized (this) {
@@ -2393,15 +2399,19 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
      */
     private static class QueryKey implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public String clsName;
         public String name;
 
+        @Override
         public int hashCode() {
             int clsHash = (clsName == null) ? 0 : clsName.hashCode();
             int nameHash = (name == null) ? 0 : name.hashCode();
             return clsHash + nameHash;
         }
 
+        @Override
         public boolean equals(Object obj) {
             if (obj == this)
                 return true;
@@ -2440,7 +2450,7 @@ public class MetaDataRepository implements PCRegistry.RegisterClassListener, Con
         // load JAXB XML metadata
         _factory.loadXMLMetaData(cls);
 
-        xmlmeta = (XMLClassMetaData) _xmlmetas.get(cls);
+        xmlmeta = _xmlmetas.get(cls);
 
         return xmlmeta;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java
index afe879e91..8ff84ef18 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java
@@ -254,6 +254,7 @@ public class MetaDataTool
         boolean ret = (args.length > 0) &&
             Configurations.runAgainstAllAnchors(opts,
             new Configurations.Runnable() {
+            @Override
             public boolean run(Options opts) throws Exception {
                 OpenJPAConfiguration conf = new OpenJPAConfigurationImpl();
                 try {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MultiQueryMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MultiQueryMetaData.java
index 16dd07109..f8793e3d2 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MultiQueryMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MultiQueryMetaData.java
@@ -36,12 +36,12 @@ import org.apache.openjpa.kernel.QueryLanguages;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class MultiQueryMetaData extends QueryMetaData {
+    private static final long serialVersionUID = 1L;
     private final String _procedureName;
     private final boolean _isTemporary;
-    private final List<QueryMetaData> _parts = new ArrayList<QueryMetaData>();
-    private final List<Parameter> _params = new ArrayList<MultiQueryMetaData.Parameter>();
+    private final List<QueryMetaData> _parts = new ArrayList<>();
+    private final List<Parameter> _params = new ArrayList<>();
 
     /**
      * Create this meta data given a scope of definition, a logical identifier, a procedure name
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NonPersistentMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NonPersistentMetaData.java
index 177fcbbb8..516f537ac 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NonPersistentMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NonPersistentMetaData.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.lib.xml.Commentable;
 public class NonPersistentMetaData
 	implements Comparable, SourceTracker, Commentable, MetaDataContext,
         Serializable {
+    
+    private static final long serialVersionUID = 1L;
     public static final int TYPE_PERSISTENCE_AWARE = 1;
     public static final int TYPE_NON_MAPPED_INTERFACE = 2;
 
@@ -57,7 +59,8 @@ public class NonPersistentMetaData
     /**
      * Owning repository.
      */
-	public MetaDataRepository getRepository() {
+	@Override
+    public MetaDataRepository getRepository() {
 		return _repos;
 	}
 
@@ -91,14 +94,17 @@ public class NonPersistentMetaData
         _listIndex = index;
     }
 
+    @Override
     public File getSourceFile() {
         return _srcFile;
     }
 
+    @Override
     public Object getSourceScope() {
         return null;
     }
 
+    @Override
     public int getSourceType() {
         return _srcType;
     }
@@ -108,6 +114,7 @@ public class NonPersistentMetaData
         _srcType = srcType;
     }
 
+    @Override
     public int getLineNumber() {
         return _lineNum;
     }
@@ -116,6 +123,7 @@ public class NonPersistentMetaData
         _lineNum = lineNum;
     }
 
+    @Override
     public int getColNumber() {
         return _colNum;
     }
@@ -124,18 +132,22 @@ public class NonPersistentMetaData
         _colNum = colNum;
     }
 
+    @Override
     public String getResourceName() {
         return _class.getName();
     }
 
+    @Override
     public String[] getComments() {
-        return (_comments == null) ? ClassMetaData.EMPTY_COMMENTS : _comments;
+        return (_comments == null) ? Commentable.EMPTY_COMMENTS : _comments;
     }
 
+    @Override
     public void setComments(String[] comments) {
         _comments = comments;
     }
 
+    @Override
     public int compareTo(Object o) {
         if (o == this)
             return 0;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java
index 74c8a6ae9..d82ff98bc 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/NoneMetaDataFactory.java
@@ -42,142 +42,180 @@ public class NoneMetaDataFactory
         return _instance;
     }
 
+    @Override
     public void setRepository(MetaDataRepository repos) {
     }
 
+    @Override
     public void setStoreDirectory(File dir) {
     }
 
+    @Override
     public void setStoreMode(int store) {
     }
 
+    @Override
     public void setStrict(boolean strict) {
     }
 
+    @Override
     public void load(Class cls, int mode, ClassLoader envLoader) {
     }
 
+    @Override
     public boolean store(ClassMetaData[] metas, QueryMetaData[] queries,
         SequenceMetaData[] seqs, int mode, Map output) {
         return false;
     }
 
+    @Override
     public boolean drop(Class[] cls, int mode, ClassLoader envLoader) {
         return false;
     }
 
+    @Override
     public MetaDataDefaults getDefaults() {
         return this;
     }
 
+    @Override
     public Set getPersistentTypeNames(boolean classpath,
         ClassLoader envLoader) {
         return null;
     }
 
+    @Override
     public Class getQueryScope(String queryName, ClassLoader loader) {
         return null;
     }
 
+    @Override
     public Class getResultSetMappingScope(String resultSetMappingName,
         ClassLoader loader) {
         return null;
     }
 
+    @Override
     public ClassArgParser newClassArgParser() {
         return new ClassArgParser();
     }
 
+    @Override
     public void clear() {
     }
 
+    @Override
     public void addClassExtensionKeys(Collection exts) {
     }
 
+    @Override
     public void addFieldExtensionKeys(Collection exts) {
     }
 
+    @Override
     public int getDefaultAccessType() {
         return AccessCode.UNKNOWN;
     }
 
+    @Override
     public int getDefaultIdentityType() {
         return ClassMetaData.ID_UNKNOWN;
     }
 
+    @Override
     public int getCallbackMode() {
         return CALLBACK_IGNORE;
     }
 
+    @Override
     public boolean getCallbacksBeforeListeners(int type) {
         return false;
     }
 
+    @Override
     public void setIgnoreNonPersistent(boolean ignore) {
     }
 
+    @Override
     public boolean isDeclaredInterfacePersistent() {
         return false;
     }
 
+    @Override
     public boolean isDataStoreObjectIdFieldUnwrapped() {
         return false;
     }
 
+    @Override
     public void populate(ClassMetaData meta, int access) {
     }
 
+    @Override
     public void populate(ClassMetaData meta, int access, boolean ignoreTransient) {
     }
 
+    @Override
     public Member getBackingMember(FieldMetaData fmd) {
         return null;
     }
 
+    @Override
     public Member getMemberByProperty(ClassMetaData meta, String property,
     		int access, boolean scan) {
     	return null;
     }
 
+    @Override
     public Class<? extends Exception> getUnimplementedExceptionType() {
         return null;
     }
 
+    @Override
     public void loadXMLMetaData(Class<?> cls) {
     }
 
+    @Override
     public String getMetaModelClassName(String managedClassName) {
         return null;
     }
+    @Override
     public String getManagedClassName(String metamodelClassName) {
         return null;
     }
 
+    @Override
     public boolean isMetaClass(Class<?> c) {
         return false;
     }
 
+    @Override
     public Class<?> getManagedClass(Class<?> c) {
         return null;
     }
 
+    @Override
     public boolean isAbstractMappingUniDirectional(OpenJPAConfiguration conf) {
         return false;
     }
 
+    @Override
     public boolean isNonDefaultMappingAllowed(OpenJPAConfiguration conf) {
         return false;
     }
 
+    @Override
     public Boolean isDefaultCascadePersistEnabled() {
         return false;
     }
 
+    @Override
     public void setDefaultCascadePersistEnabled(Boolean bool) {
 
     }
 
+    @Override
     public String getDefaultSchema(){return null;}
 
+    @Override
     public void setDefaultSchema(String schema){}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Order.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Order.java
index 884e22afe..12b8f067b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Order.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/Order.java
@@ -32,21 +32,21 @@ public interface Order
     /**
      * Token denoting to order by the element value.
      */
-    public static final String ELEMENT = "#element";
+    String ELEMENT = "#element";
 
     /**
      * Return the name of the orderable.
      */
-    public String getName();
+    String getName();
 
     /**
      * Order direction.
      */
-    public boolean isAscending();
+    boolean isAscending();
 
     /**
      * Return a comparator for ordering by this element, or null if
      * the ordering is done in the datastore.
      */
-    public Comparator getComparator ();
+    Comparator getComparator ();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java
index 89dc1ea55..910f3c007 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java
@@ -88,214 +88,260 @@ class ProxySetupStateManager
         }
     }
 
+    @Override
     public Object getPCPrimaryKey(Object oid, int field) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public StateManager replaceStateManager(StateManager sm) {
         throw new InternalException();
     }
 
+    @Override
     public boolean isDirty() {
         throw new InternalException();
     }
 
+    @Override
     public boolean isTransactional() {
         throw new InternalException();
     }
 
+    @Override
     public boolean isPersistent() {
         throw new InternalException();
     }
 
+    @Override
     public boolean isNew() {
         throw new InternalException();
     }
 
+    @Override
     public boolean isDeleted() {
         throw new InternalException();
     }
 
+    @Override
     public boolean isDetached() {
         throw new InternalException();
     }
 
+    @Override
     public Object getGenericContext() {
         throw new InternalException();
     }
 
+    @Override
     public void dirty(String s) {
         throw new InternalException();
     }
 
+    @Override
     public Object fetchObjectId() {
         throw new InternalException();
     }
 
+    @Override
     public Object getVersion() {
         throw new InternalException();
     }
 
+    @Override
     public void accessingField(int i) {
         throw new InternalException();
     }
 
+    @Override
     public boolean serializing() {
         throw new InternalException();
     }
 
+    @Override
     public boolean writeDetached(ObjectOutput out) {
         throw new InternalException();
     }
 
+    @Override
     public void proxyDetachedDeserialized(int idx) {
         throw new InternalException();
     }
 
+    @Override
     public void settingBooleanField(PersistenceCapable pc, int i, boolean b,
         boolean b2, int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingCharField(PersistenceCapable pc, int i, char c, char c2,
         int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingByteField(PersistenceCapable pc, int i, byte b, byte b2,
         int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingShortField(PersistenceCapable pc, int i, short s,
         short s2, int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingIntField(PersistenceCapable pc, int i, int i2, int i3,
         int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingLongField(PersistenceCapable pc, int i, long l, long l2,
         int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingFloatField(PersistenceCapable pc, int i, float f,
         float f2, int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingDoubleField(PersistenceCapable pc, int i, double d,
         double d2, int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingStringField(PersistenceCapable pc, int i, String s,
         String s2, int set) {
         throw new InternalException();
     }
 
+    @Override
     public void settingObjectField(PersistenceCapable pc, int i, Object o,
         Object o2, int set) {
         throw new InternalException();
     }
 
+    @Override
     public void providedBooleanField(PersistenceCapable pc, int i, boolean b) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"boolean"));
     }
 
+    @Override
     public void providedCharField(PersistenceCapable pc, int i, char c) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"char"));
     }
 
+    @Override
     public void providedByteField(PersistenceCapable pc, int i, byte b) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"byte"));
     }
 
+    @Override
     public void providedShortField(PersistenceCapable pc, int i, short s) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"short"));
     }
 
+    @Override
     public void providedIntField(PersistenceCapable pc, int i, int i2) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"int"));
     }
 
+    @Override
     public void providedLongField(PersistenceCapable pc, int i, long l) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"long"));
     }
 
+    @Override
     public void providedFloatField(PersistenceCapable pc, int i, float f) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"float"));
     }
 
+    @Override
     public void providedDoubleField(PersistenceCapable pc, int i, double d) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"double"));
     }
 
+    @Override
     public void providedStringField(PersistenceCapable pc, int i, String s) {
         throw new InternalException(_loc.get(
                 "unexpected_proxy_sm_attribute_type", pc.getClass().getName(),
 				"String"));
     }
 
+    @Override
     public void providedObjectField(PersistenceCapable pc, int i, Object o) {
         _object = o;
     }
 
+    @Override
     public boolean replaceBooleanField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public char replaceCharField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public byte replaceByteField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public short replaceShortField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public int replaceIntField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public long replaceLongField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public float replaceFloatField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public double replaceDoubleField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public String replaceStringField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
 
+    @Override
     public Object replaceObjectField(PersistenceCapable pc, int i) {
         throw new InternalException();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java
index c09272677..dfea7c276 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java
@@ -23,11 +23,11 @@ import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.OrderedMap;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.xml.Commentable;
 
 /**
@@ -40,6 +40,8 @@ import org.apache.openjpa.lib.xml.Commentable;
 public class QueryMetaData
     implements MetaDataModes, SourceTracker, Commentable, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final String[] EMPTY_KEYS = new String[0];
     private static final Object[] EMPTY_VALS = new Object[0];
 
@@ -245,6 +247,7 @@ public class QueryMetaData
         _mode = mode;
     }
 
+    @Override
     public String toString() {
         return _name;
     }
@@ -253,10 +256,12 @@ public class QueryMetaData
     // Commentable
     ///////////////
 
+    @Override
     public String[] getComments() {
         return (_comments == null) ? EMPTY_COMMENTS : _comments;
     }
 
+    @Override
     public void setComments(String[] comments) {
         _comments = comments;
     }
@@ -265,14 +270,17 @@ public class QueryMetaData
     // SourceTracker implementation
     ////////////////////////////////
 
+    @Override
     public File getSourceFile() {
         return _file;
     }
 
+    @Override
     public Object getSourceScope() {
         return _scope;
     }
 
+    @Override
     public int getSourceType() {
         return _srcType;
     }
@@ -284,10 +292,12 @@ public class QueryMetaData
         _srcName = srcName;
     }
 
+    @Override
     public String getResourceName() {
         return (_class == null) ? _name : _class.getName () + ":" + _name;
 	}
 
+    @Override
     public int getLineNumber() {
         return _lineNum;
     }
@@ -296,6 +306,7 @@ public class QueryMetaData
         _lineNum = lineNum;
     }
 
+    @Override
     public int getColNumber() {
         return _colNum;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java
index d3b60df4d..00be84da7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java
@@ -23,7 +23,6 @@ import java.io.Serializable;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.SeqValue;
 import org.apache.openjpa.kernel.Seq;
 import org.apache.openjpa.lib.conf.Configurations;
@@ -32,6 +31,7 @@ import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.Closeable;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.xml.Commentable;
 import org.apache.openjpa.util.MetaDataException;
 import org.apache.openjpa.util.OpenJPAException;
@@ -46,6 +46,9 @@ public class SequenceMetaData
     implements SourceTracker, MetaDataContext, Closeable, Commentable,
     Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Sequence name that means to use the system default sequence.
      */
@@ -106,6 +109,7 @@ public class SequenceMetaData
     /**
      * The owning repository.
      */
+    @Override
     public MetaDataRepository getRepository() {
         return _repos;
     }
@@ -117,14 +121,17 @@ public class SequenceMetaData
         return _name;
     }
 
+    @Override
     public File getSourceFile() {
         return _source;
     }
 
+    @Override
     public Object getSourceScope() {
         return _scope;
     }
 
+    @Override
     public int getSourceType() {
         return _srcType;
     }
@@ -135,6 +142,7 @@ public class SequenceMetaData
         _srcType = srcType;
     }
 
+    @Override
     public int getLineNumber() {
         return _lineNum;
     }
@@ -143,6 +151,7 @@ public class SequenceMetaData
         _lineNum = lineNum;
     }
 
+    @Override
     public int getColNumber() {
         return _colNum;
     }
@@ -151,6 +160,7 @@ public class SequenceMetaData
         _colNum = colNum;
     }
 
+    @Override
     public String getResourceName() {
         return _name;
     }
@@ -405,6 +415,7 @@ public class SequenceMetaData
     /**
      * Close user sequence instance.
      */
+    @Override
     public void close() {
         if (_instance != null && !NAME_SYSTEM.equals(_name))
             try {
@@ -422,10 +433,12 @@ public class SequenceMetaData
     // Commentable
     ///////////////
 
+    @Override
     public String[] getComments() {
         return (_comments == null) ? EMPTY_COMMENTS : _comments;
     }
 
+    @Override
     public void setComments(String[] comments) {
         _comments = comments;
     }
@@ -434,13 +447,13 @@ public class SequenceMetaData
      * Allow facades to supply adapters from a spec sequence type to the
      * OpenJPA sequence type.
      */
-    public static interface SequenceFactory
+    public interface SequenceFactory
         extends Serializable {
 
         /**
          * Transform the given class named in metadata into a sequence.
          */
-		public Seq toSequence (Class cls, String props)
+		Seq toSequence (Class cls, String props)
 			throws Exception;
 	}
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaData.java
index 560686d79..a99e7ab6d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaData.java
@@ -33,95 +33,95 @@ public interface ValueMetaData
     /**
      * The operation is not cascaded to this field.
      */
-    public int CASCADE_NONE = 0;
+    int CASCADE_NONE = 0;
 
     /**
      * The operation is immediately cascaded to this field.
      */
-    public int CASCADE_IMMEDIATE = 1;
+    int CASCADE_IMMEDIATE = 1;
 
     /**
      * Use automatic cascade behavior. Persistence-by-reachability,
      * delete-dependent, attach-if-detached, etc.
      */
-    public int CASCADE_AUTO = 2;
+    int CASCADE_AUTO = 2;
 
     /**
      * Marker to set on {@link #setValueMappedBy} to denote that the map key
      * is mapped by the primary key field of the value.
      */
-    public static final String MAPPED_BY_PK = "`pk`";
+    String MAPPED_BY_PK = "`pk`";
 
     /**
      * Return the owning field for this value.
      */
-    public FieldMetaData getFieldMetaData();
+    FieldMetaData getFieldMetaData();
 
     /**
      * The value class.
      */
-    public Class getType();
+    Class getType();
 
     /**
      * The value class.
      */
-    public void setType(Class type);
+    void setType(Class type);
 
     /**
      * The type code of the value class.
      */
-    public int getTypeCode();
+    int getTypeCode();
 
     /**
      * The type code of the value class.
      */
-    public void setTypeCode(int code);
+    void setTypeCode(int code);
 
     /**
      * Whether the type is a persistence capable instance.
      */
-    public boolean isTypePC();
+    boolean isTypePC();
 
     /**
      * The metadata for the value class, if the type is persistent.
      */
-    public ClassMetaData getTypeMetaData();
+    ClassMetaData getTypeMetaData();
 
     /**
      * Return the declared class of the value. This can differ
      * from the return value of {@link #getType} if the user indicates
      * a different type or the value has an externalizer.
      */
-    public Class getDeclaredType();
+    Class getDeclaredType();
 
     /**
      * Set the declared class of the value.
      */
-    public void setDeclaredType(Class type);
+    void setDeclaredType(Class type);
 
     /**
      * Return the declared type code of the value. This can differ
      * from the return value of {@link #getTypeCode} if the user indicates
      * a different type or the value has an externalizer.
      */
-    public int getDeclaredTypeCode();
+    int getDeclaredTypeCode();
 
     /**
      * Set the type code for the value. The type code is usually
      * computed automatically, but it can be useful to set it explicitly
      * when creating metadatas from scratch.
      */
-    public void setDeclaredTypeCode(int type);
+    void setDeclaredTypeCode(int type);
 
     /**
      * Whether the type is a persistence capable instance.
      */
-    public boolean isDeclaredTypePC();
+    boolean isDeclaredTypePC();
 
     /**
      * Return metadata for the value's class, if the type is persistent.
      */
-    public ClassMetaData getDeclaredTypeMetaData();
+    ClassMetaData getDeclaredTypeMetaData();
 
     /**
      * This attribute is a hint to the implementation to store this value
@@ -130,7 +130,7 @@ public interface ValueMetaData
      * or persistence-capable object; defaults to false otherwise.
      * Implementations are permitted to ignore this attribute.
      */
-    public boolean isEmbedded();
+    boolean isEmbedded();
 
     /**
      * This attribute is a hint to the implementation to store this value
@@ -139,27 +139,27 @@ public interface ValueMetaData
      * or persistence-capable objects; defaults to false otherwise.
      * Implementations are permitted to ignore this attribute.
      */
-    public void setEmbedded(boolean embedded);
+    void setEmbedded(boolean embedded);
 
     /**
      * Whether this is an embedded persistence capable value.
      */
-    public boolean isEmbeddedPC();
+    boolean isEmbeddedPC();
 
     /**
      * The embedded class metadata for the value.
      */
-    public ClassMetaData getEmbeddedMetaData();
+    ClassMetaData getEmbeddedMetaData();
 
     /**
      * Add embedded metadata for this value.
      */
-    public ClassMetaData addEmbeddedMetaData();
+    ClassMetaData addEmbeddedMetaData();
 
     /**
      * Add embedded metadata for this value with the given access type
      */
-    public ClassMetaData addEmbeddedMetaData(int access);
+    ClassMetaData addEmbeddedMetaData(int access);
 
     /**
      * Cascade behavior for delete operation. Only applies to
@@ -174,14 +174,14 @@ public interface ValueMetaData
      * the same transaction.</li>
      * </ul>
      */
-    public int getCascadeDelete();
+    int getCascadeDelete();
 
     /**
      * Cascade behavior for deletion.
      *
      * @see #getCascadeDelete
      */
-    public void setCascadeDelete(int cascade);
+    void setCascadeDelete(int cascade);
 
     /**
      * Cascade behavior for persist operation. Only applies to
@@ -194,21 +194,21 @@ public interface ValueMetaData
      * <li><code>CASCADE_AUTO</code>: Value will be persisted on flush.</li>
      * </ul>
      */
-    public int getCascadePersist();
+    int getCascadePersist();
 
     /**
      * Cascade behavior for persist operation.
      *
      * @see #getCascadePersist
      */
-    public void setCascadePersist(int cascade);
+    void setCascadePersist(int cascade);
 
     /**
      * Cascade behavior for persist operation.
      *
      * @see #getCascadePersist
      */
-    public void setCascadePersist(int cascade, boolean checkPUDefault);
+    void setCascadePersist(int cascade, boolean checkPUDefault);
 
     /**
      * Cascade behavior for attach operation. Only applies to
@@ -219,14 +219,14 @@ public interface ValueMetaData
      * <li><code>CASCADE_IMMEDIATE</code>: Value is attached immediately.</li>
      * </ul>
      */
-    public int getCascadeAttach();
+    int getCascadeAttach();
 
     /**
      * Cascade behavior for attach operation.
      *
      * @see #getCascadeAttach
      */
-    public void setCascadeAttach(int cascade);
+    void setCascadeAttach(int cascade);
 
     /**
      * Cascade behavior for detach operation. Only applies to
@@ -237,14 +237,14 @@ public interface ValueMetaData
      * <li><code>CASCADE_IMMEDIATE</code>: Value is detached immediately.</li>
      * </ul>
      */
-    public int getCascadeDetach();
+    int getCascadeDetach();
 
     /**
      * Cascade behavior for detach operation.
      *
      * @see #getCascadeDetach
      */
-    public void setCascadeDetach(int cascade);
+    void setCascadeDetach(int cascade);
 
 
     /**
@@ -258,79 +258,79 @@ public interface ValueMetaData
      * in the current fetch groups.</li>
      * </ul>
      */
-    public int getCascadeRefresh();
+    int getCascadeRefresh();
 
     /**
      * Cascade behavior for refresh operation.
      *
      * @see #getCascadeRefresh
      */
-    public void setCascadeRefresh(int cascade);
+    void setCascadeRefresh(int cascade);
 
     /**
      * Whether this value is serialized when stored.
      */
-    public boolean isSerialized();
+    boolean isSerialized();
 
     /**
      * Whether this value is serialized when stored.
      */
-    public void setSerialized(boolean serialized);
+    void setSerialized(boolean serialized);
 
     /**
      * The field that this value shares a mapping with. Currently the only
      * supported use for a mapped-by value is when a map field key is
      * determined by a field of the persistence-capable map value.
      */
-    public String getValueMappedBy();
+    String getValueMappedBy();
 
     /**
      * The field that this value shares a mapping with. Currently the only
      * supported use for a mapped-by value is when a map field key is
      * determined by a field of the persistence-capable map value.
      */
-    public void setValueMappedBy(String mapped);
+    void setValueMappedBy(String mapped);
 
     /**
      * The field that this value shares a mapping with. Currently the only
      * supported use for a mapped-by value is when a map field key is
      * determined by a field of the persistence-capable map value.
      */
-    public FieldMetaData getValueMappedByMetaData();
+    FieldMetaData getValueMappedByMetaData();
 
     /**
      * User-supplied type overriding assumed type based on field.
      */
-    public Class getTypeOverride();
+    Class getTypeOverride();
 
     /**
      * User-supplied type overriding assumed type based on field.
      */
-    public void setTypeOverride(Class type);
+    void setTypeOverride(Class type);
 
     /**
      * Resolve mode for metadata.
      */
-    public int getResolve();
+    int getResolve();
 
     /**
      * Resolve mode for metadata.
      */
-    public void setResolve(int mode);
+    void setResolve(int mode);
 
     /**
      * Resolve mode for metadata.
      */
-    public void setResolve(int mode, boolean on);
+    void setResolve(int mode, boolean on);
 
     /**
      * Resolve and validate metadata. Return true if already resolved.
      */
-    public boolean resolve(int mode);
+    boolean resolve(int mode);
 
     /**
      * Copy state from the given value to this one. Do not copy mapping
      * information.
      */
-    public void copy(ValueMetaData vmd);
+    void copy(ValueMetaData vmd);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
index 4a04a2785..f85e00c81 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ValueMetaDataImpl.java
@@ -71,18 +71,22 @@ public class ValueMetaDataImpl
     protected ValueMetaDataImpl() {
     }
 
+    @Override
     public FieldMetaData getFieldMetaData() {
         return _owner;
     }
 
+    @Override
     public MetaDataRepository getRepository() {
         return _owner.getRepository();
     }
 
+    @Override
     public Class getType() {
         return (_type == null) ? _decType : _type;
     }
 
+    @Override
     public void setType(Class type) {
         _type = type;
         _typeMeta = null;
@@ -90,19 +94,23 @@ public class ValueMetaDataImpl
             setTypeCode(JavaTypes.getTypeCode(type));
     }
 
+    @Override
     public int getTypeCode() {
         return (_type == null) ? _decCode : _code;
     }
 
+    @Override
     public void setTypeCode(int code) {
         _code = code;
     }
 
+    @Override
     public boolean isTypePC() {
         return getTypeCode() == JavaTypes.PC
             || getTypeCode() == JavaTypes.PC_UNTYPED;
     }
 
+    @Override
     public ClassMetaData getTypeMetaData() {
         if (_type == null)
             return getDeclaredTypeMetaData();
@@ -114,10 +122,12 @@ public class ValueMetaDataImpl
         return _typeMeta;
     }
 
+    @Override
     public Class getDeclaredType() {
         return _decType;
     }
 
+    @Override
     public void setDeclaredType(Class type) {
         _decType = type;
         _decTypeMeta = null;
@@ -126,18 +136,22 @@ public class ValueMetaDataImpl
             _embeddedMeta.setDescribedType(type);
     }
 
+    @Override
     public int getDeclaredTypeCode() {
         return _decCode;
     }
 
+    @Override
     public void setDeclaredTypeCode(int code) {
         _decCode = code;
     }
 
+    @Override
     public boolean isDeclaredTypePC() {
         return _decCode == JavaTypes.PC || _decCode == JavaTypes.PC_UNTYPED;
     }
 
+    @Override
     public ClassMetaData getDeclaredTypeMetaData() {
         if (_decTypeMeta == null && _decCode == JavaTypes.PC) {
             if (isEmbedded())
@@ -151,8 +165,9 @@ public class ValueMetaDataImpl
         return _decTypeMeta;
     }
 
+    @Override
     public boolean isEmbedded() {
-        if (_owner.getManagement() != _owner.MANAGE_PERSISTENT)
+        if (_owner.getManagement() != FieldMetaData.MANAGE_PERSISTENT)
             return false;
         if (_embedded == null) {
             // field left as default; embedded setting depends on type
@@ -170,6 +185,7 @@ public class ValueMetaDataImpl
         return _embedded.booleanValue();
     }
 
+    @Override
     public void setEmbedded(boolean embedded) {
         if (embedded && _embedded != Boolean.TRUE) {
             _decTypeMeta = null;
@@ -178,16 +194,19 @@ public class ValueMetaDataImpl
         _embedded = (embedded) ? Boolean.TRUE : Boolean.FALSE;
     }
 
+    @Override
     public boolean isEmbeddedPC() {
         return _decCode == JavaTypes.PC && isEmbedded();
     }
 
+    @Override
     public ClassMetaData getEmbeddedMetaData() {
         if (_embeddedMeta == null && isEmbeddedPC())
             addEmbeddedMetaData();
         return _embeddedMeta;
     }
 
+    @Override
     public ClassMetaData addEmbeddedMetaData(int access) {
         MetaDataRepository repos = _owner.getRepository();
         _embeddedMeta = repos.newEmbeddedClassMetaData(this);
@@ -199,10 +218,12 @@ public class ValueMetaDataImpl
         return _embeddedMeta;
     }
 
+    @Override
     public ClassMetaData addEmbeddedMetaData() {
         return addEmbeddedMetaData(AccessCode.UNKNOWN);
     }
 
+    @Override
     public int getCascadeDelete() {
         if (_owner.getManagement() != FieldMetaData.MANAGE_PERSISTENT)
             return CASCADE_NONE;
@@ -230,10 +251,12 @@ public class ValueMetaDataImpl
         return CASCADE_NONE;
     }
 
+    @Override
     public void setCascadeDelete(int delete) {
         _delete = delete;
     }
 
+    @Override
     public int getCascadePersist() {
         if (_owner.getManagement() != FieldMetaData.MANAGE_PERSISTENT)
             return CASCADE_NONE;
@@ -276,15 +299,18 @@ public class ValueMetaDataImpl
         return _persist;
     }
 
+    @Override
     public void setCascadePersist(int persist) {
         setCascadePersist(persist, true);
     }
 
+    @Override
     public void setCascadePersist(int persist, boolean checkPUDefault) {
         _persist = persist;
         _checkPUDefaultCascadePersist = checkPUDefault;
     }
 
+    @Override
     public int getCascadeAttach() {
         if (_owner.getManagement() != FieldMetaData.MANAGE_PERSISTENT
             || !isDeclaredTypePC()) // attach acts on declared type
@@ -294,12 +320,14 @@ public class ValueMetaDataImpl
         return _attach;
     }
 
+    @Override
     public void setCascadeAttach(int attach) {
         if (attach == CASCADE_AUTO)
             throw new IllegalArgumentException("CASCADE_AUTO");
         _attach = attach;
     }
 
+    @Override
     public int getCascadeDetach() {
         if (_owner.getManagement() != FieldMetaData.MANAGE_PERSISTENT
                 || !isDeclaredTypePC()) // detach acts on declared type
@@ -309,10 +337,12 @@ public class ValueMetaDataImpl
         return _detach;
     }
 
+    @Override
     public void setCascadeDetach(int detach) {
         _detach = detach;
     }
 
+    @Override
     public int getCascadeRefresh() {
         if (_owner.getManagement() != FieldMetaData.MANAGE_PERSISTENT
             || !isDeclaredTypePC()) // refresh acts on declared type
@@ -320,18 +350,22 @@ public class ValueMetaDataImpl
         return _refresh;
     }
 
+    @Override
     public void setCascadeRefresh(int refresh) {
         _refresh = refresh;
     }
 
+    @Override
     public boolean isSerialized() {
         return _serialized;
     }
 
+    @Override
     public void setSerialized(boolean serialized) {
         _serialized = serialized;
     }
 
+    @Override
     public String getValueMappedBy() {
         if (_mappedBy == MAPPED_BY_PK) {
             // use this instead of getting meta from element b/c that
@@ -349,6 +383,7 @@ public class ValueMetaDataImpl
         return _mappedBy;
     }
 
+    @Override
     public void setValueMappedBy(String mapped) {
         if (_owner.getKey() != this && mapped != null)
             throw new UserException(_loc.get("mapped-by-not-key", this));
@@ -358,6 +393,7 @@ public class ValueMetaDataImpl
         }
     }
 
+    @Override
     public FieldMetaData getValueMappedByMetaData() {
         if (getValueMappedBy() != null && _mappedByMeta == null) {
             ClassMetaData meta = _owner.getElement().getTypeMetaData();
@@ -374,14 +410,17 @@ public class ValueMetaDataImpl
         return _mappedByMeta;
     }
 
+    @Override
     public Class getTypeOverride() {
         return _typeOverride;
     }
 
+    @Override
     public void setTypeOverride(Class val) {
         _typeOverride = val;
     }
 
+    @Override
     public String toString() {
         String ret = _owner.getFullName(true);
         if (this == _owner.getKey())
@@ -398,14 +437,17 @@ public class ValueMetaDataImpl
     // Resolve and validate
     ////////////////////////
 
+    @Override
     public int getResolve() {
         return _resMode;
     }
 
+    @Override
     public void setResolve(int mode) {
         _resMode = mode;
     }
 
+    @Override
     public void setResolve(int mode, boolean on) {
         if (mode == MODE_NONE)
             _resMode = mode;
@@ -415,6 +457,7 @@ public class ValueMetaDataImpl
             _resMode &= ~mode;
     }
 
+    @Override
     public boolean resolve(int mode) {
         if ((_resMode & mode) == mode)
             return true;
@@ -496,6 +539,7 @@ public class ValueMetaDataImpl
             _decTypeMeta = meta;
     }
 
+    @Override
     public void copy(ValueMetaData vmd) {
         // copy declared types, but if OID revert to PC until we resolve
         // to OID ourselves
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLClassMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLClassMetaData.java
index 844b41dfd..f9b117892 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLClassMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLClassMetaData.java
@@ -23,6 +23,8 @@ import java.util.Objects;
 
 public class XMLClassMetaData implements XMLMetaData
 {
+    
+    private static final long serialVersionUID = 1L;
     private Class _type;
     private int _code = JavaTypes.OBJECT;
     private int _xmltype = XMLTYPE;
@@ -52,72 +54,89 @@ public class XMLClassMetaData implements XMLMetaData
         _type = type;
     }
 
+    @Override
     public void setName(String name) {
         _name = name;
     }
 
+    @Override
     public String getName() {
         return _name;
     }
 
+    @Override
     public void setXmlname(String name) {
         _xmlname = name;
     }
 
+    @Override
     public String getXmlname() {
         return _isXMLRootElement ? null : _xmlname;
     }
 
+    @Override
     public void setXmlnamespace(String name) {
         // avoid JAXB XML bind default name
         if (!Objects.equals(defaultName, name))
             _xmlnamespace = name;
     }
 
+    @Override
     public String getXmlnamespace() {
         return _xmlnamespace;
     }
 
+    @Override
     public void setXmlRootElement(boolean isXMLRootElement) {
         _isXMLRootElement = isXMLRootElement;
     }
 
+    @Override
     public boolean isXmlRootElement() {
         return _isXMLRootElement;
     }
 
+    @Override
     public boolean isXmlElement() {
         return false;
     }
 
+    @Override
     public boolean isXmlAttribute() {
         return false;
     }
 
+    @Override
     public XMLMetaData getFieldMapping(String name) {
         return (XMLMetaData) _fieldMap.get(name);
     }
 
+    @Override
     public void setType(Class type) {
         _type = type;
     }
 
+    @Override
     public Class getType() {
         return _type;
     }
 
+    @Override
     public int getTypeCode() {
         return _code;
     }
 
+    @Override
     public void setXmltype(int type) {
         _xmltype = type;
     }
 
+    @Override
     public int getXmltype() {
         return _xmltype;
     }
 
+    @Override
     public void addField(String name, XMLMetaData field) {
         _fieldMap.put(name, field);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLFieldMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLFieldMetaData.java
index 7ae1cc762..84e8a6546 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLFieldMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLFieldMetaData.java
@@ -28,6 +28,8 @@ import java.util.Objects;
  */
 public class XMLFieldMetaData implements XMLMetaData {
 
+    
+    private static final long serialVersionUID = 1L;
     private String _name;
     private String _xmlname = null;
     private String _xmlnamespace = null;
@@ -45,16 +47,19 @@ public class XMLFieldMetaData implements XMLMetaData {
         _name = name;
     }
 
+    @Override
     public Class getType() {
         return (_type == null) ? _decType : _type;
     }
 
+    @Override
     public void setType(Class type) {
         _type = type;
         if (type != null)
             setTypeCode(JavaTypes.getTypeCode(type));
     }
 
+    @Override
     public int getTypeCode() {
         return (_type == null) ? _decCode : _code;
     }
@@ -64,59 +69,73 @@ public class XMLFieldMetaData implements XMLMetaData {
         _code = code;
     }
 
+    @Override
     public void setName(String name) {
         _name = name;
     }
 
+    @Override
     public String getName() {
         return _name;
     }
 
+    @Override
     public void setXmlname(String name) {
         _xmlname = name;
     }
 
+    @Override
     public String getXmlname() {
         return _xmlname;
     }
 
+    @Override
     public void setXmlnamespace(String name) {
         // avoid JAXB XML bind default name
         if (!Objects.equals(defaultName, name))
             _xmlnamespace = name;
     }
 
+    @Override
     public String getXmlnamespace() {
         return _xmlnamespace;
     }
 
+    @Override
     public void setXmltype(int type) {
         _xmltype = type;
     }
 
+    @Override
     public int getXmltype() {
         return _xmltype;
     }
 
+    @Override
     public boolean isXmlRootElement() {
         return false;
     }
 
+    @Override
     public boolean isXmlElement() {
         return _xmltype == ELEMENT;
     }
 
+    @Override
     public boolean isXmlAttribute() {
         return _xmltype == ATTRIBUTE;
     }
 
+    @Override
     public XMLMetaData getFieldMapping(String name) {
         return null;
     }
 
+    @Override
     public void setXmlRootElement(boolean isXmlRootElement) {
     }
 
+    @Override
     public void addField(String name, XMLMetaData field) {
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLMetaData.java
index e901f2e6d..dae4227c4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/XMLMetaData.java
@@ -30,93 +30,93 @@ public interface XMLMetaData extends Serializable {
     /**
      * JAXB XML binding default name
      */
-    public static final String defaultName = "##default";
-    public static final int XMLTYPE = 0;
-    public static final int ELEMENT = 1;
-    public static final int ATTRIBUTE = 2;
+    String defaultName = "##default";
+    int XMLTYPE = 0;
+    int ELEMENT = 1;
+    int ATTRIBUTE = 2;
 
     /**
      * Return true if mapping on an XmlRootElement.
      */
-    public boolean isXmlRootElement();
+    boolean isXmlRootElement();
 
     /**
      * Return true if mapping on an XmlElement.
      */
-    public boolean isXmlElement();
+    boolean isXmlElement();
 
     /**
      * Return true if mapping on an XmlAttribute.
      */
-    public boolean isXmlAttribute();
+    boolean isXmlAttribute();
 
     /**
      * Return XMLMapping for a given field.
      * @param name the field name.
      * @return XMLMapping.
      */
-    public XMLMetaData getFieldMapping(String name);
+    XMLMetaData getFieldMapping(String name);
 
     /**
      * Set type.
      */
-    public void setType(Class type);
+    void setType(Class type);
 
     /**
      * Return type.
      */
-    public Class getType();
+    Class getType();
 
     /**
      * Return type code.
      */
-    public int getTypeCode();
+    int getTypeCode();
 
     /**
      * Return the mapping name.
      */
-    public String getName();
+    String getName();
 
     /**
      * Return xml element tag name or xml attribute name.
      */
-    public String getXmlname();
+    String getXmlname();
 
     /**
      * Return xml namespace.
      */
-    public String getXmlnamespace();
+    String getXmlnamespace();
 
     /**
      * Set field name.
      * @param name the field name.
      */
-    public void setName(String name);
+    void setName(String name);
 
     /**
      * Set xml element or attribute name.
      * @param name the element name or attribute name
      */
-    public void setXmlname(String name);
+    void setXmlname(String name);
 
     /**
      * Set namespace.
      */
-    public void setXmlnamespace(String namespace);
+    void setXmlnamespace(String namespace);
 
     /**
      * Set xmltype
      * @param type XMLTYPE, ELEMENT, or ATTRIBUTE
      */
-    public void setXmltype(int type);
+    void setXmltype(int type);
 
     /**
      * Return xmltype
      * @return xmltype
      */
-    public int getXmltype();
+    int getXmltype();
 
-    public void setXmlRootElement(boolean isXmlRootElement);
+    void setXmlRootElement(boolean isXmlRootElement);
 
-    public void addField(String name, XMLMetaData field);
+    void addField(String name, XMLMetaData field);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractChangeTracker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractChangeTracker.java
index 2f3445205..cdddbb360 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractChangeTracker.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractChangeTracker.java
@@ -76,10 +76,12 @@ public abstract class AbstractChangeTracker
         _autoOff = autoOff;
     }
 
+    @Override
     public boolean isTracking() {
         return _track;
     }
 
+    @Override
     public void startTracking() {
         _track = true;
         if (_seq == -1)
@@ -96,6 +98,7 @@ public abstract class AbstractChangeTracker
         return 0;
     }
 
+    @Override
     public void stopTracking() {
         _track = false;
         _seq = -1;
@@ -115,14 +118,17 @@ public abstract class AbstractChangeTracker
         _identity = null;
     }
 
+    @Override
     public Collection getAdded() {
         return (add == null) ? Collections.EMPTY_LIST : add;
     }
 
+    @Override
     public Collection getRemoved() {
         return (rem == null) ? Collections.EMPTY_LIST : rem;
     }
 
+    @Override
     public Collection getChanged() {
         return (change == null) ? Collections.EMPTY_LIST : change;
     }
@@ -172,10 +178,12 @@ public abstract class AbstractChangeTracker
      */
     protected abstract void change(Object val);
 
+    @Override
     public int getNextSequence() {
         return _seq;
     }
 
+    @Override
     public void setNextSequence(int seq) {
         _seq = seq;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyCollection.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyCollection.java
index b96b39db6..b9c175754 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyCollection.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyCollection.java
@@ -73,6 +73,7 @@ public abstract class AbstractLRSProxyCollection
         _ct.setAutoOff(false);
     }
 
+    @Override
     public void setOwner(OpenJPAStateManager sm, int field) {
         // can't transfer ownership of an lrs proxy
         if (sm != null && _origOwner != null
@@ -91,23 +92,28 @@ public abstract class AbstractLRSProxyCollection
         }
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return _sm;
     }
 
+    @Override
     public int getOwnerField() {
         return _field;
     }
 
+    @Override
     public ChangeTracker getChangeTracker() {
         return this;
     }
 
+    @Override
     public Object copy(Object orig) {
         // used to store fields for rollback; we don't store lrs fields
         return null;
     }
 
+    @Override
     public boolean add(Object o) {
         Proxies.assertAllowedType(o, _elementType);
         Proxies.dirty(this, false);
@@ -115,6 +121,7 @@ public abstract class AbstractLRSProxyCollection
         return true;
     }
 
+    @Override
     public boolean addAll(Collection all) {
         Proxies.dirty(this, false);
         boolean added = false;
@@ -128,6 +135,7 @@ public abstract class AbstractLRSProxyCollection
         return added;
     }
 
+    @Override
     public boolean remove(Object o) {
         if (!contains(o))
             return false;
@@ -137,6 +145,7 @@ public abstract class AbstractLRSProxyCollection
         return true;
     }
 
+    @Override
     public boolean removeAll(Collection all) {
         Proxies.dirty(this, false);
         boolean removed = false;
@@ -152,6 +161,7 @@ public abstract class AbstractLRSProxyCollection
         return removed;
     }
 
+    @Override
     public boolean retainAll(Collection all) {
         if (all.isEmpty()) {
             clear();
@@ -177,6 +187,7 @@ public abstract class AbstractLRSProxyCollection
         }
     }
 
+    @Override
     public void clear() {
         Proxies.dirty(this, false);
         Itr itr = (Itr) iterator();
@@ -193,6 +204,7 @@ public abstract class AbstractLRSProxyCollection
         }
     }
 
+    @Override
     public boolean contains(Object o) {
         if (_elementType != null && !_elementType.isInstance(o))
             return false;
@@ -205,6 +217,7 @@ public abstract class AbstractLRSProxyCollection
         return true;
     }
 
+    @Override
     public boolean containsAll(Collection all) {
         for (Iterator itr = all.iterator(); itr.hasNext();)
             if (!contains(itr.next()))
@@ -212,10 +225,12 @@ public abstract class AbstractLRSProxyCollection
         return true;
     }
 
+    @Override
     public Object[] toArray() {
         return asList().toArray();
     }
 
+    @Override
     public Object[] toArray(Object[] a) {
         return asList().toArray(a);
     }
@@ -232,6 +247,7 @@ public abstract class AbstractLRSProxyCollection
         }
     }
 
+    @Override
     public int size() {
         if (_count == -1)
             _count = count();
@@ -240,10 +256,12 @@ public abstract class AbstractLRSProxyCollection
         return _count + _ct.getAdded().size() - _ct.getRemoved().size();
     }
 
+    @Override
     public boolean isEmpty() {
         return size() == 0;
     }
 
+    @Override
     public Iterator iterator() {
         _iterated = true;
 
@@ -299,6 +317,7 @@ public abstract class AbstractLRSProxyCollection
     // Predicate Implementation
     ////////////////////////////
 
+    @Override
     public boolean evaluate(Object o) {
         return !_ct.getRemoved().contains(o);
     }
@@ -307,15 +326,18 @@ public abstract class AbstractLRSProxyCollection
     // CollectionChangeTracker Implementation
     //////////////////////////////////////////
 
+    @Override
     public boolean isTracking() {
         return _ct.isTracking();
     }
 
+    @Override
     public void startTracking() {
         _ct.startTracking();
         reset();
     }
 
+    @Override
     public void stopTracking() {
         _ct.stopTracking();
         reset();
@@ -326,30 +348,37 @@ public abstract class AbstractLRSProxyCollection
             _count = -1;
     }
 
+    @Override
     public Collection getAdded() {
         return _ct.getAdded();
     }
 
+    @Override
     public Collection getRemoved() {
         return _ct.getRemoved();
     }
 
+    @Override
     public Collection getChanged() {
         return _ct.getChanged();
     }
 
+    @Override
     public void added(Object val) {
         _ct.added(val);
     }
 
+    @Override
     public void removed(Object val) {
         _ct.removed(val);
     }
 
+    @Override
     public int getNextSequence() {
         return _ct.getNextSequence();
     }
 
+    @Override
     public void setNextSequence(int seq) {
         _ct.setNextSequence(seq);
     }
@@ -372,6 +401,7 @@ public abstract class AbstractLRSProxyCollection
             _itr = itr;
         }
 
+        @Override
         public boolean hasNext() {
             if (_state == CLOSED)
                 return false;
@@ -385,6 +415,7 @@ public abstract class AbstractLRSProxyCollection
             return true;
         }
 
+        @Override
         public Object next() {
             if (_state != OPEN)
                 throw new NoSuchElementException();
@@ -392,6 +423,7 @@ public abstract class AbstractLRSProxyCollection
             return _last;
         }
 
+        @Override
         public void remove() {
             if (_state == CLOSED || _last == null)
                 throw new NoSuchElementException();
@@ -401,6 +433,7 @@ public abstract class AbstractLRSProxyCollection
             _last = null;
         }
 
+        @Override
         public void close() {
             free();
             _state = CLOSED;
@@ -418,6 +451,7 @@ public abstract class AbstractLRSProxyCollection
             }
         }
 
+        @Override
         protected void finalize() {
             close();
 		}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyMap.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyMap.java
index 6b9e49e20..338627346 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyMap.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/AbstractLRSProxyMap.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
@@ -77,6 +76,7 @@ public abstract class AbstractLRSProxyMap<K,V>
         _ct.setAutoOff(false);
     }
 
+    @Override
     public void setOwner(OpenJPAStateManager sm, int field) {
         // can't transfer ownership of an lrs proxy
         if (sm != null && _origOwner != null
@@ -95,18 +95,22 @@ public abstract class AbstractLRSProxyMap<K,V>
         }
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return _sm;
     }
 
+    @Override
     public int getOwnerField() {
         return _field;
     }
 
+    @Override
     public ChangeTracker getChangeTracker() {
         return this;
     }
 
+    @Override
     public Object copy(Object orig) {
         // used to store fields for rollbac; we don't store lrs fields
         return null;
@@ -128,6 +132,7 @@ public abstract class AbstractLRSProxyMap<K,V>
         _iterated = it;
     }
 
+    @Override
     public int size() {
         if (_count == -1)
             _count = count();
@@ -136,10 +141,12 @@ public abstract class AbstractLRSProxyMap<K,V>
         return _count + _ct.getAdded().size() - _ct.getRemoved().size();
     }
 
+    @Override
     public boolean isEmpty() {
         return size() == 0;
     }
 
+    @Override
     public boolean containsKey(Object key) {
         if (_keyType != null && !_keyType.isInstance(key))
             return false;
@@ -160,6 +167,7 @@ public abstract class AbstractLRSProxyMap<K,V>
         return get(key) != null;
     }
 
+    @Override
     public boolean containsValue(Object val) {
         if (_valueType != null && !_valueType.isInstance(val))
             return false;
@@ -180,6 +188,7 @@ public abstract class AbstractLRSProxyMap<K,V>
         return keys.size() > 0;
     }
 
+    @Override
     public V get(Object key) {
         if (_keyType != null && !_keyType.isInstance(key))
             return null;
@@ -194,12 +203,13 @@ public abstract class AbstractLRSProxyMap<K,V>
         return val;
     }
 
+    @Override
     public V put(K key, V value) {
         Proxies.assertAllowedType(key, _keyType);
         Proxies.assertAllowedType(value, _valueType);
         Proxies.dirty(this, false);
         if (_map == null)
-            _map = new HashMap<K,V>();
+            _map = new HashMap<>();
         V old = _map.put(key, value);
         if (old == null && (!_ct.getTrackKeys()
             || !_ct.getRemoved().contains(key)))
@@ -212,12 +222,14 @@ public abstract class AbstractLRSProxyMap<K,V>
         return old;
     }
 
+    @Override
     public void putAll(Map<? extends K,? extends V> m) {
         for (Map.Entry<? extends K, ? extends V> entry : m.entrySet()) {
             put(entry.getKey(), entry.getValue());
         }
     }
 
+    @Override
     public V remove(Object key) {
         Proxies.dirty(this, false);
         V old = (_map == null) ? null : _map.remove(key);
@@ -232,6 +244,7 @@ public abstract class AbstractLRSProxyMap<K,V>
         return old;
     }
 
+    @Override
     public void clear() {
         Proxies.dirty(this, false);
         Itr itr = iterator(MODE_ENTRY);
@@ -249,40 +262,50 @@ public abstract class AbstractLRSProxyMap<K,V>
         }
     }
 
+    @Override
     public Set<K> keySet() {
         return new AbstractSet<K>() {
+            @Override
             public int size() {
                 return AbstractLRSProxyMap.this.size();
             }
 
+            @Override
             public boolean remove(Object o) {
                 return AbstractLRSProxyMap.this.remove(o) != null;
             }
 
+            @Override
             public Iterator<K> iterator() {
                 return AbstractLRSProxyMap.this.iterator(MODE_KEY);
             }
         };
     }
 
+    @Override
     public Collection<V> values() {
         return new AbstractCollection<V>() {
+            @Override
             public int size() {
                 return AbstractLRSProxyMap.this.size();
             }
 
+            @Override
             public Iterator<V> iterator() {
                 return AbstractLRSProxyMap.this.iterator(MODE_VALUE);
             }
         };
     }
 
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         return new AbstractSet<Map.Entry<K, V>>() {
+            @Override
             public int size() {
                 return AbstractLRSProxyMap.this.size();
             }
 
+            @Override
             public Iterator<Map.Entry<K, V>> iterator() {
                 return AbstractLRSProxyMap.this.iterator(MODE_ENTRY);
             }
@@ -293,7 +316,7 @@ public abstract class AbstractLRSProxyMap<K,V>
         throws ObjectStreamException {
         Itr itr = iterator(MODE_ENTRY);
         try {
-            Map<K,V> map = new HashMap<K,V>();
+            Map<K,V> map = new HashMap<>();
             Map.Entry<K,V> entry;
             while (itr.hasNext()) {
                 entry = (Map.Entry<K,V>) itr.next();
@@ -355,6 +378,7 @@ public abstract class AbstractLRSProxyMap<K,V>
     // Predicate Implementation
     ////////////////////////////
 
+    @Override
     public boolean evaluate(Object obj) {
         Map.Entry entry = (Map.Entry) obj;
         return (_ct.getTrackKeys()
@@ -368,15 +392,18 @@ public abstract class AbstractLRSProxyMap<K,V>
     // MapChangeTracker Implementation
     ///////////////////////////////////
 
+    @Override
     public boolean isTracking() {
         return _ct.isTracking();
     }
 
+    @Override
     public void startTracking() {
         _ct.startTracking();
         reset();
     }
 
+    @Override
     public void stopTracking() {
         _ct.stopTracking();
         reset();
@@ -389,42 +416,52 @@ public abstract class AbstractLRSProxyMap<K,V>
             _count = -1;
     }
 
+    @Override
     public boolean getTrackKeys() {
         return _ct.getTrackKeys();
     }
 
+    @Override
     public void setTrackKeys(boolean keys) {
         _ct.setTrackKeys(keys);
     }
 
+    @Override
     public Collection getAdded() {
         return _ct.getAdded();
     }
 
+    @Override
     public Collection getRemoved() {
         return _ct.getRemoved();
     }
 
+    @Override
     public Collection getChanged() {
         return _ct.getChanged();
     }
 
+    @Override
     public void added(Object key, Object val) {
         _ct.added(key, val);
     }
 
+    @Override
     public void removed(Object key, Object val) {
         _ct.removed(key, val);
     }
 
+    @Override
     public void changed(Object key, Object orig, Object val) {
         _ct.changed(key, orig, val);
     }
 
+    @Override
     public int getNextSequence() {
         return _ct.getNextSequence();
     }
 
+    @Override
     public void setNextSequence(int seq) {
         _ct.setNextSequence(seq);
     }
@@ -449,6 +486,7 @@ public abstract class AbstractLRSProxyMap<K,V>
             _itr = itr;
         }
 
+        @Override
         public boolean hasNext() {
             if (_state != OPEN)
                 return false;
@@ -462,6 +500,7 @@ public abstract class AbstractLRSProxyMap<K,V>
             return true;
         }
 
+        @Override
         public Object next() {
             if (_state != OPEN)
                 throw new NoSuchElementException();
@@ -477,6 +516,7 @@ public abstract class AbstractLRSProxyMap<K,V>
             }
         }
 
+        @Override
         public void remove() {
             if (_state == CLOSED || _last == null)
                 throw new NoSuchElementException();
@@ -498,6 +538,7 @@ public abstract class AbstractLRSProxyMap<K,V>
             _last = null;
         }
 
+        @Override
         public void close() {
             free();
             _state = CLOSED;
@@ -515,6 +556,7 @@ public abstract class AbstractLRSProxyMap<K,V>
             }
         }
 
+        @Override
         protected void finalize() {
             close ();
 		}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
index fccaf564f..7c8c06e3a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
@@ -604,82 +604,102 @@ public class ApplicationIds {
             _store = store;
         }
 
+        @Override
         public void storeBooleanField(int field, boolean val) {
             store((val) ? Boolean.TRUE : Boolean.FALSE);
         }
 
+        @Override
         public void storeByteField(int field, byte val) {
             store(Byte.valueOf(val));
         }
 
+        @Override
         public void storeCharField(int field, char val) {
             store(Character.valueOf(val));
         }
 
+        @Override
         public void storeShortField(int field, short val) {
             store(Short.valueOf(val));
         }
 
+        @Override
         public void storeIntField(int field, int val) {
             store(val);
         }
 
+        @Override
         public void storeLongField(int field, long val) {
             store(val);
         }
 
+        @Override
         public void storeFloatField(int field, float val) {
             store(Float.valueOf(val));
         }
 
+        @Override
         public void storeDoubleField(int field, double val) {
             store(Double.valueOf(val));
         }
 
+        @Override
         public void storeStringField(int field, String val) {
             store(val);
         }
 
+        @Override
         public void storeObjectField(int field, Object val) {
             store(val);
         }
 
+        @Override
         public boolean fetchBooleanField(int field) {
             return (retrieve(field) == Boolean.TRUE) ? true : false;
         }
 
+        @Override
         public char fetchCharField(int field) {
             return ((Character) retrieve(field)).charValue();
         }
 
+        @Override
         public byte fetchByteField(int field) {
             return ((Number) retrieve(field)).byteValue();
         }
 
+        @Override
         public short fetchShortField(int field) {
             return ((Number) retrieve(field)).shortValue();
         }
 
+        @Override
         public int fetchIntField(int field) {
             return ((Number) retrieve(field)).intValue();
         }
 
+        @Override
         public long fetchLongField(int field) {
             return ((Number) retrieve(field)).longValue();
         }
 
+        @Override
         public float fetchFloatField(int field) {
             return ((Number) retrieve(field)).floatValue();
         }
 
+        @Override
         public double fetchDoubleField(int field) {
             return ((Number) retrieve(field)).doubleValue();
         }
 
+        @Override
         public String fetchStringField(int field) {
             return (String) retrieve(field);
         }
 
+        @Override
         public Object fetchObjectField(int field) {
             return retrieve(field);
         }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java
index 92385ef6d..69f3e18d9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ArrayStateImage.java
@@ -19,7 +19,6 @@
 package org.apache.openjpa.util;
 
 import java.util.BitSet;
-
 import java.util.Objects;
 
 /**
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/BigDecimalId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/BigDecimalId.java
index 2f9aad439..655f11964 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/BigDecimalId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/BigDecimalId.java
@@ -27,6 +27,8 @@ import java.math.BigDecimal;
 public class BigDecimalId
     extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final BigDecimal key;
 
     public BigDecimalId(Class cls, String key) {
@@ -47,10 +49,12 @@ public class BigDecimalId
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return key;
     }
 
+    @Override
     public String toString() {
         if (key == null) {
             return "NULL";
@@ -58,6 +62,7 @@ public class BigDecimalId
         return key.toString();
     }
 
+    @Override
     protected int idHash() {
         if (key != null) {
             return key.hashCode();
@@ -65,6 +70,7 @@ public class BigDecimalId
         return 0;
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId other) {
         if ((key == null) ||
             (!BigDecimalId.class.isAssignableFrom(other.getClass()))) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/BigIntegerId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/BigIntegerId.java
index d34138ceb..29903682e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/BigIntegerId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/BigIntegerId.java
@@ -27,6 +27,8 @@ import java.math.BigInteger;
 public class BigIntegerId
     extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final BigInteger key;
 
     public BigIntegerId(Class cls, String key) {
@@ -47,10 +49,12 @@ public class BigIntegerId
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return key;
     }
 
+    @Override
     public String toString() {
         if (key == null) {
             return "NULL";
@@ -58,6 +62,7 @@ public class BigIntegerId
         return key.toString();
     }
 
+    @Override
     protected int idHash() {
         if (key != null) {
             return key.hashCode();
@@ -65,6 +70,7 @@ public class BigIntegerId
         return 0;
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId other) {
         if ((key == null) ||
              (!BigIntegerId.class.isAssignableFrom(other.getClass()))) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/BooleanId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/BooleanId.java
index eb9d9d45e..1094eb3b7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/BooleanId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/BooleanId.java
@@ -26,6 +26,8 @@ package org.apache.openjpa.util;
  */
 public class BooleanId extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final boolean key;
 
     public BooleanId(Class cls, Boolean key) {
@@ -55,6 +57,7 @@ public class BooleanId extends OpenJPAId {
         return Boolean.valueOf(key);
     }
 
+    @Override
     public String toString() {
         return Boolean.toString(key);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ByteId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ByteId.java
index 3cd1ae5f7..958cec774 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ByteId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ByteId.java
@@ -25,6 +25,8 @@ package org.apache.openjpa.util;
  */
 public final class ByteId extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final byte key;
 
     public ByteId(Class cls, Byte key) {
@@ -49,18 +51,22 @@ public final class ByteId extends OpenJPAId {
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return Byte.valueOf(key);
     }
 
+    @Override
     public String toString() {
         return Byte.toString(key);
     }
 
+    @Override
     protected int idHash() {
         return key;
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key == ((ByteId) o).key;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
index b99f03c38..31c04b71c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
@@ -25,20 +25,18 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.collections4.iterators.FilterIterator;
 import org.apache.commons.collections4.iterators.IteratorChain;
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 import org.apache.openjpa.lib.util.LRUMap;
-import org.apache.openjpa.lib.util.ReferenceMap;
 import org.apache.openjpa.lib.util.SizedMap;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentHashMap;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
 /**
  * Fixed-size map that has ability to pin/unpin entries and move overflow to
  * a backing soft map.
@@ -99,6 +97,7 @@ public class CacheMap
      * @deprecated use {@link CacheMap#CacheMap(boolean, int, int, float, int)}
      * instead.
      */
+    @Deprecated
     public CacheMap(boolean lru, int max, int size, float load) {
         this(lru, max, size, load, 16);
     }
@@ -115,10 +114,12 @@ public class CacheMap
 
         softMap = new ConcurrentReferenceHashMap(ReferenceStrength.HARD,
             ReferenceStrength.SOFT, size, load) {
+            @Override
             public void overflowRemoved(Object key, Object value) {
                 softMapOverflowRemoved(key, value);
             }
 
+            @Override
             public void valueExpired(Object key) {
                 softMapValueExpired(key);
             }
@@ -127,12 +128,20 @@ public class CacheMap
 
         if (!lru) {
             cacheMap = new ConcurrentHashMap(size, load) {
+                
+                private static final long serialVersionUID = 1L;
+
+                @Override
                 public void overflowRemoved(Object key, Object value) {
                     cacheMapOverflowRemoved(key, value);
                 }
             };
         } else {
             cacheMap = new LRUMap(size, load) {
+                
+                private static final long serialVersionUID = 1L;
+
+                @Override
                 public void overflowRemoved(Object key, Object value) {
                     cacheMapOverflowRemoved(key, value);
                 }
@@ -346,6 +355,7 @@ public class CacheMap
     protected void entryAdded(Object key, Object value) {
     }
 
+    @Override
     public Object get(Object key) {
         boolean putcache = false;
         Object val = null;
@@ -370,6 +380,7 @@ public class CacheMap
         }
     }
 
+    @Override
     public Object put(Object key, Object value) {
         writeLock();
         try {
@@ -412,6 +423,7 @@ public class CacheMap
         }
     }
 
+    @Override
     public void putAll(Map map) {
         putAll(map, true);
     }
@@ -430,6 +442,7 @@ public class CacheMap
      * If <code>key</code> is pinned into the cache, the pin is
      * cleared and the object is removed.
      */
+    @Override
     public Object remove(Object key) {
         writeLock();
         try {
@@ -461,6 +474,7 @@ public class CacheMap
     /**
      * Removes pinned objects as well as unpinned ones.
      */
+    @Override
     public void clear() {
         writeLock();
         try {
@@ -487,6 +501,7 @@ public class CacheMap
         }
     }
 
+    @Override
     public int size() {
         readLock();
         try {
@@ -496,10 +511,12 @@ public class CacheMap
         }
     }
 
+    @Override
     public boolean isEmpty() {
         return size() == 0;
     }
 
+    @Override
     public boolean containsKey(Object key) {
         readLock();
         try {
@@ -509,6 +526,7 @@ public class CacheMap
         }
     }
 
+    @Override
     public boolean containsValue(Object val) {
         readLock();
         try {
@@ -518,18 +536,22 @@ public class CacheMap
         }
     }
 
+    @Override
     public Set keySet() {
         return new KeySet();
     }
 
+    @Override
     public Collection values() {
         return new ValueCollection();
     }
 
+    @Override
     public Set entrySet() {
         return new EntrySet();
     }
 
+    @Override
     public String toString() {
         readLock();
         try {
@@ -545,16 +567,19 @@ public class CacheMap
     private class EntrySet
         extends AbstractSet {
 
+        @Override
         public int size() {
             return CacheMap.this.size();
         }
 
+        @Override
         public boolean add(Object o) {
             Map.Entry entry = (Map.Entry) o;
             put(entry.getKey(), entry.getValue());
             return true;
         }
 
+        @Override
         public Iterator iterator() {
             return new EntryIterator(EntryIterator.ENTRY);
         }
@@ -566,10 +591,12 @@ public class CacheMap
     private class KeySet
         extends AbstractSet {
 
+        @Override
         public int size() {
             return CacheMap.this.size();
         }
 
+        @Override
         public Iterator iterator() {
             return new EntryIterator(EntryIterator.KEY);
         }
@@ -581,10 +608,12 @@ public class CacheMap
     private class ValueCollection
         extends AbstractCollection {
 
+        @Override
         public int size() {
             return CacheMap.this.size();
         }
 
+        @Override
         public Iterator iterator() {
             return new EntryIterator(EntryIterator.VALUE);
         }
@@ -627,18 +656,22 @@ public class CacheMap
             }
         }
 
+        @Override
         public boolean hasNext() {
             return _itr.hasNext();
         }
 
+        @Override
         public Object next() {
             return _itr.next();
         }
 
+        @Override
         public void remove() {
             _itr.remove();
         }
 
+        @Override
         public boolean evaluate(Object obj) {
             switch (_type) {
                 case ENTRY:
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CallbackException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CallbackException.java
index 031a30496..c83c4b63f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CallbackException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CallbackException.java
@@ -29,6 +29,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class CallbackException
     extends UserException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public CallbackException(Message msg) {
         super(msg);
     }
@@ -37,6 +40,7 @@ public class CallbackException
         super(cause);
     }
 
+    @Override
     public int getSubtype() {
         return CALLBACK;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ChangeTracker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ChangeTracker.java
index b43ff375e..94ecb3888 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ChangeTracker.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ChangeTracker.java
@@ -33,37 +33,37 @@ public interface ChangeTracker {
      * Return true if this tracker has an up-to-date view of all the changes
      * to the container it is managing.
      */
-    public boolean isTracking();
+    boolean isTracking();
 
     /**
      * Reset the state of the change tracker, and turn change tracking back
      * on if it has been disabled.
      */
-    public void startTracking();
+    void startTracking();
 
     /**
      * Tell the tracker to stop tracking changes for its container.
      */
-    public void stopTracking();
+    void stopTracking();
 
     /**
      * Return the collection of values that need to be added to the managed
      * container.
      */
-    public Collection getAdded();
+    Collection getAdded();
 
     /**
      * Return the set of values that need to be removed from the managed
      * container.
      */
-    public Collection getRemoved();
+    Collection getRemoved();
 
     /**
      * Return the set of elements that have changed. In maps, this marks a
      * possible change in value for a key. In collections, this marks an
      * element that has been removed and re-added.
      */
-    public Collection getChanged();
+    Collection getChanged();
 
     /**
      * The next element sequence value for this proxy at load time.
@@ -74,7 +74,7 @@ public interface ChangeTracker {
      * proxy stops tracking changes. For ordered proxies, it is set to the
      * proxy's size when the proxy starts tracking changes again.
      */
-    public int getNextSequence();
+    int getNextSequence();
 
     /**
      * The maximum element sequence value for this proxy at load time.
@@ -85,5 +85,5 @@ public interface ChangeTracker {
      * proxy stops tracking changes. For ordered proxies, it is set to the
      * proxy's size when the proxy starts tracking changes again.
      */
-    public void setNextSequence (int seq);
+    void setNextSequence (int seq);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CharId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CharId.java
index ad9baf6d6..a955593c9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CharId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CharId.java
@@ -25,6 +25,8 @@ package org.apache.openjpa.util;
  */
 public final class CharId extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final char key;
 
     public CharId(Class cls, Character key) {
@@ -49,18 +51,22 @@ public final class CharId extends OpenJPAId {
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return Character.valueOf(key);
     }
 
+    @Override
     public String toString() {
         return String.valueOf(key);
     }
 
+    @Override
     protected int idHash() {
         return key;
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key == ((CharId) o).key;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolver.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolver.java
index f1f57e54b..cd9545c97 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolver.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolver.java
@@ -40,5 +40,5 @@ public interface ClassResolver {
      * was obtained; may be null if operating outside
      * the context of persistence environment
      */
-    public ClassLoader getClassLoader(Class<?> contextClass, ClassLoader envLoader);
+    ClassLoader getClassLoader(Class<?> contextClass, ClassLoader envLoader);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java
index 20aea4cf5..ee47f2ab9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.lib.util.MultiClassLoader;
 public class ClassResolverImpl
     implements ClassResolver {
 
+    @Override
     public ClassLoader getClassLoader(Class<?> contextClass,  ClassLoader envLoader) {
         // get the context class' loader; if the class was loaded by the
         // bootstrap loader, use the system classloader in the hopes that
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTracker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTracker.java
index 468bd65ea..df967a769 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTracker.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTracker.java
@@ -32,10 +32,10 @@ public interface CollectionChangeTracker
     /**
      * Record that the given element was added.
      */
-    public void added(Object elem);
+    void added(Object elem);
 
     /**
      * Record that the given element was removed.
      */
-    public void removed(Object elem);
+    void removed(Object elem);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTrackerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTrackerImpl.java
index 85de7a652..49b05ba9a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTrackerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/CollectionChangeTrackerImpl.java
@@ -63,20 +63,24 @@ public class CollectionChangeTrackerImpl
         return _order;
     }
 
+    @Override
     public void added(Object elem) {
         super.added(elem);
     }
 
+    @Override
     public void removed(Object elem) {
         super.removed(elem);
     }
 
+    @Override
     protected int initialSequence() {
         if (_order)
             return _coll.size();
         return super.initialSequence();
     }
 
+    @Override
     protected void add(Object elem) {
         if (rem == null || !rem.remove(elem)) {
             // after a point it's inefficient to keep tracking
@@ -101,6 +105,7 @@ public class CollectionChangeTrackerImpl
         }
     }
 
+    @Override
     protected void remove(Object elem) {
         // if the collection contains multiple copies of the elem, we can't
         // use change tracking because some back-ends can't just delete a
@@ -120,6 +125,7 @@ public class CollectionChangeTrackerImpl
         }
     }
 
+    @Override
     protected void change(Object elem) {
         throw new InternalException();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DateId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DateId.java
index b9839c4f3..3c7b804f7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DateId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DateId.java
@@ -28,6 +28,8 @@ import java.util.Date;
 public final class DateId
     extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final Date key;
 
     public DateId(Class cls, String key) {
@@ -56,18 +58,22 @@ public final class DateId
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return getId();
     }
 
+    @Override
     public String toString() {
         return Long.toString(key.getTime());
     }
 
+    @Override
     protected int idHash() {
         return key.hashCode();
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key.equals(((DateId) o).key);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedArrayListProxy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedArrayListProxy.java
index 192ae2330..bef35b699 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedArrayListProxy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedArrayListProxy.java
@@ -63,6 +63,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         super(paramInt);
     }
 
+    @Override
     public void setOwner(OpenJPAStateManager paramOpenJPAStateManager,
             int paramInt) {
         // If clearing the owner of this proxy, store away what is necessary for
@@ -95,6 +96,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return false;
     }
 
+    @Override
     public int getDelayedField() {
         if (field == -1 || _detached) {
             return _delayedField;
@@ -102,6 +104,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return field;
     }
 
+    @Override
     public OpenJPAStateManager getDelayedOwner() {
         if (sm == null || _detached) {
             return _delayedSm;
@@ -109,14 +112,17 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return sm;
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return sm;
     }
 
+    @Override
     public int getOwnerField() {
         return field;
     }
 
+    @Override
     public Object clone() {
         if (isDirectAccess()) {
             return super.clone();
@@ -129,6 +135,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return localProxy;
     }
 
+    @Override
     public ChangeTracker getChangeTracker() {
         return this.changeTracker;
     }
@@ -137,6 +144,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         changeTracker = ct;
     }
 
+    @Override
     public Object copy(Object paramObject) {
         if (isDelayLoad()) {
             load();
@@ -144,6 +152,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return new ArrayList((Collection) paramObject);
     }
 
+    @Override
     public Class getElementType() {
         return this.elementType;
     }
@@ -163,6 +172,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return proxy;
     }
 
+    @Override
     public boolean add(Object paramObject) {
         if (_directAccess) {
             return super.add(paramObject);
@@ -172,6 +182,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return ProxyCollections.afterAdd(this, paramObject, bool);
     }
 
+    @Override
     public void add(int paramInt, Object paramObject) {
         if (!_directAccess) {
             if (isDelayLoad()) {
@@ -182,6 +193,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         super.add(paramInt, paramObject);
     }
 
+    @Override
     public void clear() {
         if (!_directAccess) {
             if (isDelayLoad()) {
@@ -192,6 +204,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         super.clear();
     }
 
+    @Override
     public boolean addAll(int paramInt, Collection paramCollection) {
         if (isDelayLoad()) {
             load();
@@ -199,6 +212,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return ProxyCollections.addAll(this, paramInt, paramCollection);
     }
 
+    @Override
     public boolean addAll(Collection paramCollection) {
         if (_directAccess) {
             return super.addAll(paramCollection);
@@ -206,6 +220,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return ProxyCollections.addAll(this, paramCollection);
     }
 
+    @Override
     public boolean remove(Object paramObject) {
         if (_directAccess) {
             return super.remove(paramObject);
@@ -217,6 +232,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return ProxyCollections.afterRemove(this, paramObject, bool);
     }
 
+    @Override
     public Object remove(int paramInt) {
         if (_directAccess) {
             return super.remove(paramInt);
@@ -229,6 +245,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return ProxyCollections.afterRemove(this, paramInt, localObject);
     }
 
+    @Override
     public Object set(int paramInt, Object paramObject) {
         if (_directAccess) {
             return super.set(paramInt, paramObject);
@@ -242,6 +259,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
                 localObject);
     }
 
+    @Override
     public Iterator iterator() {
         if (_directAccess) {
             return super.iterator();
@@ -253,6 +271,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return ProxyCollections.afterIterator(this, localIterator);
     }
 
+    @Override
     public ListIterator listIterator(int paramInt) {
         if (_directAccess) {
             return super.listIterator(paramInt);
@@ -265,6 +284,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
                 localListIterator);
     }
 
+    @Override
     public ListIterator listIterator() {
         if (_directAccess) {
             return super.listIterator();
@@ -276,6 +296,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return ProxyCollections.afterListIterator(this, localListIterator);
     }
 
+    @Override
     public boolean removeAll(Collection paramCollection) {
         if (_directAccess) {
             return super.removeAll(paramCollection);
@@ -283,6 +304,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return ProxyCollections.removeAll(this, paramCollection);
     }
 
+    @Override
     public boolean retainAll(Collection paramCollection) {
         if (_directAccess) {
             return super.retainAll(paramCollection);
@@ -384,6 +406,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return super.toArray(array);
     }
 
+    @Override
     public boolean equals(Object paramObject) {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -391,6 +414,7 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return super.equals(paramObject);
     }
 
+    @Override
     public int hashCode() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -398,10 +422,12 @@ public class DelayedArrayListProxy extends ArrayList implements ProxyCollection,
         return super.hashCode();
     }
 
+    @Override
     public boolean isDirectAccess() {
         return _directAccess;
     }
 
+    @Override
     public void setDirectAccess(boolean direct) {
         _directAccess = direct;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedCollectionChangeTrackerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedCollectionChangeTrackerImpl.java
index ccb69a27e..689dee6d0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedCollectionChangeTrackerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedCollectionChangeTrackerImpl.java
@@ -33,6 +33,7 @@ public class DelayedCollectionChangeTrackerImpl
         super(coll, dups, order, autoOff);
     }
 
+    @Override
     protected void add(Object elem) {
         if (rem == null || !rem.remove(elem)) {
             if (add == null) {
@@ -49,6 +50,7 @@ public class DelayedCollectionChangeTrackerImpl
         }
     }
 
+    @Override
     protected void remove(Object elem) {
         if (add == null || !add.remove(elem)) {
             if (rem == null)
@@ -57,6 +59,7 @@ public class DelayedCollectionChangeTrackerImpl
         }
     }
 
+    @Override
     protected void change(Object elem) {
         throw new InternalException();
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedHashSetProxy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedHashSetProxy.java
index f86052595..d15fedfbf 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedHashSetProxy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedHashSetProxy.java
@@ -66,6 +66,7 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
     public DelayedHashSetProxy() {
     }
 
+    @Override
     public void setOwner(OpenJPAStateManager paramOpenJPAStateManager,
             int paramInt) {
         // If clearing the owner of this proxy, store away what is necessary for
@@ -98,14 +99,17 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
         return false;
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return this.sm;
     }
 
+    @Override
     public int getOwnerField() {
         return this.field;
     }
 
+    @Override
     public ChangeTracker getChangeTracker() {
         return this.changeTracker;
     }
@@ -119,6 +123,7 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
         return new HashSet((Collection) paramObject);
     }
 
+    @Override
     public Class getElementType() {
         return this.elementType;
     }
@@ -127,6 +132,7 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
         elementType = elemType;
     }
 
+    @Override
     public ProxyCollection newInstance(Class paramClass,
             Comparator paramComparator, boolean paramBoolean1,
             boolean paramBoolean2) {
@@ -286,6 +292,7 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
         return super.toString();
     }
 
+    @Override
     public boolean equals(Object paramObject) {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -293,6 +300,7 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
         return super.equals(paramObject);
     }
 
+    @Override
     public int hashCode() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -303,6 +311,7 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
     // //////////////////////////////////////
     // DelayedProxy methods
     // //////////////////////////////////////
+    @Override
     public int getDelayedField() {
         if (field == -1 || _detached) {
             return _delayedField;
@@ -310,6 +319,7 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
         return field;
     }
 
+    @Override
     public OpenJPAStateManager getDelayedOwner() {
         if (sm == null || _detached) {
             return _delayedSm;
@@ -317,10 +327,12 @@ public class DelayedHashSetProxy extends HashSet implements DelayedProxy, ProxyC
         return sm;
     }
 
+    @Override
     public boolean isDirectAccess() {
         return _directAccess;
     }
 
+    @Override
     public void setDirectAccess(boolean direct) {
         _directAccess = direct;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedLinkedHashSetProxy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedLinkedHashSetProxy.java
index abfb52bc0..15e6b1dac 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedLinkedHashSetProxy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedLinkedHashSetProxy.java
@@ -65,6 +65,7 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
     public DelayedLinkedHashSetProxy() {
     }
 
+    @Override
     public void setOwner(OpenJPAStateManager paramOpenJPAStateManager,
             int paramInt) {
         // If clearing the owner of this proxy, store away what is necessary for
@@ -97,14 +98,17 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
         return false;
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return this.sm;
     }
 
+    @Override
     public int getOwnerField() {
         return this.field;
     }
 
+    @Override
     public ChangeTracker getChangeTracker() {
         return this.changeTracker;
     }
@@ -118,6 +122,7 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
         return new LinkedHashSet((Collection) paramObject);
     }
 
+    @Override
     public Class getElementType() {
         return this.elementType;
     }
@@ -126,6 +131,7 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
         elementType = elemType;
     }
 
+    @Override
     public ProxyCollection newInstance(Class paramClass,
             Comparator paramComparator, boolean paramBoolean1,
             boolean paramBoolean2) {
@@ -285,6 +291,7 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
         return super.toString();
     }
 
+    @Override
     public boolean equals(Object paramObject) {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -292,6 +299,7 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
         return super.equals(paramObject);
     }
 
+    @Override
     public int hashCode() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -302,6 +310,7 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
     // //////////////////////////////////////
     // DelayedProxy methods
     // //////////////////////////////////////
+    @Override
     public int getDelayedField() {
         if (field == -1 || _detached) {
             return _delayedField;
@@ -309,6 +318,7 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
         return field;
     }
 
+    @Override
     public OpenJPAStateManager getDelayedOwner() {
         if (sm == null || _detached) {
             return _delayedSm;
@@ -316,10 +326,12 @@ public class DelayedLinkedHashSetProxy extends LinkedHashSet implements DelayedP
         return sm;
     }
 
+    @Override
     public boolean isDirectAccess() {
         return _directAccess;
     }
 
+    @Override
     public void setDirectAccess(boolean direct) {
         _directAccess = direct;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedPriorityQueueProxy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedPriorityQueueProxy.java
index d60f86299..10f07da33 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedPriorityQueueProxy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedPriorityQueueProxy.java
@@ -107,10 +107,12 @@ public class DelayedPriorityQueueProxy extends PriorityQueue implements ProxyCol
         return false;
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return this.sm;
     }
 
+    @Override
     public int getOwnerField() {
         return this.field;
     }
@@ -128,6 +130,7 @@ public class DelayedPriorityQueueProxy extends PriorityQueue implements ProxyCol
         return localProxy;
     }
 
+    @Override
     public ChangeTracker getChangeTracker() {
         return this.changeTracker;
     }
@@ -136,10 +139,12 @@ public class DelayedPriorityQueueProxy extends PriorityQueue implements ProxyCol
         changeTracker = ct;
     }
 
+    @Override
     public Object copy(Object paramObject) {
         return new PriorityQueue((PriorityQueue) paramObject);
     }
 
+    @Override
     public Class getElementType() {
         return this.elementType;
     }
@@ -148,6 +153,7 @@ public class DelayedPriorityQueueProxy extends PriorityQueue implements ProxyCol
         elementType = elemType;
     }
 
+    @Override
     public ProxyCollection newInstance(Class paramClass,
             Comparator paramComparator, boolean paramBoolean1,
             boolean paramBoolean2) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedTreeSetProxy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedTreeSetProxy.java
index fd520001c..281bf9aa8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedTreeSetProxy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedTreeSetProxy.java
@@ -67,6 +67,7 @@ public class DelayedTreeSetProxy extends TreeSet implements ProxyCollection, Del
         super(paramSortedSet);
     }
 
+    @Override
     public void setOwner(OpenJPAStateManager paramOpenJPAStateManager, int paramInt)
     {
       // If clearing the owner of this proxy, store away what is necessary for
@@ -97,14 +98,17 @@ public class DelayedTreeSetProxy extends TreeSet implements ProxyCollection, Del
         return false;
     }
 
+    @Override
     public OpenJPAStateManager getOwner() {
         return this.sm;
     }
 
+    @Override
     public int getOwnerField() {
         return this.field;
     }
 
+    @Override
     public ChangeTracker getChangeTracker() {
         return this.changeTracker;
     }
@@ -113,10 +117,12 @@ public class DelayedTreeSetProxy extends TreeSet implements ProxyCollection, Del
         changeTracker = ct;
     }
 
+    @Override
     public Object copy(Object paramObject) {
         return new TreeSet((SortedSet) paramObject);
     }
 
+    @Override
     public Class getElementType() {
         return this.elementType;
     }
@@ -125,6 +131,7 @@ public class DelayedTreeSetProxy extends TreeSet implements ProxyCollection, Del
         elementType = elemType;
     }
 
+    @Override
     public ProxyCollection newInstance(Class paramClass,
             Comparator paramComparator, boolean paramBoolean1,
             boolean paramBoolean2) {
@@ -161,6 +168,7 @@ public class DelayedTreeSetProxy extends TreeSet implements ProxyCollection, Del
     ////////////////////////////////////////
     // DelayedProxy methods
     ////////////////////////////////////////
+    @Override
     public int getDelayedField() {
         if (field == -1 || _detached) {
             return _delayedField;
@@ -168,6 +176,7 @@ public class DelayedTreeSetProxy extends TreeSet implements ProxyCollection, Del
         return field;
     }
 
+    @Override
     public OpenJPAStateManager getDelayedOwner() {
         if (sm == null || _detached) {
             return _delayedSm;
@@ -175,10 +184,12 @@ public class DelayedTreeSetProxy extends TreeSet implements ProxyCollection, Del
         return sm;
     }
 
+    @Override
     public boolean isDirectAccess() {
         return _directAccess;
     }
 
+    @Override
     public void setDirectAccess(boolean direct) {
         _directAccess = direct;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedVectorProxy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedVectorProxy.java
index fb5c70d85..ee2ea87ea 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedVectorProxy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedVectorProxy.java
@@ -589,6 +589,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         super.copyInto(anArray);
     }
 
+    @Override
     public synchronized void trimToSize() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -596,6 +597,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         super.trimToSize();
     }
 
+    @Override
     public synchronized void ensureCapacity(int minCapacity) {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -603,6 +605,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         super.ensureCapacity(minCapacity);
     }
 
+    @Override
     public synchronized int capacity() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -610,6 +613,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         return super.capacity();
     }
 
+    @Override
     public Enumeration elements() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -617,6 +621,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         return super.elements();
     }
 
+    @Override
     public synchronized int lastIndexOf(Object o, int index) {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -624,6 +629,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         return super.lastIndexOf(o, index);
     }
 
+    @Override
     public synchronized Object elementAt(int index) {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -631,6 +637,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         return super.elementAt(index);
     }
 
+    @Override
     public synchronized Object firstElement() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -638,6 +645,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         return super.firstElement();
     }
 
+    @Override
     public synchronized Object lastElement() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -645,6 +653,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         return super.lastElement();
     }
 
+    @Override
     public synchronized String toString() {
         if (!_directAccess && isDelayLoad()) {
             load();
@@ -652,6 +661,7 @@ public class DelayedVectorProxy extends Vector implements ProxyCollection, Delay
         return super.toString();
     }
 
+    @Override
     protected synchronized void removeRange(int fromIndex, int toIndex) {
         if (!_directAccess && isDelayLoad()) {
             load();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DoubleId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DoubleId.java
index a769df5fa..3d42582e1 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DoubleId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DoubleId.java
@@ -26,6 +26,8 @@ package org.apache.openjpa.util;
 public final class DoubleId
     extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final double key;
 
     public DoubleId(Class cls, Double key) {
@@ -50,19 +52,23 @@ public final class DoubleId
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return Double.valueOf(key);
     }
 
+    @Override
     public String toString() {
         return Double.toString(key);
     }
 
+    @Override
     protected int idHash() {
         return (int) (Double.doubleToLongBits(key)
             ^ (Double.doubleToLongBits(key) >>> 32));
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key == ((DoubleId) o).key;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java
index ae2fbabb2..4d17e78be 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ExceptionInfo.java
@@ -27,13 +27,13 @@ package org.apache.openjpa.util;
  */
 public interface ExceptionInfo {
 
-    public static final int GENERAL = 0;
-    public static final int INTERNAL = 1;
-    public static final int STORE = 2;
-    public static final int UNSUPPORTED = 3;
-    public static final int USER = 4;
-    public static final int WRAPPED = 5;
-    public static final int UNAVAILABLE = 6;
+    int GENERAL = 0;
+    int INTERNAL = 1;
+    int STORE = 2;
+    int UNSUPPORTED = 3;
+    int USER = 4;
+    int WRAPPED = 5;
+    int UNAVAILABLE = 6;
 
 
     /**
@@ -41,7 +41,7 @@ public interface ExceptionInfo {
      *
      * @see Throwable#getMessage
      */
-    public String getMessage();
+    String getMessage();
 
     /**
      * Returns the first {@link Throwable} from {@link #getNestedThrowables}
@@ -49,38 +49,38 @@ public interface ExceptionInfo {
      *
      * @see Throwable#getCause
      */
-    public Throwable getCause();
+    Throwable getCause();
 
     /**
      * Stack.
      *
      * @see Throwable#printStackTrace
      */
-    public void printStackTrace();
+    void printStackTrace();
 
     /**
      * Exception type.
      */
-    public int getType();
+    int getType();
 
     /**
      * Exception subtype.
      */
-    public int getSubtype();
+    int getSubtype();
 
     /**
      * Whether this error is fatal.
      */
-    public boolean isFatal();
+    boolean isFatal();
 
     /**
      * The nested throwables.
      */
-    public Throwable[] getNestedThrowables();
+    Throwable[] getNestedThrowables();
 
     /**
      * The failed object.
      */
-    public Object getFailedObject();
+    Object getFailedObject();
 }
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java
index 7c624139b..3acdcf371 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java
@@ -44,6 +44,7 @@ public class Exceptions {
     static final String SEP = J2DoPrivHelper.getLineSeparator();
 
     private static final OutputStream DEV_NULL = new OutputStream() {
+        @Override
         public void write(int b) {
         }
     };
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/FloatId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/FloatId.java
index 1e4de2781..22381ed05 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/FloatId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/FloatId.java
@@ -26,6 +26,8 @@ package org.apache.openjpa.util;
 public final class FloatId
     extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final float key;
 
     public FloatId(Class cls, Float key) {
@@ -50,18 +52,22 @@ public final class FloatId
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return Float.valueOf(key);
     }
 
+    @Override
     public String toString() {
         return Float.toString(key);
     }
 
+    @Override
     protected int idHash() {
         return Float.floatToIntBits(key);
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key == ((FloatId) o).key;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneralException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneralException.java
index 21553ce57..017ed16a1 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneralException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneralException.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class GeneralException
     extends OpenJPAException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public GeneralException() {
     }
 
@@ -51,6 +54,7 @@ public class GeneralException
         super(msg, cause);
     }
 
+    @Override
     public int getType() {
         return GENERAL;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneratedClasses.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneratedClasses.java
index 55e3f460e..b109b2734 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneratedClasses.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneratedClasses.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.util;
 import java.security.AccessController;
 
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.BCClassLoader;
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java
index 5ff4528c7..ca5378859 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java
@@ -33,6 +33,9 @@ import org.apache.openjpa.lib.util.Localizer;
 public final class Id
     extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage(Id.class);
 
     private final long _id;
@@ -140,14 +143,17 @@ public final class Id
         return _id;
     }
 
+    @Override
     public Object getIdObject() {
         return _id;
     }
 
+    @Override
     protected int idHash() {
         return (int) (_id ^ (_id >>> 32));
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId other) {
         return _id == ((Id) other)._id;
 	}
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java
index 7f85f9b1c..154e5e0c8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java
@@ -25,12 +25,14 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.openjpa.enhance.PersistenceCapable;
-import org.apache.openjpa.enhance.PCRegistry;
-import org.apache.openjpa.enhance.StateManager;
+import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
+import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.enhance.ManagedInstanceProvider;
+import org.apache.openjpa.enhance.PCRegistry;
+import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.ReflectingPersistenceCapable;
 import org.apache.openjpa.enhance.RuntimeUnenhancedClassesModes;
+import org.apache.openjpa.enhance.StateManager;
 import org.apache.openjpa.kernel.FetchConfiguration;
 import org.apache.openjpa.kernel.LockManager;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
@@ -38,7 +40,6 @@ import org.apache.openjpa.kernel.PCState;
 import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.kernel.StoreManager;
 import org.apache.openjpa.lib.util.Closeable;
-import org.apache.openjpa.lib.util.ReferenceMap;
 import org.apache.openjpa.lib.util.UUIDGenerator;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
 import org.apache.openjpa.meta.ClassMetaData;
@@ -46,8 +47,6 @@ import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.SequenceMetaData;
 import org.apache.openjpa.meta.ValueStrategies;
-import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
-import org.apache.openjpa.conf.OpenJPAConfiguration;
 
 /**
  * Helper for OpenJPA back-ends.
@@ -65,6 +64,7 @@ public class ImplHelper {
     public static final Map _unenhancedInstanceMap =
         new ConcurrentReferenceHashMap(ReferenceStrength.WEAK, ReferenceStrength.HARD) {
 
+            @Override
             protected boolean eq(Object x, Object y) {
                 // the Entries in ConcurrentReferenceHashMap delegate back to
                 // eq() in their equals() impls
@@ -74,6 +74,7 @@ public class ImplHelper {
                     return x == y;
             }
 
+            @Override
             protected int hc(Object o) {
                 // the Entries in ConcurrentReferenceHashMap delegate back to
                 // hc() in their hashCode() impls
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java
index 852982956..3dc2bd62b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/IntId.java
@@ -26,6 +26,8 @@ package org.apache.openjpa.util;
  */
 public final class IntId extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final int key;
 
     public IntId(Class cls, Integer key) {
@@ -50,18 +52,22 @@ public final class IntId extends OpenJPAId {
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return key;
     }
 
+    @Override
     public String toString() {
         return String.valueOf(key);
     }
 
+    @Override
     protected int idHash() {
         return key;
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key == ((IntId) o).key;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/InternalException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/InternalException.java
index d312f2cda..903566436 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/InternalException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/InternalException.java
@@ -29,6 +29,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class InternalException
     extends OpenJPAException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public InternalException() {
         setFatal(true);
     }
@@ -58,6 +61,7 @@ public class InternalException
         setFatal(true);
     }
 
+    @Override
     public int getType() {
         return INTERNAL;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/InvalidStateException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/InvalidStateException.java
index 68e9ff3f4..ce819306e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/InvalidStateException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/InvalidStateException.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class InvalidStateException
     extends UserException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public InvalidStateException(Message msg) {
         super(msg);
     }
@@ -39,6 +42,7 @@ public class InvalidStateException
         setFailedObject(failed);
     }
 
+    @Override
     public int getSubtype() {
         return INVALID_STATE;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/LockException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/LockException.java
index b25d88c57..c2b5b7f49 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/LockException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/LockException.java
@@ -30,9 +30,8 @@ import org.apache.openjpa.lib.util.Localizer;
  * @author Marc Prud'hommeaux
  * @since 0.3.1
  */
-@SuppressWarnings("serial")
-public class LockException
-    extends StoreException {
+public class LockException extends StoreException {
+    private static final long serialVersionUID = 1L;
 
     private static final transient Localizer _loc = Localizer.forPackage(LockException.class);
 
@@ -55,6 +54,7 @@ public class LockException
         setLockLevel(lockLevel);
     }
 
+    @Override
     public int getSubtype() {
         return LOCK;
     }
@@ -82,6 +82,7 @@ public class LockException
         return lockLevel;
     }
 
+    @Override
     public String toString() {
         String str = super.toString();
         if (timeout < 0)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java
index 868c5424a..0b776a6aa 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/LongId.java
@@ -26,6 +26,8 @@ package org.apache.openjpa.util;
  */
 public final class LongId extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final long key;
 
     public LongId(Class cls, Long key) {
@@ -50,18 +52,22 @@ public final class LongId extends OpenJPAId {
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return key;
     }
 
+    @Override
     public String toString() {
         return String.valueOf(key);
     }
 
+    @Override
     protected int idHash() {
         return (int) (key ^ (key >>> 32));
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key == ((LongId) o).key;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTracker.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTracker.java
index ddda35fe1..4f78e5e35 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTracker.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTracker.java
@@ -36,27 +36,27 @@ public interface MapChangeTracker
      * If you set to values, it is assumed there is a 1-1 correlation
      * between keys and values in this map.
      */
-    public boolean getTrackKeys();
+    boolean getTrackKeys();
 
     /**
      * Whether to track keys or values. Defaults to keys.
      * If you set to values, it is assumed there is a 1-1 correlation
      * between keys and values in this map.
      */
-    public void setTrackKeys(boolean keys);
+    void setTrackKeys(boolean keys);
 
     /**
      * Record that the given entry was added to the map.
      */
-    public void added(Object key, Object val);
+    void added(Object key, Object val);
 
     /**
      * Record that the given entry was removed from the map.
      */
-    public void removed(Object key, Object val);
+    void removed(Object key, Object val);
 
     /**
      * Record that the given entry was altered.
      */
-    public void changed(Object key, Object oldVal, Object newVal);
+    void changed(Object key, Object oldVal, Object newVal);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTrackerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTrackerImpl.java
index c67257e1b..19e52840f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTrackerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/MapChangeTrackerImpl.java
@@ -40,14 +40,17 @@ public class MapChangeTrackerImpl
         this.setAutoOff(autoOff);
     }
 
+    @Override
     public boolean getTrackKeys() {
         return _keys;
     }
 
+    @Override
     public void setTrackKeys(boolean keys) {
         _keys = keys;
     }
 
+    @Override
     public void added(Object key, Object val) {
         if (_keys)
             super.added(key);
@@ -55,6 +58,7 @@ public class MapChangeTrackerImpl
             super.added(val);
     }
 
+    @Override
     public void removed(Object key, Object val) {
         if (_keys)
             super.removed(key);
@@ -62,6 +66,7 @@ public class MapChangeTrackerImpl
             super.removed(val);
     }
 
+    @Override
     public void changed(Object key, Object oldVal, Object newVal) {
         if (_keys)
             super.changed(key);
@@ -71,6 +76,7 @@ public class MapChangeTrackerImpl
         }
     }
 
+    @Override
     protected void add(Object obj) {
         // if the key was previously removed and now added back, mark
         // it as a change; otherwise it's a new addition
@@ -91,6 +97,7 @@ public class MapChangeTrackerImpl
         }
     }
 
+    @Override
     protected void remove(Object obj) {
         // no longer a change, if it was before
         if (change != null)
@@ -111,6 +118,7 @@ public class MapChangeTrackerImpl
         }
     }
 
+    @Override
     protected void change(Object key) {
         // if the key is already changed or the key is newly added, nothing
         // to do
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java
index 89a0f881a..a68d68f82 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/MetaDataException.java
@@ -29,6 +29,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class MetaDataException
     extends UserException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public MetaDataException() {
         setFatal(true);
     }
@@ -48,6 +51,7 @@ public class MetaDataException
         setFatal(true);
     }
 
+    @Override
     public int getSubtype() {
         return METADATA;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/MultiLoaderClassResolver.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/MultiLoaderClassResolver.java
index c06d875b7..bd530bac3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/MultiLoaderClassResolver.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/MultiLoaderClassResolver.java
@@ -46,6 +46,7 @@ public class MultiLoaderClassResolver implements ClassResolver {
         return _loader.addClassLoader(loader);
     }
 
+    @Override
     public ClassLoader getClassLoader(Class ctx, ClassLoader envLoader) {
         return _loader;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/NoResultException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/NoResultException.java
index d6964b580..04a771f88 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/NoResultException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/NoResultException.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class NoResultException
     extends InvalidStateException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public NoResultException(Message msg) {
         super(msg);
     }
@@ -39,6 +42,7 @@ public class NoResultException
         setFailedObject(failed);
     }
 
+    @Override
     public int getSubtype() {
         return NO_RESULT;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/NoTransactionException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/NoTransactionException.java
index 8a37db47c..52afaf555 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/NoTransactionException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/NoTransactionException.java
@@ -30,10 +30,14 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class NoTransactionException
     extends InvalidStateException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public NoTransactionException(Message msg) {
         super(msg);
     }
 
+    @Override
     public int getSubtype() {
         return NO_TRANSACTION;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/NonUniqueResultException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/NonUniqueResultException.java
index 36669ee7c..dc5cb54b3 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/NonUniqueResultException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/NonUniqueResultException.java
@@ -30,6 +30,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class NonUniqueResultException
     extends InvalidStateException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public NonUniqueResultException(Message msg) {
         super(msg);
     }
@@ -39,6 +42,7 @@ public class NonUniqueResultException
         setFailedObject(failed);
     }
 
+    @Override
     public int getSubtype() {
         return NON_UNIQUE_RESULT;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectExistsException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectExistsException.java
index 602e15679..eae2a94bd 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectExistsException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectExistsException.java
@@ -28,6 +28,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class ObjectExistsException
     extends StoreException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public ObjectExistsException(String msg) {
 		super(msg);
     }
@@ -36,6 +39,7 @@ public class ObjectExistsException
         super(msg);
     }
 
+    @Override
     public int getSubtype() {
         return OBJECT_EXISTS;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectId.java
index bc293568f..b7227144e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectId.java
@@ -27,6 +27,8 @@ package org.apache.openjpa.util;
 public final class ObjectId
     extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private Object _key;
 
     public ObjectId(Class cls, Object key) {
@@ -50,14 +52,17 @@ public final class ObjectId
         _key = id;
     }
 
+    @Override
     public Object getIdObject() {
         return _key;
     }
 
+    @Override
     protected int idHash() {
         return (_key == null) ? 0 : _key.hashCode();
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         Object key = ((ObjectId) o)._key;
         return (_key == null) ? key == null : _key.equals(key);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectNotFoundException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectNotFoundException.java
index cd47db5f1..398128b75 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectNotFoundException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ObjectNotFoundException.java
@@ -31,6 +31,8 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class ObjectNotFoundException
     extends StoreException {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final transient Localizer _loc = Localizer.forPackage
         (ObjectNotFoundException.class);
 
@@ -48,6 +50,7 @@ public class ObjectNotFoundException
         setNestedThrowables(nested);
     }
 
+    @Override
     public int getSubtype() {
         return OBJECT_NOT_FOUND;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/OpenJPAException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/OpenJPAException.java
index 3e76e5757..15a89bd8d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/OpenJPAException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/OpenJPAException.java
@@ -35,11 +35,11 @@ import org.apache.openjpa.lib.util.Localizer.Message;
  * @author Abe White
  * @since 0.4.0
  */
-@SuppressWarnings("serial")
 public abstract class OpenJPAException
     extends RuntimeException
     implements Serializable, ExceptionInfo {
 
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -90,11 +90,13 @@ public abstract class OpenJPAException
     /**
      * Exception type.
      */
+    @Override
     public abstract int getType();
 
     /**
      * Exception subtype.
      */
+    @Override
     public int getSubtype() {
         return 0;
     }
@@ -102,6 +104,7 @@ public abstract class OpenJPAException
     /**
      * Whether this error is fatal.
      */
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
@@ -120,6 +123,7 @@ public abstract class OpenJPAException
      *
      * @see Throwable#getCause
      */
+    @Override
     public Throwable getCause() {
         if (_nested == null || _nested.length == 0)
             return null;
@@ -141,6 +145,7 @@ public abstract class OpenJPAException
     /**
      * The nested throwables.
      */
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
@@ -156,6 +161,7 @@ public abstract class OpenJPAException
     /**
      * The failed object.
      */
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
@@ -168,19 +174,23 @@ public abstract class OpenJPAException
         return this;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/OpenJPAId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/OpenJPAId.java
index 158804b90..09113a43c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/OpenJPAId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/OpenJPAId.java
@@ -21,7 +21,6 @@ package org.apache.openjpa.util;
 import java.io.Serializable;
 
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
-import org.apache.openjpa.lib.util.ReferenceMap;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
 
 /**
@@ -29,9 +28,11 @@ import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
  *
  * @author Steve Kim
  */
-@SuppressWarnings("serial")
 public abstract class OpenJPAId
     implements Comparable, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
     public static final char TYPE_VALUE_SEP = '-';
 
     // cache the types' generated hash codes
@@ -106,6 +107,7 @@ public abstract class OpenJPAId
      * Generate the hash code for this Id.  Cache the type's generated hash code
      * so that it doesn't have to be generated each time.
      */
+    @Override
     public int hashCode() {
         if (_typeHash == 0) {
             Integer typeHashInt = (Integer) _typeCache.get(type);
@@ -125,6 +127,7 @@ public abstract class OpenJPAId
         return _typeHash ^ idHash();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == this)
             return true;
@@ -136,10 +139,12 @@ public abstract class OpenJPAId
             || (subs && type.isAssignableFrom(id.type)));
     }
 
+    @Override
     public String toString() {
         return type.getName() + TYPE_VALUE_SEP + getIdObject();
     }
 
+    @Override
     public int compareTo(Object other) {
         if (other == this)
             return 0;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/OptimisticException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/OptimisticException.java
index 99913eb49..1db5ec8a6 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/OptimisticException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/OptimisticException.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class OptimisticException
     extends StoreException {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final transient Localizer _loc = Localizer.forPackage
         (OptimisticException.class);
 
@@ -54,6 +56,7 @@ public class OptimisticException
         setNestedThrowables(nested);
     }
 
+    @Override
     public int getSubtype() {
         return OPTIMISTIC;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxy.java
index c73835ee9..b7a6474ec 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxy.java
@@ -36,26 +36,26 @@ public interface Proxy {
      * proxy and the name of the field it is assigned to. Set to null to
      * indicate that the proxy is no longer managed.
      */
-    public void setOwner(OpenJPAStateManager sm, int field);
+    void setOwner(OpenJPAStateManager sm, int field);
 
     /**
      * Return the owning object.
      */
-    public OpenJPAStateManager getOwner();
+    OpenJPAStateManager getOwner();
 
     /**
      * Return the owning field index.
      */
-    public int getOwnerField();
+    int getOwnerField();
 
     /**
      * Return the change tracker for this proxy, or null if none.
      */
-    public ChangeTracker getChangeTracker();
+    ChangeTracker getChangeTracker();
 
     /**
      * Return an unproxied copy of the given instance. This method is used
      * by proxy managers to create backup values for use in rollback.
      */
-    public Object copy(Object orig);
+    Object copy(Object orig);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyBean.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyBean.java
index 3e9bc3228..cad7c64ba 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyBean.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyBean.java
@@ -31,5 +31,5 @@ public interface ProxyBean
      * Create a new instance of this proxy type with the same state as the
      * given instance.
      */
-    public ProxyBean newInstance(Object orig);
+    ProxyBean newInstance(Object orig);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCalendar.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCalendar.java
index 6dcd54ea4..068992484 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCalendar.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCalendar.java
@@ -30,5 +30,5 @@ public interface ProxyCalendar
     /**
      * Return a new instance of this calendar type.
      */
-    public ProxyCalendar newInstance();
+    ProxyCalendar newInstance();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollection.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollection.java
index 4a3a63745..b77c902a9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollection.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollection.java
@@ -32,11 +32,11 @@ public interface ProxyCollection
     /**
      * The collection element type.
      */
-    public Class getElementType();
+    Class getElementType();
 
     /**
      * Create a new instance of this proxy type.
      */
-    public ProxyCollection newInstance(Class elementType, Comparator comp,
+    ProxyCollection newInstance(Class elementType, Comparator comp,
         boolean trackChanges, boolean autoOff);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java
index 5072cbace..ad168639c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java
@@ -21,8 +21,10 @@ package org.apache.openjpa.util;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Vector;
 
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerImpl;
@@ -182,15 +184,18 @@ public class ProxyCollections
         return new ProxyIterator() {
             private Object _last = null;
 
+            @Override
             public boolean hasNext() {
                 return itr.hasNext();
             }
 
+            @Override
             public Object next() {
                 _last = itr.next();
                 return _last;
             }
 
+            @Override
             public void remove() {
                 dirty(coll, false);
                 itr.remove();
@@ -221,32 +226,39 @@ public class ProxyCollections
         return new ProxyListIterator() {
             private Object _last = null;
 
+            @Override
             public boolean hasNext() {
                 return itr.hasNext();
             }
 
+            @Override
             public int nextIndex() {
                 return itr.nextIndex();
             }
 
+            @Override
             public Object next() {
                 _last = itr.next();
                 return _last;
             }
 
+            @Override
             public boolean hasPrevious() {
                 return itr.hasPrevious();
             }
 
+            @Override
             public int previousIndex() {
                 return itr.previousIndex();
             }
 
+            @Override
             public Object previous() {
                 _last = itr.previous();
                 return _last;
             }
 
+            @Override
             public void set(Object o) {
                 assertAllowedType(o, coll.getElementType());
                 dirty(coll, false);
@@ -257,6 +269,7 @@ public class ProxyCollections
                 _last = o;
             }
 
+            @Override
             public void add(Object o) {
                 assertAllowedType(o, coll.getElementType());
                 dirty(coll, false);
@@ -271,6 +284,7 @@ public class ProxyCollections
                 _last = o;
             }
 
+            @Override
             public void remove() {
                 dirty(coll, false);
                 itr.remove();
@@ -499,14 +513,14 @@ public class ProxyCollections
     /**
      * Marker interface for a proxied iterator.
      */
-    public static interface ProxyIterator
+    public interface ProxyIterator
         extends Iterator {
     }
 
     /**
      * Marker interface for a proxied list iterator.
      */
-    public static interface ProxyListIterator
+    public interface ProxyListIterator
         extends ProxyIterator, ListIterator {
     }
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyDate.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyDate.java
index 0a8665659..ae783fa9d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyDate.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyDate.java
@@ -30,5 +30,5 @@ public interface ProxyDate
     /**
      * Return a new instance of this date type.
      */
-    public ProxyDate newInstance();
+    ProxyDate newInstance();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManager.java
index 8f84d575c..b021b9d65 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManager.java
@@ -48,54 +48,54 @@ public interface ProxyManager {
      * and containing the same elements. Works for both primitive and
      * object array types.
      */
-    public Object copyArray(Object orig);
+    Object copyArray(Object orig);
 
     /**
      * Return a copy of the given date with the same information.
      */
-    public Date copyDate(Date orig);
+    Date copyDate(Date orig);
 
     /**
      * Return a new date proxy.
      */
-    public Proxy newDateProxy(Class type);
+    Proxy newDateProxy(Class type);
 
     /**
      * Return a copy of the given calendar with the same information.
      */
-    public Calendar copyCalendar(Calendar orig);
+    Calendar copyCalendar(Calendar orig);
 
     /**
      * Return a new calendar proxy.
      */
-    public Proxy newCalendarProxy(Class type, TimeZone timeZone);
+    Proxy newCalendarProxy(Class type, TimeZone timeZone);
 
     /**
      * Return a new collection of the same type as the given one
      * with a copy of all contained elements.
      */
-    public Collection copyCollection(Collection orig);
+    Collection copyCollection(Collection orig);
 
     /**
      * Return a proxy for the given collection type. The returned collection
      * will allow only addition of elements assignable from the given
      * element type and will use the given comparator, if it is not null.
      */
-    public Proxy newCollectionProxy(Class type, Class elementType,
+    Proxy newCollectionProxy(Class type, Class elementType,
         Comparator compare, boolean autoOff);
 
     /**
      * Return a new map of the same type as the given one
      * with a copy of all contained key/value pairs.
      */
-    public Map copyMap(Map orig);
+    Map copyMap(Map orig);
 
     /**
      * Return a proxy for the given map type. The returned map will
      * allow only addition of keys/values assignable from the given
      * keyType/valueType, and will use the given comparator, if it is not null.
      */
-    public Proxy newMapProxy(Class type, Class keyType, Class valueType,
+    Proxy newMapProxy(Class type, Class keyType, Class valueType,
         Comparator compare, boolean autoOff);
 
     /**
@@ -104,7 +104,7 @@ public interface ProxyManager {
      *
      * @since 0.2.5
      */
-    public Object copyCustom(Object orig);
+    Object copyCustom(Object orig);
 
     /**
      * Return a proxy for the given object, or null if this manager cannot
@@ -112,7 +112,7 @@ public interface ProxyManager {
      *
      * @since 0.2.5
      */
-    public Proxy newCustomProxy (Object obj, boolean autoOff);
+    Proxy newCustomProxy (Object obj, boolean autoOff);
 
     /**
      * Returns whether this proxy manager is enabled for delayed collection
@@ -123,5 +123,5 @@ public interface ProxyManager {
      *
      * @since 2.2.1
      */
-    public boolean getDelayCollectionLoading();
+    boolean getDelayCollectionLoading();
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
index 1827e1555..e3aba2c23 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
@@ -41,13 +41,14 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TimeZone;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.openjpa.enhance.AsmAdaptor;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
@@ -58,8 +59,6 @@ import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.lib.util.StringUtil;
 
-import java.util.concurrent.ConcurrentHashMap;
-
 import serp.bytecode.BCClass;
 import serp.bytecode.BCField;
 import serp.bytecode.BCMethod;
@@ -93,8 +92,8 @@ public class ProxyManagerImpl
         _stdMaps.put(SortedMap.class, TreeMap.class);
     }
 
-    private final Set<String> _unproxyable = new HashSet<String>();
-    private final Map<Class<?>, Proxy> _proxies = new ConcurrentHashMap<Class<?>, Proxy>();
+    private final Set<String> _unproxyable = new HashSet<>();
+    private final Map<Class<?>, Proxy> _proxies = new ConcurrentHashMap<>();
     private boolean _trackChanges = true;
     private boolean _assertType = false;
     private boolean _delayedCollectionLoading = false;
@@ -145,6 +144,7 @@ public class ProxyManagerImpl
      * applies to proxies that implement java.util.Collection (ie. not arrays
      * or maps).  Defaults to false.
      */
+    @Override
     public boolean getDelayCollectionLoading() {
         return _delayedCollectionLoading;
     }
@@ -175,6 +175,7 @@ public class ProxyManagerImpl
             _unproxyable.addAll(Arrays.asList(StringUtil.split(clsNames, ";", 0)));
     }
 
+    @Override
     public Object copyArray(Object orig) {
         if (orig == null)
             return null;
@@ -192,6 +193,7 @@ public class ProxyManagerImpl
         }
     }
 
+    @Override
     public Collection copyCollection(Collection orig) {
         if (orig == null)
             return null;
@@ -202,6 +204,7 @@ public class ProxyManagerImpl
         return (Collection) proxy.copy(orig);
     }
 
+    @Override
     public Proxy newCollectionProxy(Class type, Class elementType,
         Comparator compare, boolean autoOff) {
         type = toProxyableCollectionType(type);
@@ -210,6 +213,7 @@ public class ProxyManagerImpl
             _trackChanges, autoOff);
     }
 
+    @Override
     public Map copyMap(Map orig) {
         if (orig == null)
             return null;
@@ -220,6 +224,7 @@ public class ProxyManagerImpl
         return (Map) proxy.copy(orig);
     }
 
+    @Override
     public Proxy newMapProxy(Class type, Class keyType,
         Class elementType, Comparator compare,boolean autoOff) {
         type = toProxyableMapType(type);
@@ -228,6 +233,7 @@ public class ProxyManagerImpl
             (_assertType) ? elementType : null, compare, _trackChanges, autoOff);
     }
 
+    @Override
     public Date copyDate(Date orig) {
         if (orig == null)
             return null;
@@ -238,11 +244,13 @@ public class ProxyManagerImpl
         return (Date) proxy.copy(orig);
     }
 
+    @Override
     public Proxy newDateProxy(Class type) {
         ProxyDate proxy = getFactoryProxyDate(type);
         return proxy.newInstance();
     }
 
+    @Override
     public Calendar copyCalendar(Calendar orig) {
         if (orig == null)
             return null;
@@ -253,6 +261,7 @@ public class ProxyManagerImpl
         return (Calendar) proxy.copy(orig);
     }
 
+    @Override
     public Proxy newCalendarProxy(Class type, TimeZone zone) {
         if (type == Calendar.class)
             type = GregorianCalendar.class;
@@ -263,6 +272,7 @@ public class ProxyManagerImpl
         return cal;
     }
 
+    @Override
     public Object copyCustom(Object orig) {
         if (orig == null)
             return null;
@@ -282,6 +292,7 @@ public class ProxyManagerImpl
         return (proxy == null) ? null : proxy.copy(orig);
     }
 
+    @Override
     public Proxy newCustomProxy(Object orig, boolean autoOff) {
         if (orig == null)
             return null;
@@ -463,6 +474,7 @@ public class ProxyManagerImpl
             if (pcls == null) {
                 // TODO Move this to J2DOPrivHelper?
                 BCClass bc = AccessController.doPrivileged(new PrivilegedAction<BCClass>() {
+                    @Override
                     public BCClass run() {
                         return generateProxyBeanBytecode(type, true);
                     }
@@ -1727,6 +1739,7 @@ public class ProxyManagerImpl
                 // TODO Move this to J2DOPrivHelper
                 bc = AccessController
                     .doPrivileged(new PrivilegedAction<BCClass>() {
+                        @Override
                         public BCClass run() {
                             return mgr.generateProxyBeanBytecode(fCls, false);
                         }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyMap.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyMap.java
index 60927a761..c6b2017cc 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyMap.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyMap.java
@@ -32,16 +32,16 @@ public interface ProxyMap
     /**
      * The map key type.
      */
-    public Class getKeyType();
+    Class getKeyType();
 
     /**
      * The map value type.
      */
-    public Class getValueType();
+    Class getValueType();
 
     /**
      * Create a new instance of this proxy type.
      */
-    public ProxyMap newInstance(Class keyType, Class valueType,
+    ProxyMap newInstance(Class keyType, Class valueType,
         Comparator compare, boolean trackChanges, boolean autoOff);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyMaps.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyMaps.java
index a9057be6b..877f5b1d4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyMaps.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyMaps.java
@@ -22,8 +22,9 @@ import java.io.InputStream;
 import java.io.ObjectStreamException;
 import java.util.AbstractSet;
 import java.util.Collection;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 /**
@@ -205,17 +206,17 @@ public class ProxyMaps
     /**
      * Marker interface for a proxy entry set.
      */
-    public static interface ProxyEntrySet
+    public interface ProxyEntrySet
         extends Set {
 
-        public static final int VIEW_KEYS = 0;
-        public static final int VIEW_VALUES = 1;
-        public static final int VIEW_ENTRIES = 2;
+        int VIEW_KEYS = 0;
+        int VIEW_VALUES = 1;
+        int VIEW_ENTRIES = 2;
 
         /**
          * Set what entry view this set exposes.
          */
-        public void setView(int view);
+        void setView(int view);
     }
 
     /**
@@ -247,14 +248,17 @@ public class ProxyMaps
         /**
          * View mode.
          */
+        @Override
         public void setView(int view) {
             _view = view;
         }
 
+        @Override
         public int size() {
             return _entries.size();
         }
 
+        @Override
         public boolean remove(Object o) {
             if (_view != VIEW_KEYS)
                 throw new UnsupportedOperationException();
@@ -265,15 +269,18 @@ public class ProxyMaps
             return true;
         }
 
+        @Override
         public Iterator iterator() {
             final Iterator itr = _entries.iterator();
             return new Iterator() {
                 private Map.Entry _last = null;
 
+                @Override
                 public boolean hasNext() {
                     return itr.hasNext();
                 }
 
+                @Override
                 public Object next() {
                     _last = (Map.Entry) itr.next();
                     switch (_view) {
@@ -286,6 +293,7 @@ public class ProxyMaps
                     }
                 }
 
+                @Override
                 public void remove() {
                     dirty(_map, false);
                     itr.remove();
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/QueryException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/QueryException.java
index 6f7654377..7ec32f09a 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/QueryException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/QueryException.java
@@ -32,6 +32,9 @@ import org.apache.openjpa.lib.util.Localizer;
 public class QueryException
     extends StoreException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final transient Localizer _loc =
             Localizer.forPackage(QueryException.class);
 
@@ -48,6 +51,7 @@ public class QueryException
         setTimeout(timeout);
     }
 
+    @Override
     public int getSubtype() {
         return QUERY;
     }
@@ -67,6 +71,7 @@ public class QueryException
         return this;
     }
 
+    @Override
     public String toString() {
         String str = super.toString();
         if (timeout < 0)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ReferentialIntegrityException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ReferentialIntegrityException.java
index 6be389d8c..20d4b2335 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ReferentialIntegrityException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ReferentialIntegrityException.java
@@ -32,6 +32,8 @@ import org.apache.openjpa.lib.util.Localizer;
 public class ReferentialIntegrityException
     extends StoreException {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final int IV_UNKNOWN = 0;
     public static final int IV_DUPLICATE_OID = 1;
     public static final int IV_UNIQUE = 2;
@@ -63,6 +65,7 @@ public class ReferentialIntegrityException
         }
     }
 
+    @Override
     public int getSubtype() {
         return REFERENTIAL_INTEGRITY;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/RuntimeExceptionTranslator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/RuntimeExceptionTranslator.java
index 2b38fdd69..384dffb33 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/RuntimeExceptionTranslator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/RuntimeExceptionTranslator.java
@@ -31,5 +31,5 @@ public interface RuntimeExceptionTranslator
     /**
      * Translate the given exception.
      */
-    public RuntimeException translate(RuntimeException re);
+    RuntimeException translate(RuntimeException re);
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java
index cafabd30e..1c175736d 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java
@@ -105,6 +105,7 @@ public class Serialization {
             super(delegate);
             _ctx = ctx;
             AccessController.doPrivileged(new PrivilegedAction() {
+                @Override
                 public Object run() {
                     enableReplaceObject(true);
                     return null;
@@ -112,6 +113,7 @@ public class Serialization {
             });
         }
 
+        @Override
         protected Object replaceObject(Object obj) {
             Object oid = _ctx.getObjectId(obj);
             return (oid == null) ? obj : new ObjectIdMarker(oid);
@@ -126,6 +128,7 @@ public class Serialization {
             super(delegate);
         }
 
+        @Override
         protected Class resolveClass(ObjectStreamClass desc)
             throws IOException, ClassNotFoundException {
             String name = BlacklistClassResolver.DEFAULT.check(desc.getName());
@@ -161,6 +164,7 @@ public class Serialization {
             super(delegate);
             _ctx = ctx;
             AccessController.doPrivileged(new PrivilegedAction() {
+                @Override
                 public Object run() {
                     enableResolveObject(true);
                     return null;
@@ -168,11 +172,13 @@ public class Serialization {
             });
         }
 
+        @Override
         protected void addContextClassLoaders(MultiClassLoader loader) {
             super.addContextClassLoaders(loader);
             loader.addClassLoader(_ctx.getClassLoader());
         }
 
+        @Override
         protected Object resolveObject(Object obj) {
             if (!(obj instanceof ObjectIdMarker))
                 return obj;
@@ -200,6 +206,8 @@ public class Serialization {
     private static class ObjectIdMarker
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public Object oid;
 
         public ObjectIdMarker(Object oid) {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ShortId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ShortId.java
index 3b04c2a98..ba49c8c26 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ShortId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ShortId.java
@@ -25,6 +25,8 @@ package org.apache.openjpa.util;
  */
 public final class ShortId extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final short key;
 
     public ShortId(Class cls, Short key) {
@@ -49,18 +51,22 @@ public final class ShortId extends OpenJPAId {
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return Short.valueOf(key);
     }
 
+    @Override
     public String toString() {
         return Short.toString(key);
     }
 
+    @Override
     protected int idHash() {
         return key;
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key == ((ShortId) o).key;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java
index c8148a1d5..cde82002b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreException.java
@@ -26,10 +26,8 @@ import org.apache.openjpa.lib.util.Localizer.Message;
  * @author Marc Prud'hommeaux
  * @since 0.2.5
  */
-@SuppressWarnings("serial")
-public class StoreException
-    extends OpenJPAException {
-
+public class StoreException extends OpenJPAException {
+    private static final long serialVersionUID = 1L;
     public static final int LOCK = 1;
     public static final int OBJECT_NOT_FOUND = 2;
     public static final int OPTIMISTIC = 3;
@@ -57,6 +55,7 @@ public class StoreException
         super(msg.getMessage(), cause);
     }
 
+    @Override
     public int getType() {
         return STORE;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java
index b4fb349d7..a885c52be 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java
@@ -19,9 +19,9 @@
 package org.apache.openjpa.util;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.openjpa.kernel.StoreManager;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Repository of store-specific facade classes. This is used by facade
@@ -101,10 +101,12 @@ public class StoreFacadeTypeRegistry {
             _storeType = storeType;
         }
 
+        @Override
         public int hashCode() {
             return _facadeType.hashCode() ^ _storeType.hashCode();
         }
 
+        @Override
         public boolean equals(Object other) {
             if (other == this)
                 return true;
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/StringId.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/StringId.java
index 04e6dd140..b8bf49ae5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/StringId.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/StringId.java
@@ -27,6 +27,8 @@ import org.apache.openjpa.lib.util.StringUtil;
  */
 public final class StringId extends OpenJPAId {
 
+    
+    private static final long serialVersionUID = 1L;
     private final String key;
 
     public StringId(Class<?> cls, String key) {
@@ -43,18 +45,22 @@ public final class StringId extends OpenJPAId {
         return key;
     }
 
+    @Override
     public Object getIdObject() {
         return key;
     }
 
+    @Override
     public String toString() {
         return key;
     }
 
+    @Override
     protected int idHash() {
         return key.hashCode();
     }
 
+    @Override
     protected boolean idEquals(OpenJPAId o) {
         return key.equals(((StringId) o).key);
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/UnsupportedException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/UnsupportedException.java
index bd6bc370d..6334dfa2c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/UnsupportedException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/UnsupportedException.java
@@ -29,6 +29,9 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class UnsupportedException
     extends OpenJPAException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public UnsupportedException() {
         setFatal(true);
     }
@@ -48,6 +51,7 @@ public class UnsupportedException
         setFatal(true);
     }
 
+    @Override
     public int getType() {
         return UNSUPPORTED;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/UserException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/UserException.java
index 38dac18bd..3fb69ab4c 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/UserException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/UserException.java
@@ -29,6 +29,8 @@ import org.apache.openjpa.lib.util.Localizer.Message;
 public class UserException
     extends OpenJPAException {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final int METADATA = 1;
     public static final int INVALID_STATE = 2;
     public static final int NO_TRANSACTION = 3;
@@ -59,6 +61,7 @@ public class UserException
         super(msg, cause);
     }
 
+    @Override
     public int getType() {
         return USER;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/WrappedException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/WrappedException.java
index 3b0ae92de..0385fee4e 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/WrappedException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/WrappedException.java
@@ -20,11 +20,11 @@ package org.apache.openjpa.util;
 
 import org.apache.openjpa.lib.util.Localizer.Message;
 
-@SuppressWarnings("serial")
 /**
  * Identifiable exception type which wraps an internal runtime exception.
  */
 public class WrappedException extends OpenJPAException {
+    private static final long serialVersionUID = 1L;
 
     /*
      * Methods extending OpenJPAException
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/AbstractValidator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/AbstractValidator.java
index 34c03514c..cbd9c05d9 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/AbstractValidator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/AbstractValidator.java
@@ -23,14 +23,18 @@ package org.apache.openjpa.validation;
  */
 public abstract class AbstractValidator implements Validator {
 
+    @Override
     public abstract <T> ValidationException validate(T arg0, int event);
 
+    @Override
     public abstract <T> ValidationException validateProperty(T arg0,
             String property, int event);
 
+    @Override
     public abstract <T> ValidationException validateValue(Class<T> arg0,
         String arg1, Object arg2, int event);
 
+    @Override
     public <T> boolean validating(T arg0, int event) {
         return false;
     }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java
index 06a5c84e3..ee0078a98 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidatingLifecycleEventManager.java
@@ -31,10 +31,10 @@ import org.apache.openjpa.meta.ClassMetaData;
  * events and callbacks.
  *
  */
-@SuppressWarnings("serial")
 public class ValidatingLifecycleEventManager extends LifecycleEventManager
     implements Configurable {
 
+    private static final long serialVersionUID = 1L;
     private OpenJPAConfiguration _conf = null;
     private Validator _validator = null;
     protected boolean _validationEnabled = true;
@@ -50,6 +50,7 @@ public class ValidatingLifecycleEventManager extends LifecycleEventManager
     /* (non-Javadoc)
      * @see org.apache.openjpa.lib.conf.Configurable#endConfiguration()
      */
+    @Override
     public void endConfiguration() {
         _validator = (Validator)_conf.getValidatorInstance();
     }
@@ -58,6 +59,7 @@ public class ValidatingLifecycleEventManager extends LifecycleEventManager
      * @see org.apache.openjpa.lib.conf.Configurable#setConfiguration(
      *      org.apache.openjpa.lib.conf.Configuration)
      */
+    @Override
     public void setConfiguration(Configuration conf) {
         if (conf instanceof OpenJPAConfiguration) {
             _conf = (OpenJPAConfiguration)conf;
@@ -67,6 +69,7 @@ public class ValidatingLifecycleEventManager extends LifecycleEventManager
     /* (non-Javadoc)
      * @see org.apache.openjpa.lib.conf.Configurable#startConfiguration()
      */
+    @Override
     public void startConfiguration() {
     }
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationException.java
index 9d818fc9b..6ef6df902 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationException.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.validation;
 
 import org.apache.openjpa.util.WrappedException;
 
-@SuppressWarnings("serial")
 public class ValidationException extends WrappedException {
+    private static final long serialVersionUID = 1L;
 
     public ValidationException(RuntimeException e) {
         super(e);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java
index c3c72d36d..01d35f8aa 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/ValidationUnavailableException.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.validation;
 
 import org.apache.openjpa.util.OpenJPAException;
 
-@SuppressWarnings("serial")
 public class ValidationUnavailableException extends OpenJPAException {
+    private static final long serialVersionUID = 1L;
 
     public ValidationUnavailableException(String msg) {
         super(msg);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/Validator.java b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/Validator.java
index d8a11a405..f0fb7f723 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/validation/Validator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/validation/Validator.java
@@ -33,7 +33,7 @@ public interface Validator {
      * @return ValidationException if the validator produces one or more
      *         constraint violations.
      */
-    public <T> ValidationException validate(T arg0, int event);
+    <T> ValidationException validate(T arg0, int event);
 
     /**
      * Validates a property of a given instance
@@ -45,7 +45,7 @@ public interface Validator {
      * @return ValidationException if the validator produces one or more
      *         constraint violations.
      */
-    public <T> ValidationException validateProperty(T arg0,
+    <T> ValidationException validateProperty(T arg0,
             String property, int event);
 
     /**
@@ -59,7 +59,7 @@ public interface Validator {
      * @return ValidationException if the validator produces one or more
      *         constraint violations.
      */
-    public <T> ValidationException validateValue(Class<T> arg0,
+    <T> ValidationException validateValue(Class<T> arg0,
         String arg1, Object arg2, int event);
 
     /**
@@ -71,5 +71,5 @@ public interface Validator {
      * @param event event type
      * @return true if validation is active for the specified event
      */
-    public <T> boolean validating(T arg0, int event);
+    <T> boolean validating(T arg0, int event);
 }
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestOSGiManagedRuntime.java b/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestOSGiManagedRuntime.java
index 03b0efa21..584b5be54 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestOSGiManagedRuntime.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestOSGiManagedRuntime.java
@@ -33,9 +33,6 @@ import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
 import org.apache.openjpa.util.InternalException;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -49,6 +46,9 @@ import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
 /**
  * Test javax.transaction.TransactionManager OSGi service discovery.
  */
@@ -61,41 +61,51 @@ public class TestOSGiManagedRuntime extends TestCase {
      */
     private static final TransactionManager TXN_MANAGER = new TransactionManager() {
 
+        @Override
         public void begin() throws NotSupportedException, SystemException {
         }
 
+        @Override
         public void commit() throws HeuristicMixedException,
                 HeuristicRollbackException, IllegalStateException,
                 RollbackException, SecurityException, SystemException {
         }
 
+        @Override
         public int getStatus() throws SystemException {
             return 0;
         }
 
+        @Override
         public Transaction getTransaction() throws SystemException {
             return null;
         }
 
+        @Override
         public void resume(Transaction tobj) throws IllegalStateException,
                 InvalidTransactionException, SystemException {
         }
 
+        @Override
         public void rollback() throws IllegalStateException, SecurityException,
                 SystemException {
         }
 
+        @Override
         public void setRollbackOnly() throws IllegalStateException,
                 SystemException {
         }
 
+        @Override
         public void setTransactionTimeout(int seconds) throws SystemException {
         }
 
+        @Override
         public Transaction suspend() throws SystemException {
             return null;
         }
 
+        @Override
         public String toString() {
             return TestOSGiManagedRuntime.class.getName()+"::TXN_MANAGER";
         }
@@ -136,6 +146,7 @@ public class TestOSGiManagedRuntime extends TestCase {
             return reference == TXN_SVC_REFERENCE ? 0 : 1;
         }
 
+        @Override
         public String toString() {
             return TestOSGiManagedRuntime.class.getName()+"::TXN_SVC_REFERENCE";
         }
@@ -189,47 +200,56 @@ public class TestOSGiManagedRuntime extends TestCase {
             return this.txnRefCount;
         }
 
+        @Override
         public String getProperty(String key) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Bundle getBundle() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Bundle installBundle(String location, InputStream input)
                 throws BundleException {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Bundle installBundle(String location) throws BundleException {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Bundle getBundle(long id) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Bundle[] getBundles() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void addServiceListener(ServiceListener listener, String filter)
                 throws InvalidSyntaxException {
 
             assertEquals("(objectClass="+TXN_MANAGER_CLASS_NAME+")",filter);
 
             if (this.serviceListeners == null)
-                this.serviceListeners = new ArrayList<ServiceListener>();
+                this.serviceListeners = new ArrayList<>();
 
             this.serviceListeners.add(listener);
         }
 
+        @Override
         public void addServiceListener(ServiceListener listener) {
 
             throw new AssertionFailedError("service listener must be added using an objectClass filter.");
         }
 
+        @Override
         public void removeServiceListener(ServiceListener listener) {
 
             if (this.serviceListeners == null || ! this.serviceListeners.remove(listener)) {
@@ -239,44 +259,53 @@ public class TestOSGiManagedRuntime extends TestCase {
             assertEquals(0,this.txnRefCount);
         }
 
+        @Override
         public void addBundleListener(BundleListener listener) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void removeBundleListener(BundleListener listener) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void addFrameworkListener(FrameworkListener listener) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void removeFrameworkListener(FrameworkListener listener) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         @SuppressWarnings("rawtypes")
         public ServiceRegistration registerService(String[] clazzes,
                 Object service, Dictionary properties) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         @SuppressWarnings("rawtypes")
         public ServiceRegistration registerService(String clazz,
                 Object service, Dictionary properties) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public ServiceReference[] getServiceReferences(String clazz,
                 String filter) throws InvalidSyntaxException {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public ServiceReference[] getAllServiceReferences(String clazz,
                 String filter) throws InvalidSyntaxException {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public ServiceReference getServiceReference(String clazz) {
 
             assertEquals(TXN_MANAGER_CLASS_NAME,clazz);
@@ -305,10 +334,12 @@ public class TestOSGiManagedRuntime extends TestCase {
             return true;
         }
 
+        @Override
         public File getDataFile(String filename) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Filter createFilter(String filter) throws InvalidSyntaxException {
             throw new UnsupportedOperationException();
         }
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestWASManagedRuntime.java b/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestWASManagedRuntime.java
index 575993d58..115a8fa89 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestWASManagedRuntime.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/ee/TestWASManagedRuntime.java
@@ -18,10 +18,10 @@
  */
 package org.apache.openjpa.ee;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.lib.util.ClassUtil;
 
+import junit.framework.TestCase;
+
 /**
  * Test class for build transformation performed by WASManagedRuntime.
  *
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java b/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java
index b4cb7b9c6..d64c7f85e 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestAsmAdaptor.java
@@ -18,15 +18,15 @@
  */
 package org.apache.openjpa.enhance;
 
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.Test;
 
 public class TestAsmAdaptor
 {
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestGetDeclaredMethod.java b/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestGetDeclaredMethod.java
index b7b9ee528..c68456a02 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestGetDeclaredMethod.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestGetDeclaredMethod.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.enhance;
 
 import java.lang.reflect.Method;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -55,7 +55,7 @@ public class TestGetDeclaredMethod extends TestCase {
     }
 
     public void testGenerics() throws NoSuchMethodException {
-        List<Method> meths = new ArrayList<Method>();
+        List<Method> meths = new ArrayList<>();
         for (Method meth : GenericsImpl.class.getDeclaredMethods()) {
             if ("getObject".equals(meth.getName()))
                 meths.add(meth);
@@ -70,6 +70,7 @@ public class TestGetDeclaredMethod extends TestCase {
     }
 
     static class Impl implements Iface {
+        @Override
         public String getObject() {
             return "string";
         }
@@ -82,10 +83,11 @@ public class TestGetDeclaredMethod extends TestCase {
     }
 
     interface GenericsIface<T> {
-        public T getObject();
+        T getObject();
     }
 
     static class GenericsImpl implements GenericsIface {
+        @Override
         public String getObject() {
             return null;
         }
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/meta/TestMemberProvider.java b/openjpa-kernel/src/test/java/org/apache/openjpa/meta/TestMemberProvider.java
index eb8f78a3b..fe59edb05 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/meta/TestMemberProvider.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/meta/TestMemberProvider.java
@@ -20,12 +20,13 @@ package org.apache.openjpa.meta;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
+
+import org.apache.openjpa.meta.FieldMetaData.MemberProvider;
 
 import junit.framework.TestCase;
-import org.apache.openjpa.meta.FieldMetaData.MemberProvider;
 
 public class TestMemberProvider
     extends TestCase {
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestProxyManager.java b/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestProxyManager.java
index 55dd8b54a..96bc79475 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestProxyManager.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestProxyManager.java
@@ -43,11 +43,10 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TimeZone;
-import java.util.TreeSet;
 import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.Vector;
 
-import org.apache.openjpa.util.Proxy;
 import junit.framework.TestCase;
 import junit.textui.TestRunner;
 
@@ -60,6 +59,7 @@ public class TestProxyManager extends TestCase {
 
     private ProxyManagerImpl _mgr;
 
+    @Override
     public void setUp() {
         _mgr = new ProxyManagerImpl();
     }
@@ -827,10 +827,12 @@ public class TestProxyManager extends TestCase {
 
         private final List _delegate = new ArrayList();
 
+        @Override
         public int size() {
             return _delegate.size();
         }
 
+        @Override
         public ListIterator listIterator(int idx) {
             return _delegate.listIterator(idx);
         }
@@ -843,14 +845,17 @@ public class TestProxyManager extends TestCase {
 
         private final Set _delegate = new HashSet();
 
+        @Override
         public int size() {
             return _delegate.size();
         }
 
+        @Override
         public Iterator iterator() {
             return _delegate.iterator();
         }
 
+        @Override
         public boolean add(Object o) {
             return _delegate.add(o);
         }
@@ -860,6 +865,9 @@ public class TestProxyManager extends TestCase {
      * Used to test custom set handling. Copy constructor intentionally ommitted.
      */
     public static class CustomSortedSet extends TreeSet {
+
+        
+        private static final long serialVersionUID = 1L;
     }
 
     /**
@@ -867,6 +875,9 @@ public class TestProxyManager extends TestCase {
      */
     public static class CustomComparatorSortedSet extends TreeSet {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public CustomComparatorSortedSet() {
         }
 
@@ -882,10 +893,12 @@ public class TestProxyManager extends TestCase {
 
         private final Map _delegate = new HashMap();
 
+        @Override
         public Object put(Object key, Object value) {
             return _delegate.put(key, value);
         }
 
+        @Override
         public Set entrySet() {
             return _delegate.entrySet();
         }
@@ -895,6 +908,9 @@ public class TestProxyManager extends TestCase {
      * Used to test custom map handling. Copy constructor intentionally ommitted.
      */
     public static class CustomSortedMap extends TreeMap {
+
+        
+        private static final long serialVersionUID = 1L;
     }
 
     /**
@@ -902,6 +918,9 @@ public class TestProxyManager extends TestCase {
      */
     public static class CustomComparatorSortedMap extends TreeMap {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public CustomComparatorSortedMap() {
         }
 
@@ -915,6 +934,7 @@ public class TestProxyManager extends TestCase {
      */
     private static class CustomComparator implements Comparator {
 
+        @Override
         public int compare(Object o1, Object o2) {
             return ((Comparable) o1).compareTo(o2);
         }
@@ -925,6 +945,9 @@ public class TestProxyManager extends TestCase {
      */
     public static class CustomDate extends Timestamp {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public CustomDate(long time) {
             super(time);
         }
@@ -986,5 +1009,8 @@ public class TestProxyManager extends TestCase {
      * Used to test custom calendar handling.
      */
     public static class CustomCalendar extends GregorianCalendar {
+
+        
+        private static final long serialVersionUID = 1L;
     }
 }
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestResultShape.java b/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestResultShape.java
index 7fe8ef95a..dc67c8008 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestResultShape.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestResultShape.java
@@ -33,7 +33,7 @@ import junit.framework.TestCase;
 public class TestResultShape extends TestCase {
 
     public void testPrimitiveShapeIsImmutable() {
-        ResultShape<Object> shape = new ResultShape<Object>(Object.class, true);
+        ResultShape<Object> shape = new ResultShape<>(Object.class, true);
         assertCategory(shape, true, false, false);
         assertEquals(FillStrategy.Assign.class, shape.getStrategy().getClass());
 
@@ -50,18 +50,18 @@ public class TestResultShape extends TestCase {
     }
 
     public void testArrayIsMutable() {
-        ResultShape<Object[]> shape = new ResultShape<Object[]>(Object[].class);
+        ResultShape<Object[]> shape = new ResultShape<>(Object[].class);
         assertCategory(shape, false, true, false);
         assertEquals(FillStrategy.Array.class, shape.getStrategy().getClass());
 
         shape.add(int.class, double.class); // will add primitive shapes
         assertCategory(shape, false, true, false);
 
-        ResultShape<Object> primitiveShape = new ResultShape<Object>(Object.class, true);
+        ResultShape<Object> primitiveShape = new ResultShape<>(Object.class, true);
         shape.nest(primitiveShape);
         assertCategory(shape, false, true, false);
 
-        ResultShape<Object[]> nonPrimitiveShape = new ResultShape<Object[]>(Object[].class);
+        ResultShape<Object[]> nonPrimitiveShape = new ResultShape<>(Object[].class);
         nonPrimitiveShape.add(int.class, double.class);
         assertCategory(nonPrimitiveShape, false, true, false);
         shape.nest(nonPrimitiveShape);
@@ -69,26 +69,26 @@ public class TestResultShape extends TestCase {
     }
 
     public void testMethodImpliesMapStrategy() {
-        FillStrategy<Map> strategy = new FillStrategy.Map<Map>(method(Map.class, "put", Object.class, Object.class));
-        ResultShape<Map> mapShape = new ResultShape<Map>(Map.class, strategy, true);
+        FillStrategy<Map> strategy = new FillStrategy.Map<>(method(Map.class, "put", Object.class, Object.class));
+        ResultShape<Map> mapShape = new ResultShape<>(Map.class, strategy, true);
         assertCategory(mapShape, true, false, false);
         assertEquals(FillStrategy.Map.class, mapShape.getStrategy().getClass());
     }
 
     public void testShapeWithConstrcutorStrategy() {
-        FillStrategy<List> strategy = new FillStrategy.NewInstance<List>(constructor(ArrayList.class, int.class));
-        ResultShape<List> listShape = new ResultShape<List>(List.class, strategy);
+        FillStrategy<List> strategy = new FillStrategy.NewInstance<>(constructor(ArrayList.class, int.class));
+        ResultShape<List> listShape = new ResultShape<>(List.class, strategy);
         assertCategory(listShape, false, true, false);
         assertEquals(FillStrategy.NewInstance.class, listShape.getStrategy().getClass());
     }
 
     public void testGetCompositeTypes() {
-        ResultShape<Object[]> root  = new ResultShape<Object[]>(Object[].class);
-        FillStrategy<Bar> strategy1 = new FillStrategy.NewInstance<Bar>(Bar.class);
-        ResultShape<Bar> bar1 = new ResultShape<Bar>(Bar.class, strategy1, false);
+        ResultShape<Object[]> root  = new ResultShape<>(Object[].class);
+        FillStrategy<Bar> strategy1 = new FillStrategy.NewInstance<>(Bar.class);
+        ResultShape<Bar> bar1 = new ResultShape<>(Bar.class, strategy1, false);
         bar1.add(int.class);
-        FillStrategy<Foo> strategy2 = new FillStrategy.NewInstance<Foo>(constructor(Foo.class, short.class, Bar.class));
-        ResultShape<Foo> fooBarConstructor = new ResultShape<Foo>(Foo.class, strategy2);
+        FillStrategy<Foo> strategy2 = new FillStrategy.NewInstance<>(constructor(Foo.class, short.class, Bar.class));
+        ResultShape<Foo> fooBarConstructor = new ResultShape<>(Foo.class, strategy2);
         fooBarConstructor.add(short.class);
         fooBarConstructor.nest(bar1);
         root.add(Foo.class, Object.class);
@@ -104,7 +104,7 @@ public class TestResultShape extends TestCase {
     }
 
     public void testRecursiveNestingIsNotAllowed() {
-        ResultShape<Object[]> root = new ResultShape<Object[]>(Object[].class);
+        ResultShape<Object[]> root = new ResultShape<>(Object[].class);
         ResultShape<Bar> bar1 = new ResultShape<Bar>(Bar.class, new FillStrategy.NewInstance(Bar.class), false);
         bar1.add(int.class);
         ResultShape<Foo> fooBarConstructor = new ResultShape<Foo>(Foo.class,
@@ -145,13 +145,13 @@ public class TestResultShape extends TestCase {
     }
     public void testFill2() {
         //Fill this shape: Object[]{Foo, Object, Foo{short, Bar{String, Double}}, Bar{double}};
-        ResultShape<Object[]> root = new ResultShape<Object[]>(Object[].class);
-        ResultShape<Bar> bar1 = new ResultShape<Bar>(Bar.class, new FillStrategy.NewInstance<Bar>(Bar.class));
+        ResultShape<Object[]> root = new ResultShape<>(Object[].class);
+        ResultShape<Bar> bar1 = new ResultShape<>(Bar.class, new FillStrategy.NewInstance<>(Bar.class));
         bar1.add(String.class, Double.class);
-        ResultShape<Foo> fooBarConstr = new ResultShape<Foo>(Foo.class, new FillStrategy.NewInstance<Foo>(Foo.class));
+        ResultShape<Foo> fooBarConstr = new ResultShape<>(Foo.class, new FillStrategy.NewInstance<>(Foo.class));
         fooBarConstr.add(short.class);
         fooBarConstr.nest(bar1);
-        ResultShape<Bar> bar2 = new ResultShape<Bar>(Bar.class, new FillStrategy.NewInstance<Bar>(Bar.class));
+        ResultShape<Bar> bar2 = new ResultShape<>(Bar.class, new FillStrategy.NewInstance<>(Bar.class));
         bar2.add(double.class);
         root.add(Foo.class, Object.class);
         root.nest(fooBarConstr);
@@ -220,6 +220,7 @@ public class TestResultShape extends TestCase {
         public Foo() {}
         public Foo(String s, int i) {this.string = s; this.i = i;}
         public Foo(short s, Bar b){this.shrt = s; this.b = b;}
+        @Override
         public String toString() {
             return "Foo(string='"+string+"' i="+i+" short="+shrt+" bar="+b+"";}
     }
@@ -231,6 +232,7 @@ public class TestResultShape extends TestCase {
         public Bar() {}
         public Bar(double d) {this.dbl = d;}
         public Bar(String s, Double i) {this.string = s; this.Dbl = i;}
+        @Override
         public String toString() {return "Bar(string='"+string+"' Dbl="+Dbl+" dbl="+dbl+"";}
     }
 }
diff --git a/openjpa-kernel/src/test/java/org/apache/openjpa/util/custom/CustomProxyDefaultScopeList.java b/openjpa-kernel/src/test/java/org/apache/openjpa/util/custom/CustomProxyDefaultScopeList.java
index 4f24d1dd8..625fe94dd 100644
--- a/openjpa-kernel/src/test/java/org/apache/openjpa/util/custom/CustomProxyDefaultScopeList.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/util/custom/CustomProxyDefaultScopeList.java
@@ -25,12 +25,14 @@ import java.util.ListIterator;
 
 class CustomProxyDefaultScopeList<E> extends AbstractSequentialList<E> {
 
-    private final List<E> _delegate = new ArrayList<E>();
+    private final List<E> _delegate = new ArrayList<>();
 
+    @Override
     public int size() {
         return _delegate.size();
     }
 
+    @Override
     public ListIterator<E> listIterator(int idx) {
         return _delegate.listIterator(idx);
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
index ed63bc0c3..9ffc22e61 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.conf.ConfigurationImpl;
 import org.apache.openjpa.lib.conf.ConfigurationProvider;
@@ -33,6 +32,7 @@ import org.apache.openjpa.lib.conf.ProductDerivations;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.MultiClassLoader;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -59,7 +59,7 @@ public abstract class AbstractTask extends MatchingTask {
     private static final Localizer _loc = Localizer.forPackage
         (AbstractTask.class);
 
-    protected final List<FileSet> fileSets = new ArrayList<FileSet>();
+    protected final List<FileSet> fileSets = new ArrayList<>();
     protected boolean haltOnError = true;
     protected Path classpath = null;
     protected boolean useParent = false;
@@ -159,6 +159,7 @@ public abstract class AbstractTask extends MatchingTask {
         fileSets.add(set);
     }
 
+    @Override
     public void execute() throws BuildException {
         // if the user didn't supply a conf file, load the default
         if (_conf == null)
@@ -201,7 +202,7 @@ public abstract class AbstractTask extends MatchingTask {
     }
 
     private String[] getFiles() {
-        List<String> files = new ArrayList<String>();
+        List<String> files = new ArrayList<>();
         for(FileSet fs : fileSets) {
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
 
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/AbstractProductDerivation.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/AbstractProductDerivation.java
index 443619816..e784e1fdc 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/AbstractProductDerivation.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/AbstractProductDerivation.java
@@ -32,62 +32,76 @@ import java.util.Set;
 public abstract class AbstractProductDerivation
     implements ProductDerivation {
 
+    @Override
     public String getConfigurationPrefix() {
         return null;
     }
 
+    @Override
     public void validate()
         throws Exception {
     }
 
+    @Override
     public ConfigurationProvider loadGlobals(ClassLoader loader)
         throws Exception {
         return null;
     }
 
+    @Override
     public ConfigurationProvider loadDefaults(ClassLoader loader)
         throws Exception {
         return null;
     }
 
+    @Override
     public ConfigurationProvider load(String resource, String anchor,
         ClassLoader loader)
         throws Exception {
         return null;
     }
 
+    @Override
     public ConfigurationProvider load(File file, String anchor)
         throws Exception {
         return null;
     }
 
+    @Override
     public String getDefaultResourceLocation() {
         return null;
     }
 
+    @Override
     public List<String> getAnchorsInFile(File file) throws Exception {
         return null;
     }
 
+    @Override
     public List<String> getAnchorsInResource(String resource) throws Exception {
         return null;
     }
 
+    @Override
     public boolean beforeConfigurationConstruct(ConfigurationProvider cp) {
         return false;
     }
 
+    @Override
     public boolean beforeConfigurationLoad(Configuration conf) {
         return false;
     }
 
+    @Override
     public boolean afterSpecificationSet(Configuration conf) {
         return false;
     }
 
+    @Override
     public void beforeConfigurationClose(Configuration conf) {
     }
 
+    @Override
     public Set<String> getSupportedQueryHints() {
         return Collections.EMPTY_SET;
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/BooleanValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/BooleanValue.java
index 6a101dbc0..5209d1847 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/BooleanValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/BooleanValue.java
@@ -32,6 +32,7 @@ public class BooleanValue extends Value {
         setAliasListComprehensive(true);
     }
 
+    @Override
     public Class<Boolean> getValueType() {
         return boolean.class;
     }
@@ -50,18 +51,22 @@ public class BooleanValue extends Value {
     /**
      * The internal value.
      */
+    @Override
     public Boolean get() {
         return value;
     }
 
+    @Override
     protected String getInternalString() {
         return String.valueOf(value);
     }
 
+    @Override
     protected void setInternalString(String val) {
         set(Boolean.valueOf(val).booleanValue());
     }
 
+    @Override
     protected void setInternalObject(Object obj) {
         if (obj == null)
             set(false);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/BootstrapException.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/BootstrapException.java
index cccdc9c13..c2f94c828 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/BootstrapException.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/BootstrapException.java
@@ -25,6 +25,8 @@ package org.apache.openjpa.lib.conf;
  *
  */
 public class BootstrapException extends RuntimeException {
+    
+    private static final long serialVersionUID = 1L;
     private boolean _fatal = false;
 
 	public BootstrapException() {
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurable.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurable.java
index b274ef794..c12e7c27f 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurable.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurable.java
@@ -31,15 +31,15 @@ public interface Configurable {
     /**
      * Invoked prior to setting bean properties.
      */
-    public void setConfiguration(Configuration conf);
+    void setConfiguration(Configuration conf);
 
     /**
      * Invoked before bean property configuration is begun on this object.
      */
-    public void startConfiguration();
+    void startConfiguration();
 
     /**
      * Invoked upon completion of bean property configuration for this object.
      */
-    public void endConfiguration();
+    void endConfiguration();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configuration.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configuration.java
index ffc5d07c3..a87a20243 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configuration.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configuration.java
@@ -45,85 +45,85 @@ public interface Configuration
      * Attribute of returned {@link Value} property descriptors listing
      * recognized values for the property.
      */
-    public static final String ATTRIBUTE_ALLOWED_VALUES = "allowedValues";
+    String ATTRIBUTE_ALLOWED_VALUES = "allowedValues";
 
     /**
      * Attribute of the returned {@link Value} property descriptors naming
      * the property's type or category.
      */
-    public static final String ATTRIBUTE_TYPE = "propertyType";
+    String ATTRIBUTE_TYPE = "propertyType";
 
     /**
      * Attribute of the returned {@link Value} property descriptors naming
      * the property' hierarchical category.
      */
-    public static final String ATTRIBUTE_CATEGORY = "propertyCategory";
+    String ATTRIBUTE_CATEGORY = "propertyCategory";
 
     /**
      * Attribute of the returned {@link Value} property descriptors naming
      * the property's ordering in its category.
      */
-    public static final String ATTRIBUTE_ORDER = "propertyCategoryOrder";
+    String ATTRIBUTE_ORDER = "propertyCategoryOrder";
 
     /**
      * Attribute of the returned {@link Value} property descriptors naming
      * the interface that plugin values for this property must implement.
      */
-    public static final String ATTRIBUTE_INTERFACE = "propertyInterface";
+    String ATTRIBUTE_INTERFACE = "propertyInterface";
 
     /**
      * Attribute of the returned {@link Value} property descriptors naming
      * the property's name in XML format (i.e. two-words instead of TwoWords).
      */
-    public static final String ATTRIBUTE_XML = "xmlName";
+    String ATTRIBUTE_XML = "xmlName";
 
-    public static final int INIT_STATE_LIQUID   = 0;
-    public static final int INIT_STATE_FREEZING = 1;
-    public static final int INIT_STATE_FROZEN   = 2;
+    int INIT_STATE_LIQUID   = 0;
+    int INIT_STATE_FREEZING = 1;
+    int INIT_STATE_FROZEN   = 2;
 
 
     /**
      * Return the product name. Defaults to <code>openjpa</code>.
      */
-    public String getProductName();
+    String getProductName();
 
     /**
      * Set the product name.
      */
-    public void setProductName(String name);
+    void setProductName(String name);
 
     /**
      * The log factory. If no log factory has been set explicitly,
      * this method will create one.
      */
-    public LogFactory getLogFactory();
+    LogFactory getLogFactory();
 
     /**
      * The log factory.
      */
-    public void setLogFactory(LogFactory factory);
+    void setLogFactory(LogFactory factory);
 
     /**
      * Log plugin setting.
      */
-    public String getLog();
+    String getLog();
 
     /**
      * Log plugin setting.
      */
-    public void setLog(String log);
+    void setLog(String log);
 
     /**
      * Return the log for the given category.
      *
      * @see #getLogFactory
      */
-    public Log getLog(String category);
+    Log getLog(String category);
 
     /**
      * Return the log to use for configuration messages.
      */
-    public Log getConfigurationLog();
+    Log getConfigurationLog();
 
 
     /**
@@ -133,7 +133,7 @@ public interface Configuration
      *
      * @since 0.9.7
      */
-    public String getId();
+    String getId();
 
     /**
      * An environment-specific identifier for this configuration. This
@@ -142,29 +142,29 @@ public interface Configuration
      *
      * @since 0.9.7
      */
-    public void setId(String id);
+    void setId(String id);
 
     /**
      * Return the {@link Value} for the given property, or null if none.
      */
-    public Value getValue(String property);
+    Value getValue(String property);
 
     /**
      * Return the set of all {@link Value}s.
      */
-    public Value[] getValues();
+    Value[] getValues();
 
     /**
      * Add the given value to the set of configuration properties. This
      * method replaces any existing value under the same property.
      */
-    public <T extends Value> T addValue(T val);
+    <T extends Value> T addValue(T val);
     //public Value addValue(Value val);
 
     /**
      * Remove the given value from the set of configuration properties.
      */
-    public boolean removeValue(Value val);
+    boolean removeValue(Value val);
 
     /**
      * A properties representation of this Configuration.
@@ -174,7 +174,7 @@ public interface Configuration
      * @param storeDefaults if true, then properties will be written
      * out even if they match the default value for a property
      */
-    public Map<String,Object> toProperties(boolean storeDefaults);
+    Map<String,Object> toProperties(boolean storeDefaults);
 
     /**
      * Get the set of all known property keys, including any equivalent keys,
@@ -185,7 +185,7 @@ public interface Configuration
      *
      * @since 2.0.0
      */
-    public List<String> getPropertyKeys(String propertyName);
+    List<String> getPropertyKeys(String propertyName);
 
     /**
      * Get the set of all known property keys, including any equivalent keys,
@@ -193,7 +193,7 @@ public interface Configuration
      *
      * @since 2.0.0
      */
-    public Set<String> getPropertyKeys();
+    Set<String> getPropertyKeys();
 
     /**
      * Set this Configuration via the given map. Any keys missing from
@@ -206,7 +206,7 @@ public interface Configuration
      * string form(such as an {@link ObjectValue}), the object is not
      * part of the equality and hashing calculations.
      */
-    public void fromProperties(Map map);
+    void fromProperties(Map map);
 
     /**
      * Adds a listener for any property changes. The property events fired
@@ -214,42 +214,42 @@ public interface Configuration
      *
      * @param listener the listener to receive notification of property changes
      */
-    public void addPropertyChangeListener(PropertyChangeListener listener);
+    void addPropertyChangeListener(PropertyChangeListener listener);
 
     /**
      * Removes a listener for any property changes.
      *
      * @param listener the listener to remove
      */
-    public void removePropertyChangeListener(PropertyChangeListener listener);
+    void removePropertyChangeListener(PropertyChangeListener listener);
 
     /**
      * Lock down the configuration's state. Attempting to set state on a
      * read-only configuration results in an exception.
      */
-    public void setReadOnly(int readOnly);
+    void setReadOnly(int readOnly);
 
     /**
      * Return true if this configuration is immutable.
      */
-    public boolean isReadOnly();
+    boolean isReadOnly();
 
     /**
      * Call the instantiating get methods for all values. Up-front
      * instantiation allows one to avoid the synchronization necessary with
      * lazy instantiation.
      */
-    public void instantiateAll();
+    void instantiateAll();
 
     /**
      * Free the resources used by this object.
      */
-    public void close();
+    @Override void close();
 
     /**
      * Return a copy of this configuration.
      */
-    public Object clone();
+    Object clone();
 
     /**
      * Gets a class loader that can be additionally used to load custom plugin values.
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
index 942813398..14076c474 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.lib.conf;
 
-import java.awt.*;
+import java.awt.Image;
 import java.beans.BeanDescriptor;
 import java.beans.BeanInfo;
 import java.beans.EventSetDescriptor;
@@ -117,8 +117,8 @@ public class ConfigurationImpl
     private Map _props = null;
     private boolean _globals = false;
     private String _auto = null;
-    private final List<Value> _vals = new ArrayList<Value>();
-    private Set<String> _supportedKeys = new TreeSet<String>();
+    private final List<Value> _vals = new ArrayList<>();
+    private Set<String> _supportedKeys = new TreeSet<>();
 
     // property listener helper
     private PropertyChangeSupport _changeSupport = null;
@@ -210,40 +210,49 @@ public class ConfigurationImpl
         return true;
     }
 
+    @Override
     public String getProductName() {
         return _product;
     }
 
+    @Override
     public void setProductName(String name) {
         _product = name;
     }
 
+    @Override
     public LogFactory getLogFactory() {
         if (logFactoryPlugin.get() == null)
             logFactoryPlugin.instantiate(LogFactory.class, this);
         return (LogFactory) logFactoryPlugin.get();
     }
 
+    @Override
     public void setLogFactory(LogFactory logFactory) {
         logFactoryPlugin.set(logFactory);
     }
 
+    @Override
     public String getLog() {
         return logFactoryPlugin.getString();
     }
 
+    @Override
     public void setLog(String log) {
         logFactoryPlugin.setString(log);
     }
 
+    @Override
     public Log getLog(String category) {
         return getLogFactory().getLog(category);
     }
 
+    @Override
     public String getId() {
         return id.get();
     }
 
+    @Override
     public void setId(String id) {
         this.id.set(id);
     }
@@ -251,10 +260,12 @@ public class ConfigurationImpl
     /**
      * Returns the logging channel <code>openjpa.Runtime</code> by default.
      */
+    @Override
     public Log getConfigurationLog() {
         return getLog("openjpa.Runtime");
     }
 
+    @Override
     public Value[] getValues() {
         return (Value[]) _vals.toArray(new Value[_vals.size()]);
     }
@@ -266,6 +277,7 @@ public class ConfigurationImpl
      * with which the value has been registered. A value may have multiple
      * equivalent names and this method searches with all equivalent names.
      */
+    @Override
     public Value getValue(String property) {
         if (property == null)
             return null;
@@ -279,6 +291,7 @@ public class ConfigurationImpl
         return null;
     }
 
+    @Override
     public void setReadOnly(int newState) {
         if (newState >= _readOnlyState) {
         	_readOnlyState = newState;
@@ -293,6 +306,7 @@ public class ConfigurationImpl
         this._deferResourceLoading = deferResourceLoading;
     }
 
+    @Override
     public void instantiateAll() {
         StringWriter errs = null;
         PrintWriter stack = null;
@@ -331,21 +345,25 @@ public class ConfigurationImpl
                 errs.toString()).getMessage());
     }
 
+    @Override
     public boolean isReadOnly() {
         return _readOnlyState==INIT_STATE_FROZEN;
     }
 
+    @Override
     public void addPropertyChangeListener(PropertyChangeListener listener) {
         if (_changeSupport == null)
             _changeSupport = new PropertyChangeSupport(this);
         _changeSupport.addPropertyChangeListener(listener);
     }
 
+    @Override
     public void removePropertyChangeListener(PropertyChangeListener listener) {
         if (_changeSupport != null)
             _changeSupport.removePropertyChangeListener(listener);
     }
 
+    @Override
     public void valueChanged(Value val) {
         if (_changeSupport == null && _props == null)
             return;
@@ -368,6 +386,7 @@ public class ConfigurationImpl
     /**
      * Closes all closeable values and plugins.
      */
+    @Override
     public final void close() {
         ProductDerivations.beforeClose(this);
 
@@ -412,36 +431,43 @@ public class ConfigurationImpl
     // BeanInfo implementation
     ///////////////////////////
 
+    @Override
     public BeanInfo[] getAdditionalBeanInfo() {
         return new BeanInfo[0];
     }
 
+    @Override
     public BeanDescriptor getBeanDescriptor() {
         return new BeanDescriptor(getClass());
     }
 
+    @Override
     public int getDefaultEventIndex() {
         return 0;
     }
 
+    @Override
     public int getDefaultPropertyIndex() {
         return 0;
     }
 
+    @Override
     public EventSetDescriptor[] getEventSetDescriptors() {
         return new EventSetDescriptor[0];
     }
 
+    @Override
     public Image getIcon(int kind) {
         return null;
     }
 
+    @Override
     public synchronized MethodDescriptor[] getMethodDescriptors() {
         if (_mds != null)
             return _mds;
 
         PropertyDescriptor[] pds = getPropertyDescriptors();
-        List<MethodDescriptor> descs = new ArrayList<MethodDescriptor>();
+        List<MethodDescriptor> descs = new ArrayList<>();
         for (int i = 0; i < pds.length; i++) {
             Method write = pds[i].getWriteMethod();
             Method read = pds[i].getReadMethod();
@@ -455,6 +481,7 @@ public class ConfigurationImpl
         return _mds;
     }
 
+    @Override
     public synchronized PropertyDescriptor[] getPropertyDescriptors() {
         if (_pds != null)
             return _pds;
@@ -469,11 +496,11 @@ public class ConfigurationImpl
                 _pds[i] = getPropertyDescriptor(val);
             } catch (MissingResourceException mre) {
                 if (failures == null)
-                    failures = new ArrayList<String>();
+                    failures = new ArrayList<>();
                 failures.add(val.getProperty());
             } catch (IntrospectionException ie) {
                 if (failures == null)
-                    failures = new ArrayList<String>();
+                    failures = new ArrayList<>();
                 failures.add(val.getProperty());
             }
         }
@@ -538,7 +565,7 @@ public class ConfigurationImpl
 
         // collect allowed values from alias keys, listed values, and
         // interface implementors
-        Collection<String> allowed = new TreeSet<String>();
+        Collection<String> allowed = new TreeSet<>();
         List<String> aliases = Collections.emptyList();
         if (val.getAliases() != null) {
             aliases = Arrays.asList(val.getAliases());
@@ -612,13 +639,14 @@ public class ConfigurationImpl
      *            whether or not to retrieve a property if its value is the
      *            default value.
      */
+    @Override
     public Map toProperties(boolean storeDefaults) {
         // clone properties before making any modifications; we need to keep
         // the internal properties instance consistent to maintain equals and
         // hashcode contracts
         Map<String, String> clone;
         if (_props == null)
-            clone = new TreeMap<String, String>();
+            clone = new TreeMap<>();
         else if (_props instanceof Properties)
             clone = (Map) ((Properties) _props).clone();
         else
@@ -643,6 +671,7 @@ public class ConfigurationImpl
         return clone;
     }
 
+    @Override
     public void fromProperties(Map map) {
         if (map == null || map.isEmpty())
             return;
@@ -708,6 +737,7 @@ public class ConfigurationImpl
             _props = map;
     }
 
+    @Override
     public List<String> getPropertyKeys(String propertyName) {
         Value value = getValue(propertyName);
         return value == null ? Collections.EMPTY_LIST : value.getPropertyKeys();
@@ -720,6 +750,7 @@ public class ConfigurationImpl
      * @see #fixPrefix(String)
      * The Values that are {@linkplain Value#makePrivate() marked private} are filtered out.
      */
+    @Override
     public Set<String> getPropertyKeys() {
         synchronized (_supportedKeys) {
             if (_supportedKeys.size() == 0) {
@@ -735,7 +766,7 @@ public class ConfigurationImpl
         }
         //OJ2257: Return a copy of _supportedKeys as calls to this method (e.g.
         //BrokerImpl.getSupportedProperties()) may add to this set.
-        return new TreeSet<String>(_supportedKeys);
+        return new TreeSet<>(_supportedKeys);
     }
 
     /**
@@ -831,7 +862,7 @@ public class ConfigurationImpl
      */
     private Collection<String> newPropertyList() {
         String[] prefixes = ProductDerivations.getConfigurationPrefixes();
-        List<String> l = new ArrayList<String>(_vals.size() * prefixes.length);
+        List<String> l = new ArrayList<>(_vals.size() * prefixes.length);
         for(Value v : _vals) {
             for (int j = 0; j < prefixes.length; j++)
                 l.add(prefixes[j] + "." + v.getProperty());
@@ -912,6 +943,7 @@ public class ConfigurationImpl
      * {@link Value#equals(Object) Equality} of Values varies if the Value is
      * {@link Value#isDynamic() dynamic}.
      */
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -940,6 +972,7 @@ public class ConfigurationImpl
      * {@link Value#hashCode() HashCode} of a Value varies if the Value is
      * {@link Value#isDynamic() dynamic}.
      */
+    @Override
     public int hashCode() {
         int hash = 0;
         for(Value v : _vals) {
@@ -989,6 +1022,7 @@ public class ConfigurationImpl
      * Implementation of the {@link Externalizable} interface to read from
      * the properties written by {@link #writeExternal}.
      */
+    @Override
     @SuppressWarnings("unchecked")
     public void readExternal(ObjectInput in)
         throws IOException, ClassNotFoundException {
@@ -1001,6 +1035,7 @@ public class ConfigurationImpl
      * Implementation of the {@link Externalizable} interface to write
      * the properties returned by {@link #toProperties}.
      */
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeObject(toProperties(true));
         out.writeObject(_props);
@@ -1011,6 +1046,7 @@ public class ConfigurationImpl
      * Uses {@link #toProperties} and {@link #fromProperties} to clone
      * configuration.
      */
+    @Override
     public Object clone() {
         try {
             Constructor cons = getClass().getConstructor
@@ -1028,6 +1064,7 @@ public class ConfigurationImpl
         }
     }
 
+    @Override
     public boolean removeValue(Value val) {
         if (!_vals.remove(val))
             return false;
@@ -1035,6 +1072,7 @@ public class ConfigurationImpl
         return true;
     }
 
+    @Override
     public <T extends Value> T addValue(T val) {
         _vals.add(val);
         val.addListener(this);
@@ -1123,10 +1161,12 @@ public class ConfigurationImpl
         return val;
     }
 
+    @Override
     public ClassLoader getUserClassLoader() {
     	return _userCL;
     }
 
+    @Override
     public void setUserClassLoader(ClassLoader cl) {
     	_userCL = cl;
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationProvider.java
index 3adb3a970..4da7b5be6 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationProvider.java
@@ -33,22 +33,22 @@ public interface ConfigurationProvider {
     /**
      * Return properties loaded thus far, or empty map if none.
      */
-    public Map<String,Object> getProperties();
+    Map<String,Object> getProperties();
 
     /**
      * Add the given properties to those in this provider, overwriting
      * any existing properties under the same keys.
      */
-    public void addProperties(Map<?,?> props);
+    void addProperties(Map<?,?> props);
 
     /**
      * Add a single property, overwriting any existing property under the
      * same key.
      */
-    public Object addProperty(String key, Object value);
+    Object addProperty(String key, Object value);
 
     /**
      * Set loaded information into the given configuration.
      */
-    public void setInto(Configuration conf);
+    void setInto(Configuration conf);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
index 4643818a1..5e8ad9a25 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
@@ -379,7 +379,7 @@ public class Configurations {
                     props).getMessage(), Configurations.class.getName(),
                     props);
         }
-        Map <String, String> result = new HashMap<String, String>();
+        Map <String, String> result = new HashMap<>();
         result.put(CONFIG_RESOURCE_PATH, path);
         result.put(CONFIG_RESOURCE_ANCHOR, anchor);
         return result;
@@ -413,12 +413,12 @@ public class Configurations {
             msg = "invalid-plugin-aliases";
             params = new Object[]{
                 val.getProperty(), alias, e.toString(),
-                new TreeSet<String>(Arrays.asList(keys)), };
+                new TreeSet<>(Arrays.asList(keys)), };
         } else {
             msg = "invalid-plugin-aliases-hint";
             params = new Object[]{
                 val.getProperty(), alias, e.toString(),
-                new TreeSet<String>(Arrays.asList(keys)), closest, };
+                new TreeSet<>(Arrays.asList(keys)), closest, };
         }
         return new ParseException(_loc.get(msg, params), e);
     }
@@ -769,6 +769,6 @@ public class Configurations {
     }
 
     public interface Runnable {
-        public boolean run(Options opts) throws Exception;
+        boolean run(Options opts) throws Exception;
     }
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java
index 7e5383173..e5f7c10ea 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java
@@ -33,6 +33,7 @@ public class DoubleValue extends Value {
         super(prop);
     }
 
+    @Override
     public Class<Double> getValueType() {
         return double.class;
     }
@@ -51,14 +52,17 @@ public class DoubleValue extends Value {
     /**
      * The internal value.
      */
+    @Override
     public Double get() {
         return value;
     }
 
+    @Override
     protected String getInternalString() {
         return String.valueOf(value);
     }
 
+    @Override
     protected void setInternalString(String val) {
         if (StringUtil.isEmpty(val))
             set(0D);
@@ -66,6 +70,7 @@ public class DoubleValue extends Value {
             set(Double.parseDouble(val));
     }
 
+    @Override
     protected void setInternalObject(Object obj) {
         if (obj == null)
             set(0D);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java
index fa9f05cb0..9bcd6bc85 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java
@@ -37,6 +37,7 @@ public class FileValue extends Value {
         super(prop);
     }
 
+    @Override
     public Class<File> getValueType() {
         return File.class;
     }
@@ -55,19 +56,23 @@ public class FileValue extends Value {
     /**
      * The internal value.
      */
+    @Override
     public File get() {
         return value;
     }
 
+    @Override
     protected String getInternalString() {
         return (value == null) ? null : AccessController.doPrivileged(
             J2DoPrivHelper.getAbsolutePathAction(value));
     }
 
+    @Override
     protected void setInternalString(String val) {
         set(new File(val));
     }
 
+    @Override
     protected void setInternalObject(Object obj) {
         set((File) obj);
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/GenericConfigurable.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/GenericConfigurable.java
index 9a62a9b59..774c91663 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/GenericConfigurable.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/GenericConfigurable.java
@@ -37,5 +37,5 @@ public interface GenericConfigurable {
      * values remain in <code>opts</code> after this method is executed,
      * an exception will be thrown identifying those key-value pairs as invalid.
      */
-    public void setInto(Options opts);
+    void setInto(Options opts);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java
index 7d2e70b0f..75feda4c3 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java
@@ -33,6 +33,7 @@ public class IntValue extends Value {
         super(prop);
     }
 
+    @Override
     public Class<Integer> getValueType() {
         return int.class;
     }
@@ -51,14 +52,17 @@ public class IntValue extends Value {
     /**
      * The internal value.
      */
+    @Override
     public Integer get() {
         return this.value;
     }
 
+    @Override
     protected String getInternalString() {
         return String.valueOf(this.value);
     }
 
+    @Override
     protected void setInternalString(String val) {
         if (StringUtil.isEmpty(val))
             set(0);
@@ -66,6 +70,7 @@ public class IntValue extends Value {
             set(Integer.parseInt(val));
     }
 
+    @Override
     protected void setInternalObject(Object obj) {
         if (obj == null)
             set(0);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/MapConfigurationProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/MapConfigurationProvider.java
index 0f56cbf31..0411986c5 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/MapConfigurationProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/MapConfigurationProvider.java
@@ -51,10 +51,12 @@ public class MapConfigurationProvider implements ConfigurationProvider {
         addProperties(props);
     }
 
+    @Override
     public Map getProperties() {
         return (_props == null) ? Collections.EMPTY_MAP : _props;
     }
 
+    @Override
     public void addProperties(Map props) {
         if (props == null || props.isEmpty())
             return;
@@ -63,12 +65,14 @@ public class MapConfigurationProvider implements ConfigurationProvider {
         _props.putAll(props);
     }
 
+    @Override
     public Object addProperty(String key, Object value) {
         if (_props == null)
             _props = new HashMap();
         return _props.put(key, value);
     }
 
+    @Override
     public void setInto(Configuration conf) {
         setInto(conf, conf.getConfigurationLog());
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java
index 46e09a246..37b55f0c4 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java
@@ -24,7 +24,6 @@ import java.util.Objects;
 import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.util.ReferenceMap;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
 
 /**
@@ -50,6 +49,7 @@ public class ObjectValue extends Value {
     /**
      * The internal value.
      */
+    @Override
     public Object get() {
         return _value;
     }
@@ -125,6 +125,7 @@ public class ObjectValue extends Value {
         return Configurations.newInstance(clsName, this, conf, cl, fatal);
     }
 
+    @Override
     public Class<?> getValueType() {
         return Object.class;
     }
@@ -136,10 +137,12 @@ public class ObjectValue extends Value {
     protected void objectChanged() {
     }
 
+    @Override
     protected String getInternalString() {
         return null;
     }
 
+    @Override
     protected void setInternalString(String str) {
         if (str == null)
             set(null);
@@ -148,6 +151,7 @@ public class ObjectValue extends Value {
                 getProperty()).getMessage());
     }
 
+    @Override
     protected void setInternalObject(Object obj) {
         set(obj);
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java
index 4ea5adfc0..ab2182223 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java
@@ -81,6 +81,7 @@ public class PluginListValue extends ObjectValue {
     /**
      * Instantiate the plugins as instances of the given class.
      */
+    @Override
     public Object instantiate(Class<?> elemType, Configuration conf,
         boolean fatal) {
         Object[] ret;
@@ -102,6 +103,7 @@ public class PluginListValue extends ObjectValue {
      * Override to recognize aliases of the class name without the attached
      * properties string.
      */
+    @Override
     public String getString() {
         if (_names.length == 0)
             return null;
@@ -122,6 +124,7 @@ public class PluginListValue extends ObjectValue {
      * Override to recognize aliases of the plugin name without the attached
      * properties string.
      */
+    @Override
     public void setString(String str) {
         if (StringUtil.isEmpty(str))
             str = getDefault();
@@ -135,7 +138,7 @@ public class PluginListValue extends ObjectValue {
 
         // split up the string; each element might be a class name, or a
         // class name with properties settings
-        List<String> plugins = new ArrayList<String>();
+        List<String> plugins = new ArrayList<>();
         StringBuilder plugin = new StringBuilder();
         boolean inParen = false;
         char c;
@@ -166,8 +169,8 @@ public class PluginListValue extends ObjectValue {
             plugins.add(plugin.toString());
 
         // parse each plugin element into its name and properties
-        List<String> names = new ArrayList<String>();
-        List<String> props = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
+        List<String> props = new ArrayList<>();
         String clsName;
         for(String s : plugins) {
             clsName = unalias(Configurations.getClassName(s));
@@ -182,10 +185,12 @@ public class PluginListValue extends ObjectValue {
         valueChanged();
     }
 
+    @Override
     public Class<Object []> getValueType() {
         return Object[].class;
     }
 
+    @Override
     protected void objectChanged() {
         Object[] vals = (Object[]) get();
         if (vals == null || vals.length == 0)
@@ -199,11 +204,13 @@ public class PluginListValue extends ObjectValue {
         _props = EMPTY;
     }
 
+    @Override
     protected String getInternalString() {
         // should never get called
         throw new IllegalStateException();
     }
 
+    @Override
     protected void setInternalString(String str) {
         // should never get called
         throw new IllegalStateException();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java
index 41749ef0a..3cac19630 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java
@@ -102,6 +102,7 @@ public class PluginValue extends ObjectValue {
     /**
      * Instantiate the plugin as an instance of the given class.
      */
+    @Override
     public Object instantiate(Class<?> type, Configuration conf, boolean fatal)
     {
         Object obj = newInstance(_name, type, conf, fatal);
@@ -137,6 +138,7 @@ public class PluginValue extends ObjectValue {
 	/**
      * Configure the given object.
      */
+    @Override
     public Object configure(Object obj, Configuration conf, boolean fatal) {
         Configurations.configureInstance(obj, conf, _props,
             (fatal) ? getProperty() : null);
@@ -146,6 +148,7 @@ public class PluginValue extends ObjectValue {
     }
 
 
+    @Override
     public void set(Object obj, boolean derived) {
         if (!_singleton)
             throw new IllegalStateException(_loc.get("not-singleton",
@@ -153,10 +156,12 @@ public class PluginValue extends ObjectValue {
         super.set(obj, derived);
     }
 
+    @Override
     public String getString() {
         return Configurations.getPlugin(alias(_name), _props);
     }
 
+    @Override
     public void setString(String str) {
     	assertChangeable();
         _name = Configurations.getClassName(str);
@@ -167,21 +172,25 @@ public class PluginValue extends ObjectValue {
         valueChanged();
     }
 
+    @Override
     public Class<Object> getValueType() {
         return Object.class;
     }
 
+    @Override
     protected void objectChanged() {
         Object obj = get();
         _name = (obj == null) ? unalias(null) : obj.getClass().getName();
         _props = null;
     }
 
+    @Override
     protected String getInternalString() {
         // should never get called
         throw new IllegalStateException();
     }
 
+    @Override
     protected void setInternalString(String str) {
         // should never get called
         throw new IllegalStateException();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivation.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivation.java
index 28a742b02..d47a729b2 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivation.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivation.java
@@ -37,18 +37,18 @@ import java.util.Set;
  */
 public interface ProductDerivation {
 
-    public static final int TYPE_PRODUCT = 100;
-    public static final int TYPE_FEATURE = 1000;
+    int TYPE_PRODUCT = 100;
+    int TYPE_FEATURE = 1000;
 
     /**
      * Return the type of derivation.
      */
-    public int getType();
+    int getType();
 
     /**
      * Return the configuration prefix for properties of this product.
      */
-    public String getConfigurationPrefix();
+    String getConfigurationPrefix();
 
     /**
      * Ensure that this derivation is valid.  This action might consist of
@@ -56,21 +56,21 @@ public interface ProductDerivation {
      * they exist.  Throw any throwable to indicate an invalid derivation.
      * Invalid derivations will not be used.
      */
-    public void validate()
+    void validate()
         throws Exception;
 
     /**
      * Load globals into the returned ConfigurationProvider, or return null if
      * no globals are found.
      */
-    public ConfigurationProvider loadGlobals(ClassLoader loader)
+    ConfigurationProvider loadGlobals(ClassLoader loader)
         throws Exception;
 
     /**
      * Load defaults into the returned ConfigurationProvider, or return null if
      * no defaults are found.
      */
-    public ConfigurationProvider loadDefaults(ClassLoader loader)
+    ConfigurationProvider loadDefaults(ClassLoader loader)
         throws Exception;
 
     /**
@@ -81,7 +81,7 @@ public interface ProductDerivation {
      * @param anchor optional named anchor within a multiple-configuration
      * resource
      */
-    public ConfigurationProvider load(String resource, String anchor,
+    ConfigurationProvider load(String resource, String anchor,
         ClassLoader loader)
         throws Exception;
 
@@ -91,7 +91,7 @@ public interface ProductDerivation {
      *
      * @param anchor optional named anchor within a multiple-configuration file
      */
-    public ConfigurationProvider load(File file, String anchor)
+    ConfigurationProvider load(File file, String anchor)
         throws Exception;
 
     /**
@@ -101,7 +101,7 @@ public interface ProductDerivation {
      *
      * @since 1.1.0
      */
-    public String getDefaultResourceLocation();
+    String getDefaultResourceLocation();
 
     /**
      * Return a List<String> of all the anchors defined in <code>file</code>.
@@ -113,7 +113,7 @@ public interface ProductDerivation {
      *
      * @since 1.1.0
      */
-    public List<String> getAnchorsInFile(File file) throws IOException,
+    List<String> getAnchorsInFile(File file) throws IOException,
             Exception;
 
     /**
@@ -126,7 +126,7 @@ public interface ProductDerivation {
      *
      * @since 1.1.0
      */
-    public List<String> getAnchorsInResource(String resource) throws Exception;
+    List<String> getAnchorsInResource(String resource) throws Exception;
 
     /**
      * Provides the instance with a callback to mutate the initial properties
@@ -136,7 +136,7 @@ public interface ProductDerivation {
      *
      * @return true if given ConfigurationProvider has been mutated.
      */
-    public boolean beforeConfigurationConstruct(ConfigurationProvider cp);
+    boolean beforeConfigurationConstruct(ConfigurationProvider cp);
 
     /**
      * Provides the instance with the opportunity to mutate
@@ -144,21 +144,21 @@ public interface ProductDerivation {
      *
      * @return true if given Configuration has been mutated.
      */
-    public boolean beforeConfigurationLoad(Configuration conf);
+    boolean beforeConfigurationLoad(Configuration conf);
 
     /**
      * Called after the specification has been set.
      *
      * @return true if given Configuration has been mutated.
      */
-    public boolean afterSpecificationSet(Configuration conf);
+    boolean afterSpecificationSet(Configuration conf);
 
     /**
      * Called before the given Configuration is closed.
      *
      * @since 0.9.7
      */
-    public void beforeConfigurationClose(Configuration conf);
+    void beforeConfigurationClose(Configuration conf);
 
 
     /**
@@ -166,6 +166,6 @@ public interface ProductDerivation {
      *
      * @since 2.0.0
      */
-    public Set<String> getSupportedQueryHints();
+    Set<String> getSupportedQueryHints();
 
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
index 9bef8d1e0..3c606d683 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
@@ -32,11 +32,11 @@ import java.util.MissingResourceException;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.MultiClassLoader;
 import org.apache.openjpa.lib.util.Services;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Utilities for running product derivations.
@@ -61,7 +61,7 @@ public class ProductDerivations {
         _derivationNames = Services.getImplementors(ProductDerivation.class, l);
         _derivationErrors = new Throwable[_derivationNames.length];
         List<ProductDerivation> derivations =
-            new ArrayList<ProductDerivation>(_derivationNames.length);
+            new ArrayList<>(_derivationNames.length);
         boolean errors = false;
         for (int i = 0; i < _derivationNames.length; i++) {
             try {
@@ -106,7 +106,7 @@ public class ProductDerivations {
         _derivations =
             derivations.toArray(new ProductDerivation[derivations.size()]);
 
-        List<String> prefixes = new ArrayList<String>(2);
+        List<String> prefixes = new ArrayList<>(2);
         prefixes.add("openjpa");
         for (int i = 0; i < _derivations.length; i++) {
             String prefix = _derivations[i].getConfigurationPrefix();
@@ -394,7 +394,7 @@ public class ProductDerivations {
      */
     public static List<String> getFullyQualifiedAnchorsInPropertiesLocation(
         final String propertiesLocation) {
-        List<String> fqAnchors = new ArrayList<String>();
+        List<String> fqAnchors = new ArrayList<>();
         StringBuilder errs = null;
         Throwable err = null;
         for (int i = _derivations.length - 1; i >= 0; i--) {
@@ -447,7 +447,7 @@ public class ProductDerivations {
 
 
     public static Set<String> getSupportedQueryHints() {
-        Set<String> result = new TreeSet<String>();
+        Set<String> result = new TreeSet<>();
         // most specific to least
         for (int i = _derivations.length - 1; i >= 0; i--) {
             Set<String> members = _derivations[i].getSupportedQueryHints();
@@ -464,6 +464,7 @@ public class ProductDerivations {
     private static class ProductDerivationComparator
         implements Comparator<ProductDerivation> {
 
+        @Override
         public int compare(ProductDerivation o1, ProductDerivation o2) {
             int type1 = o1.getType();
             int type2 = o2.getType();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java
index b234a4043..5503682c5 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java
@@ -24,7 +24,6 @@ import java.util.Objects;
 
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.ParseException;
-
 import org.apache.openjpa.lib.util.StringUtil;
 
 /**
@@ -56,10 +55,12 @@ public class StringListValue extends Value {
     /**
      * The internal value.
      */
+    @Override
     public String[] get() {
         return _values;
     }
 
+    @Override
     public Class<String []> getValueType() {
         return String[].class;
     }
@@ -69,6 +70,7 @@ public class StringListValue extends Value {
      * UNLESS the string passed is a list of values for a property that
      * has aliases.
      */
+    @Override
     public String unalias(String str) {
 
         // defer to super.unalias
@@ -119,10 +121,12 @@ public class StringListValue extends Value {
         return retv.toString();
     }
 
+    @Override
     protected String getInternalString() {
         return StringUtil.join(_values, ", ");
     }
 
+    @Override
     protected void setInternalString(String val) {
         String[] vals = StringUtil.split(val, ",", 0);
         if (vals != null) {
@@ -133,6 +137,7 @@ public class StringListValue extends Value {
         set(vals);
     }
 
+    @Override
     protected void setInternalObject(Object obj) {
         set((String[]) obj);
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java
index 5bcea970a..7168de314 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java
@@ -34,6 +34,7 @@ public class StringValue extends Value {
         super(prop);
     }
 
+    @Override
     public Class<String> getValueType() {
         return String.class;
     }
@@ -41,6 +42,7 @@ public class StringValue extends Value {
     /**
      * The internal value.
      */
+    @Override
     public String get() {
         return value;
     }
@@ -56,14 +58,17 @@ public class StringValue extends Value {
             valueChanged();
     }
 
+    @Override
     protected String getInternalString() {
         return get();
     }
 
+    @Override
     protected void setInternalString(String val) {
         set(val);
     }
 
+    @Override
     protected void setInternalObject(Object obj) {
         if (obj instanceof String) {
             set((String) obj);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java
index e9085de95..ab364d115 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java
@@ -95,7 +95,7 @@ public abstract class Value implements Cloneable {
      */
     public void addEquivalentKey(String other) {
         if (otherNames == null)
-            otherNames = new HashSet<String>();
+            otherNames = new HashSet<>();
         otherNames.add(other);
     }
 
@@ -118,7 +118,7 @@ public abstract class Value implements Cloneable {
      * @since 2.0.0
      */
     public List<String> getPropertyKeys() {
-        List<String> result = new ArrayList<String>(1 +
+        List<String> result = new ArrayList<>(1 +
             (otherNames ==null ? 0 : otherNames.size()));
         result.add(getProperty());
         if (otherNames != null)
@@ -444,7 +444,7 @@ public abstract class Value implements Cloneable {
     	if (listener == null)
     		return;
     	if (listeners == null)
-    		listeners = new ArrayList<ValueListener>();
+    		listeners = new ArrayList<>();
         listeners.add(listener);
     }
 
@@ -519,6 +519,7 @@ public abstract class Value implements Cloneable {
      * for non-dynamic Values and ensures that modifying dynamic Values do not
      * impact equality or hashCode contract.
      */
+    @Override
     public int hashCode() {
         String str = (isDynamic()) ? getOriginalValue() : getString();
         int strHash = (str == null) ? 0 : str.hashCode();
@@ -532,6 +533,7 @@ public abstract class Value implements Cloneable {
      * for non-dynamic Values and ensures that modifying dynamic Values do not
      * impact equality or hashCode contract.
      */
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -546,6 +548,7 @@ public abstract class Value implements Cloneable {
             && Objects.equals(thisStr, thatStr);
     }
 
+    @Override
     public Object clone() {
         try {
             return super.clone();
@@ -590,6 +593,7 @@ public abstract class Value implements Cloneable {
      */
     public abstract Object get();
 
+    @Override
     public String toString() {
         return getProperty()+ ":" + get() + "[" + getValueType().getName() + "]";
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ValueListener.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ValueListener.java
index 5adc5f30a..d51686a7c 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ValueListener.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ValueListener.java
@@ -28,5 +28,5 @@ public interface ValueListener {
     /**
      * Callback used by {@link Value} objects to notify listener of change.
      */
-    public void valueChanged(Value val);
+    void valueChanged(Value val);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/encryption/EncryptionProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/encryption/EncryptionProvider.java
index d62da9b46..781cfe0c2 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/encryption/EncryptionProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/encryption/EncryptionProvider.java
@@ -35,7 +35,7 @@ public interface EncryptionProvider {
 	 * Note: Currently method is ONLY called to decrypt
 	 * openjpa.ConnectionPassword and openjpa.Connection2Password properties.
 	 */
-	public String decrypt(String password);
+	String decrypt(String password);
 
 	/**
 	 * This method will encrypt the provided string. If null is passed into this
@@ -45,5 +45,5 @@ public interface EncryptionProvider {
 	 * NOTE : This method is not called by the OpenJPA runtime. It is here for
 	 * possible future uses.
 	 */
-	public String encrypt(String password);
+	String encrypt(String password);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/BreadthFirstWalk.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/BreadthFirstWalk.java
index daec3b393..3b4786eb8 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/BreadthFirstWalk.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/BreadthFirstWalk.java
@@ -42,9 +42,9 @@ import java.util.Set;
 public class BreadthFirstWalk {
 
     private final Graph _graph;
-    private final Set<GraphVisitor> _visitors = new HashSet<GraphVisitor>();
-    private final List<Object> _queue = new LinkedList<Object>();
-    private final Map<Object, NodeInfo> _nodeInfo = new HashMap<Object, NodeInfo>();
+    private final Set<GraphVisitor> _visitors = new HashSet<>();
+    private final List<Object> _queue = new LinkedList<>();
+    private final Map<Object, NodeInfo> _nodeInfo = new HashMap<>();
 
     public BreadthFirstWalk(Graph graph) {
         _graph = graph;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/DepthFirstAnalysis.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/DepthFirstAnalysis.java
index 80e2b886f..e4e7a31d0 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/DepthFirstAnalysis.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/DepthFirstAnalysis.java
@@ -18,8 +18,6 @@
  */
 package org.apache.openjpa.lib.graph;
 
-import org.apache.openjpa.lib.util.Localizer;
-
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,6 +29,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.openjpa.lib.util.Localizer;
+
 /**
  * <p>Performs a depth-first analysis of a given {@link Graph}, caching
  * information about the graph's nodes and edges.  See the DFS algorithm
@@ -47,7 +47,7 @@ public class DepthFirstAnalysis {
         (DepthFirstAnalysis.class);
 
     private final Graph _graph;
-    private final Map<Object, NodeInfo> _nodeInfo = new HashMap<Object, NodeInfo>();
+    private final Map<Object, NodeInfo> _nodeInfo = new HashMap<>();
     private Comparator<Object> _comp;
 
     /**
@@ -101,7 +101,7 @@ public class DepthFirstAnalysis {
                 childTime = otherInfo.finished;
                 edge.setType(Edge.TYPE_FORWARD);
                 // find the cycle including this edge
-                List<Edge> cycle = new LinkedList<Edge>();
+                List<Edge> cycle = new LinkedList<>();
                 cycle.add(edge);
                 if (cycleForForwardEdge(graph, other, node, cycle)) {
                     edge.setCycle(cycle);
@@ -151,7 +151,7 @@ public class DepthFirstAnalysis {
             for (Edge edge : _graph.getEdgesFrom(node)) {
                 if (edge.getType() == type) {
                     if (typed == null)
-                        typed = new ArrayList<Edge>();
+                        typed = new ArrayList<>();
                     typed.add(edge);
                 }
             }
@@ -183,7 +183,7 @@ public class DepthFirstAnalysis {
      */
     private List<Edge> buildCycle(Edge backEdge, List<Edge> path, int pos) {
         int length = path != null ? path.size() - pos : 0;
-        List<Edge> cycle = new ArrayList<Edge>(length + 1);
+        List<Edge> cycle = new ArrayList<>(length + 1);
         cycle.add(0, backEdge);
         for (int i = 0; i < length; i++) {
             cycle.add(i + 1, path.get(pos + i));
@@ -308,6 +308,7 @@ public class DepthFirstAnalysis {
             _subComp = subComp;
         }
 
+        @Override
         public int compare(Map.Entry<Object,NodeInfo> e1, Map.Entry<Object,NodeInfo> e2) {
             NodeInfo n1 = e1.getValue();
             NodeInfo n2 = e2.getValue();
@@ -332,10 +333,12 @@ public class DepthFirstAnalysis {
             _entries = entries;
         }
 
+        @Override
         public Object get(int idx) {
             return _entries[idx].getKey();
         }
 
+        @Override
         public int size() {
             return _entries.length;
 		}
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Edge.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Edge.java
index 7be2f04d7..ad2dee710 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Edge.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Edge.java
@@ -216,6 +216,7 @@ public class Edge {
         _cycle = null;
     }
 
+    @Override
     public String toString() {
         return super.toString() + "[from=" + getFrom() + ";to=" + getTo()
             + ";directed=" + isDirected () + ";weight=" + getWeight () + "]";
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Graph.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Graph.java
index c5f37bad0..6f201508e 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Graph.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Graph.java
@@ -38,7 +38,7 @@ public class Graph {
      * Map each node to list of edges from that node.
      * Using a LinkedHashMap to ensure order of iterator processing.
      */
-    private final Map<Object, Collection<Edge>> _nodes = new LinkedHashMap<Object, Collection<Edge>>();
+    private final Map<Object, Collection<Edge>> _nodes = new LinkedHashMap<>();
 
     /**
      * Clear the graph.
@@ -92,7 +92,7 @@ public class Graph {
      * Return all edges in the graph.
      */
     public Collection<Edge> getEdges() {
-        Collection<Edge> all = new HashSet<Edge>();
+        Collection<Edge> all = new HashSet<>();
         for (Collection<Edge> edges : _nodes.values()) {
         	if (edges != null)
         		all.addAll(edges);
@@ -116,7 +116,7 @@ public class Graph {
      */
     public Collection<Edge> getEdgesTo(Object node) {
     	Collection<Edge> edges = getEdges();
-    	Collection<Edge> to = new ArrayList<Edge>();
+    	Collection<Edge> to = new ArrayList<>();
     	for (Edge edge : edges) {
     		if (edge.isTo(node))
     			to.add(edge);
@@ -129,7 +129,7 @@ public class Graph {
      */
     public Collection<Edge> getEdges(Object from, Object to) {
         Collection<Edge> edges = getEdgesFrom(from);
-        Collection<Edge> matches = new ArrayList<Edge>(edges.size());
+        Collection<Edge> matches = new ArrayList<>(edges.size());
         for (Edge edge : edges) {
             if (edge.isTo(to))
                 matches.add(edge);
@@ -148,7 +148,7 @@ public class Graph {
 
         Collection<Edge> from = _nodes.get(edge.getFrom());
         if (from == null) {
-            from = new ArrayList<Edge>(3);
+            from = new ArrayList<>(3);
             _nodes.put(edge.getFrom(), from);
         }
         from.add(edge);
@@ -156,7 +156,7 @@ public class Graph {
         if (!edge.isDirected() && !edge.getFrom().equals(edge.getTo())) {
             Collection<Edge> to = _nodes.get(edge.getTo());
             if (to == null) {
-                to = new ArrayList<Edge>(3);
+                to = new ArrayList<>(3);
                 _nodes.put(edge.getTo(), to);
             }
             to.add(edge);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/GraphVisitor.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/GraphVisitor.java
index bc1fbcecc..18b8beeeb 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/GraphVisitor.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/GraphVisitor.java
@@ -32,15 +32,15 @@ public interface GraphVisitor {
      * on the traversal being used.  See each appropriate graph
      * walker for details.
      */
-    public void nodeSeen(Object node);
+    void nodeSeen(Object node);
 
     /**
      * will only be called once per node
      */
-    public void nodeVisited(Object node);
+    void nodeVisited(Object node);
 
     /**
      * may visit the node twice (both sides)
      */
-    public void edgeVisited(Edge edge);
+    void edgeVisited(Edge edge);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/Identifier.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/Identifier.java
index 8aa1ca0bb..2bad62ada 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/Identifier.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/Identifier.java
@@ -23,7 +23,7 @@ package org.apache.openjpa.lib.identifier;
  */
 public interface Identifier extends Comparable<Identifier>, Cloneable {
 
-    public String getName();
-    public void setName(String name);
-    public int length();
+    String getName();
+    void setName(String name);
+    int length();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierConfiguration.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierConfiguration.java
index 031d6f436..addc97029 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierConfiguration.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierConfiguration.java
@@ -29,62 +29,62 @@ public interface IdentifierConfiguration {
     /**
      * Returns the leading delimiter value to use when delimiting a name.
      */
-    public String getLeadingDelimiter();
+    String getLeadingDelimiter();
 
     /**
      * Returns the trailing delimiter value to use when delimiting a name.
      */
-    public String getTrailingDelimiter();
+    String getTrailingDelimiter();
 
     /**
      * Returns true if global name delimiting is enabled.
      */
-    public boolean delimitAll();
+    boolean delimitAll();
 
     /**
      * Returns true if delimiting is supported
      */
-    public boolean getSupportsDelimitedIdentifiers();
+    boolean getSupportsDelimitedIdentifiers();
 
     /**
      * Returns the value used to concatenate multiple names together.
      * For example: "_" used in TABLE1_TABLE2
      */
-    public String getIdentifierConcatenator();
+    String getIdentifierConcatenator();
 
     /**
      * Returns the value used to delimit between individual names.
      * For example: "." used in MYSCHEMA.MYTABLE
      */
-    public String getIdentifierDelimiter();
+    String getIdentifierDelimiter();
 
     /**
      * Gets the default naming rule
      */
-    public IdentifierRule getDefaultIdentifierRule();
+    IdentifierRule getDefaultIdentifierRule();
 
     /**
      * Returns all naming rules
      */
-    public <T> Map<T, IdentifierRule> getIdentifierRules();
+    <T> Map<T, IdentifierRule> getIdentifierRules();
 
     /**
      * Returns a naming rule or null if the rule is
      * not found.
      */
-    public <T> IdentifierRule getIdentifierRule(T t);
+    <T> IdentifierRule getIdentifierRule(T t);
 
     /**
      * Returns the case that is used when delimiting.
      * @return upper, lower, or preserve
      */
-    public String getDelimitedCase();
+    String getDelimitedCase();
 
     /**
      * Returns the case that is used when delimiters are not used.
      * @return upper, lower, or preserve
      */
-    public String getSchemaCase();
+    String getSchemaCase();
 
     /**
      * Returns a key that can be used to determine whether conversion
@@ -92,5 +92,5 @@ public interface IdentifierConfiguration {
      * to their configuration.  The typical key is:
      * leading delimiter (") + name separator(.) + trailing delimiter(")
      */
-    public String getConversionKey();
+    String getConversionKey();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierImpl.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierImpl.java
index b48ecaeea..3958cd3b1 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierImpl.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierImpl.java
@@ -25,6 +25,8 @@ import java.io.Serializable;
  */
 public class IdentifierImpl implements Identifier, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private String _name = null;
 
     protected IdentifierImpl() {}
@@ -33,18 +35,22 @@ public class IdentifierImpl implements Identifier, Serializable {
         setName(name);
     }
 
+    @Override
     public void setName(String name) {
         _name = name;
     }
 
+    @Override
     public String getName() {
         return _name;
     }
 
+    @Override
     public String toString() {
         return getName();
     }
 
+    @Override
     public int hashCode() {
         if (_name == null) {
             return super.hashCode();
@@ -52,6 +58,7 @@ public class IdentifierImpl implements Identifier, Serializable {
         return _name.toUpperCase().hashCode();
     }
 
+    @Override
     public int length() {
         if (getName() == null) {
             return 0;
@@ -59,6 +66,7 @@ public class IdentifierImpl implements Identifier, Serializable {
         return getName().length();
     }
 
+    @Override
     public int compareTo(Identifier o) {
         if (_name == null && (o == null || o.getName() == null)) {
             return 0;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java
index 34f673c6f..a9c90d250 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java
@@ -32,7 +32,7 @@ import org.apache.openjpa.lib.util.StringUtil;
  */
 public class IdentifierRule {
 
-    public static final Set<String> EMPTY_SET = new HashSet<String>(0);
+    public static final Set<String> EMPTY_SET = new HashSet<>(0);
     public static final String DEFAULT_RULE = "default";
     public static char UNDERSCORE = '_';
 
@@ -128,7 +128,7 @@ public class IdentifierRule {
 
     public Set<String> getReservedWords() {
         if (_reservedWords == null) {
-            _reservedWords = new HashSet<String>();
+            _reservedWords = new HashSet<>();
         }
         return _reservedWords;
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtil.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtil.java
index ff6361438..dc3b4bacd 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtil.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtil.java
@@ -23,24 +23,24 @@ package org.apache.openjpa.lib.identifier;
  * on strings using identifier rules.
  */
 public interface IdentifierUtil {
-    public static final String DOUBLE_QUOTE = "\"";
-    public static final String DOT = ".";
-    public static final String UNDERSCORE = "_";
-    public static final String SPACE = " ";
-    public static final String BAR = "|";
-    public static final String EMPTY = "";
-    public static final String PERCENT = "%";
+    String DOUBLE_QUOTE = "\"";
+    String DOT = ".";
+    String UNDERSCORE = "_";
+    String SPACE = " ";
+    String BAR = "|";
+    String EMPTY = "";
+    String PERCENT = "%";
 
-    public static final char DOLLAR_CHAR = '$';
-    public static final char UNDERSCORE_CHAR = '_';
+    char DOLLAR_CHAR = '$';
+    char UNDERSCORE_CHAR = '_';
 
-    public static final String CASE_UPPER = "upper";
-    public static final String CASE_LOWER = "lower";
-    public static final String CASE_PRESERVE = "preserve";
+    String CASE_UPPER = "upper";
+    String CASE_LOWER = "lower";
+    String CASE_PRESERVE = "preserve";
     /**
      * Get the naming configuration.
      */
-    public IdentifierConfiguration getIdentifierConfiguration();
+    IdentifierConfiguration getIdentifierConfiguration();
 
     /**
      * Set the naming configuration to use for naming operations.  A naming
@@ -54,7 +54,7 @@ public interface IdentifierUtil {
      * @param name the name to delimit
      * @return the delimited name, if delimiting was necessary.
      */
-    public String delimit(String rule, String name);
+    String delimit(String rule, String name);
 
     /**
      * Delimit the name if it requires delimiters
@@ -62,7 +62,7 @@ public interface IdentifierUtil {
      * @param name the name to delimit
      * @return the delimited name, if delimiting was necessary.
      */
-    public String delimit(IdentifierRule rule, String name);
+    String delimit(IdentifierRule rule, String name);
 
     /**
      * Delimit the string with the option to force delimiting.  If force is
@@ -73,7 +73,7 @@ public interface IdentifierUtil {
      * @param force add delimiters even if delimiting is not required
      * @return the delimited name, if delimiting was necessary.
      */
-    public String delimit(String rule, String name, boolean force);
+    String delimit(String rule, String name, boolean force);
 
     /**
      * Delimit the string with the option to force delimiting.  If force is
@@ -84,7 +84,7 @@ public interface IdentifierUtil {
      * @param force add delimiters even if delimiting is not required
      * @return the delimited name, if delimiting was necessary.
      */
-    public String delimit(IdentifierRule rule, String name, boolean force);
+    String delimit(IdentifierRule rule, String name, boolean force);
 
 
     /**
@@ -92,35 +92,35 @@ public interface IdentifierUtil {
      * @param the rule to use for removing delimiters
      * @param name the name from which to remove delimiters
      */
-    public String removeDelimiters(String rule, String name);
+    String removeDelimiters(String rule, String name);
 
     /**
      * Remove delimiters from a delimited name
      * @param the rule to use for removing delimiters
      * @param name the name from which to remove delimiters
      */
-    public String removeDelimiters(IdentifierConfiguration config, String rule, String name);
+    String removeDelimiters(IdentifierConfiguration config, String rule, String name);
 
     /**
      * Remove delimiters from a delimited name
      * @param the rule to use for removing delimiters
      * @param name the name from which to remove delimiters
      */
-    public String removeDelimiters(IdentifierRule rule, String name);
+    String removeDelimiters(IdentifierRule rule, String name);
 
     /**
      * Determines whether a name is delimited.
      * @param the rule to use for removing delimiters
      * @param name the name to examine for delimiters
      */
-    public boolean isDelimited(String rule, String name);
+    boolean isDelimited(String rule, String name);
 
     /**
      * Determines whether a name is delimited.
      * @param the rule to use for removing delimiters
      * @param name the name to examine for delimiters
      */
-    public boolean isDelimited(IdentifierRule rule, String name);
+    boolean isDelimited(IdentifierRule rule, String name);
 
     /**
      * Determines whether a name requires delimiters based upon:
@@ -131,7 +131,7 @@ public interface IdentifierUtil {
      * @param the rule to use for removing delimiters
      * @param name the name to examine for delimiting requirements
      */
-    public boolean requiresDelimiters(String rule, String name);
+    boolean requiresDelimiters(String rule, String name);
 
     /**
      * Determines whether a name requires delimiters based upon:
@@ -142,80 +142,80 @@ public interface IdentifierUtil {
      * @param the rule to use for removing delimiters
      * @param name the name to examine for delimiting requirements
      */
-    public boolean requiresDelimiters(IdentifierRule rule, String name);
+    boolean requiresDelimiters(IdentifierRule rule, String name);
 
     /**
      * Combines names using delimiting rules and appropriate separators
      * @return a combined name
      *         ex. {"TH IS", THAT} -> "TH IS_THAT"
      */
-    public String combineNames(String rule, String[] rules, String[] names);
+    String combineNames(String rule, String[] rules, String[] names);
 
     /**
      * Combines names using delimiting rules and appropriate separators
      * @return a combined name
      *         ex. {"TH IS", THAT} -> "TH IS_THAT"
      */
-    public String combineNames(IdentifierRule rule, IdentifierRule[] rules, String[] names);
+    String combineNames(IdentifierRule rule, IdentifierRule[] rules, String[] names);
 
     /**
      * Combines names using the specified delimiting rule and appropriate separators
      * @return a combined name
      *         ex. {"TH IS", THAT} -> "TH IS_THAT"
      */
-    public String combineNames(String rule, String[] names);
+    String combineNames(String rule, String[] names);
 
     /**
      * Combines names using the specified delimiting rule and appropriate separators
      * @return a combined name
      *         ex. {"TH IS", THAT} -> "TH IS_THAT"
      */
-    public String combineNames(IdentifierRule rule, String[] names);
+    String combineNames(IdentifierRule rule, String[] names);
 
     /**
      * Combines two names using delimiting rules and appropriate separators
      */
-    public String combineNames(String rule, String name1, String name2);
+    String combineNames(String rule, String name1, String name2);
 
     /**
      * Combines two names using delimiting rules and appropriate separators
      */
-    public String combineNames(IdentifierRule rule, String name1, String name2);
+    String combineNames(IdentifierRule rule, String name1, String name2);
 
     /**
      * Joins several names with different naming rules into a single string
      * using appropriate delimiters and separators
      */
-    public String joinNames(String[] rules, String[] names);
+    String joinNames(String[] rules, String[] names);
 
     /**
      * Joins several names with different naming rules into a single string
      * using appropriate delimiters and separators
      */
-    public String joinNames(IdentifierRule[] rules, String[] names);
+    String joinNames(IdentifierRule[] rules, String[] names);
 
     /**
      * Joins several names with different naming rules into a single string
      * using appropriate delimiters and separators
      */
-    public String joinNames(String rule, String[] names);
+    String joinNames(String rule, String[] names);
 
     /**
      * Joins several names with different naming rules into a single string
      * using appropriate delimiters and separators
      */
-    public String joinNames(IdentifierRule rule, String[] names);
+    String joinNames(IdentifierRule rule, String[] names);
 
     /**
      * Joins several names with different naming rules into a single string
      * using the specified delimiter
      */
-    public String joinNames(IdentifierRule rule, String[] names, String delimiter);
+    String joinNames(IdentifierRule rule, String[] names, String delimiter);
     /**
      * Joins several names with different naming rules into a single string
      * using the specified delimiter
      */
-    public String joinNames(String rule, String[] names, String delimiter);
+    String joinNames(String rule, String[] names, String delimiter);
 
     /**
      * Splits a combined name name using the provided naming rule
@@ -223,7 +223,7 @@ public interface IdentifierUtil {
      * @return individual components of the name
      *         ex. schema.table --> { schema, table }
      */
-    public String[] splitName(String rule, String name);
+    String[] splitName(String rule, String name);
 
     /**
      * Splits a combined name name using the provided naming rule
@@ -231,7 +231,7 @@ public interface IdentifierUtil {
      * @return individual components of the name
      *         ex. schema.table --> { schema, table }
      */
-    public String[] splitName(IdentifierRule rule, String name);
+    String[] splitName(IdentifierRule rule, String name);
 
     /**
      * Splits a combined name name using the provided naming rule and
@@ -240,7 +240,7 @@ public interface IdentifierUtil {
      * @return individual components of the name
      *         ex. schema.table --> { schema, table }
      */
-    public String[] splitName(String rule, String name, String delimiter);
+    String[] splitName(String rule, String name, String delimiter);
 
     /**
      * Splits a combined name name using the provided naming rule and
@@ -249,78 +249,78 @@ public interface IdentifierUtil {
      * @return individual components of the name
      *         ex. schema.table --> { schema, table }
      */
-    public String[] splitName(IdentifierRule rule, String name, String delimiter);
+    String[] splitName(IdentifierRule rule, String name, String delimiter);
 
     /**
      * Returns whether a name is considered a reserved word
      */
-    public boolean isReservedWord(String rule, String name);
+    boolean isReservedWord(String rule, String name);
 
     /**
      * Returns whether a name is considered a reserved word
      */
-    public boolean isReservedWord(IdentifierRule rule, String name);
+    boolean isReservedWord(IdentifierRule rule, String name);
 
     /**
      * Convert the string using this naming configuration to the supplied
      * naming configuration.
      */
-    public String convert(IdentifierConfiguration config, String rule, String name);
+    String convert(IdentifierConfiguration config, String rule, String name);
 
     /**
      * Truncates a name while maintaining delimiters.
      */
-    public String truncateName(String rule, String name, int length);
+    String truncateName(String rule, String name, int length);
 
     /**
      * Truncates a name while maintaining delimiters.
      */
-    public String truncateName(IdentifierRule rule, String name, int length);
+    String truncateName(IdentifierRule rule, String name, int length);
 
     /**
      * Append the names together while maintaining delimiters.
      */
-    public String appendNames(IdentifierRule rule, String name1, String name2);
+    String appendNames(IdentifierRule rule, String name1, String name2);
 
     /**
      * Append the names together while maintaining delimiters.
      */
-    public String appendNames(String rule, String name1, String name2);
+    String appendNames(String rule, String name1, String name2);
 
     /**
      * Converts a qualified string-based name defined using the base configuration to the
      * specified configuration.  Returns the converted name.
      */
-    public String convertFull(IdentifierConfiguration config, String rule, String fullName);
+    String convertFull(IdentifierConfiguration config, String rule, String fullName);
 
     /**
      * Removes Hungarian notation from the specified string.
      */
-    public String removeHungarianNotation(String rule, String name);
+    String removeHungarianNotation(String rule, String name);
     /**
      * Removes Hungarian notation from the specified string.
      */
-    public String removeHungarianNotation(IdentifierRule rule, String name);
+    String removeHungarianNotation(IdentifierRule rule, String name);
 
     /**
      * Determines whether a name can be split into multiple components.
      */
-    public boolean canSplit(String rule, String name);
+    boolean canSplit(String rule, String name);
 
     /**
      * Determines whether a name can be split into multiple components.
      */
-    public boolean canSplit(IdentifierRule rule, String name);
+    boolean canSplit(IdentifierRule rule, String name);
 
     /**
      * Determines whether a name can be split into multiple components, taking
      * into account the specified delimiter.
      */
-    public boolean canSplit(String rule, String name, String delim);
+    boolean canSplit(String rule, String name, String delim);
 
     /**
      * Determines whether a name can be split into multiple components, taking
      * into account the specified delimiter.
      */
-    public boolean canSplit(IdentifierRule rule, String name, String delim);
+    boolean canSplit(IdentifierRule rule, String name, String delim);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java
index 5fe34c2b2..60986bf5a 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java
@@ -21,10 +21,10 @@ package org.apache.openjpa.lib.identifier;
 import java.util.ArrayList;
 import java.util.Locale;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.conf.Configurable;
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Implementation class for the base identifier impl.
@@ -45,18 +45,22 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         _config = config;
     }
 
+    @Override
     public void setIdentifierConfiguration(IdentifierConfiguration config) {
         _config = config;
     }
 
+    @Override
     public IdentifierConfiguration getIdentifierConfiguration() {
         return _config;
     }
 
+    @Override
     public String combineNames(String rule, String name1, String name2) {
         return combineNames(getNamingRule(rule), name1, name2);
     }
 
+    @Override
     public String combineNames(String rule, String[] names) {
         return combineNames(getNamingRule(rule), names);
     }
@@ -65,6 +69,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return combineNames(config, getNamingRule(rule), names);
     }
 
+    @Override
     public String combineNames(IdentifierRule rule,
         IdentifierRule[] rules, String[] names) {
         return combineNames(_config, rule, rules, names);
@@ -132,6 +137,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return combined;
     }
 
+    @Override
     public String appendNames(IdentifierRule rule, String name1, String name2) {
         if (isDelimited(rule, name1)) {
             name1 = removeDelimiters(rule, name1);
@@ -153,6 +159,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
      * Joins multiple names together using the standard delimiting rules
      * ex. ( {"s", "t", "c"} --> "s"."t"."c" }
      */
+    @Override
     public String joinNames(IdentifierRule[] rules, String[] names) {
 
         if (names == null || names.length == 0) {
@@ -168,18 +175,22 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return combinedName.toString();
     }
 
+    @Override
     public String joinNames(String rule, String[] names) {
         return joinNames(_config, getNamingRule(rule), names, _config.getIdentifierDelimiter());
     }
 
+    @Override
     public String joinNames(IdentifierRule rule, String[] names) {
         return joinNames(_config, rule, names, _config.getIdentifierDelimiter());
     }
 
+    @Override
     public String joinNames(IdentifierRule rule, String[] names, String delimiter) {
         return joinNames(_config, rule, names, delimiter);
     }
 
+    @Override
     public String joinNames(String rule, String[] names, String delimiter) {
         return joinNames(_config, getNamingRule(rule), names, delimiter);
     }
@@ -210,6 +221,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return splitName(nrule, name, config.getIdentifierDelimiter());
     }
 
+    @Override
     public String[] splitName(IdentifierRule nrule, String name) {
         return splitName(nrule, name, _config.getIdentifierDelimiter());
     }
@@ -221,6 +233,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
      * @return individual components of the name
      *         ex. schema.table --> { schema, table }
      */
+    @Override
     public String[] splitName(IdentifierRule nrule, String name, String nameDelim) {
         if (!canSplit(nrule, name, nameDelim) || StringUtil.isEmpty(name)) {
             return new String[] {name};
@@ -230,7 +243,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         // "sch""ma".table
 
         // Split names by object delimiter not between name delimiters
-        ArrayList<String> names = new ArrayList<String>(2);
+        ArrayList<String> names = new ArrayList<>(2);
         String pname = name;
 
         // for each name
@@ -297,10 +310,12 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
     }
 
 
+    @Override
     public String delimit(IdentifierRule rule, String name) {
         return delimit(_config, rule, name, false);
     }
 
+    @Override
     public String delimit(IdentifierRule rule, String name, boolean force) {
         return delimit(_config, rule, name, force);
     }
@@ -316,6 +331,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return name;
     }
 
+    @Override
     public boolean isDelimited(IdentifierRule rule, String name) {
         return isDelimited(_config, rule, name);
     }
@@ -328,12 +344,14 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
             name.endsWith(config.getTrailingDelimiter());
     }
 
+    @Override
     public String removeDelimiters(IdentifierConfiguration config, String rule,
         String name) {
         return removeDelimiters(_config, getNamingRule(rule), name, _config.getLeadingDelimiter(),
             _config.getTrailingDelimiter());
     }
 
+    @Override
     public String removeDelimiters(IdentifierRule rule, String name) {
         return removeDelimiters(_config, rule, name, _config.getLeadingDelimiter(),
             _config.getTrailingDelimiter());
@@ -344,6 +362,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
             _config.getTrailingDelimiter());
     }
 
+    @Override
     public boolean requiresDelimiters(IdentifierRule rule, String name) {
         return requiresDelimiters(_config, rule, name);
     }
@@ -361,6 +380,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
     /**
      * Returns whether a name is considered a reserved word.
      */
+    @Override
     public boolean isReservedWord(IdentifierRule rule, String name) {
         if (rule == null) {
             throw new IllegalArgumentException("Naming rule is null!");
@@ -374,6 +394,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return rule.getReservedWords().contains(name);
     }
 
+    @Override
     public boolean isReservedWord(String rule, String name) {
         return isReservedWord(_config.getIdentifierRule(rule), name);
     }
@@ -392,14 +413,17 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return name;
     }
 
+    @Override
     public String combineNames(String rule, String[] rules, String[] names) {
         return combineNames(getNamingRule(rule), getNamingRules(rules), names);
     }
 
+    @Override
     public String truncateName(String rule, String name, int length) {
         return truncateName(getNamingRule(rule), name, length);
     }
 
+    @Override
     public String truncateName(IdentifierRule namingRule, String name, int length) {
         String tName = name;
         boolean delimited = isDelimited(namingRule, name);
@@ -416,22 +440,27 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return tName;
     }
 
+    @Override
     public String delimit(String rule, String name) {
         return delimit(getNamingRule(rule), name);
     }
 
+    @Override
     public String delimit(String rule, String name, boolean force) {
         return delimit(getNamingRule(rule), name, force);
     }
 
+    @Override
     public boolean isDelimited(String rule, String name) {
         return isDelimited(getNamingRule(rule), name);
     }
 
+    @Override
     public String removeDelimiters(String rule, String name) {
         return removeDelimiters(getNamingRule(rule), name);
     }
 
+    @Override
     public boolean requiresDelimiters(String rule, String name) {
         return requiresDelimiters(getNamingRule(rule), name);
     }
@@ -440,10 +469,12 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return splitName(config, getNamingRule(rule), name);
     }
 
+    @Override
     public String[] splitName(String rule, String name) {
         return splitName(_config, getNamingRule(rule), name);
     }
 
+    @Override
     public String joinNames(String[] rules, String[] names) {
         return joinNames(getNamingRules(rules), names);
     }
@@ -452,10 +483,12 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return _config.getIdentifierRule(rule);
     }
 
+    @Override
     public String appendNames(String rule, String name1, String name2) {
         return appendNames(getNamingRule(rule), name1, name2);
     }
 
+    @Override
     public String removeHungarianNotation(IdentifierRule rule, String name) {
         boolean delimited = isDelimited(rule, name);
         if (delimited) {
@@ -479,14 +512,17 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return name;
     }
 
+    @Override
     public String removeHungarianNotation(String rule, String name) {
         return removeHungarianNotation(getNamingRule(rule), name);
     }
 
+    @Override
     public String[] splitName(String nrule, String name, String nameDelim) {
         return splitName(getNamingRule(nrule), name, nameDelim);
     }
 
+    @Override
     public String convert(IdentifierConfiguration config, String rule, String name) {
         // Already using same delimiter, no need to convert
         if (!needsConversion(config)) {
@@ -504,6 +540,7 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return name;
     }
 
+    @Override
     public String convertFull(IdentifierConfiguration config, String rule, String fullName) {
         if (!needsConversion(config)) {
             return fullName;
@@ -551,27 +588,34 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return nrules;
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public boolean canSplit(String rule, String name) {
         return canSplit(getNamingRule(rule), name, _config.getIdentifierDelimiter());
     }
 
+    @Override
     public boolean canSplit(IdentifierRule rule, String name) {
         return canSplit(rule, name, _config.getIdentifierDelimiter());
     }
 
+    @Override
     public boolean canSplit(String rule, String name, String delim) {
         return canSplit(getNamingRule(rule), name);
     }
 
+    @Override
     public boolean canSplit(IdentifierRule rule, String name, String delim) {
         if (name == null || name.length() == 0) {
             return false;
@@ -579,10 +623,12 @@ public class IdentifierUtilImpl implements IdentifierUtil, Configurable {
         return name.contains(delim);
     }
 
+    @Override
     public String combineNames(IdentifierRule rule, String[] names) {
         return combineNames(_config, rule, names);
     }
 
+    @Override
     public String combineNames(IdentifierRule rule, String name1, String name2) {
         return combineNames(_config, rule, name1, name2);
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/AbstractInstrument.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/AbstractInstrument.java
index 6673632b7..ae6a9c1c1 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/AbstractInstrument.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/AbstractInstrument.java
@@ -30,48 +30,60 @@ public abstract class AbstractInstrument implements Instrument {
     private Object _context;
     private String _options;
 
+    @Override
     public Object getContext() {
         return _context;
     }
 
+    @Override
     public void setContext(Object context) {
         _context = context;
     }
 
+    @Override
     public String getOptions() {
         return _options;
     }
 
+    @Override
     public void setOptions(String options) {
         _options = options;
     }
 
+    @Override
     public boolean isStarted() {
         return _started;
     }
 
+    @Override
     public void setStarted(boolean started) {
         _started = started;
     }
 
+    @Override
     public void restart() {
         stop();
         start();
     }
 
+    @Override
     public void setProvider(InstrumentationProvider provider) {
         _provider = provider;
     }
 
+    @Override
     public InstrumentationProvider getProvider() {
         return _provider;
     }
 
+    @Override
     public InstrumentationLevel getLevel() {
         return InstrumentationLevel.MANUAL;
     }
 
+    @Override
     public abstract String getName();
 
+    @Override
     public abstract void initialize();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/AbstractInstrumentationProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/AbstractInstrumentationProvider.java
index 3d5a5cf46..349b5f781 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/AbstractInstrumentationProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/AbstractInstrumentationProvider.java
@@ -35,27 +35,32 @@ import org.apache.openjpa.lib.conf.PluginListValue;
  */
 public abstract class AbstractInstrumentationProvider implements InstrumentationProvider, Configurable {
 
-    private Map<String, Instrument> _instruments = new ConcurrentHashMap<String, Instrument>();
+    private Map<String, Instrument> _instruments = new ConcurrentHashMap<>();
 
     private boolean _started = false;
     private PluginListValue _instrumentValues;
     private String _options;
     private Configuration _config;
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _config = conf;
     }
 
+    @Override
     public Configuration getConfiguration() {
         return _config;
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 
+    @Override
     public void setInstrument(String instrument) {
         _instrumentValues = new PluginListValue("Instrument");
         if (getInstrumentAliases() != null) {
@@ -70,18 +75,22 @@ public abstract class AbstractInstrumentationProvider implements Instrumentation
         }
     }
 
+    @Override
     public String getInstrument() {
         return _instrumentValues.getString();
     }
 
+    @Override
     public void setOptions(String options) {
         _options = options;
     }
 
+    @Override
     public String getOptions() {
         return _options;
     }
 
+    @Override
     public void addInstrument(Instrument instrument) {
         if (instrument == null) {
             return;
@@ -90,10 +99,12 @@ public abstract class AbstractInstrumentationProvider implements Instrumentation
         _instruments.put(instrument.getName(), instrument);
     }
 
+    @Override
     public void initializeInstrument(Instrument instrument, Object context) {
         initializeInstrument(instrument, _options, context);
     }
 
+    @Override
     public void initializeInstrument(Instrument instrument, String options, Object context) {
         instrument.setProvider(this);
         instrument.setOptions(options);
@@ -101,14 +112,17 @@ public abstract class AbstractInstrumentationProvider implements Instrumentation
         instrument.initialize();
     }
 
+    @Override
     public Instrument getInstrumentByName(String name) {
         return _instruments.get(name);
     }
 
+    @Override
     public Set<Instrument> getInstruments() {
-        return new HashSet<Instrument>(_instruments.values());
+        return new HashSet<>(_instruments.values());
     }
 
+    @Override
     public void stopInstruments(InstrumentationLevel level, Object context) {
         try {
             Set<Instrument> instruments = getInstruments();
@@ -123,6 +137,7 @@ public abstract class AbstractInstrumentationProvider implements Instrumentation
         }
     }
 
+    @Override
     public void startInstruments(InstrumentationLevel level, Object context) {
         Set<Instrument> instruments = getInstruments();
         for (Instrument instrument : instruments) {
@@ -133,10 +148,12 @@ public abstract class AbstractInstrumentationProvider implements Instrumentation
         }
     }
 
+    @Override
     public void stopInstrument(Instrument instrument) {
         stopInstrument(instrument, true);
     }
 
+    @Override
     public void removeInstrumentByName(String name) {
         Instrument ins = _instruments.remove(name);
         if (ins != null) {
@@ -144,6 +161,7 @@ public abstract class AbstractInstrumentationProvider implements Instrumentation
         }
     }
 
+    @Override
     public boolean isStarted() {
         return _started;
     }
@@ -152,12 +170,15 @@ public abstract class AbstractInstrumentationProvider implements Instrumentation
         _started = started;
     }
 
+    @Override
     public String[] getInstrumentAliases() {
         return null;
     }
 
+    @Override
     public abstract void start();
 
+    @Override
     public abstract void stop();
 
     private static boolean contextEquals(Object ctx1, Object ctx2) {
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/Instrument.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/Instrument.java
index 5acd4471f..f6607e16c 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/Instrument.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/Instrument.java
@@ -26,86 +26,86 @@ public interface Instrument {
     /**
      * Returns the name of the instrument.  Must be unique per-provider.
      */
-    public String getName();
+    String getName();
 
     /**
      * Returns the options specified for the instrument in string form.
      * @return options configuration options for the instrument
      */
-    public String getOptions();
+    String getOptions();
 
     /**
      * Sets options to specify for the instrument in standard string form.
      * ex.  DataCache(Options='Start=true')
      * @param options options
      */
-    public void setOptions(String options);
+    void setOptions(String options);
 
     /**
      * Gets the context of the instrument.  Typically, a reference to a broker
      * or broker factory.
      * @return the context associated with the instrument.
      */
-    public Object getContext();
+    Object getContext();
 
     /**
      * Sets the context of the instrument.  Typically, a reference to a broker
      * or broker factory.
      * @return the context associated with the instrument.
      */
-    public void setContext(Object context);
+    void setContext(Object context);
 
     /**
      * Sets the instrumentation provider for the instrument.
      * @param provider instrumentation provider of the instrument
      */
-    public void setProvider(InstrumentationProvider provider);
+    void setProvider(InstrumentationProvider provider);
 
     /**
      * Gets the instrumentation provider for the instrument.
      * @return instrumentation provider of the instrument
      */
-    public InstrumentationProvider getProvider();
+    InstrumentationProvider getProvider();
 
     /**
      * Initializes the instrument.  Depending on the instrument, the provider,
      * options, and various options may need to be set before calling this method.
      */
-    public void initialize();
+    void initialize();
 
     /**
      * Gets the instrumentation level of this instrument.  The instrumentation level
      * determines if and when the instrument will automatically start and stop.
      * @return  the instrumentation level of the instrument
      */
-    public InstrumentationLevel getLevel();
+    InstrumentationLevel getLevel();
 
     /**
      * Returns true if the instrument is started.
      */
-    public boolean isStarted();
+    boolean isStarted();
 
     /**
      * Sets whether the instrument is an available state.
      * @param started
      */
-    public void setStarted(boolean started);
+    void setStarted(boolean started);
 
     /**
      * Starts the instrument.  Typically this will be performed through the provider,
      * but in some cases an instrument will have its own specialized startup.
      */
-    public void start();
+    void start();
 
     /**
      * Starts the instrument.  Typically this will be performed through the provider,
      * but in some cases an instrument will have its own specialized shutdown.
      */
-    public void stop();
+    void stop();
 
     /**
      * Restarts the instrument.  Typically this will be performed through the provider,
      * but in some cases an instrument will have its own specialized restart.
      */
-    public void restart();
+    void restart();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/InstrumentationProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/InstrumentationProvider.java
index 6f21c0809..f6f31baab 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/InstrumentationProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/instrumentation/InstrumentationProvider.java
@@ -33,22 +33,22 @@ public interface InstrumentationProvider {
      * Whether the instrumentation provider started
      * @return true if the provider is started
      */
-    public boolean isStarted();
+    boolean isStarted();
     /**
      * Starts the instrumentation provider
      */
-    public void stop();
+    void stop();
 
     /**
      * Stops the instrumentation provider
      */
-    public void start();
+    void start();
 
     /**
      * Gets the configuration associated with the instrumentation provider
      * @return the configuration associated with the provider
      */
-    public Configuration getConfiguration();
+    Configuration getConfiguration();
 
     /**
      * Used to associate one or more instruments to a provider.  Instruments
@@ -61,25 +61,25 @@ public interface InstrumentationProvider {
      *
      * @param instruments  one or more instrument class names or aliases
      */
-    public void setInstrument(String instruments);
+    void setInstrument(String instruments);
 
     /**
      * Returns the string-based list of instruments directly configured by
      * this provider via setInstrument.
      */
-    public String getInstrument();
+    String getInstrument();
 
     /**
      * Sets configuration options for this provider
      * @param options
      */
-    public void setOptions(String options);
+    void setOptions(String options);
 
     /**
      * Gets configuration options for this provider
      * @param options
      */
-    public String getOptions();
+    String getOptions();
 
     /**
      * Returns an string array of identifier to class name aliases for
@@ -89,7 +89,7 @@ public interface InstrumentationProvider {
      *   "QueryCache", "org.apache.openjpa.instrumentation.QueryCacheInstrument"}
      * @return a string array of identifier, class name pairs.
      */
-    public String[] getInstrumentAliases();
+    String[] getInstrumentAliases();
 
     /**
      * Adds an instrument to this providers list of managed instruments.  The
@@ -97,28 +97,28 @@ public interface InstrumentationProvider {
      * depending on the instrumentation level.
      * @param instrument
      */
-    public void addInstrument(Instrument instrument);
+    void addInstrument(Instrument instrument);
 
     /**
      * Stops all instruments of the specified instrumentation level and context.
      * @param level instrumentation level
      * @param context  instrumentation context (factory, broker, config)
      */
-    public void stopInstruments(InstrumentationLevel level, Object context);
+    void stopInstruments(InstrumentationLevel level, Object context);
 
     /**
      * Starts all instruments of the specified instrumentation level and context.
      * @param level instrumentation level
      * @param context  instrumentation context (factory, broker, config)
      */
-    public void startInstruments(InstrumentationLevel level, Object context);
+    void startInstruments(InstrumentationLevel level, Object context);
 
     /**
      * Initializes an instrument within the provided context.
      * @param instrument an instrument
      * @param context  instrumentation context (factory, broker, config)
      */
-    public void initializeInstrument(Instrument instrument, Object context);
+    void initializeInstrument(Instrument instrument, Object context);
 
     /**
      * Initializes an instrument within the provided options and context.
@@ -126,43 +126,43 @@ public interface InstrumentationProvider {
      * @param options configuration options to provide the instrument during initialization
      * @param context  instrumentation context (factory, broker, config)
      */
-    public void initializeInstrument(Instrument instrument, String options, Object context);
+    void initializeInstrument(Instrument instrument, String options, Object context);
 
     /**
      * Returns an instrument instrumented by this provider by name
      * @param name the name of the instrument to return
      * @return the instrument or null if not instrumented by this provider
      */
-    public Instrument getInstrumentByName(String name);
+    Instrument getInstrumentByName(String name);
 
     /**
      * Removes an instrument instrumented by this provider by name
      * @param name the name of the instrument to remove
      */
-    public void removeInstrumentByName(String name);
+    void removeInstrumentByName(String name);
 
     /**
      * Gets all instruments instrumented by this provider
      * @return instruments instrumented by this provider
      */
-    public Set<Instrument> getInstruments();
+    Set<Instrument> getInstruments();
 
     /**
      * Starts an instrument
      * @param instrument this instrument to start
      */
-    public void startInstrument(Instrument instrument);
+    void startInstrument(Instrument instrument);
 
     /**
      * Stops an instrument
      * @param instrument the instrument to stop
      */
-    public void stopInstrument(Instrument instrument);
+    void stopInstrument(Instrument instrument);
 
     /**
      * Stops an instrument, forcing the stop, if necessary.
      * @param instrument the instrument to stop
      * @param force forces the stop if the instrument does not stop gracefully.
      */
-    public void stopInstrument(Instrument instrument, boolean force);
+    void stopInstrument(Instrument instrument, boolean force);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/AbstractJDBCListener.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/AbstractJDBCListener.java
index 80f0dbb28..15df46480 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/AbstractJDBCListener.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/AbstractJDBCListener.java
@@ -33,42 +33,52 @@ public class AbstractJDBCListener implements JDBCListener {
     protected void eventOccurred(JDBCEvent event) {
     }
 
+    @Override
     public void beforePrepareStatement(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterPrepareStatement(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeCreateStatement(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterCreateStatement(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeExecuteStatement(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterExecuteStatement(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeCommit(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterCommit(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeRollback(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void afterRollback(JDBCEvent event) {
         eventOccurred(event);
     }
@@ -81,10 +91,12 @@ public class AbstractJDBCListener implements JDBCListener {
         eventOccurred(event);
     }
 
+    @Override
     public void afterConnect(JDBCEvent event) {
         eventOccurred(event);
     }
 
+    @Override
     public void beforeClose(JDBCEvent event) {
         eventOccurred(event);
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ConfiguringConnectionDecorator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ConfiguringConnectionDecorator.java
index d0a41c648..daf42ed1a 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ConfiguringConnectionDecorator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ConfiguringConnectionDecorator.java
@@ -86,6 +86,7 @@ public class ConfiguringConnectionDecorator implements ConnectionDecorator {
         _autoCommit = autoCommit;
     }
 
+    @Override
     public Connection decorate(Connection conn) throws SQLException {
         if (_isolation == Connection.TRANSACTION_NONE || _queryTimeout != -1
             || _autoCommit != null)
@@ -111,6 +112,7 @@ public class ConfiguringConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         public void setAutoCommit(boolean auto) throws SQLException {
             if (_isolation != TRANSACTION_NONE) {
                 super.setAutoCommit(auto);
@@ -118,6 +120,7 @@ public class ConfiguringConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         public void commit() throws SQLException {
             if (_isolation != TRANSACTION_NONE)
                 super.commit();
@@ -126,6 +129,7 @@ public class ConfiguringConnectionDecorator implements ConnectionDecorator {
                 setAutoCommit(_autoCommit.booleanValue());
         }
 
+        @Override
         public void rollback() throws SQLException {
             if (_isolation != TRANSACTION_NONE)
                 super.rollback();
@@ -134,6 +138,7 @@ public class ConfiguringConnectionDecorator implements ConnectionDecorator {
                 setAutoCommit(_autoCommit.booleanValue());
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, boolean wrap)
             throws SQLException {
             PreparedStatement stmnt = super.prepareStatement(sql, wrap);
@@ -142,6 +147,7 @@ public class ConfiguringConnectionDecorator implements ConnectionDecorator {
             return stmnt;
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, int rsType,
             int rsConcur, boolean wrap) throws SQLException {
             PreparedStatement stmnt = super.prepareStatement(sql, rsType,
@@ -151,6 +157,7 @@ public class ConfiguringConnectionDecorator implements ConnectionDecorator {
             return stmnt;
         }
 
+        @Override
         protected Statement createStatement(boolean wrap) throws SQLException {
             Statement stmnt = super.createStatement(wrap);
             if (_queryTimeout != -1)
@@ -158,6 +165,7 @@ public class ConfiguringConnectionDecorator implements ConnectionDecorator {
             return stmnt;
         }
 
+        @Override
         protected Statement createStatement(int rsType, int rsConcur,
             boolean wrap) throws SQLException {
             Statement stmnt = super.createStatement(rsType, rsConcur, wrap);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ConnectionDecorator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ConnectionDecorator.java
index fc3c26e4d..2b912f830 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ConnectionDecorator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ConnectionDecorator.java
@@ -32,5 +32,5 @@ public interface ConnectionDecorator {
     /**
      * Decorate the given connection if desired.
      */
-    public Connection decorate(Connection conn) throws SQLException;
+    Connection decorate(Connection conn) throws SQLException;
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DecoratingDataSource.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DecoratingDataSource.java
index 6ae8e1408..7542fe936 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DecoratingDataSource.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DecoratingDataSource.java
@@ -35,7 +35,7 @@ import javax.sql.DataSource;
 public class DecoratingDataSource extends DelegatingDataSource {
 
     private List<ConnectionDecorator> _decorators =
-        new CopyOnWriteArrayList<ConnectionDecorator>();
+        new CopyOnWriteArrayList<>();
 
     /**
      * Constructor. Supply wrapped data source.
@@ -82,11 +82,13 @@ public class DecoratingDataSource extends DelegatingDataSource {
         _decorators.clear();
     }
 
+    @Override
     public Connection getConnection() throws SQLException {
         Connection conn = super.getConnection();
         return decorate(conn);
     }
 
+    @Override
     public Connection getConnection(String user, String pass)
         throws SQLException {
         Connection conn = super.getConnection(user, pass);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java
index 7eedd5ab1..9ade0fb09 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java
@@ -91,10 +91,12 @@ public class DelegatingCallableStatement
         return (_del == null) ? _stmnt : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -104,6 +106,7 @@ public class DelegatingCallableStatement
         return getInnermostDelegate().equals(other);
     }
 
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer("callstmnt ").append(hashCode());
         appendInfo(buf);
@@ -115,6 +118,7 @@ public class DelegatingCallableStatement
             _del.appendInfo(buf);
     }
 
+    @Override
     public ResultSet executeQuery(String str) throws SQLException {
         return executeQuery(true);
     }
@@ -134,62 +138,77 @@ public class DelegatingCallableStatement
         return wrapResult(wrap, rs);
     }
 
+    @Override
     public int executeUpdate(String str) throws SQLException {
         return _stmnt.executeUpdate(str);
     }
 
+    @Override
     public boolean execute(String str) throws SQLException {
         return _stmnt.execute(str);
     }
 
+    @Override
     public void close() throws SQLException {
         _stmnt.close();
     }
 
+    @Override
     public int getMaxFieldSize() throws SQLException {
         return _stmnt.getMaxFieldSize();
     }
 
+    @Override
     public void setMaxFieldSize(int i) throws SQLException {
         _stmnt.setMaxFieldSize(i);
     }
 
+    @Override
     public int getMaxRows() throws SQLException {
         return _stmnt.getMaxRows();
     }
 
+    @Override
     public void setMaxRows(int i) throws SQLException {
         _stmnt.setMaxRows(i);
     }
 
+    @Override
     public void setEscapeProcessing(boolean bool) throws SQLException {
         _stmnt.setEscapeProcessing(bool);
     }
 
+    @Override
     public int getQueryTimeout() throws SQLException {
         return _stmnt.getQueryTimeout();
     }
 
+    @Override
     public void setQueryTimeout(int i) throws SQLException {
         _stmnt.setQueryTimeout(i);
     }
 
+    @Override
     public void cancel() throws SQLException {
         _stmnt.cancel();
     }
 
+    @Override
     public SQLWarning getWarnings() throws SQLException {
         return _stmnt.getWarnings();
     }
 
+    @Override
     public void clearWarnings() throws SQLException {
         _stmnt.clearWarnings();
     }
 
+    @Override
     public void setCursorName(String str) throws SQLException {
         _stmnt.setCursorName(str);
     }
 
+    @Override
     public ResultSet getResultSet() throws SQLException {
         return getResultSet(true);
     }
@@ -208,54 +227,67 @@ public class DelegatingCallableStatement
         return wrapResult(wrap, rs);
     }
 
+    @Override
     public int getUpdateCount() throws SQLException {
         return _stmnt.getUpdateCount();
     }
 
+    @Override
     public boolean getMoreResults() throws SQLException {
         return _stmnt.getMoreResults();
     }
 
+    @Override
     public void setFetchDirection(int i) throws SQLException {
         _stmnt.setFetchDirection(i);
     }
 
+    @Override
     public int getFetchDirection() throws SQLException {
         return _stmnt.getFetchDirection();
     }
 
+    @Override
     public void setFetchSize(int i) throws SQLException {
         _stmnt.setFetchSize(i);
     }
 
+    @Override
     public int getFetchSize() throws SQLException {
         return _stmnt.getFetchSize();
     }
 
+    @Override
     public int getResultSetConcurrency() throws SQLException {
         return _stmnt.getResultSetConcurrency();
     }
 
+    @Override
     public int getResultSetType() throws SQLException {
         return _stmnt.getResultSetType();
     }
 
+    @Override
     public void addBatch(String str) throws SQLException {
         _stmnt.addBatch(str);
     }
 
+    @Override
     public void clearBatch() throws SQLException {
         _stmnt.clearBatch();
     }
 
+    @Override
     public int[] executeBatch() throws SQLException {
         return _stmnt.executeBatch();
     }
 
+    @Override
     public Connection getConnection() throws SQLException {
         return _conn;
     }
 
+    @Override
     public ResultSet executeQuery() throws SQLException {
         return executeQuery(true);
     }
@@ -274,66 +306,82 @@ public class DelegatingCallableStatement
         return wrapResult(wrap, rs);
     }
 
+    @Override
     public int executeUpdate() throws SQLException {
         return _stmnt.executeUpdate();
     }
 
+    @Override
     public void setNull(int i1, int i2) throws SQLException {
         _stmnt.setNull(i1, i2);
     }
 
+    @Override
     public void setBoolean(int i, boolean b) throws SQLException {
         _stmnt.setBoolean(i, b);
     }
 
+    @Override
     public void setByte(int i, byte b) throws SQLException {
         _stmnt.setByte(i, b);
     }
 
+    @Override
     public void setShort(int i, short s) throws SQLException {
         _stmnt.setShort(i, s);
     }
 
+    @Override
     public void setInt(int i1, int i2) throws SQLException {
         _stmnt.setInt(i1, i2);
     }
 
+    @Override
     public void setLong(int i, long l) throws SQLException {
         _stmnt.setLong(i, l);
     }
 
+    @Override
     public void setFloat(int i, float f) throws SQLException {
         _stmnt.setFloat(i, f);
     }
 
+    @Override
     public void setDouble(int i, double d) throws SQLException {
         _stmnt.setDouble(i, d);
     }
 
+    @Override
     public void setBigDecimal(int i, BigDecimal bd) throws SQLException {
         _stmnt.setBigDecimal(i, bd);
     }
 
+    @Override
     public void setString(int i, String s) throws SQLException {
         _stmnt.setString(i, s);
     }
 
+    @Override
     public void setBytes(int i, byte[] b) throws SQLException {
         _stmnt.setBytes(i, b);
     }
 
+    @Override
     public void setDate(int i, Date d) throws SQLException {
         _stmnt.setDate(i, d);
     }
 
+    @Override
     public void setTime(int i, Time t) throws SQLException {
         _stmnt.setTime(i, t);
     }
 
+    @Override
     public void setTimestamp(int i, Timestamp t) throws SQLException {
         _stmnt.setTimestamp(i, t);
     }
 
+    @Override
     public void setAsciiStream(int i1, InputStream is, int i2)
         throws SQLException {
         _stmnt.setAsciiStream(i1, is, i2);
@@ -342,125 +390,155 @@ public class DelegatingCallableStatement
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public void setUnicodeStream(int i1, InputStream is, int i2)
         throws SQLException {
         _stmnt.setUnicodeStream(i1, is, i2);
     }
 
+    @Override
     public void setBinaryStream(int i1, InputStream is, int i2)
         throws SQLException {
         _stmnt.setBinaryStream(i1, is, i2);
     }
 
+    @Override
     public void clearParameters() throws SQLException {
         _stmnt.clearParameters();
     }
 
+    @Override
     public void setObject(int i1, Object o, int i2, int i3)
         throws SQLException {
         _stmnt.setObject(i1, o, i2, i3);
     }
 
+    @Override
     public void setObject(int i1, Object o, int i2) throws SQLException {
         _stmnt.setObject(i1, o, i2);
     }
 
+    @Override
     public void setObject(int i, Object o) throws SQLException {
         _stmnt.setObject(i, o);
     }
 
+    @Override
     public boolean execute() throws SQLException {
         return _stmnt.execute();
     }
 
+    @Override
     public void addBatch() throws SQLException {
         _stmnt.addBatch();
     }
 
+    @Override
     public void setCharacterStream(int i1, Reader r, int i2)
         throws SQLException {
         _stmnt.setCharacterStream(i1, r, i2);
     }
 
+    @Override
     public void setRef(int i, Ref r) throws SQLException {
         _stmnt.setRef(i, r);
     }
 
+    @Override
     public void setBlob(int i, Blob b) throws SQLException {
         _stmnt.setBlob(i, b);
     }
 
+    @Override
     public void setClob(int i, Clob c) throws SQLException {
         _stmnt.setClob(i, c);
     }
 
+    @Override
     public void setArray(int i, Array a) throws SQLException {
         _stmnt.setArray(i, a);
     }
 
+    @Override
     public ResultSetMetaData getMetaData() throws SQLException {
         return _stmnt.getMetaData();
     }
 
+    @Override
     public void setDate(int i, Date d, Calendar c) throws SQLException {
         _stmnt.setDate(i, d, c);
     }
 
+    @Override
     public void setTime(int i, Time t, Calendar c) throws SQLException {
         _stmnt.setTime(i, t, c);
     }
 
+    @Override
     public void setTimestamp(int i, Timestamp t, Calendar c)
         throws SQLException {
         _stmnt.setTimestamp(i, t, c);
     }
 
+    @Override
     public void setNull(int i1, int i2, String s) throws SQLException {
         _stmnt.setNull(i1, i2, s);
     }
 
     // JDBC 3 methods follow.
 
+    @Override
     public boolean getMoreResults(int i) throws SQLException {
         return _stmnt.getMoreResults(i);
     }
 
+    @Override
     public ResultSet getGeneratedKeys() throws SQLException {
         return _stmnt.getGeneratedKeys();
     }
 
+    @Override
     public int executeUpdate(String s, int i) throws SQLException {
         return _stmnt.executeUpdate(s, i);
     }
 
+    @Override
     public int executeUpdate(String s, int[] ia) throws SQLException {
         return _stmnt.executeUpdate(s, ia);
     }
 
+    @Override
     public int executeUpdate(String s, String[] sa) throws SQLException {
         return _stmnt.executeUpdate(s, sa);
     }
 
+    @Override
     public boolean execute(String s, int i) throws SQLException {
         return _stmnt.execute(s, i);
     }
 
+    @Override
     public boolean execute(String s, int[] ia) throws SQLException {
         return _stmnt.execute(s, ia);
     }
 
+    @Override
     public boolean execute(String s, String[] sa) throws SQLException {
         return _stmnt.execute(s, sa);
     }
 
+    @Override
     public int getResultSetHoldability() throws SQLException {
         return _stmnt.getResultSetHoldability();
     }
 
+    @Override
     public void setURL(int i, URL url) throws SQLException {
         _stmnt.setURL(i, url);
     }
 
+    @Override
     public ParameterMetaData getParameterMetaData() throws SQLException {
         return _stmnt.getParameterMetaData();
     }
@@ -469,47 +547,58 @@ public class DelegatingCallableStatement
     // CallableStatement methods
     /////////////////////////////
 
+    @Override
     public void registerOutParameter(int i1, int i2) throws SQLException {
         _stmnt.registerOutParameter(i1, i2);
     }
 
+    @Override
     public void registerOutParameter(int i1, int i2, int i3)
         throws SQLException {
         _stmnt.registerOutParameter(i1, i2, i3);
     }
 
+    @Override
     public boolean wasNull() throws SQLException {
         return _stmnt.wasNull();
     }
 
+    @Override
     public String getString(int i) throws SQLException {
         return _stmnt.getString(i);
     }
 
+    @Override
     public boolean getBoolean(int i) throws SQLException {
         return _stmnt.getBoolean(i);
     }
 
+    @Override
     public byte getByte(int i) throws SQLException {
         return _stmnt.getByte(i);
     }
 
+    @Override
     public short getShort(int i) throws SQLException {
         return _stmnt.getShort(i);
     }
 
+    @Override
     public int getInt(int i) throws SQLException {
         return _stmnt.getInt(i);
     }
 
+    @Override
     public long getLong(int i) throws SQLException {
         return _stmnt.getLong(i);
     }
 
+    @Override
     public float getFloat(int i) throws SQLException {
         return _stmnt.getFloat(i);
     }
 
+    @Override
     public double getDouble(int i) throws SQLException {
         return _stmnt.getDouble(i);
     }
@@ -518,66 +607,83 @@ public class DelegatingCallableStatement
      * @deprecated use <code>getBigDecimal(int parameterIndex)</code> or
      *             <code>getBigDecimal(String parameterName)</code>
      */
+    @Deprecated
+    @Override
     public BigDecimal getBigDecimal(int a, int b) throws SQLException {
         return _stmnt.getBigDecimal(a, b);
     }
 
+    @Override
     public byte[] getBytes(int i) throws SQLException {
         return _stmnt.getBytes(i);
     }
 
+    @Override
     public Date getDate(int i) throws SQLException {
         return _stmnt.getDate(i);
     }
 
+    @Override
     public Time getTime(int i) throws SQLException {
         return _stmnt.getTime(i);
     }
 
+    @Override
     public Timestamp getTimestamp(int i) throws SQLException {
         return _stmnt.getTimestamp(i);
     }
 
+    @Override
     public Object getObject(int i) throws SQLException {
         return _stmnt.getObject(i);
     }
 
+    @Override
     public BigDecimal getBigDecimal(int i) throws SQLException {
         return _stmnt.getBigDecimal(i);
     }
 
+    @Override
     public Object getObject(int i, Map<String,Class<?>> m) throws SQLException {
         return _stmnt.getObject(i, m);
     }
 
+    @Override
     public Ref getRef(int i) throws SQLException {
         return _stmnt.getRef(i);
     }
 
+    @Override
     public Blob getBlob(int i) throws SQLException {
         return _stmnt.getBlob(i);
     }
 
+    @Override
     public Clob getClob(int i) throws SQLException {
         return _stmnt.getClob(i);
     }
 
+    @Override
     public Array getArray(int i) throws SQLException {
         return _stmnt.getArray(i);
     }
 
+    @Override
     public Date getDate(int i, Calendar c) throws SQLException {
         return _stmnt.getDate(i, c);
     }
 
+    @Override
     public Time getTime(int i, Calendar c) throws SQLException {
         return _stmnt.getTime(i, c);
     }
 
+    @Override
     public Timestamp getTimestamp(int i, Calendar c) throws SQLException {
         return _stmnt.getTimestamp(i, c);
     }
 
+    @Override
     public void registerOutParameter(int i1, int i2, String s)
         throws SQLException {
         _stmnt.registerOutParameter(i1, i2, s);
@@ -585,224 +691,277 @@ public class DelegatingCallableStatement
 
     // JDBC 3 methods follow.
 
+    @Override
     public void registerOutParameter(String s, int i) throws SQLException {
         _stmnt.registerOutParameter(s, i);
     }
 
+    @Override
     public void registerOutParameter(String s, int i1, int i2)
         throws SQLException {
         _stmnt.registerOutParameter(s, i1, i2);
     }
 
+    @Override
     public void registerOutParameter(String s1, int i, String s2)
         throws SQLException {
         _stmnt.registerOutParameter(s1, i, s2);
     }
 
+    @Override
     public URL getURL(int i) throws SQLException {
         return _stmnt.getURL(i);
     }
 
+    @Override
     public void setURL(String a, URL b) throws SQLException {
         _stmnt.setURL(a, b);
     }
 
+    @Override
     public URL getURL(String a) throws SQLException {
         return _stmnt.getURL(a);
     }
 
+    @Override
     public void setNull(String a, int b) throws SQLException {
         _stmnt.setNull(a, b);
     }
 
+    @Override
     public void setBoolean(String a, boolean b) throws SQLException {
         _stmnt.setBoolean(a, b);
     }
 
+    @Override
     public void setByte(String a, byte b) throws SQLException {
         _stmnt.setByte(a, b);
     }
 
+    @Override
     public void setShort(String a, short b) throws SQLException {
         _stmnt.setShort(a, b);
     }
 
+    @Override
     public void setInt(String a, int b) throws SQLException {
         _stmnt.setInt(a, b);
     }
 
+    @Override
     public void setLong(String a, long b) throws SQLException {
         _stmnt.setLong(a, b);
     }
 
+    @Override
     public void setFloat(String a, float b) throws SQLException {
         _stmnt.setFloat(a, b);
     }
 
+    @Override
     public void setDouble(String a, double b) throws SQLException {
         _stmnt.setDouble(a, b);
     }
 
+    @Override
     public void setBigDecimal(String a, BigDecimal b) throws SQLException {
         _stmnt.setBigDecimal(a, b);
     }
 
+    @Override
     public void setString(String a, String b) throws SQLException {
         _stmnt.setString(a, b);
     }
 
+    @Override
     public void setBytes(String a, byte[] b) throws SQLException {
         _stmnt.setBytes(a, b);
     }
 
+    @Override
     public void setDate(String a, Date b) throws SQLException {
         _stmnt.setDate(a, b);
     }
 
+    @Override
     public void setTime(String a, Time b) throws SQLException {
         _stmnt.setTime(a, b);
     }
 
+    @Override
     public void setTimestamp(String a, Timestamp b) throws SQLException {
         _stmnt.setTimestamp(a, b);
     }
 
+    @Override
     public void setAsciiStream(String a, InputStream b, int c)
         throws SQLException {
         _stmnt.setAsciiStream(a, b, c);
     }
 
+    @Override
     public void setBinaryStream(String a, InputStream b, int c)
         throws SQLException {
         _stmnt.setBinaryStream(a, b, c);
     }
 
+    @Override
     public void setObject(String a, Object b, int c, int d)
         throws SQLException {
         _stmnt.setObject(a, b, c, d);
     }
 
+    @Override
     public void setObject(String a, Object b, int c) throws SQLException {
         _stmnt.setObject(a, b, c);
     }
 
+    @Override
     public void setObject(String a, Object b) throws SQLException {
         _stmnt.setObject(a, b);
     }
 
+    @Override
     public void setCharacterStream(String a, Reader b, int c)
         throws SQLException {
         _stmnt.setCharacterStream(a, b, c);
     }
 
+    @Override
     public void setDate(String a, Date b, Calendar c) throws SQLException {
         _stmnt.setDate(a, b, c);
     }
 
+    @Override
     public void setTime(String a, Time b, Calendar c) throws SQLException {
         _stmnt.setTime(a, b, c);
     }
 
+    @Override
     public void setTimestamp(String a, Timestamp b, Calendar c)
         throws SQLException {
         _stmnt.setTimestamp(a, b, c);
     }
 
+    @Override
     public void setNull(String a, int b, String c) throws SQLException {
         _stmnt.setNull(a, b, c);
     }
 
+    @Override
     public String getString(String a) throws SQLException {
         return _stmnt.getString(a);
     }
 
+    @Override
     public boolean getBoolean(String a) throws SQLException {
         return _stmnt.getBoolean(a);
     }
 
+    @Override
     public byte getByte(String a) throws SQLException {
         return _stmnt.getByte(a);
     }
 
+    @Override
     public short getShort(String a) throws SQLException {
         return _stmnt.getShort(a);
     }
 
+    @Override
     public int getInt(String a) throws SQLException {
         return _stmnt.getInt(a);
     }
 
+    @Override
     public long getLong(String a) throws SQLException {
         return _stmnt.getLong(a);
     }
 
+    @Override
     public float getFloat(String a) throws SQLException {
         return _stmnt.getFloat(a);
     }
 
+    @Override
     public double getDouble(String a) throws SQLException {
         return _stmnt.getDouble(a);
     }
 
+    @Override
     public byte[] getBytes(String a) throws SQLException {
         return _stmnt.getBytes(a);
     }
 
+    @Override
     public Date getDate(String a) throws SQLException {
         return _stmnt.getDate(a);
     }
 
+    @Override
     public Time getTime(String a) throws SQLException {
         return _stmnt.getTime(a);
     }
 
+    @Override
     public Timestamp getTimestamp(String a) throws SQLException {
         return _stmnt.getTimestamp(a);
     }
 
+    @Override
     public Object getObject(String a) throws SQLException {
         return _stmnt.getObject(a);
     }
 
+    @Override
     public BigDecimal getBigDecimal(String a) throws SQLException {
         return _stmnt.getBigDecimal(a);
     }
 
+    @Override
     public Object getObject(String a, Map<String, Class<?>>b) throws
             SQLException {
         return _stmnt.getObject(a, b);
     }
 
+    @Override
     public Ref getRef(String a) throws SQLException {
         return _stmnt.getRef(a);
     }
 
+    @Override
     public Blob getBlob(String a) throws SQLException {
         return _stmnt.getBlob(a);
     }
 
+    @Override
     public Clob getClob(String a) throws SQLException {
         return _stmnt.getClob(a);
     }
 
+    @Override
     public Array getArray(String a) throws SQLException {
         return _stmnt.getArray(a);
     }
 
+    @Override
     public Date getDate(String a, Calendar b) throws SQLException {
         return _stmnt.getDate(a, b);
     }
 
+    @Override
     public Time getTime(String a, Calendar b) throws SQLException {
         return _stmnt.getTime(a, b);
     }
 
+    @Override
     public Timestamp getTimestamp(String a, Calendar b) throws SQLException {
         return _stmnt.getTimestamp(a, b);
     }
 
     // JDBC 4 methods follow.
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getDelegate().getClass());
     }
@@ -815,232 +974,289 @@ public class DelegatingCallableStatement
             return null;
     }
 
+    @Override
     public Reader getCharacterStream(int parameterIndex) throws SQLException {
         return _stmnt.getCharacterStream(parameterIndex);
     }
 
+    @Override
     public Reader getCharacterStream(String parameterName) throws SQLException {
         return _stmnt.getCharacterStream(parameterName);
     }
 
+    @Override
     public Reader getNCharacterStream(int parameterIndex) throws SQLException {
         return _stmnt.getNCharacterStream(parameterIndex);
     }
 
+    @Override
     public Reader getNCharacterStream(String parameterName) throws SQLException {
         return _stmnt.getNCharacterStream(parameterName);
     }
 
+    @Override
     public NClob getNClob(int parameterIndex) throws SQLException {
         return _stmnt.getNClob(parameterIndex);
     }
 
+    @Override
     public NClob getNClob(String parameterName) throws SQLException {
         return _stmnt.getNClob(parameterName);
     }
 
+    @Override
     public String getNString(int parameterIndex) throws SQLException {
         return _stmnt.getNString(parameterIndex);
     }
 
+    @Override
     public String getNString(String parameterName) throws SQLException {
         return _stmnt.getNString(parameterName);
     }
 
+    @Override
     public RowId getRowId(int parameterIndex) throws SQLException {
         return _stmnt.getRowId(parameterIndex);
     }
 
+    @Override
     public RowId getRowId(String parameterName) throws SQLException {
         return _stmnt.getRowId(parameterName);
     }
 
+    @Override
     public SQLXML getSQLXML(int parameterIndex) throws SQLException {
         return _stmnt.getSQLXML(parameterIndex);
     }
 
+    @Override
     public SQLXML getSQLXML(String parameterName) throws SQLException {
         return _stmnt.getSQLXML(parameterName);
     }
 
+    @Override
     public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException {
         _stmnt.setAsciiStream(parameterName, x, length);
     }
 
+    @Override
     public void setAsciiStream(String parameterName, InputStream x) throws SQLException {
         _stmnt.setAsciiStream(parameterName, x);
     }
 
+    @Override
     public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException {
         _stmnt.setBinaryStream(parameterName, x, length);
     }
 
+    @Override
     public void setBinaryStream(String parameterName, InputStream x) throws SQLException {
         _stmnt.setBinaryStream(parameterName, x);
     }
 
+    @Override
     public void setBlob(String parameterName, Blob x) throws SQLException {
         _stmnt.setBlob(parameterName, x);
     }
 
+    @Override
     public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
         _stmnt.setBlob(parameterName, inputStream, length);
     }
 
+    @Override
     public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
         _stmnt.setBlob(parameterName, inputStream);
     }
 
+    @Override
     public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
         _stmnt.setCharacterStream(parameterName, reader, length);
     }
 
+    @Override
     public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
         _stmnt.setCharacterStream(parameterName, reader);
     }
 
+    @Override
     public void setClob(String parameterName, Clob x) throws SQLException {
         _stmnt.setClob(parameterName, x);
     }
 
+    @Override
     public void setClob(String parameterName, Reader reader, long length) throws SQLException {
         _stmnt.setClob(parameterName, reader, length);
     }
 
+    @Override
     public void setClob(String parameterName, Reader reader) throws SQLException {
         _stmnt.setClob(parameterName, reader);
     }
 
+    @Override
     public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
         _stmnt.setNCharacterStream(parameterName, value, length);
     }
 
+    @Override
     public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
         _stmnt.setNCharacterStream(parameterName, value);
     }
 
+    @Override
     public void setNClob(String parameterName, NClob value) throws SQLException {
         _stmnt.setNClob(parameterName, value);
     }
 
+    @Override
     public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
         _stmnt.setNClob(parameterName, reader, length);
     }
 
+    @Override
     public void setNClob(String parameterName, Reader reader) throws SQLException {
         _stmnt.setNClob(parameterName, reader);
     }
 
+    @Override
     public void setNString(String parameterName, String value) throws SQLException {
         _stmnt.setNString(parameterName, value);
     }
 
+    @Override
     public void setRowId(String parameterName, RowId x) throws SQLException {
         _stmnt.setRowId(parameterName, x);
     }
 
+    @Override
     public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
         _stmnt.setSQLXML(parameterName, xmlObject);
     }
 
+    @Override
     public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
         _stmnt.setAsciiStream(parameterIndex, x, length);
     }
 
+    @Override
     public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
         _stmnt.setAsciiStream(parameterIndex, x);
     }
 
+    @Override
     public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
         _stmnt.setBinaryStream(parameterIndex, x, length);
     }
 
+    @Override
     public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
         _stmnt.setBinaryStream(parameterIndex, x);
     }
 
+    @Override
     public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
         _stmnt.setBlob(parameterIndex, inputStream, length);
     }
 
+    @Override
     public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
         _stmnt.setBlob(parameterIndex, inputStream);
     }
 
+    @Override
     public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
         _stmnt.setCharacterStream(parameterIndex, reader, length);
     }
 
+    @Override
     public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
         _stmnt.setCharacterStream(parameterIndex, reader);
     }
 
+    @Override
     public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
         _stmnt.setClob(parameterIndex, reader, length);
     }
 
+    @Override
     public void setClob(int parameterIndex, Reader reader) throws SQLException {
         _stmnt.setClob(parameterIndex, reader);
     }
 
+    @Override
     public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
         _stmnt.setNCharacterStream(parameterIndex, value, length);
     }
 
+    @Override
     public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
         _stmnt.setNCharacterStream(parameterIndex, value);
     }
 
+    @Override
     public void setNClob(int parameterIndex, NClob value) throws SQLException {
         _stmnt.setNClob(parameterIndex, value);
     }
 
+    @Override
     public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
         _stmnt.setNClob(parameterIndex, reader, length);
     }
 
+    @Override
     public void setNClob(int parameterIndex, Reader reader) throws SQLException {
         _stmnt.setNClob(parameterIndex, reader);
     }
 
+    @Override
     public void setNString(int parameterIndex, String value) throws SQLException {
         _stmnt.setNString(parameterIndex, value);
     }
 
+    @Override
     public void setRowId(int parameterIndex, RowId x) throws SQLException {
         _stmnt.setRowId(parameterIndex, x);
     }
 
+    @Override
     public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
         _stmnt.setSQLXML(parameterIndex, xmlObject);
     }
 
+    @Override
     public boolean isClosed() throws SQLException {
         return _stmnt.isClosed();
     }
 
+    @Override
     public boolean isPoolable() throws SQLException {
         return _stmnt.isPoolable();
     }
 
+    @Override
     public void setPoolable(boolean poolable) throws SQLException {
         _stmnt.setPoolable(poolable);
     }
 
     // Java 7 methods follow
 
+    @Override
     public <T>T getObject(String columnLabel, Class<T> type) throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T>T getObject(int columnIndex, Class<T> type) throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isCloseOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void closeOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java
index fb56e40cd..d7916289b 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java
@@ -76,10 +76,12 @@ public class DelegatingConnection implements Connection, Closeable {
         return (_del == null) ? _conn : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -88,6 +90,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return getInnermostDelegate().equals(other);
     }
 
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer("conn ").append(hashCode());
         appendInfo(buf);
@@ -99,6 +102,7 @@ public class DelegatingConnection implements Connection, Closeable {
             _del.appendInfo(buf);
     }
 
+    @Override
     public Statement createStatement() throws SQLException {
         return createStatement(true);
     }
@@ -118,6 +122,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public PreparedStatement prepareStatement(String str) throws SQLException {
         return prepareStatement(str, true);
     }
@@ -139,6 +144,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public CallableStatement prepareCall(String str) throws SQLException {
         return prepareCall(str, true);
     }
@@ -159,34 +165,42 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public String nativeSQL(String str) throws SQLException {
         return _conn.nativeSQL(str);
     }
 
+    @Override
     public void setAutoCommit(boolean bool) throws SQLException {
         _conn.setAutoCommit(bool);
     }
 
+    @Override
     public boolean getAutoCommit() throws SQLException {
         return _conn.getAutoCommit();
     }
 
+    @Override
     public void commit() throws SQLException {
         _conn.commit();
     }
 
+    @Override
     public void rollback() throws SQLException {
         _conn.rollback();
     }
 
+    @Override
     public void close() throws SQLException {
         _conn.close();
     }
 
+    @Override
     public boolean isClosed() throws SQLException {
         return _conn.isClosed();
     }
 
+    @Override
     public DatabaseMetaData getMetaData() throws SQLException {
         return getMetaData(true);
     }
@@ -206,38 +220,47 @@ public class DelegatingConnection implements Connection, Closeable {
         return meta;
     }
 
+    @Override
     public void setReadOnly(boolean bool) throws SQLException {
         _conn.setReadOnly(bool);
     }
 
+    @Override
     public boolean isReadOnly() throws SQLException {
         return _conn.isReadOnly();
     }
 
+    @Override
     public void setCatalog(String str) throws SQLException {
         _conn.setCatalog(str);
     }
 
+    @Override
     public String getCatalog() throws SQLException {
         return _conn.getCatalog();
     }
 
+    @Override
     public void setTransactionIsolation(int i) throws SQLException {
         _conn.setTransactionIsolation(i);
     }
 
+    @Override
     public int getTransactionIsolation() throws SQLException {
         return _conn.getTransactionIsolation();
     }
 
+    @Override
     public SQLWarning getWarnings() throws SQLException {
         return _conn.getWarnings();
     }
 
+    @Override
     public void clearWarnings() throws SQLException {
         _conn.clearWarnings();
     }
 
+    @Override
     public Statement createStatement(int type, int concur) throws SQLException {
         return createStatement(type, concur, true);
     }
@@ -258,6 +281,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public PreparedStatement prepareStatement(String str, int type, int concur)
         throws SQLException {
         return prepareStatement(str, type, concur, true);
@@ -279,6 +303,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public CallableStatement prepareCall(String str, int type, int concur)
         throws SQLException {
         return prepareCall(str, type, concur, true);
@@ -300,40 +325,49 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public Map<String, Class<?>> getTypeMap() throws SQLException {
         return _conn.getTypeMap();
     }
 
+    @Override
     public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
         _conn.setTypeMap(map);
     }
 
     // JDBC 3.0 methods follow.
 
+    @Override
     public void setHoldability(int holdability) throws SQLException {
         _conn.setHoldability(holdability);
     }
 
+    @Override
     public int getHoldability() throws SQLException {
         return _conn.getHoldability();
     }
 
+    @Override
     public Savepoint setSavepoint() throws SQLException {
         return _conn.setSavepoint();
     }
 
+    @Override
     public Savepoint setSavepoint(String savepoint) throws SQLException {
         return _conn.setSavepoint(savepoint);
     }
 
+    @Override
     public void rollback(Savepoint savepoint) throws SQLException {
         _conn.rollback(savepoint);
     }
 
+    @Override
     public void releaseSavepoint(Savepoint savepoint) throws SQLException {
         _conn.releaseSavepoint(savepoint);
     }
 
+    @Override
     public Statement createStatement(int resultSetType,
         int resultSetConcurrency, int resultSetHoldability)
         throws SQLException {
@@ -356,6 +390,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public PreparedStatement prepareStatement(String sql,
         int resultSetType, int resultSetConcurrency, int resultSetHoldability)
         throws SQLException {
@@ -378,6 +413,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public CallableStatement prepareCall(String sql,
         int resultSetType, int resultSetConcurrency, int resultSetHoldability)
         throws SQLException {
@@ -400,6 +436,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
         throws SQLException {
         return prepareStatement(sql, autoGeneratedKeys, true);
@@ -418,6 +455,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public PreparedStatement prepareStatement(String sql, int[] columnIndexes)
         throws SQLException {
         return prepareStatement(sql, columnIndexes, true);
@@ -436,6 +474,7 @@ public class DelegatingConnection implements Connection, Closeable {
         return stmnt;
     }
 
+    @Override
     public PreparedStatement prepareStatement(String sql, String[] columnNames)
         throws SQLException {
         return prepareStatement(sql, columnNames, true);
@@ -456,6 +495,7 @@ public class DelegatingConnection implements Connection, Closeable {
 
     //  JDBC 4.0 methods follow.
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getDelegate().getClass());
     }
@@ -483,68 +523,84 @@ public class DelegatingConnection implements Connection, Closeable {
         }
     }
 
+    @Override
     public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
         return _conn.createArrayOf(typeName, elements);
     }
 
+    @Override
     public Blob createBlob() throws SQLException {
         return _conn.createBlob();
     }
 
+    @Override
     public Clob createClob() throws SQLException {
         return _conn.createClob();
     }
 
+    @Override
     public NClob createNClob() throws SQLException {
         return _conn.createNClob();
     }
 
+    @Override
     public SQLXML createSQLXML() throws SQLException {
         return _conn.createSQLXML();
     }
 
+    @Override
     public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
         return _conn.createStruct(typeName, attributes);
     }
 
+    @Override
     public Properties getClientInfo() throws SQLException {
         return _conn.getClientInfo();
     }
 
+    @Override
     public String getClientInfo(String name) throws SQLException {
         return _conn.getClientInfo(name);
     }
 
+    @Override
     public boolean isValid(int timeout) throws SQLException {
         return _conn.isValid(timeout);
     }
 
+    @Override
     public void setClientInfo(Properties properties) throws SQLClientInfoException {
         _conn.setClientInfo(properties);
     }
 
+    @Override
     public void setClientInfo(String name, String value) throws SQLClientInfoException {
         _conn.setClientInfo(name, value);
     }
 
     // Java 7 methods follow
 
+    @Override
     public void abort(Executor executor) throws SQLException {
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public int getNetworkTimeout() throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public String getSchema() throws SQLException {
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setSchema(String schema)throws SQLException {
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java
index babac33b8..9907875b5 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java
@@ -67,10 +67,12 @@ public class DelegatingDataSource implements DataSource, Closeable {
         return (_del == null) ? _ds : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -79,6 +81,7 @@ public class DelegatingDataSource implements DataSource, Closeable {
         return getInnermostDelegate().equals(other);
     }
 
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer("datasource "). append(hashCode());
         appendInfo(buf);
@@ -90,26 +93,32 @@ public class DelegatingDataSource implements DataSource, Closeable {
             _del.appendInfo(buf);
     }
 
+    @Override
     public PrintWriter getLogWriter() throws SQLException {
         return _ds.getLogWriter();
     }
 
+    @Override
     public void setLogWriter(PrintWriter out) throws SQLException {
         _ds.setLogWriter(out);
     }
 
+    @Override
     public int getLoginTimeout() throws SQLException {
         return _ds.getLoginTimeout();
     }
 
+    @Override
     public void setLoginTimeout(int timeout) throws SQLException {
         _ds.setLoginTimeout(timeout);
     }
 
+    @Override
     public Connection getConnection() throws SQLException {
         return _ds.getConnection();
     }
 
+    @Override
     public Connection getConnection(String user, String pass)
         throws SQLException {
         if (user == null && pass == null)
@@ -129,16 +138,19 @@ public class DelegatingDataSource implements DataSource, Closeable {
         return null;
     }
 
+    @Override
     public void close() throws Exception {
         if (_ds instanceof Closeable)
             ((Closeable) _ds).close();
     }
 
     // java.sql.Wrapper implementation (JDBC 4)
+    @Override
     public boolean isWrapperFor(Class iface) {
         return iface.isAssignableFrom(getDelegate().getClass());
     }
 
+    @Override
     public Object unwrap(Class iface) {
         if (isWrapperFor(iface))
             return getDelegate();
@@ -158,6 +170,7 @@ public class DelegatingDataSource implements DataSource, Closeable {
 
     // Java 7 methods follow
 
+    @Override
     public Logger getParentLogger() throws SQLFeatureNotSupportedException{
         return _ds.getParentLogger();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java
index 7af3e0131..17b062138 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java
@@ -49,10 +49,12 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
             : _metaData;
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -62,36 +64,44 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
         return getInnermostDelegate().equals(other);
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder("metadata ").append(hashCode());
         buf.append("[").append(_metaData.toString()).append("]");
         return buf.toString();
     }
 
+    @Override
     public boolean allProceduresAreCallable() throws SQLException {
         return _metaData.allProceduresAreCallable();
     }
 
+    @Override
     public boolean allTablesAreSelectable() throws SQLException {
         return _metaData.allTablesAreSelectable();
     }
 
+    @Override
     public boolean dataDefinitionCausesTransactionCommit() throws SQLException {
         return _metaData.dataDefinitionCausesTransactionCommit();
     }
 
+    @Override
     public boolean dataDefinitionIgnoredInTransactions() throws SQLException {
         return _metaData.dataDefinitionIgnoredInTransactions();
     }
 
+    @Override
     public boolean deletesAreDetected(int type) throws SQLException {
         return _metaData.deletesAreDetected(type);
     }
 
+    @Override
     public boolean doesMaxRowSizeIncludeBlobs() throws SQLException {
         return _metaData.doesMaxRowSizeIncludeBlobs();
     }
 
+    @Override
     public ResultSet getBestRowIdentifier(String catalog,
         String schema, String table, int scope, boolean nullable)
         throws SQLException {
@@ -99,34 +109,41 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
             table, scope, nullable);
     }
 
+    @Override
     public ResultSet getCatalogs() throws SQLException {
         return _metaData.getCatalogs();
     }
 
+    @Override
     public String getCatalogSeparator() throws SQLException {
         return _metaData.getCatalogSeparator();
     }
 
+    @Override
     public String getCatalogTerm() throws SQLException {
         return _metaData.getCatalogTerm();
     }
 
+    @Override
     public ResultSet getColumnPrivileges(String catalog, String schema,
         String table, String columnNamePattern) throws SQLException {
         return _metaData.getColumnPrivileges(catalog, schema,
             table, columnNamePattern);
     }
 
+    @Override
     public ResultSet getColumns(String catalog, String schemaPattern,
         String tableNamePattern, String columnNamePattern) throws SQLException {
         return _metaData.getColumns(catalog, schemaPattern,
             tableNamePattern, columnNamePattern);
     }
 
+    @Override
     public Connection getConnection() throws SQLException {
         return _conn;
     }
 
+    @Override
     public ResultSet getCrossReference(String primaryCatalog,
         String primarySchema, String primaryTable, String foreignCatalog,
         String foreignSchema, String foreignTable) throws SQLException {
@@ -134,147 +151,182 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
             primaryTable, foreignCatalog, foreignSchema, foreignTable);
     }
 
+    @Override
     public String getDatabaseProductName() throws SQLException {
         return _metaData.getDatabaseProductName();
     }
 
+    @Override
     public String getDatabaseProductVersion() throws SQLException {
         return _metaData.getDatabaseProductVersion();
     }
 
+    @Override
     public int getDefaultTransactionIsolation() throws SQLException {
         return _metaData.getDefaultTransactionIsolation();
     }
 
+    @Override
     public int getDriverMajorVersion() {
         return _metaData.getDriverMajorVersion();
     }
 
+    @Override
     public int getDriverMinorVersion() {
         return _metaData.getDriverMinorVersion();
     }
 
+    @Override
     public String getDriverName() throws SQLException {
         return _metaData.getDriverName();
     }
 
+    @Override
     public String getDriverVersion() throws SQLException {
         return _metaData.getDriverVersion();
     }
 
+    @Override
     public ResultSet getExportedKeys(String catalog, String schema,
         String table) throws SQLException {
         return _metaData.getExportedKeys(catalog, schema, table);
     }
 
+    @Override
     public String getExtraNameCharacters() throws SQLException {
         return _metaData.getExtraNameCharacters();
     }
 
+    @Override
     public String getIdentifierQuoteString() throws SQLException {
         return _metaData.getIdentifierQuoteString();
     }
 
+    @Override
     public ResultSet getImportedKeys(String catalog, String schema,
         String table) throws SQLException {
         return _metaData.getImportedKeys(catalog, schema, table);
     }
 
+    @Override
     public ResultSet getIndexInfo(String catalog, String schema,
         String table, boolean unique, boolean approximate) throws SQLException {
         return _metaData.getIndexInfo(catalog, schema, table, unique,
             approximate);
     }
 
+    @Override
     public int getMaxBinaryLiteralLength() throws SQLException {
         return _metaData.getMaxBinaryLiteralLength();
     }
 
+    @Override
     public int getMaxCatalogNameLength() throws SQLException {
         return _metaData.getMaxCatalogNameLength();
     }
 
+    @Override
     public int getMaxCharLiteralLength() throws SQLException {
         return _metaData.getMaxCharLiteralLength();
     }
 
+    @Override
     public int getMaxColumnNameLength() throws SQLException {
         return _metaData.getMaxColumnNameLength();
     }
 
+    @Override
     public int getMaxColumnsInGroupBy() throws SQLException {
         return _metaData.getMaxColumnsInGroupBy();
     }
 
+    @Override
     public int getMaxColumnsInIndex() throws SQLException {
         return _metaData.getMaxColumnsInIndex();
     }
 
+    @Override
     public int getMaxColumnsInOrderBy() throws SQLException {
         return _metaData.getMaxColumnsInOrderBy();
     }
 
+    @Override
     public int getMaxColumnsInSelect() throws SQLException {
         return _metaData.getMaxColumnsInSelect();
     }
 
+    @Override
     public int getMaxColumnsInTable() throws SQLException {
         return _metaData.getMaxColumnsInTable();
     }
 
+    @Override
     public int getMaxConnections() throws SQLException {
         return _metaData.getMaxConnections();
     }
 
+    @Override
     public int getMaxCursorNameLength() throws SQLException {
         return _metaData.getMaxCursorNameLength();
     }
 
+    @Override
     public int getMaxIndexLength() throws SQLException {
         return _metaData.getMaxIndexLength();
     }
 
+    @Override
     public int getMaxProcedureNameLength() throws SQLException {
         return _metaData.getMaxProcedureNameLength();
     }
 
+    @Override
     public int getMaxRowSize() throws SQLException {
         return _metaData.getMaxRowSize();
     }
 
+    @Override
     public int getMaxSchemaNameLength() throws SQLException {
         return _metaData.getMaxSchemaNameLength();
     }
 
+    @Override
     public int getMaxStatementLength() throws SQLException {
         return _metaData.getMaxStatementLength();
     }
 
+    @Override
     public int getMaxStatements() throws SQLException {
         return _metaData.getMaxStatements();
     }
 
+    @Override
     public int getMaxTableNameLength() throws SQLException {
         return _metaData.getMaxTableNameLength();
     }
 
+    @Override
     public int getMaxTablesInSelect() throws SQLException {
         return _metaData.getMaxTablesInSelect();
     }
 
+    @Override
     public int getMaxUserNameLength() throws SQLException {
         return _metaData.getMaxUserNameLength();
     }
 
+    @Override
     public String getNumericFunctions() throws SQLException {
         return _metaData.getNumericFunctions();
     }
 
+    @Override
     public ResultSet getPrimaryKeys(String catalog, String schema, String table)
         throws SQLException {
         return _metaData.getPrimaryKeys(catalog, schema, table);
     }
 
+    @Override
     public ResultSet getProcedureColumns(String catalog, String schemaPattern,
         String procedureNamePattern, String columnNamePattern)
         throws SQLException {
@@ -282,452 +334,559 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
             procedureNamePattern, columnNamePattern);
     }
 
+    @Override
     public ResultSet getProcedures(String catalog, String schemaPattern,
         String procedureNamePattern) throws SQLException {
         return _metaData.getProcedures(catalog, schemaPattern,
             procedureNamePattern);
     }
 
+    @Override
     public String getProcedureTerm() throws SQLException {
         return _metaData.getProcedureTerm();
     }
 
+    @Override
     public ResultSet getSchemas() throws SQLException {
         return _metaData.getSchemas();
     }
 
+    @Override
     public String getSchemaTerm() throws SQLException {
         return _metaData.getSchemaTerm();
     }
 
+    @Override
     public String getSearchStringEscape() throws SQLException {
         return _metaData.getSearchStringEscape();
     }
 
+    @Override
     public String getSQLKeywords() throws SQLException {
         return _metaData.getSQLKeywords();
     }
 
+    @Override
     public String getStringFunctions() throws SQLException {
         return _metaData.getStringFunctions();
     }
 
+    @Override
     public String getSystemFunctions() throws SQLException {
         return _metaData.getSystemFunctions();
     }
 
+    @Override
     public ResultSet getTablePrivileges(String catalog,
         String schemaPattern, String tableNamePattern) throws SQLException {
         return _metaData.getTablePrivileges(catalog, schemaPattern,
             tableNamePattern);
     }
 
+    @Override
     public ResultSet getTables(String catalog, String schemaPattern,
         String tableNamePattern, String[] types) throws SQLException {
         return _metaData.getTables(catalog, schemaPattern,
             tableNamePattern, types);
     }
 
+    @Override
     public ResultSet getTableTypes() throws SQLException {
         return _metaData.getTableTypes();
     }
 
+    @Override
     public String getTimeDateFunctions() throws SQLException {
         return _metaData.getTimeDateFunctions();
     }
 
+    @Override
     public ResultSet getTypeInfo() throws SQLException {
         return _metaData.getTypeInfo();
     }
 
+    @Override
     public ResultSet getUDTs(String catalog, String schemaPattern,
         String typeNamePattern, int[] types) throws SQLException {
         return _metaData.getUDTs(catalog, schemaPattern,
             typeNamePattern, types);
     }
 
+    @Override
     public String getURL() throws SQLException {
         return _metaData.getURL();
     }
 
+    @Override
     public String getUserName() throws SQLException {
         return _metaData.getUserName();
     }
 
+    @Override
     public ResultSet getVersionColumns(String catalog,
         String schema, String table) throws SQLException {
         return _metaData.getVersionColumns(catalog, schema, table);
     }
 
+    @Override
     public boolean insertsAreDetected(int type) throws SQLException {
         return _metaData.insertsAreDetected(type);
     }
 
+    @Override
     public boolean isCatalogAtStart() throws SQLException {
         return _metaData.isCatalogAtStart();
     }
 
+    @Override
     public boolean isReadOnly() throws SQLException {
         return _metaData.isReadOnly();
     }
 
+    @Override
     public boolean nullPlusNonNullIsNull() throws SQLException {
         return _metaData.nullPlusNonNullIsNull();
     }
 
+    @Override
     public boolean nullsAreSortedAtEnd() throws SQLException {
         return _metaData.nullsAreSortedAtEnd();
     }
 
+    @Override
     public boolean nullsAreSortedAtStart() throws SQLException {
         return _metaData.nullsAreSortedAtStart();
     }
 
+    @Override
     public boolean nullsAreSortedHigh() throws SQLException {
         return _metaData.nullsAreSortedHigh();
     }
 
+    @Override
     public boolean nullsAreSortedLow() throws SQLException {
         return _metaData.nullsAreSortedLow();
     }
 
+    @Override
     public boolean othersDeletesAreVisible(int type) throws SQLException {
         return _metaData.othersDeletesAreVisible(type);
     }
 
+    @Override
     public boolean othersInsertsAreVisible(int type) throws SQLException {
         return _metaData.othersInsertsAreVisible(type);
     }
 
+    @Override
     public boolean othersUpdatesAreVisible(int type) throws SQLException {
         return _metaData.othersUpdatesAreVisible(type);
     }
 
+    @Override
     public boolean ownDeletesAreVisible(int type) throws SQLException {
         return _metaData.ownDeletesAreVisible(type);
     }
 
+    @Override
     public boolean ownInsertsAreVisible(int type) throws SQLException {
         return _metaData.ownInsertsAreVisible(type);
     }
 
+    @Override
     public boolean ownUpdatesAreVisible(int type) throws SQLException {
         return _metaData.ownUpdatesAreVisible(type);
     }
 
+    @Override
     public boolean storesLowerCaseIdentifiers() throws SQLException {
         return _metaData.storesLowerCaseIdentifiers();
     }
 
+    @Override
     public boolean storesLowerCaseQuotedIdentifiers() throws SQLException {
         return _metaData.storesLowerCaseQuotedIdentifiers();
     }
 
+    @Override
     public boolean storesMixedCaseIdentifiers() throws SQLException {
         return _metaData.storesMixedCaseIdentifiers();
     }
 
+    @Override
     public boolean storesMixedCaseQuotedIdentifiers() throws SQLException {
         return _metaData.storesMixedCaseQuotedIdentifiers();
     }
 
+    @Override
     public boolean storesUpperCaseIdentifiers() throws SQLException {
         return _metaData.storesUpperCaseIdentifiers();
     }
 
+    @Override
     public boolean storesUpperCaseQuotedIdentifiers() throws SQLException {
         return _metaData.storesUpperCaseQuotedIdentifiers();
     }
 
+    @Override
     public boolean supportsAlterTableWithAddColumn() throws SQLException {
         return _metaData.supportsAlterTableWithAddColumn();
     }
 
+    @Override
     public boolean supportsAlterTableWithDropColumn() throws SQLException {
         return _metaData.supportsAlterTableWithDropColumn();
     }
 
+    @Override
     public boolean supportsANSI92EntryLevelSQL() throws SQLException {
         return _metaData.supportsANSI92EntryLevelSQL();
     }
 
+    @Override
     public boolean supportsANSI92FullSQL() throws SQLException {
         return _metaData.supportsANSI92FullSQL();
     }
 
+    @Override
     public boolean supportsANSI92IntermediateSQL() throws SQLException {
         return _metaData.supportsANSI92IntermediateSQL();
     }
 
+    @Override
     public boolean supportsBatchUpdates() throws SQLException {
         return _metaData.supportsBatchUpdates();
     }
 
+    @Override
     public boolean supportsCatalogsInDataManipulation() throws SQLException {
         return _metaData.supportsCatalogsInDataManipulation();
     }
 
+    @Override
     public boolean supportsCatalogsInIndexDefinitions() throws SQLException {
         return _metaData.supportsCatalogsInIndexDefinitions();
     }
 
+    @Override
     public boolean supportsCatalogsInPrivilegeDefinitions()
         throws SQLException {
         return _metaData.supportsCatalogsInPrivilegeDefinitions();
     }
 
+    @Override
     public boolean supportsCatalogsInProcedureCalls() throws SQLException {
         return _metaData.supportsCatalogsInProcedureCalls();
     }
 
+    @Override
     public boolean supportsCatalogsInTableDefinitions() throws SQLException {
         return _metaData.supportsCatalogsInTableDefinitions();
     }
 
+    @Override
     public boolean supportsColumnAliasing() throws SQLException {
         return _metaData.supportsColumnAliasing();
     }
 
+    @Override
     public boolean supportsConvert() throws SQLException {
         return _metaData.supportsConvert();
     }
 
+    @Override
     public boolean supportsConvert(int fromType, int toType)
         throws SQLException {
         return _metaData.supportsConvert(fromType, toType);
     }
 
+    @Override
     public boolean supportsCoreSQLGrammar() throws SQLException {
         return _metaData.supportsCoreSQLGrammar();
     }
 
+    @Override
     public boolean supportsCorrelatedSubqueries() throws SQLException {
         return _metaData.supportsCorrelatedSubqueries();
     }
 
+    @Override
     public boolean supportsDataDefinitionAndDataManipulationTransactions()
         throws SQLException {
         return _metaData
             .supportsDataDefinitionAndDataManipulationTransactions();
     }
 
+    @Override
     public boolean supportsDataManipulationTransactionsOnly()
         throws SQLException {
         return _metaData.supportsDataManipulationTransactionsOnly();
     }
 
+    @Override
     public boolean supportsDifferentTableCorrelationNames()
         throws SQLException {
         return _metaData.supportsDifferentTableCorrelationNames();
     }
 
+    @Override
     public boolean supportsExpressionsInOrderBy() throws SQLException {
         return _metaData.supportsExpressionsInOrderBy();
     }
 
+    @Override
     public boolean supportsExtendedSQLGrammar() throws SQLException {
         return _metaData.supportsExtendedSQLGrammar();
     }
 
+    @Override
     public boolean supportsFullOuterJoins() throws SQLException {
         return _metaData.supportsFullOuterJoins();
     }
 
+    @Override
     public boolean supportsGroupBy() throws SQLException {
         return _metaData.supportsGroupBy();
     }
 
+    @Override
     public boolean supportsGroupByBeyondSelect() throws SQLException {
         return _metaData.supportsGroupByBeyondSelect();
     }
 
+    @Override
     public boolean supportsGroupByUnrelated() throws SQLException {
         return _metaData.supportsGroupByUnrelated();
     }
 
+    @Override
     public boolean supportsIntegrityEnhancementFacility() throws SQLException {
         return _metaData.supportsIntegrityEnhancementFacility();
     }
 
+    @Override
     public boolean supportsLikeEscapeClause() throws SQLException {
         return _metaData.supportsLikeEscapeClause();
     }
 
+    @Override
     public boolean supportsLimitedOuterJoins() throws SQLException {
         return _metaData.supportsLimitedOuterJoins();
     }
 
+    @Override
     public boolean supportsMinimumSQLGrammar() throws SQLException {
         return _metaData.supportsMinimumSQLGrammar();
     }
 
+    @Override
     public boolean supportsMixedCaseIdentifiers() throws SQLException {
         return _metaData.supportsMixedCaseIdentifiers();
     }
 
+    @Override
     public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
         return _metaData.supportsMixedCaseQuotedIdentifiers();
     }
 
+    @Override
     public boolean supportsMultipleResultSets() throws SQLException {
         return _metaData.supportsMultipleResultSets();
     }
 
+    @Override
     public boolean supportsMultipleTransactions() throws SQLException {
         return _metaData.supportsMultipleTransactions();
     }
 
+    @Override
     public boolean supportsNonNullableColumns() throws SQLException {
         return _metaData.supportsNonNullableColumns();
     }
 
+    @Override
     public boolean supportsOpenCursorsAcrossCommit() throws SQLException {
         return _metaData.supportsOpenCursorsAcrossCommit();
     }
 
+    @Override
     public boolean supportsOpenCursorsAcrossRollback() throws SQLException {
         return _metaData.supportsOpenCursorsAcrossRollback();
     }
 
+    @Override
     public boolean supportsOpenStatementsAcrossCommit() throws SQLException {
         return _metaData.supportsOpenStatementsAcrossCommit();
     }
 
+    @Override
     public boolean supportsOpenStatementsAcrossRollback() throws SQLException {
         return _metaData.supportsOpenStatementsAcrossRollback();
     }
 
+    @Override
     public boolean supportsOrderByUnrelated() throws SQLException {
         return _metaData.supportsOrderByUnrelated();
     }
 
+    @Override
     public boolean supportsOuterJoins() throws SQLException {
         return _metaData.supportsOuterJoins();
     }
 
+    @Override
     public boolean supportsPositionedDelete() throws SQLException {
         return _metaData.supportsPositionedDelete();
     }
 
+    @Override
     public boolean supportsPositionedUpdate() throws SQLException {
         return _metaData.supportsPositionedUpdate();
     }
 
+    @Override
     public boolean supportsResultSetConcurrency(int type, int concurrency)
         throws SQLException {
         return _metaData.supportsResultSetConcurrency(type, concurrency);
     }
 
+    @Override
     public boolean supportsResultSetType(int type) throws SQLException {
         return _metaData.supportsResultSetType(type);
     }
 
+    @Override
     public boolean supportsSchemasInDataManipulation() throws SQLException {
         return _metaData.supportsSchemasInDataManipulation();
     }
 
+    @Override
     public boolean supportsSchemasInIndexDefinitions() throws SQLException {
         return _metaData.supportsSchemasInIndexDefinitions();
     }
 
+    @Override
     public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException {
         return _metaData.supportsSchemasInPrivilegeDefinitions();
     }
 
+    @Override
     public boolean supportsSchemasInProcedureCalls() throws SQLException {
         return _metaData.supportsSchemasInProcedureCalls();
     }
 
+    @Override
     public boolean supportsSchemasInTableDefinitions() throws SQLException {
         return _metaData.supportsSchemasInTableDefinitions();
     }
 
+    @Override
     public boolean supportsSelectForUpdate() throws SQLException {
         return _metaData.supportsSelectForUpdate();
     }
 
+    @Override
     public boolean supportsStoredProcedures() throws SQLException {
         return _metaData.supportsStoredProcedures();
     }
 
+    @Override
     public boolean supportsSubqueriesInComparisons() throws SQLException {
         return _metaData.supportsSubqueriesInComparisons();
     }
 
+    @Override
     public boolean supportsSubqueriesInExists() throws SQLException {
         return _metaData.supportsSubqueriesInExists();
     }
 
+    @Override
     public boolean supportsSubqueriesInIns() throws SQLException {
         return _metaData.supportsSubqueriesInIns();
     }
 
+    @Override
     public boolean supportsSubqueriesInQuantifieds() throws SQLException {
         return _metaData.supportsSubqueriesInQuantifieds();
     }
 
+    @Override
     public boolean supportsTableCorrelationNames() throws SQLException {
         return _metaData.supportsTableCorrelationNames();
     }
 
+    @Override
     public boolean supportsTransactionIsolationLevel(int level)
         throws SQLException {
         return _metaData.supportsTransactionIsolationLevel(level);
     }
 
+    @Override
     public boolean supportsTransactions() throws SQLException {
         return _metaData.supportsTransactions();
     }
 
+    @Override
     public boolean supportsUnion() throws SQLException {
         return _metaData.supportsUnion();
     }
 
+    @Override
     public boolean supportsUnionAll() throws SQLException {
         return _metaData.supportsUnionAll();
     }
 
+    @Override
     public boolean updatesAreDetected(int type) throws SQLException {
         return _metaData.updatesAreDetected(type);
     }
 
+    @Override
     public boolean usesLocalFilePerTable() throws SQLException {
         return _metaData.usesLocalFilePerTable();
     }
 
+    @Override
     public boolean usesLocalFiles() throws SQLException {
         return _metaData.usesLocalFiles();
     }
 
     // JDBC 3.0 methods follow.
 
+    @Override
     public boolean supportsSavepoints() throws SQLException {
         return _metaData.supportsSavepoints();
     }
 
+    @Override
     public boolean supportsNamedParameters() throws SQLException {
         return _metaData.supportsNamedParameters();
     }
 
+    @Override
     public boolean supportsMultipleOpenResults() throws SQLException {
         return _metaData.supportsMultipleOpenResults();
     }
 
+    @Override
     public boolean supportsGetGeneratedKeys() throws SQLException {
         return _metaData.supportsGetGeneratedKeys();
     }
 
+    @Override
     public ResultSet getSuperTypes(String catalog, String schemaPattern,
         String typeNamePattern) throws SQLException {
         return _metaData.getSuperTypes(catalog, schemaPattern, typeNamePattern);
     }
 
+    @Override
     public ResultSet getSuperTables(String catalog, String schemaPattern,
         String tableNamePattern) throws SQLException {
         return _metaData.getSuperTables(catalog, schemaPattern,
             tableNamePattern);
     }
 
+    @Override
     public ResultSet getAttributes(String catalog, String schemaPattern,
         String typeNamePattern, String attributeNamePattern)
         throws SQLException {
@@ -735,39 +894,48 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
             attributeNamePattern);
     }
 
+    @Override
     public boolean supportsResultSetHoldability(int holdability)
         throws SQLException {
         return _metaData.supportsResultSetHoldability(holdability);
     }
 
+    @Override
     public int getResultSetHoldability() throws SQLException {
         return _metaData.getResultSetHoldability();
     }
 
+    @Override
     public int getDatabaseMajorVersion() throws SQLException {
         return _metaData.getDatabaseMajorVersion();
     }
 
+    @Override
     public int getDatabaseMinorVersion() throws SQLException {
         return _metaData.getDatabaseMinorVersion();
     }
 
+    @Override
     public int getJDBCMajorVersion() throws SQLException {
         return _metaData.getJDBCMajorVersion();
     }
 
+    @Override
     public int getJDBCMinorVersion() throws SQLException {
         return _metaData.getJDBCMinorVersion();
     }
 
+    @Override
     public int getSQLStateType() throws SQLException {
         return _metaData.getSQLStateType();
     }
 
+    @Override
     public boolean locatorsUpdateCopy() throws SQLException {
         return _metaData.locatorsUpdateCopy();
     }
 
+    @Override
     public boolean supportsStatementPooling() throws SQLException {
         return _metaData.supportsStatementPooling();
     }
@@ -781,10 +949,12 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
 
     //  JDBC 4.0 methods follow.
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getDelegate().getClass());
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
         if (isWrapperFor(iface))
             return (T) getDelegate();
@@ -792,43 +962,52 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
             return null;
     }
 
+    @Override
     public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
         return _metaData.autoCommitFailureClosesAllResultSets();
     }
 
+    @Override
     public ResultSet getClientInfoProperties() throws SQLException {
         return _metaData.getClientInfoProperties();
     }
 
+    @Override
     public ResultSet getFunctionColumns(String catalog, String schemaPattern,
             String functionNamePattern, String columnNamePattern)
             throws SQLException {
         return _metaData.getFunctionColumns(catalog, schemaPattern, functionNamePattern, columnNamePattern);
     }
 
+    @Override
     public ResultSet getFunctions(String catalog, String schemaPattern,
             String functionNamePattern) throws SQLException {
         return _metaData.getFunctions(catalog, schemaPattern, functionNamePattern);
     }
 
+    @Override
     public RowIdLifetime getRowIdLifetime() throws SQLException {
         return _metaData.getRowIdLifetime();
     }
 
+    @Override
     public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
         return _metaData.getSchemas(catalog, schemaPattern);
     }
 
+    @Override
     public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
         return _metaData.supportsStoredFunctionsUsingCallSyntax();
     }
 
     // Java 7 methods follow
 
+    @Override
     public boolean generatedKeyAlwaysReturned() throws SQLException {
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public ResultSet getPseudoColumns(String catalog, String schemaPattern,
     	String tableNamepattern, String columnNamePattern) throws SQLException {
     	throw new UnsupportedOperationException();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
index e04cbf429..968dc9463 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
@@ -91,10 +91,12 @@ public class DelegatingPreparedStatement
         return (_del == null) ? _stmnt : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -104,6 +106,7 @@ public class DelegatingPreparedStatement
         return getInnermostDelegate().equals(other);
     }
 
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer("prepstmnt ").append(hashCode());
         appendInfo(buf);
@@ -115,6 +118,7 @@ public class DelegatingPreparedStatement
             _del.appendInfo(buf);
     }
 
+    @Override
     public ResultSet executeQuery(String str) throws SQLException {
         return executeQuery(str, true);
     }
@@ -133,62 +137,77 @@ public class DelegatingPreparedStatement
         return wrapResult(rs, wrap);
     }
 
+    @Override
     public int executeUpdate(String str) throws SQLException {
         return _stmnt.executeUpdate(str);
     }
 
+    @Override
     public boolean execute(String str) throws SQLException {
         return _stmnt.execute(str);
     }
 
+    @Override
     public void close() throws SQLException {
         _stmnt.close();
     }
 
+    @Override
     public int getMaxFieldSize() throws SQLException {
         return _stmnt.getMaxFieldSize();
     }
 
+    @Override
     public void setMaxFieldSize(int i) throws SQLException {
         _stmnt.setMaxFieldSize(i);
     }
 
+    @Override
     public int getMaxRows() throws SQLException {
         return _stmnt.getMaxRows();
     }
 
+    @Override
     public void setMaxRows(int i) throws SQLException {
         _stmnt.setMaxRows(i);
     }
 
+    @Override
     public void setEscapeProcessing(boolean bool) throws SQLException {
         _stmnt.setEscapeProcessing(bool);
     }
 
+    @Override
     public int getQueryTimeout() throws SQLException {
         return _stmnt.getQueryTimeout();
     }
 
+    @Override
     public void setQueryTimeout(int i) throws SQLException {
         _stmnt.setQueryTimeout(i);
     }
 
+    @Override
     public void cancel() throws SQLException {
         _stmnt.cancel();
     }
 
+    @Override
     public SQLWarning getWarnings() throws SQLException {
         return _stmnt.getWarnings();
     }
 
+    @Override
     public void clearWarnings() throws SQLException {
         _stmnt.clearWarnings();
     }
 
+    @Override
     public void setCursorName(String str) throws SQLException {
         _stmnt.setCursorName(str);
     }
 
+    @Override
     public ResultSet getResultSet() throws SQLException {
         return getResultSet(true);
     }
@@ -206,54 +225,67 @@ public class DelegatingPreparedStatement
         return wrapResult(rs, wrap);
     }
 
+    @Override
     public int getUpdateCount() throws SQLException {
         return _stmnt.getUpdateCount();
     }
 
+    @Override
     public boolean getMoreResults() throws SQLException {
         return _stmnt.getMoreResults();
     }
 
+    @Override
     public void setFetchDirection(int i) throws SQLException {
         _stmnt.setFetchDirection(i);
     }
 
+    @Override
     public int getFetchDirection() throws SQLException {
         return _stmnt.getFetchDirection();
     }
 
+    @Override
     public void setFetchSize(int i) throws SQLException {
         _stmnt.setFetchSize(i);
     }
 
+    @Override
     public int getFetchSize() throws SQLException {
         return _stmnt.getFetchSize();
     }
 
+    @Override
     public int getResultSetConcurrency() throws SQLException {
         return _stmnt.getResultSetConcurrency();
     }
 
+    @Override
     public int getResultSetType() throws SQLException {
         return _stmnt.getResultSetType();
     }
 
+    @Override
     public void addBatch(String str) throws SQLException {
         _stmnt.addBatch(str);
     }
 
+    @Override
     public void clearBatch() throws SQLException {
         _stmnt.clearBatch();
     }
 
+    @Override
     public int[] executeBatch() throws SQLException {
         return _stmnt.executeBatch();
     }
 
+    @Override
     public Connection getConnection() throws SQLException {
         return _conn;
     }
 
+    @Override
     public ResultSet executeQuery() throws SQLException {
         return executeQuery(true);
     }
@@ -271,66 +303,82 @@ public class DelegatingPreparedStatement
         return wrapResult(rs, wrap);
     }
 
+    @Override
     public int executeUpdate() throws SQLException {
         return _stmnt.executeUpdate();
     }
 
+    @Override
     public void setNull(int i1, int i2) throws SQLException {
         _stmnt.setNull(i1, i2);
     }
 
+    @Override
     public void setBoolean(int i, boolean b) throws SQLException {
         _stmnt.setBoolean(i, b);
     }
 
+    @Override
     public void setByte(int i, byte b) throws SQLException {
         _stmnt.setByte(i, b);
     }
 
+    @Override
     public void setShort(int i, short s) throws SQLException {
         _stmnt.setShort(i, s);
     }
 
+    @Override
     public void setInt(int i1, int i2) throws SQLException {
         _stmnt.setInt(i1, i2);
     }
 
+    @Override
     public void setLong(int i, long l) throws SQLException {
         _stmnt.setLong(i, l);
     }
 
+    @Override
     public void setFloat(int i, float f) throws SQLException {
         _stmnt.setFloat(i, f);
     }
 
+    @Override
     public void setDouble(int i, double d) throws SQLException {
         _stmnt.setDouble(i, d);
     }
 
+    @Override
     public void setBigDecimal(int i, BigDecimal bd) throws SQLException {
         _stmnt.setBigDecimal(i, bd);
     }
 
+    @Override
     public void setString(int i, String s) throws SQLException {
         _stmnt.setString(i, s);
     }
 
+    @Override
     public void setBytes(int i, byte[] b) throws SQLException {
         _stmnt.setBytes(i, b);
     }
 
+    @Override
     public void setDate(int i, Date d) throws SQLException {
         _stmnt.setDate(i, d);
     }
 
+    @Override
     public void setTime(int i, Time t) throws SQLException {
         _stmnt.setTime(i, t);
     }
 
+    @Override
     public void setTimestamp(int i, Timestamp t) throws SQLException {
         _stmnt.setTimestamp(i, t);
     }
 
+    @Override
     public void setAsciiStream(int i1, InputStream is, int i2)
         throws SQLException {
         _stmnt.setAsciiStream(i1, is, i2);
@@ -339,135 +387,167 @@ public class DelegatingPreparedStatement
     /**
      * @deprecated
      */
+    @Deprecated
+    @Override
     public void setUnicodeStream(int i1, InputStream is, int i2)
         throws SQLException {
         _stmnt.setUnicodeStream(i1, is, i2);
     }
 
+    @Override
     public void setBinaryStream(int i1, InputStream is, int i2)
         throws SQLException {
         _stmnt.setBinaryStream(i1, is, i2);
     }
 
+    @Override
     public void clearParameters() throws SQLException {
         _stmnt.clearParameters();
     }
 
+    @Override
     public void setObject(int i1, Object o, int i2, int i3)
         throws SQLException {
         _stmnt.setObject(i1, o, i2, i3);
     }
 
+    @Override
     public void setObject(int i1, Object o, int i2) throws SQLException {
         _stmnt.setObject(i1, o, i2);
     }
 
+    @Override
     public void setObject(int i, Object o) throws SQLException {
         _stmnt.setObject(i, o);
     }
 
+    @Override
     public boolean execute() throws SQLException {
         return _stmnt.execute();
     }
 
+    @Override
     public void addBatch() throws SQLException {
         _stmnt.addBatch();
     }
 
+    @Override
     public void setCharacterStream(int i1, Reader r, int i2)
         throws SQLException {
         _stmnt.setCharacterStream(i1, r, i2);
     }
 
+    @Override
     public void setRef(int i, Ref r) throws SQLException {
         _stmnt.setRef(i, r);
     }
 
+    @Override
     public void setBlob(int i, Blob b) throws SQLException {
         _stmnt.setBlob(i, b);
     }
 
+    @Override
     public void setClob(int i, Clob c) throws SQLException {
         _stmnt.setClob(i, c);
     }
 
+    @Override
     public void setArray(int i, Array a) throws SQLException {
         _stmnt.setArray(i, a);
     }
 
+    @Override
     public ResultSetMetaData getMetaData() throws SQLException {
         return _stmnt.getMetaData();
     }
 
+    @Override
     public void setDate(int i, Date d, Calendar c) throws SQLException {
         _stmnt.setDate(i, d, c);
     }
 
+    @Override
     public void setTime(int i, Time t, Calendar c) throws SQLException {
         _stmnt.setTime(i, t, c);
     }
 
+    @Override
     public void setTimestamp(int i, Timestamp t, Calendar c)
         throws SQLException {
         _stmnt.setTimestamp(i, t, c);
     }
 
+    @Override
     public void setNull(int i1, int i2, String s) throws SQLException {
         _stmnt.setNull(i1, i2, s);
     }
 
     // JDBC 3 methods follow.
 
+    @Override
     public boolean getMoreResults(int i) throws SQLException {
         return _stmnt.getMoreResults(i);
     }
 
+    @Override
     public ResultSet getGeneratedKeys() throws SQLException {
         return _stmnt.getGeneratedKeys();
     }
 
+    @Override
     public int executeUpdate(String s, int i) throws SQLException {
         return _stmnt.executeUpdate(s, i);
     }
 
+    @Override
     public int executeUpdate(String s, int[] ia) throws SQLException {
         return _stmnt.executeUpdate(s, ia);
     }
 
+    @Override
     public int executeUpdate(String s, String[] sa) throws SQLException {
         return _stmnt.executeUpdate(s, sa);
     }
 
+    @Override
     public boolean execute(String s, int i) throws SQLException {
         return _stmnt.execute(s, i);
     }
 
+    @Override
     public boolean execute(String s, int[] ia) throws SQLException {
         return _stmnt.execute(s, ia);
     }
 
+    @Override
     public boolean execute(String s, String[] sa) throws SQLException {
         return _stmnt.execute(s, sa);
     }
 
+    @Override
     public int getResultSetHoldability() throws SQLException {
         return _stmnt.getResultSetHoldability();
     }
 
+    @Override
     public void setURL(int i, URL url) throws SQLException {
         _stmnt.setURL(i, url);
     }
 
+    @Override
     public ParameterMetaData getParameterMetaData() throws SQLException {
         return _stmnt.getParameterMetaData();
     }
 
     // JDBC 4 methods follow.
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getDelegate().getClass());
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
         if (isWrapperFor(iface))
             return (T) getDelegate();
@@ -475,96 +555,119 @@ public class DelegatingPreparedStatement
             return null;
     }
 
+    @Override
     public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
         _stmnt.setAsciiStream(parameterIndex, x, length);
     }
 
+    @Override
     public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
         _stmnt.setAsciiStream(parameterIndex, x);
     }
 
+    @Override
     public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
         _stmnt.setBinaryStream(parameterIndex, x, length);
     }
 
+    @Override
     public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
         _stmnt.setBinaryStream(parameterIndex, x);
     }
 
+    @Override
     public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
         _stmnt.setBlob(parameterIndex, inputStream, length);
     }
 
+    @Override
     public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
         _stmnt.setBlob(parameterIndex, inputStream);
     }
 
+    @Override
     public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
         _stmnt.setCharacterStream(parameterIndex, reader, length);
     }
 
+    @Override
     public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
         _stmnt.setCharacterStream(parameterIndex, reader);
     }
 
+    @Override
     public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
         _stmnt.setClob(parameterIndex, reader, length);
     }
 
+    @Override
     public void setClob(int parameterIndex, Reader reader) throws SQLException {
         _stmnt.setClob(parameterIndex, reader);
     }
 
+    @Override
     public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
         _stmnt.setNCharacterStream(parameterIndex, value, length);
     }
 
+    @Override
     public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
         _stmnt.setNCharacterStream(parameterIndex, value);
     }
 
+    @Override
     public void setNClob(int parameterIndex, NClob value) throws SQLException {
         _stmnt.setNClob(parameterIndex, value);
     }
 
+    @Override
     public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
         _stmnt.setNClob(parameterIndex, reader, length);
     }
 
+    @Override
     public void setNClob(int parameterIndex, Reader reader) throws SQLException {
         _stmnt.setNClob(parameterIndex, reader);
     }
 
+    @Override
     public void setNString(int parameterIndex, String value) throws SQLException {
         _stmnt.setNString(parameterIndex, value);
     }
 
+    @Override
     public void setRowId(int parameterIndex, RowId x) throws SQLException {
         _stmnt.setRowId(parameterIndex, x);
     }
 
+    @Override
     public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
         _stmnt.setSQLXML(parameterIndex, xmlObject);
     }
 
+    @Override
     public boolean isClosed() throws SQLException {
         return _stmnt.isClosed();
     }
 
+    @Override
     public boolean isPoolable() throws SQLException {
         return _stmnt.isPoolable();
     }
 
+    @Override
     public void setPoolable(boolean poolable) throws SQLException {
         _stmnt.setPoolable(poolable);
     }
 
     // Java 7 methods follow
 
+    @Override
     public boolean isCloseOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void closeOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java
index c51bd2da2..b12422cf6 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java
@@ -82,10 +82,12 @@ public class DelegatingResultSet implements ResultSet, Closeable {
         return (_del == null) ? _rs : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return _rs.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -94,6 +96,7 @@ public class DelegatingResultSet implements ResultSet, Closeable {
         return getInnermostDelegate().equals(other);
     }
 
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer("resultset ").append(hashCode());
         appendInfo(buf);
@@ -105,572 +108,711 @@ public class DelegatingResultSet implements ResultSet, Closeable {
             _del.appendInfo(buf);
     }
 
+    @Override
     public boolean next() throws SQLException {
         return _rs.next();
     }
 
+    @Override
     public void close() throws SQLException {
         _rs.close();
     }
 
+    @Override
     public boolean wasNull() throws SQLException {
         return _rs.wasNull();
     }
 
+    @Override
     public String getString(int a) throws SQLException {
         return _rs.getString(a);
     }
 
+    @Override
     public boolean getBoolean(int a) throws SQLException {
         return _rs.getBoolean(a);
     }
 
+    @Override
     public byte getByte(int a) throws SQLException {
         return _rs.getByte(a);
     }
 
+    @Override
     public short getShort(int a) throws SQLException {
         return _rs.getShort(a);
     }
 
+    @Override
     public int getInt(int a) throws SQLException {
         return _rs.getInt(a);
     }
 
+    @Override
     public long getLong(int a) throws SQLException {
         return _rs.getLong(a);
     }
 
+    @Override
     public float getFloat(int a) throws SQLException {
         return _rs.getFloat(a);
     }
 
+    @Override
     public double getDouble(int a) throws SQLException {
         return _rs.getDouble(a);
     }
 
+    @Override
     @Deprecated
     public BigDecimal getBigDecimal(int a, int b) throws SQLException {
         return _rs.getBigDecimal(a, b);
     }
 
+    @Override
     public byte[] getBytes(int a) throws SQLException {
         return _rs.getBytes(a);
     }
 
+    @Override
     public Date getDate(int a) throws SQLException {
         return _rs.getDate(a);
     }
 
+    @Override
     public Time getTime(int a) throws SQLException {
         return _rs.getTime(a);
     }
 
+    @Override
     public Timestamp getTimestamp(int a) throws SQLException {
         return _rs.getTimestamp(a);
     }
 
+    @Override
     public InputStream getAsciiStream(int a) throws SQLException {
         return _rs.getAsciiStream(a);
     }
 
+    @Override
     @Deprecated
     public InputStream getUnicodeStream(int a) throws SQLException {
         return _rs.getUnicodeStream(a);
     }
 
+    @Override
     public InputStream getBinaryStream(int a) throws SQLException {
         return _rs.getBinaryStream(a);
     }
 
+    @Override
     public String getString(String a) throws SQLException {
         return _rs.getString(a);
     }
 
+    @Override
     public boolean getBoolean(String a) throws SQLException {
         return _rs.getBoolean(a);
     }
 
+    @Override
     public byte getByte(String a) throws SQLException {
         return _rs.getByte(a);
     }
 
+    @Override
     public short getShort(String a) throws SQLException {
         return _rs.getShort(a);
     }
 
+    @Override
     public int getInt(String a) throws SQLException {
         return _rs.getInt(a);
     }
 
+    @Override
     public long getLong(String a) throws SQLException {
         return _rs.getLong(a);
     }
 
+    @Override
     public float getFloat(String a) throws SQLException {
         return _rs.getFloat(a);
     }
 
+    @Override
     public double getDouble(String a) throws SQLException {
         return _rs.getDouble(a);
     }
 
+    @Override
     @Deprecated
     public BigDecimal getBigDecimal(String a, int b) throws SQLException {
         return _rs.getBigDecimal(a, b);
     }
 
+    @Override
     public byte[] getBytes(String a) throws SQLException {
         return _rs.getBytes(a);
     }
 
+    @Override
     public Date getDate(String a) throws SQLException {
         return _rs.getDate(a);
     }
 
+    @Override
     public Time getTime(String a) throws SQLException {
         return _rs.getTime(a);
     }
 
+    @Override
     public Timestamp getTimestamp(String a) throws SQLException {
         return _rs.getTimestamp(a);
     }
 
+    @Override
     public InputStream getAsciiStream(String a) throws SQLException {
         return _rs.getAsciiStream(a);
     }
 
+    @Override
     @Deprecated
     public InputStream getUnicodeStream(String a) throws SQLException {
         return _rs.getUnicodeStream(a);
     }
 
+    @Override
     public InputStream getBinaryStream(String a) throws SQLException {
         return _rs.getBinaryStream(a);
     }
 
+    @Override
     public SQLWarning getWarnings() throws SQLException {
         return _rs.getWarnings();
     }
 
+    @Override
     public void clearWarnings() throws SQLException {
         _rs.clearWarnings();
     }
 
+    @Override
     public String getCursorName() throws SQLException {
         return _rs.getCursorName();
     }
 
+    @Override
     public ResultSetMetaData getMetaData() throws SQLException {
         return _rs.getMetaData();
     }
 
+    @Override
     public Object getObject(int a) throws SQLException {
         return _rs.getObject(a);
     }
 
+    @Override
     public Object getObject(String a) throws SQLException {
         return _rs.getObject(a);
     }
 
+    @Override
     public int findColumn(String a) throws SQLException {
         return _rs.findColumn(a);
     }
 
+    @Override
     public Reader getCharacterStream(int a) throws SQLException {
         return _rs.getCharacterStream(a);
     }
 
+    @Override
     public Reader getCharacterStream(String a) throws SQLException {
         return _rs.getCharacterStream(a);
     }
 
+    @Override
     public BigDecimal getBigDecimal(int a) throws SQLException {
         return _rs.getBigDecimal(a);
     }
 
+    @Override
     public BigDecimal getBigDecimal(String a) throws SQLException {
         return _rs.getBigDecimal(a);
     }
 
+    @Override
     public boolean isBeforeFirst() throws SQLException {
         return _rs.isBeforeFirst();
     }
 
+    @Override
     public boolean isAfterLast() throws SQLException {
         return _rs.isAfterLast();
     }
 
+    @Override
     public boolean isFirst() throws SQLException {
         return _rs.isFirst();
     }
 
+    @Override
     public boolean isLast() throws SQLException {
         return _rs.isLast();
     }
 
+    @Override
     public void beforeFirst() throws SQLException {
         _rs.beforeFirst();
     }
 
+    @Override
     public void afterLast() throws SQLException {
         _rs.afterLast();
     }
 
+    @Override
     public boolean first() throws SQLException {
         return _rs.first();
     }
 
+    @Override
     public boolean last() throws SQLException {
         return _rs.last();
     }
 
+    @Override
     public int getRow() throws SQLException {
         return _rs.getRow();
     }
 
+    @Override
     public boolean absolute(int a) throws SQLException {
         return _rs.absolute(a);
     }
 
+    @Override
     public boolean relative(int a) throws SQLException {
         return _rs.relative(a);
     }
 
+    @Override
     public boolean previous() throws SQLException {
         return _rs.previous();
     }
 
+    @Override
     public void setFetchDirection(int a) throws SQLException {
         _rs.setFetchDirection(a);
     }
 
+    @Override
     public int getFetchDirection() throws SQLException {
         return _rs.getFetchDirection();
     }
 
+    @Override
     public void setFetchSize(int a) throws SQLException {
         _rs.setFetchSize(a);
     }
 
+    @Override
     public int getFetchSize() throws SQLException {
         return _rs.getFetchSize();
     }
 
+    @Override
     public int getType() throws SQLException {
         return _rs.getType();
     }
 
+    @Override
     public int getConcurrency() throws SQLException {
         return _rs.getConcurrency();
     }
 
+    @Override
     public boolean rowUpdated() throws SQLException {
         return _rs.rowUpdated();
     }
 
+    @Override
     public boolean rowInserted() throws SQLException {
         return _rs.rowInserted();
     }
 
+    @Override
     public boolean rowDeleted() throws SQLException {
         return _rs.rowDeleted();
     }
 
+    @Override
     public void updateNull(int a) throws SQLException {
         _rs.updateNull(a);
     }
 
+    @Override
     public void updateBoolean(int a, boolean b) throws SQLException {
         _rs.updateBoolean(a, b);
     }
 
+    @Override
     public void updateByte(int a, byte b) throws SQLException {
         _rs.updateByte(a, b);
     }
 
+    @Override
     public void updateShort(int a, short b) throws SQLException {
         _rs.updateShort(a, b);
     }
 
+    @Override
     public void updateInt(int a, int b) throws SQLException {
         _rs.updateInt(a, b);
     }
 
+    @Override
     public void updateLong(int a, long b) throws SQLException {
         _rs.updateLong(a, b);
     }
 
+    @Override
     public void updateFloat(int a, float b) throws SQLException {
         _rs.updateFloat(a, b);
     }
 
+    @Override
     public void updateDouble(int a, double b) throws SQLException {
         _rs.updateDouble(a, b);
     }
 
+    @Override
     public void updateBigDecimal(int a, BigDecimal b) throws SQLException {
         _rs.updateBigDecimal(a, b);
     }
 
+    @Override
     public void updateString(int a, String b) throws SQLException {
         _rs.updateString(a, b);
     }
 
+    @Override
     public void updateBytes(int a, byte[] b) throws SQLException {
         _rs.updateBytes(a, b);
     }
 
+    @Override
     public void updateDate(int a, Date b) throws SQLException {
         _rs.updateDate(a, b);
     }
 
+    @Override
     public void updateTime(int a, Time b) throws SQLException {
         _rs.updateTime(a, b);
     }
 
+    @Override
     public void updateTimestamp(int a, Timestamp b) throws SQLException {
         _rs.updateTimestamp(a, b);
     }
 
+    @Override
     public void updateAsciiStream(int a, InputStream in, int b)
         throws SQLException {
         _rs.updateAsciiStream(a, in, b);
     }
 
+    @Override
     public void updateBinaryStream(int a, InputStream in, int b)
         throws SQLException {
         _rs.updateBinaryStream(a, in, b);
     }
 
+    @Override
     public void updateBlob(int a, Blob blob) throws SQLException {
         _rs.updateBlob(a, blob);
     }
 
+    @Override
     public void updateCharacterStream(int a, Reader reader, int b)
         throws SQLException {
         _rs.updateCharacterStream(a, reader, b);
     }
 
+    @Override
     public void updateClob(int a, Clob clob) throws SQLException {
        _rs.updateClob(a, clob);
     }
 
+    @Override
     public void updateObject(int a, Object ob, int b) throws SQLException {
         _rs.updateObject(a, ob, b);
     }
 
+    @Override
     public void updateObject(int a, Object ob) throws SQLException {
         _rs.updateObject(a, ob);
     }
 
+    @Override
     public void updateNull(String a) throws SQLException {
         _rs.updateNull(a);
     }
 
+    @Override
     public void updateBoolean(String a, boolean b) throws SQLException {
         _rs.updateBoolean(a, b);
     }
 
+    @Override
     public void updateByte(String a, byte b) throws SQLException {
         _rs.updateByte(a, b);
     }
 
+    @Override
     public void updateShort(String a, short b) throws SQLException {
         _rs.updateShort(a, b);
     }
 
+    @Override
     public void updateInt(String a, int b) throws SQLException {
         _rs.updateInt(a, b);
     }
 
+    @Override
     public void updateLong(String a, long b) throws SQLException {
         _rs.updateLong(a, b);
     }
 
+    @Override
     public void updateFloat(String a, float b) throws SQLException {
         _rs.updateFloat(a, b);
     }
 
+    @Override
     public void updateDouble(String a, double b) throws SQLException {
         _rs.updateDouble(a, b);
     }
 
+    @Override
     public void updateBigDecimal(String a, BigDecimal b) throws SQLException {
         _rs.updateBigDecimal(a, b);
     }
 
+    @Override
     public void updateString(String a, String b) throws SQLException {
         _rs.updateString(a, b);
     }
 
+    @Override
     public void updateBytes(String a, byte[] b) throws SQLException {
         _rs.updateBytes(a, b);
     }
 
+    @Override
     public void updateDate(String a, Date b) throws SQLException {
         _rs.updateDate(a, b);
     }
 
+    @Override
     public void updateTime(String a, Time b) throws SQLException {
         _rs.updateTime(a, b);
     }
 
+    @Override
     public void updateTimestamp(String a, Timestamp b) throws SQLException {
         _rs.updateTimestamp(a, b);
     }
 
+    @Override
     public void updateAsciiStream(String a, InputStream in, int b)
         throws SQLException {
         _rs.updateAsciiStream(a, in, b);
     }
 
+    @Override
     public void updateBinaryStream(String a, InputStream in, int b)
         throws SQLException {
         _rs.updateBinaryStream(a, in, b);
     }
 
+    @Override
     public void updateCharacterStream(String a, Reader reader, int b)
         throws SQLException {
         _rs.updateCharacterStream(a, reader, b);
     }
 
+    @Override
     public void updateObject(String a, Object ob, int b) throws SQLException {
         _rs.updateObject(a, ob, b);
     }
 
+    @Override
     public void updateObject(String a, Object b) throws SQLException {
         _rs.updateObject(a, b);
     }
 
+    @Override
     public void insertRow() throws SQLException {
         _rs.insertRow();
     }
 
+    @Override
     public void updateRow() throws SQLException {
         _rs.updateRow();
     }
 
+    @Override
     public void deleteRow() throws SQLException {
         _rs.deleteRow();
     }
 
+    @Override
     public void refreshRow() throws SQLException {
         _rs.refreshRow();
     }
 
+    @Override
     public void cancelRowUpdates() throws SQLException {
         _rs.cancelRowUpdates();
     }
 
+    @Override
     public void moveToInsertRow() throws SQLException {
         _rs.moveToInsertRow();
     }
 
+    @Override
     public void moveToCurrentRow() throws SQLException {
         _rs.moveToCurrentRow();
     }
 
+    @Override
     public Statement getStatement() throws SQLException {
         return _stmnt;
     }
 
+    @Override
     public Object getObject(int a, Map<String, Class<?>> b) throws
             SQLException {
         return _rs.getObject(a, b);
     }
 
+    @Override
     public Ref getRef(int a) throws SQLException {
         return _rs.getRef(a);
     }
 
+    @Override
     public Blob getBlob(int a) throws SQLException {
         return _rs.getBlob(a);
     }
 
+    @Override
     public Clob getClob(int a) throws SQLException {
         return _rs.getClob(a);
     }
 
+    @Override
     public Array getArray(int a) throws SQLException {
         return _rs.getArray(a);
     }
 
+    @Override
     public Object getObject(String a, Map<String, Class<?>> b) throws
             SQLException {
         return _rs.getObject(a, b);
     }
 
+    @Override
     public Ref getRef(String a) throws SQLException {
         return _rs.getRef(a);
     }
 
+    @Override
     public Blob getBlob(String a) throws SQLException {
         return _rs.getBlob(a);
     }
 
+    @Override
     public Clob getClob(String a) throws SQLException {
         return _rs.getClob(a);
     }
 
+    @Override
     public Array getArray(String a) throws SQLException {
         return _rs.getArray(a);
     }
 
+    @Override
     public Date getDate(int a, Calendar b) throws SQLException {
         return _rs.getDate(a, b);
     }
 
+    @Override
     public Date getDate(String a, Calendar b) throws SQLException {
         return _rs.getDate(a, b);
     }
 
+    @Override
     public Time getTime(int a, Calendar b) throws SQLException {
         return _rs.getTime(a, b);
     }
 
+    @Override
     public Time getTime(String a, Calendar b) throws SQLException {
         return _rs.getTime(a, b);
     }
 
+    @Override
     public Timestamp getTimestamp(int a, Calendar b) throws SQLException {
         return _rs.getTimestamp(a, b);
     }
 
+    @Override
     public Timestamp getTimestamp(String a, Calendar b) throws SQLException {
         return _rs.getTimestamp(a, b);
     }
 
     // JDBC 3.0 methods follow.
 
+    @Override
     public URL getURL(int column) throws SQLException {
         return _rs.getURL(column);
     }
 
+    @Override
     public URL getURL(String columnName) throws SQLException {
         return _rs.getURL(columnName);
     }
 
+    @Override
     public void updateRef(int column, Ref ref) throws SQLException {
         _rs.updateRef(column, ref);
     }
 
+    @Override
     public void updateRef(String columnName, Ref ref) throws SQLException {
         _rs.updateRef(columnName, ref);
     }
 
+    @Override
     public void updateBlob(String columnName, Blob blob) throws SQLException {
         _rs.updateBlob(columnName, blob);
     }
 
+    @Override
     public void updateClob(String columnName, Clob clob) throws SQLException {
         _rs.updateClob(columnName, clob);
     }
 
+    @Override
     public void updateArray(int column, Array array) throws SQLException {
         _rs.updateArray(column, array);
     }
 
+    @Override
     public void updateArray(String columnName, Array array)
         throws SQLException {
         _rs.updateArray(columnName, array);
@@ -678,6 +820,7 @@ public class DelegatingResultSet implements ResultSet, Closeable {
 
     // JDBC 4.0 methods follow.
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getDelegate().getClass());
     }
@@ -690,204 +833,254 @@ public class DelegatingResultSet implements ResultSet, Closeable {
             return null;
     }
 
+    @Override
     public int getHoldability() throws SQLException {
         return _rs.getHoldability();
     }
 
+    @Override
     public Reader getNCharacterStream(int columnIndex) throws SQLException {
         return _rs.getNCharacterStream(columnIndex);
     }
 
+    @Override
     public Reader getNCharacterStream(String columnLabel) throws SQLException {
         return _rs.getNCharacterStream(columnLabel);
     }
 
+    @Override
     public NClob getNClob(int columnIndex) throws SQLException {
         return _rs.getNClob(columnIndex);
     }
 
+    @Override
     public NClob getNClob(String columnLabel) throws SQLException {
         return _rs.getNClob(columnLabel);
     }
 
+    @Override
     public String getNString(int columnIndex) throws SQLException {
         return _rs.getNString(columnIndex);
     }
 
+    @Override
     public String getNString(String columnLabel) throws SQLException {
         return _rs.getNString(columnLabel);
     }
 
+    @Override
     public RowId getRowId(int columnIndex) throws SQLException {
         return _rs.getRowId(columnIndex);
     }
 
+    @Override
     public RowId getRowId(String columnLabel) throws SQLException {
         return _rs.getRowId(columnLabel);
     }
 
+    @Override
     public SQLXML getSQLXML(int columnIndex) throws SQLException {
         return _rs.getSQLXML(columnIndex);
     }
 
+    @Override
     public SQLXML getSQLXML(String columnLabel) throws SQLException {
         return _rs.getSQLXML(columnLabel);
     }
 
+    @Override
     public boolean isClosed() throws SQLException {
         return _rs.isClosed();
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
         _rs.updateAsciiStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
         _rs.updateAsciiStream(columnIndex, x);
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
         _rs.updateAsciiStream(columnLabel, x, length);
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
         _rs.updateAsciiStream(columnLabel, x);
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
         _rs.updateBinaryStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
         _rs.updateBinaryStream(columnIndex, x);
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
         _rs.updateBinaryStream(columnLabel, x, length);
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
         _rs.updateBinaryStream(columnLabel, x);
     }
 
+    @Override
     public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
         _rs.updateBlob(columnIndex, inputStream, length);
     }
 
+    @Override
     public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
         _rs.updateBlob(columnIndex, inputStream);
     }
 
+    @Override
     public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
         _rs.updateBlob(columnLabel, inputStream, length);
     }
 
+    @Override
     public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
         _rs.updateBlob(columnLabel, inputStream);
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
         _rs.updateCharacterStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
         _rs.updateCharacterStream(columnIndex, x);
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
         _rs.updateCharacterStream(columnLabel, reader, length);
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
         _rs.updateCharacterStream(columnLabel, reader);
     }
 
+    @Override
     public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
         _rs.updateClob(columnIndex, reader, length);
     }
 
+    @Override
     public void updateClob(int columnIndex, Reader reader) throws SQLException {
         _rs.updateClob(columnIndex, reader);
     }
 
+    @Override
     public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
         _rs.updateClob(columnLabel, reader, length);
     }
 
+    @Override
     public void updateClob(String columnLabel, Reader reader) throws SQLException {
         _rs.updateClob(columnLabel, reader);
     }
 
+    @Override
     public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
         _rs.updateNCharacterStream(columnIndex, x, length);
     }
 
+    @Override
     public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
         _rs.updateNCharacterStream(columnIndex, x);
     }
 
+    @Override
     public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
         _rs.updateNCharacterStream(columnLabel, reader, length);
     }
 
+    @Override
     public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
         _rs.updateNCharacterStream(columnLabel, reader);
     }
 
+    @Override
     public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
         _rs.updateNClob(columnIndex, nClob);
     }
 
+    @Override
     public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
         _rs.updateNClob(columnIndex, reader, length);
     }
 
+    @Override
     public void updateNClob(int columnIndex, Reader reader) throws SQLException {
         _rs.updateNClob(columnIndex, reader);
     }
 
+    @Override
     public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
         _rs.updateNClob(columnLabel, nClob);
     }
 
+    @Override
     public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
         _rs.updateNClob(columnLabel, reader, length);
     }
 
+    @Override
     public void updateNClob(String columnLabel, Reader reader) throws SQLException {
         _rs.updateNClob(columnLabel, reader);
     }
 
+    @Override
     public void updateNString(int columnIndex, String nString) throws SQLException {
         _rs.updateNString(columnIndex, nString);
     }
 
+    @Override
     public void updateNString(String columnLabel, String nString) throws SQLException {
         _rs.updateNString(columnLabel, nString);
     }
 
+    @Override
     public void updateRowId(int columnIndex, RowId x) throws SQLException {
         _rs.updateRowId(columnIndex, x);
     }
 
+    @Override
     public void updateRowId(String columnLabel, RowId x) throws SQLException {
         _rs.updateRowId(columnLabel, x);
     }
 
+    @Override
     public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
         _rs.updateSQLXML(columnIndex, xmlObject);
     }
 
+    @Override
     public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
         _rs.updateSQLXML(columnLabel, xmlObject);
     }
 
     // Java 7 methods follow
 
+    @Override
     public <T>T getObject(String columnLabel, Class<T> type) throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T>T getObject(int columnIndex, Class<T> type) throws SQLException{
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
index 8e4b6bc42..f0a780bf2 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
@@ -73,10 +73,12 @@ public class DelegatingStatement implements Statement, Closeable {
         return (_del == null) ? _stmnt : _del.getInnermostDelegate();
     }
 
+    @Override
     public int hashCode() {
         return getInnermostDelegate().hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -85,6 +87,7 @@ public class DelegatingStatement implements Statement, Closeable {
         return getInnermostDelegate().equals(other);
     }
 
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer("stmnt ").append(hashCode());
         appendInfo(buf);
@@ -96,6 +99,7 @@ public class DelegatingStatement implements Statement, Closeable {
             _del.appendInfo(buf);
     }
 
+    @Override
     public ResultSet executeQuery(String str) throws SQLException {
         return executeQuery(str, true);
     }
@@ -114,62 +118,77 @@ public class DelegatingStatement implements Statement, Closeable {
         return wrapResult(rs, wrap);
     }
 
+    @Override
     public int executeUpdate(String str) throws SQLException {
         return _stmnt.executeUpdate(str);
     }
 
+    @Override
     public boolean execute(String str) throws SQLException {
         return _stmnt.execute(str);
     }
 
+    @Override
     public void close() throws SQLException {
         _stmnt.close();
     }
 
+    @Override
     public int getMaxFieldSize() throws SQLException {
         return _stmnt.getMaxFieldSize();
     }
 
+    @Override
     public void setMaxFieldSize(int i) throws SQLException {
         _stmnt.setMaxFieldSize(i);
     }
 
+    @Override
     public int getMaxRows() throws SQLException {
         return _stmnt.getMaxRows();
     }
 
+    @Override
     public void setMaxRows(int i) throws SQLException {
         _stmnt.setMaxRows(i);
     }
 
+    @Override
     public void setEscapeProcessing(boolean bool) throws SQLException {
         _stmnt.setEscapeProcessing(bool);
     }
 
+    @Override
     public int getQueryTimeout() throws SQLException {
         return _stmnt.getQueryTimeout();
     }
 
+    @Override
     public void setQueryTimeout(int i) throws SQLException {
         _stmnt.setQueryTimeout(i);
     }
 
+    @Override
     public void cancel() throws SQLException {
         _stmnt.cancel();
     }
 
+    @Override
     public SQLWarning getWarnings() throws SQLException {
         return _stmnt.getWarnings();
     }
 
+    @Override
     public void clearWarnings() throws SQLException {
         _stmnt.clearWarnings();
     }
 
+    @Override
     public void setCursorName(String str) throws SQLException {
         _stmnt.setCursorName(str);
     }
 
+    @Override
     public ResultSet getResultSet() throws SQLException {
         return getResultSet(true);
     }
@@ -187,98 +206,121 @@ public class DelegatingStatement implements Statement, Closeable {
         return wrapResult(rs, wrap);
     }
 
+    @Override
     public int getUpdateCount() throws SQLException {
         return _stmnt.getUpdateCount();
     }
 
+    @Override
     public boolean getMoreResults() throws SQLException {
         return _stmnt.getMoreResults();
     }
 
+    @Override
     public void setFetchDirection(int i) throws SQLException {
         _stmnt.setFetchDirection(i);
     }
 
+    @Override
     public int getFetchDirection() throws SQLException {
         return _stmnt.getFetchDirection();
     }
 
+    @Override
     public void setFetchSize(int i) throws SQLException {
         _stmnt.setFetchSize(i);
     }
 
+    @Override
     public int getFetchSize() throws SQLException {
         return _stmnt.getFetchSize();
     }
 
+    @Override
     public int getResultSetConcurrency() throws SQLException {
         return _stmnt.getResultSetConcurrency();
     }
 
+    @Override
     public int getResultSetType() throws SQLException {
         return _stmnt.getResultSetType();
     }
 
+    @Override
     public void addBatch(String str) throws SQLException {
         _stmnt.addBatch(str);
     }
 
+    @Override
     public void clearBatch() throws SQLException {
         _stmnt.clearBatch();
     }
 
+    @Override
     public int[] executeBatch() throws SQLException {
         return _stmnt.executeBatch();
     }
 
+    @Override
     public Connection getConnection() throws SQLException {
         return _conn;
     }
 
     // JDBC 3 methods follow.
 
+    @Override
     public boolean getMoreResults(int i) throws SQLException {
         return _stmnt.getMoreResults(i);
     }
 
+    @Override
     public ResultSet getGeneratedKeys() throws SQLException {
         return _stmnt.getGeneratedKeys();
     }
 
+    @Override
     public int executeUpdate(String s, int i) throws SQLException {
         return _stmnt.executeUpdate(s, i);
     }
 
+    @Override
     public int executeUpdate(String s, int[] ia) throws SQLException {
         return _stmnt.executeUpdate(s, ia);
     }
 
+    @Override
     public int executeUpdate(String s, String[] sa) throws SQLException {
         return _stmnt.executeUpdate(s, sa);
     }
 
+    @Override
     public boolean execute(String s, int i) throws SQLException {
         return _stmnt.execute(s, i);
     }
 
+    @Override
     public boolean execute(String s, int[] ia) throws SQLException {
         return _stmnt.execute(s, ia);
     }
 
+    @Override
     public boolean execute(String s, String[] sa) throws SQLException {
         return _stmnt.execute(s, sa);
     }
 
+    @Override
     public int getResultSetHoldability() throws SQLException {
         return _stmnt.getResultSetHoldability();
     }
 
     // JDBC 4 methods follow.
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getDelegate().getClass());
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
         if (isWrapperFor(iface))
             return (T) getDelegate();
@@ -286,24 +328,29 @@ public class DelegatingStatement implements Statement, Closeable {
             return null;
     }
 
+    @Override
     public boolean isClosed() throws SQLException {
         return _stmnt.isClosed();
     }
 
+    @Override
     public void setPoolable(boolean b) throws SQLException {
         _stmnt.setPoolable(b);
     }
 
+    @Override
     public boolean isPoolable() throws SQLException {
         return _stmnt.isPoolable();
     }
 
     // Java 7 methods follow
 
+    @Override
     public boolean isCloseOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void closeOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEvent.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEvent.java
index 82fc0bd7d..273acbe0a 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEvent.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEvent.java
@@ -29,8 +29,8 @@ import java.util.EventObject;
  * @author Abe White
  * @see JDBCListener
  */
-@SuppressWarnings("serial")
 public class JDBCEvent extends EventObject {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Type code indicating that a {@link Statement} is being prepared.
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java
index 9c1e55dad..a68a0c69e 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java
@@ -31,10 +31,12 @@ import org.apache.openjpa.lib.util.concurrent.AbstractConcurrentEventManager;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
     implements ConnectionDecorator {
 
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public Connection decorate(Connection conn) {
         if (!hasListeners())
             return conn;
@@ -59,6 +61,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
     /**
      * Fire the given event to all listeners.
      */
+    @Override
     protected void fireEvent(Object event, Object listener) {
         JDBCListener listen = (JDBCListener) listener;
         JDBCEvent ev = (JDBCEvent) event;
@@ -112,6 +115,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             fireEvent(getDelegate(), JDBCEvent.AFTER_CONNECT, null, null, null);
         }
 
+        @Override
         public void commit() throws SQLException {
             JDBCEvent before = fireEvent(getDelegate(),
                 JDBCEvent.BEFORE_COMMIT, null, null, null);
@@ -123,6 +127,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public void rollback() throws SQLException {
             JDBCEvent before = fireEvent(getDelegate(),
                 JDBCEvent.BEFORE_ROLLBACK, null, null, null);
@@ -134,6 +139,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         protected Statement createStatement(boolean wrap) throws SQLException {
             JDBCEvent before = fireEvent(getDelegate(),
                 JDBCEvent.BEFORE_CREATE_STATEMENT, null, null, null);
@@ -148,6 +154,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             return stmnt;
         }
 
+        @Override
         protected Statement createStatement(int rsType, int rsConcur,
             boolean wrap) throws SQLException {
             JDBCEvent before = fireEvent(getDelegate(),
@@ -163,6 +170,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             return stmnt;
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, boolean wrap)
             throws SQLException {
             JDBCEvent before = fireEvent(getDelegate(),
@@ -178,6 +186,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             return stmnt;
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, int rsType,
             int rsConcur, boolean wrap) throws SQLException {
             JDBCEvent before = fireEvent(getDelegate(),
@@ -193,6 +202,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             return stmnt;
         }
 
+        @Override
         public void close() throws SQLException {
             try {
                 fireEvent(getDelegate(), JDBCEvent.BEFORE_CLOSE,
@@ -219,6 +229,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             _sql = sql;
         }
 
+        @Override
         public int executeUpdate() throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), _sql);
@@ -231,6 +242,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         protected ResultSet executeQuery(boolean wrap) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), _sql);
@@ -243,6 +255,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public int[] executeBatch() throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), _sql);
@@ -255,6 +268,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute() throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), _sql);
@@ -267,6 +281,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public int executeUpdate(String sql) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -279,6 +294,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public int executeUpdate(String sql, int i) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -291,6 +307,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public int executeUpdate(String sql, int[] ia) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -303,6 +320,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public int executeUpdate(String sql, String[] sa) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -315,6 +333,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute(String sql) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -327,6 +346,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute(String sql, int i) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -339,6 +359,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute(String sql, int[] ia) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -351,6 +372,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute(String sql, String[] sa) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -376,6 +398,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             _conn = conn;
         }
 
+        @Override
         public int executeUpdate(String sql) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -388,6 +411,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         protected ResultSet executeQuery(String sql, boolean wrap)
             throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
@@ -401,6 +425,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute(String sql) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -413,6 +438,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public int executeUpdate(String sql, int i) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -425,6 +451,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public int executeUpdate(String sql, int[] ia) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -437,6 +464,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public int executeUpdate(String sql, String[] sa) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -449,6 +477,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute(String sql, int i) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -461,6 +490,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute(String sql, int[] ia) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
@@ -473,6 +503,7 @@ public class JDBCEventConnectionDecorator extends AbstractConcurrentEventManager
             }
         }
 
+        @Override
         public boolean execute(String sql, String[] sa) throws SQLException {
             JDBCEvent before = fireEvent(_conn.getDelegate(),
                 JDBCEvent.BEFORE_EXECUTE_STATEMENT, null, getDelegate(), sql);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCListener.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCListener.java
index 3b5dabe7f..459af2e06 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCListener.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCListener.java
@@ -30,61 +30,61 @@ public interface JDBCListener {
     /**
      * @see JDBCEvent#BEFORE_PREPARE_STATEMENT
      */
-    public void beforePrepareStatement(JDBCEvent event);
+    void beforePrepareStatement(JDBCEvent event);
 
     /**
      * @see JDBCEvent#AFTER_PREPARE_STATEMENT
      */
-    public void afterPrepareStatement(JDBCEvent event);
+    void afterPrepareStatement(JDBCEvent event);
 
     /**
      * @see JDBCEvent#BEFORE_CREATE_STATEMENT
      */
-    public void beforeCreateStatement(JDBCEvent event);
+    void beforeCreateStatement(JDBCEvent event);
 
     /**
      * @see JDBCEvent#AFTER_CREATE_STATEMENT
      */
-    public void afterCreateStatement(JDBCEvent event);
+    void afterCreateStatement(JDBCEvent event);
 
     /**
      * @see JDBCEvent#BEFORE_EXECUTE_STATEMENT
      */
-    public void beforeExecuteStatement(JDBCEvent event);
+    void beforeExecuteStatement(JDBCEvent event);
 
     /**
      * @see JDBCEvent#AFTER_EXECUTE_STATEMENT
      */
-    public void afterExecuteStatement(JDBCEvent event);
+    void afterExecuteStatement(JDBCEvent event);
 
     /**
      * @see JDBCEvent#BEFORE_COMMIT
      */
-    public void beforeCommit(JDBCEvent event);
+    void beforeCommit(JDBCEvent event);
 
     /**
      * @see JDBCEvent#AFTER_COMMIT
      */
-    public void afterCommit(JDBCEvent event);
+    void afterCommit(JDBCEvent event);
 
     /**
      * @see JDBCEvent#BEFORE_ROLLBACK
      */
-    public void beforeRollback(JDBCEvent event);
+    void beforeRollback(JDBCEvent event);
 
     /**
      * @see JDBCEvent#AFTER_ROLLBACK
      */
-    public void afterRollback(JDBCEvent event);
+    void afterRollback(JDBCEvent event);
 
     /**
      * @see JDBCEvent#AFTER_CONNECT
      */
-    public void afterConnect(JDBCEvent event);
+    void afterConnect(JDBCEvent event);
 
     /**
      * @see JDBCEvent#BEFORE_CLOSE
      */
-    public void beforeClose(JDBCEvent event);
+    void beforeClose(JDBCEvent event);
 }
 
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
index 987855d00..c4171bb31 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
@@ -181,6 +181,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
         return _logs;
     }
 
+    @Override
     public Connection decorate(Connection conn) throws SQLException {
         return newLoggingConnection(conn);
     }
@@ -226,9 +227,9 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
      * Interface that allows customization of what to do when
      * {@link SQLWarning}s occur.
      */
-    public static interface SQLWarningHandler {
+    public interface SQLWarningHandler {
 
-        public void handleWarning(SQLWarning warning) throws SQLException;
+        void handleWarning(SQLWarning warning) throws SQLException;
     }
 
     /**
@@ -240,6 +241,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             super(conn);
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, boolean wrap)
             throws SQLException {
             SQLException err = null;
@@ -254,6 +256,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql, int rsType,
             int rsConcur, boolean wrap) throws SQLException {
             SQLException err = null;
@@ -269,6 +272,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected Statement createStatement(boolean wrap) throws SQLException {
             SQLException err = null;
             try {
@@ -282,6 +286,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected Statement createStatement(int type, int concurrency,
             boolean wrap) throws SQLException {
             SQLException err = null;
@@ -297,6 +302,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected CallableStatement prepareCall(String sql, boolean wrap)
             throws SQLException {
             SQLException err = null;
@@ -333,6 +339,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
 
 
 
+        @Override
         public void commit() throws SQLException {
             long start = System.currentTimeMillis();
             SQLException err = null;
@@ -348,6 +355,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         public void rollback() throws SQLException {
             long start = System.currentTimeMillis();
             SQLException err = null;
@@ -363,6 +371,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         public void close() throws SQLException {
             long start = System.currentTimeMillis();
             try {
@@ -373,6 +382,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         public Savepoint setSavepoint() throws SQLException {
             long start = System.currentTimeMillis();
             SQLException err = null;
@@ -388,6 +398,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         public Savepoint setSavepoint(String name) throws SQLException {
             long start = System.currentTimeMillis();
             SQLException err = null;
@@ -403,6 +414,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         public void rollback(Savepoint savepoint) throws SQLException {
             long start = System.currentTimeMillis();
             SQLException err = null;
@@ -425,6 +437,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         public void releaseSavepoint(Savepoint savepoint) throws SQLException {
             long start = System.currentTimeMillis();
             SQLException err = null;
@@ -447,6 +460,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected Statement createStatement(int resultSetType,
             int resultSetConcurrency, int resultSetHoldability, boolean wrap)
             throws SQLException {
@@ -463,6 +477,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql,
             int resultSetType, int resultSetConcurrency,
             int resultSetHoldability, boolean wrap) throws SQLException {
@@ -480,6 +495,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql,
             int autoGeneratedKeys, boolean wrap) throws SQLException {
             SQLException err = null;
@@ -495,6 +511,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql,
             int[] columnIndexes, boolean wrap) throws SQLException {
             SQLException err = null;
@@ -510,6 +527,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected PreparedStatement prepareStatement(String sql,
             String[] columnNames, boolean wrap) throws SQLException {
             SQLException err = null;
@@ -525,6 +543,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
             }
         }
 
+        @Override
         protected DatabaseMetaData getMetaData(boolean wrap)
             throws SQLException {
             return newLoggingDatabaseMetaData(super.getMetaData(false));
@@ -676,6 +695,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 super(meta, LoggingConnection.this);
             }
 
+            @Override
             public ResultSet getBestRowIdentifier(String catalog,
                 String schema, String table, int scope, boolean nullable)
                 throws SQLException {
@@ -687,12 +707,14 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     table, scope, nullable);
             }
 
+            @Override
             public ResultSet getCatalogs() throws SQLException {
                 if (_logs.isJDBCEnabled())
                     _logs.logJDBC("getCatalogs", LoggingConnection.this);
                 return super.getCatalogs();
             }
 
+            @Override
             public ResultSet getColumnPrivileges(String catalog, String schema,
                 String table, String columnNamePattern) throws SQLException {
                 if (_logs.isJDBCEnabled())
@@ -703,6 +725,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     table, columnNamePattern);
             }
 
+            @Override
             public ResultSet getColumns(String catalog, String schemaPattern,
                 String tableNamePattern, String columnNamePattern)
                 throws SQLException {
@@ -715,6 +738,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     tableNamePattern, columnNamePattern);
             }
 
+            @Override
             public ResultSet getCrossReference(String primaryCatalog,
                 String primarySchema, String primaryTable,
                 String foreignCatalog, String foreignSchema,
@@ -729,6 +753,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     primaryTable, foreignCatalog, foreignSchema, foreignTable);
             }
 
+            @Override
             public ResultSet getExportedKeys(String catalog, String schema,
                 String table) throws SQLException {
                 if (_logs.isJDBCEnabled())
@@ -738,6 +763,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 return super.getExportedKeys(catalog, schema, table);
             }
 
+            @Override
             public ResultSet getImportedKeys(String catalog, String schema,
                 String table) throws SQLException {
                 if (_logs.isJDBCEnabled())
@@ -747,6 +773,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 return super.getImportedKeys(catalog, schema, table);
             }
 
+            @Override
             public ResultSet getIndexInfo(String catalog, String schema,
                 String table, boolean unique, boolean approximate)
                 throws SQLException {
@@ -758,6 +785,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     approximate);
             }
 
+            @Override
             public ResultSet getPrimaryKeys(String catalog, String schema,
                 String table) throws SQLException {
                 if (_logs.isJDBCEnabled())
@@ -767,6 +795,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 return super.getPrimaryKeys(catalog, schema, table);
             }
 
+            @Override
             public ResultSet getProcedureColumns(String catalog,
                 String schemaPattern, String procedureNamePattern,
                 String columnNamePattern) throws SQLException {
@@ -779,6 +808,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     procedureNamePattern, columnNamePattern);
             }
 
+            @Override
             public ResultSet getProcedures(String catalog,
                 String schemaPattern, String procedureNamePattern)
                 throws SQLException {
@@ -790,12 +820,14 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     procedureNamePattern);
             }
 
+            @Override
             public ResultSet getSchemas() throws SQLException {
                 if (_logs.isJDBCEnabled())
                     _logs.logJDBC("getSchemas", LoggingConnection.this);
                 return super.getSchemas();
             }
 
+            @Override
             public ResultSet getTablePrivileges(String catalog,
                 String schemaPattern, String tableNamePattern)
                 throws SQLException {
@@ -805,6 +837,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     tableNamePattern);
             }
 
+            @Override
             public ResultSet getTables(String catalog, String schemaPattern,
                 String tableNamePattern, String[] types) throws SQLException {
                 if (_logs.isJDBCEnabled())
@@ -815,18 +848,21 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     tableNamePattern, types);
             }
 
+            @Override
             public ResultSet getTableTypes() throws SQLException {
                 if (_logs.isJDBCEnabled())
                     _logs.logJDBC("getTableTypes", LoggingConnection.this);
                 return super.getTableTypes();
             }
 
+            @Override
             public ResultSet getTypeInfo() throws SQLException {
                 if (_logs.isJDBCEnabled())
                     _logs.logJDBC("getTypeInfo", LoggingConnection.this);
                 return super.getTypeInfo();
             }
 
+            @Override
             public ResultSet getUDTs(String catalog, String schemaPattern,
                 String typeNamePattern, int[] types) throws SQLException {
                 if (_logs.isJDBCEnabled())
@@ -835,6 +871,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     typeNamePattern, types);
             }
 
+            @Override
             public ResultSet getVersionColumns(String catalog,
                 String schema, String table) throws SQLException {
                 if (_logs.isJDBCEnabled())
@@ -861,6 +898,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 return new LoggingResultSet(rs, stmnt);
             }
 
+            @Override
             public void appendInfo(StringBuffer buf) {
                 if (_sql != null) {
                     buf.append(" ");
@@ -873,18 +911,21 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             protected ResultSet wrapResult(ResultSet rs, boolean wrap) {
                 if (!wrap || rs == null)
                     return super.wrapResult(rs, wrap);
                 return newLoggingResultSet(rs, this);
             }
 
+            @Override
             public void cancel() throws SQLException {
                 if (_logs.isJDBCEnabled())
                     _logs.logJDBC("cancel " + this, LoggingConnection.this);
                 super.cancel();
             }
 
+            @Override
             protected ResultSet executeQuery(String sql, boolean wrap)
                 throws SQLException {
                 _sql = sql;
@@ -902,6 +943,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String sql) throws SQLException {
                 _sql = sql;
                 logSQL(this);
@@ -918,6 +960,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String sql) throws SQLException {
                 _sql = sql;
                 logSQL(this);
@@ -934,6 +977,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String sql, int i) throws SQLException {
                 _sql = sql;
                 logSQL(this);
@@ -950,6 +994,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String sql, int[] ia) throws SQLException {
                 _sql = sql;
                 logSQL(this);
@@ -966,6 +1011,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String sql, String[] sa) throws SQLException {
                 _sql = sql;
                 logSQL(this);
@@ -982,6 +1028,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String sql, int i) throws SQLException {
                 _sql = sql;
                 logSQL(this);
@@ -998,6 +1045,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String sql, int[] ia) throws SQLException {
                 _sql = sql;
                 logSQL(this);
@@ -1014,6 +1062,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String sql, String[] sa) throws SQLException {
                 _sql = sql;
                 logSQL(this);
@@ -1052,12 +1101,14 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 return new LoggingResultSet(rs, stmnt);
             }
 
+            @Override
             protected ResultSet wrapResult(ResultSet rs, boolean wrap) {
                 if (!wrap || rs == null)
                     return super.wrapResult(rs, wrap);
                 return newLoggingResultSet(rs, this);
             }
 
+            @Override
             protected ResultSet executeQuery(String sql, boolean wrap)
                 throws SQLException {
                 logSQL(this);
@@ -1075,6 +1126,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String sql) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1091,6 +1143,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String sql) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1107,6 +1160,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             protected ResultSet executeQuery(boolean wrap) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1123,6 +1177,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate() throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1139,6 +1194,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int[] executeBatch() throws SQLException {
                 int indexOfFirstFailedObject = -1;
 
@@ -1219,6 +1275,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute() throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1235,6 +1292,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String s, int i) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1251,6 +1309,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String s, int[] ia) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1267,6 +1326,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String s, String[] sa) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1283,6 +1343,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String s, int i) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1299,6 +1360,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String s, int[] ia) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1315,6 +1377,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String s, String[] sa) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1331,6 +1394,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public void cancel() throws SQLException {
                 if (_logs.isJDBCEnabled())
                     _logs.logJDBC("cancel " + this + ": " + _sql,
@@ -1339,83 +1403,99 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 super.cancel();
             }
 
+            @Override
             public void setNull(int i1, int i2) throws SQLException {
                 setLogParameter(i1, "null", null);
                 super.setNull(i1, i2);
             }
 
+            @Override
             public void setBoolean(int i, boolean b) throws SQLException {
                 setLogParameter(i, b);
                 super.setBoolean(i, b);
             }
 
+            @Override
             public void setByte(int i, byte b) throws SQLException {
                 setLogParameter(i, b);
                 super.setByte(i, b);
             }
 
+            @Override
             public void setShort(int i, short s) throws SQLException {
                 setLogParameter(i, s);
                 super.setShort(i, s);
             }
 
+            @Override
             public void setInt(int i1, int i2) throws SQLException {
                 setLogParameter(i1, i2);
                 super.setInt(i1, i2);
             }
 
+            @Override
             public void setLong(int i, long l) throws SQLException {
                 setLogParameter(i, l);
                 super.setLong(i, l);
             }
 
+            @Override
             public void setFloat(int i, float f) throws SQLException {
                 setLogParameter(i, f);
                 super.setFloat(i, f);
             }
 
+            @Override
             public void setDouble(int i, double d) throws SQLException {
                 setLogParameter(i, d);
                 super.setDouble(i, d);
             }
 
+            @Override
             public void setBigDecimal(int i, BigDecimal bd)
                 throws SQLException {
                 setLogParameter(i, "BigDecimal", bd);
                 super.setBigDecimal(i, bd);
             }
 
+            @Override
             public void setString(int i, String s) throws SQLException {
                 setLogParameter(i, "String", s);
                 super.setString(i, s);
             }
 
+            @Override
             public void setBytes(int i, byte[] b) throws SQLException {
                 setLogParameter(i, "byte[]", b);
                 super.setBytes(i, b);
             }
 
+            @Override
             public void setDate(int i, Date d) throws SQLException {
                 setLogParameter(i, "Date", d);
                 super.setDate(i, d);
             }
 
+            @Override
             public void setTime(int i, Time t) throws SQLException {
                 setLogParameter(i, "Time", t);
                 super.setTime(i, t);
             }
 
+            @Override
             public void setTimestamp(int i, Timestamp t) throws SQLException {
                 setLogParameter(i, "Timestamp", t);
                 super.setTimestamp(i, t);
             }
 
+            @Override
             public void setAsciiStream(int i1, InputStream is, int i2)
                 throws SQLException {
                 setLogParameter(i1, "InputStream", is);
                 super.setAsciiStream(i1, is, i2);
             }
 
+            @Override
             @Deprecated
             public void setUnicodeStream(int i1, InputStream is, int i2)
                 throws SQLException {
@@ -1423,40 +1503,47 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 super.setUnicodeStream(i2, is, i2);
             }
 
+            @Override
             public void setBinaryStream(int i1, InputStream is, int i2)
                 throws SQLException {
                 setLogParameter(i1, "InputStream", is);
                 super.setBinaryStream(i1, is, i2);
             }
 
+            @Override
             public void setBinaryStream(int i1, InputStream is)
             throws SQLException {
             	setLogParameter(i1, "InputStream", is);
             	super.setBinaryStream(i1, is);
             }
 
+            @Override
             public void clearParameters() throws SQLException {
                 clearLogParameters(false);
                 super.clearParameters();
             }
 
+            @Override
             public void setObject(int i1, Object o, int i2, int i3)
                 throws SQLException {
                 setLogParameter(i1, "Object", o);
                 super.setObject(i1, o, i2, i3);
             }
 
+            @Override
             public void setObject(int i1, Object o, int i2)
                 throws SQLException {
                 setLogParameter(i1, "Object", o);
                 super.setObject(i1, o, i2);
             }
 
+            @Override
             public void setObject(int i, Object o) throws SQLException {
                 setLogParameter(i, "Object", o);
                 super.setObject(i, o);
             }
 
+            @Override
             public void addBatch() throws SQLException {
                 if (_logs.isSQLEnabled())
                     _logs.logSQL("batching " + this, LoggingConnection.this);
@@ -1466,11 +1553,11 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     if (shouldTrackParameters()) {
                         // make sure our list is initialized
                         if (_paramBatch == null)
-                            _paramBatch = new ArrayList<List<String>>();
+                            _paramBatch = new ArrayList<>();
                         // copy parameters since they will be re-used
                         if (_params != null) {
                             List<String> copyParms =
-                                    new ArrayList<String>(_params);
+                                    new ArrayList<>(_params);
                             _paramBatch.add(copyParms);
                         }
                         else
@@ -1482,62 +1569,74 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public void setCharacterStream(int i1, Reader r, int i2)
                 throws SQLException {
                 setLogParameter(i1, "Reader", r);
                 super.setCharacterStream(i1, r, i2);
             }
 
+            @Override
             public void setRef(int i, Ref r) throws SQLException {
                 setLogParameter(i, "Ref", r);
                 super.setRef(i, r);
             }
 
+            @Override
             public void setBlob(int i, Blob b) throws SQLException {
                 setLogParameter(i, "Blob", b);
                 super.setBlob(i, b);
             }
 
+            @Override
             public void setClob(int i, Clob c) throws SQLException {
                 setLogParameter(i, "Clob", c);
                 super.setClob(i, c);
             }
 
+            @Override
             public void setArray(int i, Array a) throws SQLException {
                 setLogParameter(i, "Array", a);
                 super.setArray(i, a);
             }
 
+            @Override
             public ResultSetMetaData getMetaData() throws SQLException {
                 return super.getMetaData();
             }
 
+            @Override
             public void setDate(int i, Date d, Calendar c) throws SQLException {
                 setLogParameter(i, "Date", d);
                 super.setDate(i, d, c);
             }
 
+            @Override
             public void setTime(int i, Time t, Calendar c) throws SQLException {
                 setLogParameter(i, "Time", t);
                 super.setTime(i, t, c);
             }
 
+            @Override
             public void setTimestamp(int i, Timestamp t, Calendar c)
                 throws SQLException {
                 setLogParameter(i, "Timestamp", t);
                 super.setTimestamp(i, t, c);
             }
 
+            @Override
             public void setNull(int i1, int i2, String s) throws SQLException {
                 setLogParameter(i1, "null", null);
                 super.setNull(i1, i2, s);
             }
 
+            @Override
             public void setURL(int i, URL u) throws SQLException {
                 setLogParameter(i, "URL", u);
                 super.setURL(i, u);
             }
 
+            @Override
             protected void appendInfo(StringBuffer buf) {
                 buf.append(" ");
                 if (_formatter != null) {
@@ -1630,7 +1729,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
 
             private void setLogParameter(int index, String val) {
                 if (_params == null)
-                    _params = new ArrayList<String>();
+                    _params = new ArrayList<>();
                 while (_params.size() < index)
                     _params.add(null);
                 if (val.length() > 80)
@@ -1648,6 +1747,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 super(rs, stmnt);
             }
 
+            @Override
             public boolean next() throws SQLException {
                 SQLException err = null;
                 try {
@@ -1660,6 +1760,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public void close() throws SQLException {
                 SQLException err = null;
                 try {
@@ -1672,6 +1773,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public void beforeFirst() throws SQLException {
                 SQLException err = null;
                 try {
@@ -1684,6 +1786,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public void afterLast() throws SQLException {
                 SQLException err = null;
                 try {
@@ -1696,6 +1799,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean first() throws SQLException {
                 SQLException err = null;
                 try {
@@ -1708,6 +1812,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean last() throws SQLException {
                 SQLException err = null;
                 try {
@@ -1720,6 +1825,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean absolute(int a) throws SQLException {
                 SQLException err = null;
                 try {
@@ -1732,6 +1838,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean relative(int a) throws SQLException {
                 SQLException err = null;
                 try {
@@ -1744,6 +1851,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean previous() throws SQLException {
                 SQLException err = null;
                 try {
@@ -1788,6 +1896,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 return newLoggingResultSet(rs, this);
             }
 
+            @Override
             protected ResultSet executeQuery(String sql, boolean wrap)
                 throws SQLException {
                 logSQL(this);
@@ -1805,6 +1914,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String sql) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1821,6 +1931,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String sql) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1837,6 +1948,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             protected ResultSet executeQuery(boolean wrap) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1853,6 +1965,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate() throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1869,6 +1982,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int[] executeBatch() throws SQLException {
                 int indexOfFirstFailedObject = -1;
 
@@ -1950,6 +2064,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute() throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1966,6 +2081,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String s, int i) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1982,6 +2098,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String s, int[] ia) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -1998,6 +2115,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public int executeUpdate(String s, String[] sa) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -2014,6 +2132,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String s, int i) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -2030,6 +2149,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String s, int[] ia) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -2046,6 +2166,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public boolean execute(String s, String[] sa) throws SQLException {
                 logSQL(this);
                 long start = System.currentTimeMillis();
@@ -2062,6 +2183,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public void cancel() throws SQLException {
                 if (_logs.isJDBCEnabled())
                     _logs.logJDBC("cancel " + this + ": " + _sql,
@@ -2070,83 +2192,99 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 super.cancel();
             }
 
+            @Override
             public void setNull(int i1, int i2) throws SQLException {
                 setLogParameter(i1, "null", null);
                 super.setNull(i1, i2);
             }
 
+            @Override
             public void setBoolean(int i, boolean b) throws SQLException {
                 setLogParameter(i, b);
                 super.setBoolean(i, b);
             }
 
+            @Override
             public void setByte(int i, byte b) throws SQLException {
                 setLogParameter(i, b);
                 super.setByte(i, b);
             }
 
+            @Override
             public void setShort(int i, short s) throws SQLException {
                 setLogParameter(i, s);
                 super.setShort(i, s);
             }
 
+            @Override
             public void setInt(int i1, int i2) throws SQLException {
                 setLogParameter(i1, i2);
                 super.setInt(i1, i2);
             }
 
+            @Override
             public void setLong(int i, long l) throws SQLException {
                 setLogParameter(i, l);
                 super.setLong(i, l);
             }
 
+            @Override
             public void setFloat(int i, float f) throws SQLException {
                 setLogParameter(i, f);
                 super.setFloat(i, f);
             }
 
+            @Override
             public void setDouble(int i, double d) throws SQLException {
                 setLogParameter(i, d);
                 super.setDouble(i, d);
             }
 
+            @Override
             public void setBigDecimal(int i, BigDecimal bd)
                 throws SQLException {
                 setLogParameter(i, "BigDecimal", bd);
                 super.setBigDecimal(i, bd);
             }
 
+            @Override
             public void setString(int i, String s) throws SQLException {
                 setLogParameter(i, "String", s);
                 super.setString(i, s);
             }
 
+            @Override
             public void setBytes(int i, byte[] b) throws SQLException {
                 setLogParameter(i, "byte[]", b);
                 super.setBytes(i, b);
             }
 
+            @Override
             public void setDate(int i, Date d) throws SQLException {
                 setLogParameter(i, "Date", d);
                 super.setDate(i, d);
             }
 
+            @Override
             public void setTime(int i, Time t) throws SQLException {
                 setLogParameter(i, "Time", t);
                 super.setTime(i, t);
             }
 
+            @Override
             public void setTimestamp(int i, Timestamp t) throws SQLException {
                 setLogParameter(i, "Timestamp", t);
                 super.setTimestamp(i, t);
             }
 
+            @Override
             public void setAsciiStream(int i1, InputStream is, int i2)
                 throws SQLException {
                 setLogParameter(i1, "InputStream", is);
                 super.setAsciiStream(i1, is, i2);
             }
 
+            @Override
             @Deprecated
             public void setUnicodeStream(int i1, InputStream is, int i2)
                 throws SQLException {
@@ -2154,34 +2292,40 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 super.setUnicodeStream(i2, is, i2);
             }
 
+            @Override
             public void setBinaryStream(int i1, InputStream is, int i2)
                 throws SQLException {
                 setLogParameter(i1, "InputStream", is);
                 super.setBinaryStream(i1, is, i2);
             }
 
+            @Override
             public void clearParameters() throws SQLException {
                 clearLogParameters(false);
                 super.clearParameters();
             }
 
+            @Override
             public void setObject(int i1, Object o, int i2, int i3)
                 throws SQLException {
                 setLogParameter(i1, "Object", o);
                 super.setObject(i1, o, i2, i3);
             }
 
+            @Override
             public void setObject(int i1, Object o, int i2)
                 throws SQLException {
                 setLogParameter(i1, "Object", o);
                 super.setObject(i1, o, i2);
             }
 
+            @Override
             public void setObject(int i, Object o) throws SQLException {
                 setLogParameter(i, "Object", o);
                 super.setObject(i, o);
             }
 
+            @Override
             public void addBatch() throws SQLException {
                 if (_logs.isSQLEnabled())
                     _logs.logSQL("batching " + this, LoggingConnection.this);
@@ -2191,11 +2335,11 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                     if (shouldTrackParameters()) {
                         // make sure our list is initialized
                         if (_paramBatch == null)
-                            _paramBatch = new ArrayList<List<String>>();
+                            _paramBatch = new ArrayList<>();
                         // copy parameters since they will be re-used
                         if (_params != null) {
                             List<String> copyParams =
-                                new ArrayList<String>(_params);
+                                new ArrayList<>(_params);
                             _paramBatch.add(copyParams);
                         }
                         else
@@ -2207,62 +2351,74 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
                 }
             }
 
+            @Override
             public void setCharacterStream(int i1, Reader r, int i2)
                 throws SQLException {
                 setLogParameter(i1, "Reader", r);
                 super.setCharacterStream(i1, r, i2);
             }
 
+            @Override
             public void setRef(int i, Ref r) throws SQLException {
                 setLogParameter(i, "Ref", r);
                 super.setRef(i, r);
             }
 
+            @Override
             public void setBlob(int i, Blob b) throws SQLException {
                 setLogParameter(i, "Blob", b);
                 super.setBlob(i, b);
             }
 
+            @Override
             public void setClob(int i, Clob c) throws SQLException {
                 setLogParameter(i, "Clob", c);
                 super.setClob(i, c);
             }
 
+            @Override
             public void setArray(int i, Array a) throws SQLException {
                 setLogParameter(i, "Array", a);
                 super.setArray(i, a);
             }
 
+            @Override
             public ResultSetMetaData getMetaData() throws SQLException {
                 return super.getMetaData();
             }
 
+            @Override
             public void setDate(int i, Date d, Calendar c) throws SQLException {
                 setLogParameter(i, "Date", d);
                 super.setDate(i, d, c);
             }
 
+            @Override
             public void setTime(int i, Time t, Calendar c) throws SQLException {
                 setLogParameter(i, "Time", t);
                 super.setTime(i, t, c);
             }
 
+            @Override
             public void setTimestamp(int i, Timestamp t, Calendar c)
                 throws SQLException {
                 setLogParameter(i, "Timestamp", t);
                 super.setTimestamp(i, t, c);
             }
 
+            @Override
             public void setNull(int i1, int i2, String s) throws SQLException {
                 setLogParameter(i1, "null", null);
                 super.setNull(i1, i2, s);
             }
 
+            @Override
             public void setURL(int i, URL u) throws SQLException {
                 setLogParameter(i, "URL", u);
                 super.setURL(i, u);
             }
 
+            @Override
             protected void appendInfo(StringBuffer buf) {
                 buf.append(" ");
                 if (_formatter != null) {
@@ -2346,7 +2502,7 @@ public class LoggingConnectionDecorator implements ConnectionDecorator {
 
             private void setLogParameter(int index, String val) {
                 if (_params == null)
-                    _params = new ArrayList<String>();
+                    _params = new ArrayList<>();
                 while (_params.size() < index)
                     _params.add(null);
                 if (val.length() > 80)
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ReportingSQLException.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ReportingSQLException.java
index 2651101a0..e462542e9 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ReportingSQLException.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/ReportingSQLException.java
@@ -27,9 +27,9 @@ import java.sql.Statement;
  *
  * @author Marc Prud'hommeaux
  */
-@SuppressWarnings("serial")
 public class ReportingSQLException extends SQLException {
 
+    private static final long serialVersionUID = 1L;
     private final transient Statement _stmnt;
     private final SQLException _sqle;
     private final String       _sql;
@@ -59,6 +59,7 @@ public class ReportingSQLException extends SQLException {
     /**
      * Returns the SQL state of the underlying {@link SQLException}.
      */
+    @Override
     public String getSQLState() {
         return _sqle.getSQLState();
     }
@@ -66,6 +67,7 @@ public class ReportingSQLException extends SQLException {
     /**
      * Returns the error code of the underlying {@link SQLException}.
      */
+    @Override
     public int getErrorCode() {
         return _sqle.getErrorCode();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java
index 20d020edd..6ec335533 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java
@@ -184,7 +184,7 @@ public class SQLFormatter {
         int start = 0;
         int end = -1;
         StringBuilder clause;
-        List<StringBuilder> clauses = new ArrayList<StringBuilder>();
+        List<StringBuilder> clauses = new ArrayList<>();
         clauses.add(new StringBuilder());
         for (int i = 0; i < separators.length; i++) {
             end = lowerCaseSql.indexOf(" " + separators[i].toLowerCase(),
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/AbstractLog.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/AbstractLog.java
index fd009346c..ed2ed82bf 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/AbstractLog.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/AbstractLog.java
@@ -43,66 +43,81 @@ public abstract class AbstractLog implements Log {
      */
     protected abstract void log(short level, String message, Throwable t);
 
+    @Override
     public boolean isTraceEnabled() {
         return isEnabled(TRACE);
     }
 
+    @Override
     public boolean isInfoEnabled() {
         return isEnabled(INFO);
     }
 
+    @Override
     public boolean isWarnEnabled() {
         return isEnabled(WARN);
     }
 
+    @Override
     public boolean isErrorEnabled() {
         return isEnabled(ERROR);
     }
 
+    @Override
     public boolean isFatalEnabled() {
         return isEnabled(FATAL);
     }
 
+    @Override
     public void trace(Object message) {
         trace(message, throwableParam(message, null));
     }
 
+    @Override
     public void trace(Object message, Throwable t) {
         if (isTraceEnabled())
             log(TRACE, toString(message), throwableParam(message, t));
     }
 
+    @Override
     public void info(Object message) {
         info(message, throwableParam(message, null));
     }
 
+    @Override
     public void info(Object message, Throwable t) {
         if (isInfoEnabled())
             log(INFO, toString(message), throwableParam(message, t));
     }
 
+    @Override
     public void warn(Object message) {
         warn(message, throwableParam(message, null));
     }
 
+    @Override
     public void warn(Object message, Throwable t) {
         if (isWarnEnabled())
             log(WARN, toString(message), throwableParam(message, t));
     }
 
+    @Override
     public void error(Object message) {
         error(message, throwableParam(message, null));
     }
 
+    @Override
     public void error(Object message, Throwable t) {
         if (isErrorEnabled())
             log(ERROR, toString(message), throwableParam(message, t));
     }
 
+    @Override
     public void fatal(Object message) {
         fatal(message, throwableParam(message, null));
     }
 
+    @Override
     public void fatal(Object message, Throwable t) {
         if (isFatalEnabled())
             log(FATAL, toString(message), throwableParam(message, t));
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/CommonsLogFactory.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/CommonsLogFactory.java
index 97c5c0578..5f64ad23c 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/CommonsLogFactory.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/CommonsLogFactory.java
@@ -32,6 +32,7 @@ public class CommonsLogFactory extends LogFactoryAdapter {
         _factory = org.apache.commons.logging.LogFactory.getFactory();
     }
 
+    @Override
     protected org.apache.openjpa.lib.log.Log newLogAdapter(String channel) {
         return new LogAdapter(_factory.getInstance(channel));
     }
@@ -52,62 +53,77 @@ public class CommonsLogFactory extends LogFactoryAdapter {
             return _log;
         }
 
+        @Override
         public boolean isErrorEnabled() {
             return _log.isErrorEnabled();
         }
 
+        @Override
         public boolean isFatalEnabled() {
             return _log.isFatalEnabled();
         }
 
+        @Override
         public boolean isInfoEnabled() {
             return _log.isInfoEnabled();
         }
 
+        @Override
         public boolean isTraceEnabled() {
             return _log.isTraceEnabled();
         }
 
+        @Override
         public boolean isWarnEnabled() {
             return _log.isWarnEnabled();
         }
 
+        @Override
         public void trace(Object o) {
             _log.trace(o);
         }
 
+        @Override
         public void trace(Object o, Throwable t) {
             _log.trace(o, t);
         }
 
+        @Override
         public void info(Object o) {
             _log.info(o);
         }
 
+        @Override
         public void info(Object o, Throwable t) {
             _log.info(o, t);
         }
 
+        @Override
         public void warn(Object o) {
             _log.warn(o);
         }
 
+        @Override
         public void warn(Object o, Throwable t) {
             _log.warn(o, t);
         }
 
+        @Override
         public void error(Object o) {
             _log.error(o);
         }
 
+        @Override
         public void error(Object o, Throwable t) {
             _log.error(o, t);
         }
 
+        @Override
         public void fatal(Object o) {
             _log.fatal(o);
         }
 
+        @Override
         public void fatal(Object o, Throwable t) {
             _log.fatal(o, t);
         }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log.java
index 68c05e85e..244b9991e 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log.java
@@ -26,105 +26,105 @@ package org.apache.openjpa.lib.log;
  */
 public interface Log {
 
-    public static final short TRACE = 1;
+    short TRACE = 1;
     // the old DEBUG constant was 2. Leaving a hole for compatibility.
-    public static final short INFO = 3;
-    public static final short WARN = 4;
-    public static final short ERROR = 5;
-    public static final short FATAL = 6;
+    short INFO = 3;
+    short WARN = 4;
+    short ERROR = 5;
+    short FATAL = 6;
 
     /**
      * Returns if the {@link #TRACE} log level is enabled.
      */
-    public boolean isTraceEnabled();
+    boolean isTraceEnabled();
 
     /**
      * Returns if the {@link #INFO} log level is enabled.
      */
-    public boolean isInfoEnabled();
+    boolean isInfoEnabled();
 
     /**
      * Returns if the {@link #WARN} log level is enabled.
      */
-    public boolean isWarnEnabled();
+    boolean isWarnEnabled();
 
     /**
      * Returns if the {@link #ERROR} log level is enabled.
      */
-    public boolean isErrorEnabled();
+    boolean isErrorEnabled();
 
     /**
      * Returns if the {@link #FATAL} log level is enabled.
      */
-    public boolean isFatalEnabled();
+    boolean isFatalEnabled();
 
     /**
      * Write out a log message at the {@link #TRACE}
      * level with the stringification of <code>o</code> as the body
      * of the message.
      */
-    public void trace(Object o);
+    void trace(Object o);
 
     /**
      * Write out a log message at the {@link #TRACE}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void trace(Object o, Throwable t);
+    void trace(Object o, Throwable t);
 
     /**
      * Write out a log message at the {@link #INFO}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void info(Object o);
+    void info(Object o);
 
     /**
      * Write out a log message at the {@link #INFO}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void info(Object o, Throwable t);
+    void info(Object o, Throwable t);
 
     /**
      * Write out a log message at the {@link #WARN}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void warn(Object o);
+    void warn(Object o);
 
     /**
      * Write out a log message at the {@link #WARN}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void warn(Object o, Throwable t);
+    void warn(Object o, Throwable t);
 
     /**
      * Write out a log message at the {@link #ERROR}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void error(Object o);
+    void error(Object o);
 
     /**
      * Write out a log message at the {@link #ERROR}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void error(Object o, Throwable t);
+    void error(Object o, Throwable t);
 
     /**
      * Write out a log message at the {@link #FATAL}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void fatal(Object o);
+    void fatal(Object o);
 
     /**
      * Write out a log message at the {@link #FATAL}
      * level with the stringification of <code>o</code> as the body
      * of the message, also outputting <code>t</code> to the log.
      */
-    public void fatal(Object o, Throwable t);
+    void fatal(Object o, Throwable t);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java
index 8010d7976..e08732851 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java
@@ -29,6 +29,7 @@ import org.apache.log4j.Logger;
  */
 public class Log4JLogFactory extends LogFactoryAdapter {
 
+    @Override
     protected Log newLogAdapter(String channel) {
         return new LogAdapter((Logger) LogManager.getLogger(channel));
     }
@@ -49,62 +50,77 @@ public class Log4JLogFactory extends LogFactoryAdapter {
             return _log;
         }
 
+        @Override
         public boolean isTraceEnabled() {
             return _log.isEnabledFor(Level.DEBUG);
         }
 
+        @Override
         public boolean isInfoEnabled() {
             return _log.isEnabledFor(Level.INFO);
         }
 
+        @Override
         public boolean isWarnEnabled() {
             return _log.isEnabledFor(Level.WARN);
         }
 
+        @Override
         public boolean isErrorEnabled() {
             return _log.isEnabledFor(Level.ERROR);
         }
 
+        @Override
         public boolean isFatalEnabled() {
             return _log.isEnabledFor(Level.FATAL);
         }
 
+        @Override
         public void trace(Object o) {
             _log.debug(o);
         }
 
+        @Override
         public void trace(Object o, Throwable t) {
             _log.debug(o, t);
         }
 
+        @Override
         public void info(Object o) {
             _log.info(o);
         }
 
+        @Override
         public void info(Object o, Throwable t) {
             _log.info(o, t);
         }
 
+        @Override
         public void warn(Object o) {
             _log.warn(o);
         }
 
+        @Override
         public void warn(Object o, Throwable t) {
             _log.warn(o, t);
         }
 
+        @Override
         public void error(Object o) {
             _log.error(o);
         }
 
+        @Override
         public void error(Object o, Throwable t) {
             _log.error(o, t);
         }
 
+        @Override
         public void fatal(Object o) {
             _log.fatal(o);
         }
 
+        @Override
         public void fatal(Object o, Throwable t) {
             _log.fatal(o, t);
         }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactory.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactory.java
index a2c1f87c4..0738db9dc 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactory.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactory.java
@@ -28,5 +28,5 @@ public interface LogFactory {
     /**
      * Return a log for the given channel name.
      */
-    public Log getLog(String channel);
+    Log getLog(String channel);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryAdapter.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryAdapter.java
index 40e658889..ff5780c4c 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryAdapter.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryAdapter.java
@@ -19,7 +19,6 @@
 package org.apache.openjpa.lib.log;
 
 import java.util.Map;
-
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -31,8 +30,9 @@ import java.util.concurrent.ConcurrentHashMap;
 public abstract class LogFactoryAdapter implements LogFactory {
 
     // cache category to log adapters
-    private Map<String, Log> _logs = new ConcurrentHashMap<String, Log>();
+    private Map<String, Log> _logs = new ConcurrentHashMap<>();
 
+    @Override
     public Log getLog(String channel) {
         // no locking; OK if same adapter created multiple times
         Log log = _logs.get(channel);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
index df0788b13..ace5aa350 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.openjpa.lib.conf.Configurable;
 import org.apache.openjpa.lib.conf.Configuration;
@@ -38,7 +39,6 @@ import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Default {@link LogFactory} implementation. For ease of automatic
@@ -74,7 +74,7 @@ public class LogFactoryImpl
      * The {@link Log}s that this factory manages, keyed by log channel name.
      */
     private Map<String, LogImpl> _logs =
-        new ConcurrentHashMap<String, LogImpl>();
+        new ConcurrentHashMap<>();
 
     /**
      * The default logging level.
@@ -85,7 +85,7 @@ public class LogFactoryImpl
      * Storage for logging level configuration specified at configuration time.
      */
     private Map<String, Short> _configuredLevels =
-        new HashMap<String, Short>();
+        new HashMap<>();
 
     /**
      * The stream to write to. Defaults to System.err.
@@ -106,6 +106,7 @@ public class LogFactoryImpl
         initializationMillis = System.currentTimeMillis();
     }
 
+    @Override
     public Log getLog(String channel) {
         // no locking; ok if same log created multiple times
         LogImpl l = _logs.get(channel);
@@ -259,18 +260,22 @@ public class LogFactoryImpl
 
     // ---------- Configurable implementation ----------
 
+    @Override
     public void setConfiguration(Configuration conf) {
         _conf = conf;
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
     }
 
     // ---------- GenericConfigurable implementation ----------
 
+    @Override
     public void setInto(Options opts) {
         if (!opts.isEmpty()) {
             Map.Entry<Object, Object> e;
@@ -296,10 +301,12 @@ public class LogFactoryImpl
         private short _level = INFO;
         private String _channel;
 
+        @Override
         protected boolean isEnabled(short level) {
             return level >= _level;
         }
 
+        @Override
         protected void log(short level, String message, Throwable t) {
             String msg = formatMessage(level, message, t);
             _out.println(msg);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogOutputStream.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogOutputStream.java
index 5f8f775d4..4e5b209ed 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogOutputStream.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogOutputStream.java
@@ -51,6 +51,7 @@ public class LogOutputStream extends ByteArrayOutputStream {
         _level = level;
     }
 
+    @Override
     public void flush() throws IOException {
         super.flush();
         byte[] bytes = toByteArray();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/MultiLogFactory.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/MultiLogFactory.java
index ac5fbd701..a7b4f441b 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/MultiLogFactory.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/MultiLogFactory.java
@@ -21,7 +21,6 @@ package org.apache.openjpa.lib.log;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
@@ -53,7 +52,7 @@ public class MultiLogFactory implements LogFactory {
      */
     public MultiLogFactory(LogFactory[] delegates) {
         _delegates =
-            new CopyOnWriteArrayList<LogFactory>(Arrays.asList(delegates));
+            new CopyOnWriteArrayList<>(Arrays.asList(delegates));
     }
 
     public void addLogFactory(LogFactory factory) {
@@ -74,8 +73,9 @@ public class MultiLogFactory implements LogFactory {
     /**
      * Returns a Log impl that combines all logs.
      */
+    @Override
     public synchronized Log getLog(String channel) {
-        List<Log> logs = new ArrayList<Log>(_delegates.size());
+        List<Log> logs = new ArrayList<>(_delegates.size());
         for(LogFactory f : _delegates) {
             if (f != null) {
                 Log l = f.getLog(channel);
@@ -104,56 +104,67 @@ public class MultiLogFactory implements LogFactory {
             return _logs;
         }
 
+        @Override
         public void trace(Object msg) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].trace(msg);
         }
 
+        @Override
         public void trace(Object msg, Throwable t) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].trace(msg, t);
         }
 
+        @Override
         public void info(Object msg) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].info(msg);
         }
 
+        @Override
         public void info(Object msg, Throwable t) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].info(msg, t);
         }
 
+        @Override
         public void warn(Object msg) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].warn(msg);
         }
 
+        @Override
         public void warn(Object msg, Throwable t) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].warn(msg, t);
         }
 
+        @Override
         public void error(Object msg) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].error(msg);
         }
 
+        @Override
         public void error(Object msg, Throwable t) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].error(msg, t);
         }
 
+        @Override
         public void fatal(Object msg) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].fatal(msg);
         }
 
+        @Override
         public void fatal(Object msg, Throwable t) {
             for (int i = 0; i < _logs.length; i++)
                 _logs[i].fatal(msg, t);
         }
 
+        @Override
         public boolean isTraceEnabled() {
             for (int i = 0; i < _logs.length; i++)
                 if (_logs[i].isTraceEnabled())
@@ -161,6 +172,7 @@ public class MultiLogFactory implements LogFactory {
             return false;
         }
 
+        @Override
         public boolean isInfoEnabled() {
             for (int i = 0; i < _logs.length; i++)
                 if (_logs[i].isInfoEnabled())
@@ -168,6 +180,7 @@ public class MultiLogFactory implements LogFactory {
             return false;
         }
 
+        @Override
         public boolean isWarnEnabled() {
             for (int i = 0; i < _logs.length; i++)
                 if (_logs[i].isWarnEnabled())
@@ -175,6 +188,7 @@ public class MultiLogFactory implements LogFactory {
             return false;
         }
 
+        @Override
         public boolean isErrorEnabled() {
             for (int i = 0; i < _logs.length; i++)
                 if (_logs[i].isErrorEnabled())
@@ -182,6 +196,7 @@ public class MultiLogFactory implements LogFactory {
             return false;
         }
 
+        @Override
         public boolean isFatalEnabled() {
             for (int i = 0; i < _logs.length; i++)
                 if (_logs[i].isFatalEnabled())
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/NoneLogFactory.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/NoneLogFactory.java
index 15643c1bb..69c1a36f2 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/NoneLogFactory.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/NoneLogFactory.java
@@ -26,6 +26,7 @@ package org.apache.openjpa.lib.log;
  */
 public class NoneLogFactory implements LogFactory {
 
+    @Override
     public final Log getLog(String channel) {
         return NoneLog.getInstance();
     }
@@ -41,53 +42,68 @@ public class NoneLogFactory implements LogFactory {
             return s_log;
         }
 
+        @Override
         public final boolean isErrorEnabled() {
             return false;
         }
 
+        @Override
         public final boolean isFatalEnabled() {
             return false;
         }
 
+        @Override
         public final boolean isInfoEnabled() {
             return false;
         }
 
+        @Override
         public final boolean isTraceEnabled() {
             return false;
         }
 
+        @Override
         public final boolean isWarnEnabled() {
             return false;
         }
 
+        @Override
         public final void trace(Object o) {
         }
 
+        @Override
         public final void trace(Object o, Throwable t) {
         }
 
+        @Override
         public final void info(Object o) {
         }
 
+        @Override
         public final void info(Object o, Throwable t) {
         }
 
+        @Override
         public final void warn(Object o) {
         }
 
+        @Override
         public final void warn(Object o, Throwable t) {
         }
 
+        @Override
         public final void error(Object o) {
         }
 
+        @Override
         public final void error(Object o, Throwable t) {
         }
 
+        @Override
         public final void fatal(Object o) {
         }
 
+        @Override
         public final void fatal(Object o, Throwable t) {
         }
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/SLF4JLogFactory.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/SLF4JLogFactory.java
index e50357277..099135c60 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/SLF4JLogFactory.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/SLF4JLogFactory.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.lib.log;
 
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * {@link LogFactory} implementation that delegates to the SLF4J framework.
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
  */
 public class SLF4JLogFactory extends LogFactoryAdapter {
 
+    @Override
     protected Log newLogAdapter(String channel) {
         return new LogAdapter((Logger) LoggerFactory.getLogger(channel));
     }
@@ -47,6 +48,7 @@ public class SLF4JLogFactory extends LogFactoryAdapter {
             return _log;
         }
 
+        @Override
         public boolean isTraceEnabled() {
             return _log.isTraceEnabled();
         }
@@ -56,27 +58,33 @@ public class SLF4JLogFactory extends LogFactoryAdapter {
             return _log.isDebugEnabled();
         }
 
+        @Override
         public boolean isInfoEnabled() {
             return _log.isInfoEnabled();
         }
 
+        @Override
         public boolean isWarnEnabled() {
             return _log.isWarnEnabled();
         }
 
+        @Override
         public boolean isErrorEnabled() {
             return _log.isErrorEnabled();
         }
 
+        @Override
         public boolean isFatalEnabled() {
             // SLF4J has no FATAL level, so map to ERROR like log4j-over-slf4j
             return _log.isErrorEnabled();
         }
 
+        @Override
         public void trace(Object o) {
             _log.trace(objectToString(o));
         }
 
+        @Override
         public void trace(Object o, Throwable t) {
             _log.trace(objectToString(o), t);
         }
@@ -91,35 +99,43 @@ public class SLF4JLogFactory extends LogFactoryAdapter {
             _log.debug(objectToString(o), t);
         }
 
+        @Override
         public void info(Object o) {
             _log.info(objectToString(o));
         }
 
+        @Override
         public void info(Object o, Throwable t) {
             _log.info(objectToString(o), t);
         }
 
+        @Override
         public void warn(Object o) {
             _log.warn(objectToString(o));
         }
 
+        @Override
         public void warn(Object o, Throwable t) {
             _log.warn(objectToString(o), t);
         }
 
+        @Override
         public void error(Object o) {
             _log.error(objectToString(o));
         }
 
+        @Override
         public void error(Object o, Throwable t) {
             _log.error(objectToString(o), t);
         }
 
+        @Override
         public void fatal(Object o) {
             // SLF4J has no FATAL level, so map to ERROR like log4j-over-slf4j
             _log.error(objectToString(o));
         }
 
+        @Override
         public void fatal(Object o, Throwable t) {
             // SLF4J has no FATAL level, so map to ERROR like log4j-over-slf4j
             _log.error(objectToString(o), t);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java
index f16568795..71a4cfbde 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java
@@ -20,10 +20,10 @@ package org.apache.openjpa.lib.meta;
 
 import java.security.AccessController;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.lib.util.ClassUtil;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -92,6 +92,7 @@ public class CFMetaDataParser extends XMLMetaDataParser {
         return 2;
     }
 
+    @Override
     protected boolean startElement(String name, Attributes attrs)
         throws SAXException {
         // skip root element
@@ -133,6 +134,7 @@ public class CFMetaDataParser extends XMLMetaDataParser {
         }
     }
 
+    @Override
     protected void endElement(String name) throws SAXException {
         // skip root element
         int depth = currentDepth();
@@ -288,6 +290,7 @@ public class CFMetaDataParser extends XMLMetaDataParser {
      * a new document. Subclasses should call
      * <code>super.reset()</code> to clear superclass state.
      */
+    @Override
     protected void reset() {
         super.reset();
         _package = null;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataSerializer.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataSerializer.java
index d1692af82..4a6f50842 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataSerializer.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataSerializer.java
@@ -20,9 +20,9 @@ package org.apache.openjpa.lib.meta;
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.LinkedHashMap;
 
 import org.xml.sax.SAXException;
 
@@ -59,7 +59,7 @@ public abstract class CFMetaDataSerializer extends XMLMetaDataSerializer {
     protected Map<String, Collection<Object>> groupByPackage(
         Collection<Object> objs) throws SAXException {
         Map<String, Collection<Object>> packages =
-            new LinkedHashMap<String, Collection<Object>>();
+            new LinkedHashMap<>();
         String packageName;
         Collection<Object> packageObjs;
         Object obj;
@@ -68,7 +68,7 @@ public abstract class CFMetaDataSerializer extends XMLMetaDataSerializer {
             packageName = getPackage(obj);
             packageObjs = packages.get(packageName);
             if (packageObjs == null) {
-                packageObjs = new LinkedList<Object>();
+                packageObjs = new LinkedList<>();
                 packages.put(packageName, packageObjs);
             }
             packageObjs.add(obj);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassAnnotationMetaDataFilter.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassAnnotationMetaDataFilter.java
index da98e08e5..0d269d3b1 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassAnnotationMetaDataFilter.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassAnnotationMetaDataFilter.java
@@ -56,6 +56,7 @@ public class ClassAnnotationMetaDataFilter implements MetaDataFilter {
             _annos[i] = "L" + annos[i].getName().replace('.', '/') + ";";
     }
 
+    @Override
     public boolean matches(Resource rsrc) throws IOException {
         if (_annos.length == 0 || !rsrc.getName().endsWith(".class"))
             return false;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java
index 97a046c12..c13c95769 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java
@@ -41,6 +41,7 @@ import org.apache.openjpa.lib.util.ClassUtil;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+
 import serp.bytecode.lowlevel.ConstantPoolTable;
 
 /**
@@ -181,7 +182,7 @@ public class ClassArgParser {
      */
     public Map<Object, Class<?>[]> mapTypes(MetaDataIterator itr) {
         Map<Object, String[]> map = mapTypeNames(itr);
-        Map<Object, Class<?>[]> rval = new HashMap<Object, Class<?>[]>();
+        Map<Object, Class<?>[]> rval = new HashMap<>();
         Map.Entry<Object, String[]> entry;
         String[] names;
         Class<?>[] objs;
@@ -236,7 +237,7 @@ public class ClassArgParser {
         if (itr == null)
             return new String[0];
 
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         Object source = null;
         try {
             while (itr.hasNext()) {
@@ -276,9 +277,9 @@ public class ClassArgParser {
         if (itr == null)
             return Collections.emptyMap();
 
-        Map<Object, String []> map = new HashMap<Object, String[]>();
+        Map<Object, String []> map = new HashMap<>();
         Object source = null;
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         try {
             while (itr.hasNext()) {
                 source = itr.next();
@@ -392,7 +393,7 @@ public class ClassArgParser {
      * Returns the classes named in the given common format metadata stream.
      */
     private Collection<String> getFromMetaData(Reader xml) throws IOException {
-        Collection<String> names = new ArrayList<String>();
+        Collection<String> names = new ArrayList<>();
         BufferedReader in = new BufferedReader(xml);
 
         boolean comment = false;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
index a4892a61f..76839ea42 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
@@ -47,7 +47,7 @@ public class ClassMetaDataIterator implements MetaDataIterator {
     private final ClassLoader _loader;
     private final List<String> _locs;
     private int _loc = -1;
-    private final List<URL> _urls = new ArrayList<URL>(3);
+    private final List<URL> _urls = new ArrayList<>(3);
     private int _url = -1;
 
     /**
@@ -93,7 +93,7 @@ public class ClassMetaDataIterator implements MetaDataIterator {
 
         // collect the set of all possible metadata locations; start with
         // system locations
-        _locs = new ArrayList<String>();
+        _locs = new ArrayList<>();
         _locs.add("META-INF/package" + suffix);
         _locs.add("WEB-INF/package" + suffix);
         _locs.add("package" + suffix);
@@ -146,6 +146,7 @@ public class ClassMetaDataIterator implements MetaDataIterator {
             Collections.reverse(_locs);
     }
 
+    @Override
     public boolean hasNext() throws IOException {
         Enumeration<URL> e;
         while (_url + 1 >= _urls.size()) {
@@ -167,12 +168,14 @@ public class ClassMetaDataIterator implements MetaDataIterator {
         return true;
     }
 
+    @Override
     public URL next() throws IOException {
         if (!hasNext())
             throw new NoSuchElementException();
         return _urls.get(++_url);
     }
 
+    @Override
     public InputStream getInputStream() throws IOException {
         if (_url == -1 || _url >= _urls.size())
             throw new IllegalStateException();
@@ -184,6 +187,7 @@ public class ClassMetaDataIterator implements MetaDataIterator {
         }
     }
 
+    @Override
     public File getFile() throws IOException {
         if (_url == -1 || _url >= _urls.size())
             throw new IllegalStateException();
@@ -192,6 +196,7 @@ public class ClassMetaDataIterator implements MetaDataIterator {
             J2DoPrivHelper.existsAction(file))).booleanValue()) ? file:null;
     }
 
+    @Override
     public void close() {
     }
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java
index 50a20c32b..dc94e0417 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java
@@ -26,7 +26,6 @@ import java.util.Properties;
 import java.util.zip.ZipFile;
 
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
-
 import org.apache.openjpa.lib.util.StringUtil;
 
 /**
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java
index 15f6778fc..28624a602 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java
@@ -68,7 +68,7 @@ public class FileMetaDataIterator implements MetaDataIterator {
         if (dir == null)
             _itr = null;
         else {
-            Collection<File> metas = new ArrayList<File>();
+            Collection<File> metas = new ArrayList<>();
             FileResource rsrc = (filter == null) ? null : new FileResource();
             scan(dir, filter, rsrc, metas, 0);
             _itr = metas.iterator();
@@ -103,10 +103,12 @@ public class FileMetaDataIterator implements MetaDataIterator {
         return scanned;
     }
 
+    @Override
     public boolean hasNext() {
         return _itr != null && _itr.hasNext();
     }
 
+    @Override
     public URL next() throws IOException {
         if (_itr == null)
             throw new NoSuchElementException();
@@ -122,6 +124,7 @@ public class FileMetaDataIterator implements MetaDataIterator {
         }
     }
 
+    @Override
     public InputStream getInputStream() throws IOException {
         if (_file == null)
             throw new IllegalStateException();
@@ -135,12 +138,14 @@ public class FileMetaDataIterator implements MetaDataIterator {
         }
     }
 
+    @Override
     public File getFile() {
         if (_file == null)
             throw new IllegalStateException();
         return _file;
     }
 
+    @Override
     public void close() {
     }
 
@@ -152,10 +157,12 @@ public class FileMetaDataIterator implements MetaDataIterator {
             _file = file;
         }
 
+        @Override
         public String getName() {
             return _file.getName();
         }
 
+        @Override
         public byte[] getContent() throws IOException {
             long len = (AccessController.doPrivileged(
                 J2DoPrivHelper.lengthAction(_file))).longValue();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/JarFileURLMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/JarFileURLMetaDataIterator.java
index 4e2307421..dc29a997d 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/JarFileURLMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/JarFileURLMetaDataIterator.java
@@ -45,7 +45,7 @@ public class JarFileURLMetaDataIterator implements MetaDataIterator, MetaDataFil
 
     private int index = 0;
     private JarEntry _last = null;
-    private final ArrayList<JarEntry> _entryList = new ArrayList<JarEntry>();
+    private final ArrayList<JarEntry> _entryList = new ArrayList<>();
 
     public JarFileURLMetaDataIterator(URL url, MetaDataFilter filter) throws IOException {
         if (url == null) {
@@ -81,6 +81,7 @@ public class JarFileURLMetaDataIterator implements MetaDataIterator, MetaDataFil
     /**
      * Return whether there is another resource to iterate over.
      */
+    @Override
     public boolean hasNext() throws IOException {
         if (_entryList.size() <= index) {
             return false;
@@ -101,6 +102,7 @@ public class JarFileURLMetaDataIterator implements MetaDataIterator, MetaDataFil
     /**
      * Return the next metadata resource.
      */
+    @Override
     public Object next() throws IOException {
         if (!hasNext()) {
             throw new NoSuchElementException();
@@ -116,6 +118,7 @@ public class JarFileURLMetaDataIterator implements MetaDataIterator, MetaDataFil
     /**
      * Return the last-iterated metadata resource content as a stream.
      */
+    @Override
     public InputStream getInputStream() throws IOException {
         if (_last == null)
             throw new IllegalStateException();
@@ -125,6 +128,7 @@ public class JarFileURLMetaDataIterator implements MetaDataIterator, MetaDataFil
     /**
      * Return the last-iterated metadata resource content as a file, or null if not an extant file.
      */
+    @Override
     public File getFile() throws IOException {
         if (_last == null)
             throw new IllegalStateException();
@@ -134,6 +138,7 @@ public class JarFileURLMetaDataIterator implements MetaDataIterator, MetaDataFil
     /**
      * Close the resources used by this iterator.
      */
+    @Override
     public void close() {
         try {
             if (_jarFile != null)
@@ -149,6 +154,7 @@ public class JarFileURLMetaDataIterator implements MetaDataIterator, MetaDataFil
     /**
      * The name of the resource.
      */
+    @Override
     public String getName() {
         if (index < _entryList.size()) {
             return _entryList.get(index).getName();
@@ -160,6 +166,7 @@ public class JarFileURLMetaDataIterator implements MetaDataIterator, MetaDataFil
     /**
      * Resource content.
      */
+    @Override
     public byte[] getContent() throws IOException {
         if (_entryList.size() <= index) {
             return new byte[0];
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataFilter.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataFilter.java
index f7ed446d7..c553eb05b 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataFilter.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataFilter.java
@@ -31,21 +31,21 @@ public interface MetaDataFilter {
     /**
      * Return whether the given resource passes the filter.
      */
-    public boolean matches(Resource rsrc) throws IOException;
+    boolean matches(Resource rsrc) throws IOException;
 
     /**
      * Information about a metadata resource.
      */
-    public static interface Resource {
+    public interface Resource {
 
         /**
          * The name of the resource.
          */
-        public String getName();
+        String getName();
 
         /**
          * Resource content.
          */
-        public byte[] getContent() throws IOException;
+        byte[] getContent() throws IOException;
     }
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataIterator.java
index 3871bf3a7..6bcc905e9 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataIterator.java
@@ -34,27 +34,27 @@ public interface MetaDataIterator extends Closeable {
     /**
      * Return whether there is another resource to iterate over.
      */
-    public boolean hasNext() throws IOException;
+    boolean hasNext() throws IOException;
 
     /**
      * Return the next metadata resource.
      */
-    public Object next() throws IOException;
+    Object next() throws IOException;
 
     /**
      * Return the last-iterated metadata resource content as a stream.
      */
-    public InputStream getInputStream() throws IOException;
+    InputStream getInputStream() throws IOException;
 
     /**
      * Return the last-iterated metadata resource content as a file, or null
      * if not an extant file.
      */
-    public File getFile() throws IOException;
+    File getFile() throws IOException;
 
     /**
      * Close the resources used by this iterator.
      */
-    public void close();
+    @Override void close();
 }
 
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataIteratorChain.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataIteratorChain.java
index 2c2284c3f..7c098a242 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataIteratorChain.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataIteratorChain.java
@@ -46,7 +46,7 @@ public class MetaDataIteratorChain implements MetaDataIterator {
      * Combine two iterators.
      */
     public MetaDataIteratorChain(MetaDataIterator itr1, MetaDataIterator itr2) {
-        _itrs = new ArrayList<MetaDataIterator>(2);
+        _itrs = new ArrayList<>(2);
         _itrs.add(itr1);
         _itrs.add(itr2);
     }
@@ -58,10 +58,11 @@ public class MetaDataIteratorChain implements MetaDataIterator {
         if (_cur != -1)
             throw new IllegalStateException();
         if (_itrs == null)
-            _itrs = new ArrayList<MetaDataIterator>(4);
+            _itrs = new ArrayList<>(4);
         _itrs.add(itr);
     }
 
+    @Override
     public boolean hasNext() throws IOException {
         if (_itrs == null)
             return false;
@@ -80,24 +81,28 @@ public class MetaDataIteratorChain implements MetaDataIterator {
         return false;
     }
 
+    @Override
     public Object next() throws IOException {
         if (!hasNext())
             throw new NoSuchElementException();
         return _itr.next();
     }
 
+    @Override
     public InputStream getInputStream() throws IOException {
         if (_itr == null)
             throw new IllegalStateException();
         return _itr.getInputStream();
     }
 
+    @Override
     public File getFile() throws IOException {
         if (_itr == null)
             throw new IllegalStateException();
         return _itr.getFile();
     }
 
+    @Override
     public void close() {
         if (_itrs != null) {
             for(MetaDataIterator mdi: _itrs) {
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataParser.java
index de8788416..13a056fd8 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataParser.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataParser.java
@@ -35,35 +35,35 @@ public interface MetaDataParser {
      * The classloader to use to resolve resources, or null for impl-defined
      * default.
      */
-    public void setClassLoader(ClassLoader loader);
+    void setClassLoader(ClassLoader loader);
 
     /**
      * Return the results from the last parse.
      */
-    public List getResults();
+    List getResults();
 
     /**
      * Parse the given resource.
      */
-    public void parse(String rsrc) throws IOException;
+    void parse(String rsrc) throws IOException;
 
     /**
      * Parse the given resource.
      */
-    public void parse(URL url) throws IOException;
+    void parse(URL url) throws IOException;
 
     /**
      * Parse the given file, which may be a directory, in which case it
      * will be scanned recursively for metadata files.
      */
-    public void parse(File file) throws IOException;
+    void parse(File file) throws IOException;
 
     /**
      * Parse all possible metadata locations for the given class, going
      * top-down or bottom-up. If the class is null, only top-level locations
      * will be parsed.
      */
-    public void parse(Class<?> cls, boolean topDown) throws IOException;
+    void parse(Class<?> cls, boolean topDown) throws IOException;
 
     /**
      * Parse the metadata in the given reader.
@@ -72,15 +72,15 @@ public interface MetaDataParser {
      * @param sourceName the name of the source being parsed, for use
      * in error messages
      */
-    public void parse(Reader content, String sourceName) throws IOException;
+    void parse(Reader content, String sourceName) throws IOException;
 
     /**
      * Parse the metadata supplied by the given iterator.
      */
-    public void parse(MetaDataIterator itr) throws IOException;
+    void parse(MetaDataIterator itr) throws IOException;
 
     /**
      * Clears the cache of parsed resource names.
      */
-    public void clear();
+    void clear();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataSerializer.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataSerializer.java
index f6592d2a5..1eb1c71c2 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataSerializer.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/MetaDataSerializer.java
@@ -30,10 +30,10 @@ import java.util.Map;
  */
 public interface MetaDataSerializer {
 
-    public static final int COMPACT = 0;
-    public static final int PRETTY = 1;
-    public static final int APPEND = 2;
-    public static final int VERBOSE = 4;
+    int COMPACT = 0;
+    int PRETTY = 1;
+    int APPEND = 2;
+    int VERBOSE = 4;
 
     /**
      * Serialize the current set of objects to the files from which they were
@@ -42,7 +42,7 @@ public interface MetaDataSerializer {
      *
      * @param flags bit flags specifying the output flags; e.g. {@link #PRETTY}
      */
-    public void serialize(int flags) throws IOException;
+    void serialize(int flags) throws IOException;
 
     /**
      * Serialize the current set of objects to the files from which they were
@@ -54,7 +54,7 @@ public interface MetaDataSerializer {
      * values that are the {@link String} contents of the MetaData
      * @param flags bit flags specifying the output flags; e.g. {@link #PRETTY}
      */
-    public void serialize(Map output, int flags) throws IOException;
+    void serialize(Map output, int flags) throws IOException;
 
     /**
      * Serialize the current set of objects to the given file.
@@ -62,12 +62,12 @@ public interface MetaDataSerializer {
      * @param flags bit flags specifying the output flags; e.g.
      * {@link #PRETTY} | {@link #APPEND}
      */
-    public void serialize(File file, int flags) throws IOException;
+    void serialize(File file, int flags) throws IOException;
 
     /**
      * Serialize the current set of objects to the given stream.
      *
      * @param flags bit flags specifying the output flags; e.g. {@link #PRETTY}
      */
-    public void serialize(Writer out, int flags) throws IOException;
+    void serialize(Writer out, int flags) throws IOException;
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java
index 5f7fbad98..4cefb8e3d 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java
@@ -69,7 +69,7 @@ public class ResourceMetaDataIterator implements MetaDataIterator {
                 J2DoPrivHelper.getResourcesAction(loader, rsrc));
             while (e.hasMoreElements()) {
                 if (_urls == null)
-                    _urls = new ArrayList<URL>(3);
+                    _urls = new ArrayList<>(3);
                 _urls.add(e.nextElement());
             }
         } catch (PrivilegedActionException pae) {
@@ -77,16 +77,19 @@ public class ResourceMetaDataIterator implements MetaDataIterator {
         }
     }
 
+    @Override
     public boolean hasNext() {
         return _urls != null && _url + 1 < _urls.size();
     }
 
+    @Override
     public URL next() {
         if (!hasNext())
             throw new NoSuchElementException();
         return _urls.get(++_url);
     }
 
+    @Override
     public InputStream getInputStream() throws IOException {
         if (_url == -1 || _url >= _urls.size())
             throw new IllegalStateException();
@@ -98,6 +101,7 @@ public class ResourceMetaDataIterator implements MetaDataIterator {
         }
     }
 
+    @Override
     public File getFile() throws IOException {
         if (_url == -1 || _url >= _urls.size())
             throw new IllegalStateException();
@@ -106,6 +110,7 @@ public class ResourceMetaDataIterator implements MetaDataIterator {
             J2DoPrivHelper.existsAction(file))).booleanValue()) ? file :null;
     }
 
+    @Override
     public void close() {
     }
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTracker.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTracker.java
index 145ca4a2b..d15ead7d3 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTracker.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTracker.java
@@ -28,40 +28,40 @@ import java.io.File;
  */
 public interface SourceTracker {
 
-    public static final int SRC_OTHER = 0;
-    public static final int SRC_ANNOTATIONS = 1;
-    public static final int SRC_XML = 2;
+    int SRC_OTHER = 0;
+    int SRC_ANNOTATIONS = 1;
+    int SRC_XML = 2;
 
     /**
      * Return the file from which this instance was parsed.
      */
-    public File getSourceFile();
+    File getSourceFile();
 
     /**
      * Return the domain-dependent scope of this instance within its file.
      */
-    public Object getSourceScope();
+    Object getSourceScope();
 
     /**
      * Return the type of source.
      */
-    public int getSourceType();
+    int getSourceType();
 
     /**
      * Return the domain-meaningful name of the resource that was loaded
      * from this source. I.e., if we had loaded the source for a Java
      * class, this would return the name of the class.
      */
-    public String getResourceName();
+    String getResourceName();
 
     /**
      * Return the line number of the file at which this instance was parsed.
      */
-    public int getLineNumber();
+    int getLineNumber();
 
     /**
      * Return the column number in the line of the file at which this
      * instance was parsed.
      */
-    public int getColNumber();
+    int getColNumber();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SuffixMetaDataFilter.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SuffixMetaDataFilter.java
index 9e5414586..d8f2cedd1 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SuffixMetaDataFilter.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SuffixMetaDataFilter.java
@@ -34,6 +34,7 @@ public class SuffixMetaDataFilter implements MetaDataFilter {
         _suffix = suffix;
     }
 
+    @Override
     public boolean matches(Resource rsrc) {
         String name = rsrc.getName();
         return name != null && name.endsWith(_suffix);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java
index 21183e30b..cc1cdee7f 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java
@@ -45,10 +45,12 @@ public class URLMetaDataIterator implements MetaDataIterator {
         _url = url;
     }
 
+    @Override
     public boolean hasNext() {
         return _url != null && !_iterated;
     }
 
+    @Override
     public URL next() throws IOException {
         if (!hasNext())
             throw new IllegalStateException();
@@ -57,6 +59,7 @@ public class URLMetaDataIterator implements MetaDataIterator {
         return _url;
     }
 
+    @Override
     public InputStream getInputStream() throws IOException {
         if (!_iterated)
             throw new IllegalStateException();
@@ -70,6 +73,7 @@ public class URLMetaDataIterator implements MetaDataIterator {
         }
     }
 
+    @Override
     public File getFile() {
         if (!_iterated)
             throw new IllegalStateException();
@@ -80,6 +84,7 @@ public class URLMetaDataIterator implements MetaDataIterator {
             J2DoPrivHelper.existsAction(file))).booleanValue()) ? file:null;
     }
 
+    @Override
     public void close() {
     }
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
index 4b963aa43..470bdf553 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
@@ -33,8 +33,17 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.xml.parsers.SAXParser;
 
+import org.apache.openjpa.lib.log.Log;
+import org.apache.openjpa.lib.util.J2DoPrivHelper;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.Localizer.Message;
+import org.apache.openjpa.lib.xml.Commentable;
+import org.apache.openjpa.lib.xml.DocTypeReader;
+import org.apache.openjpa.lib.xml.Location;
+import org.apache.openjpa.lib.xml.XMLFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
@@ -42,14 +51,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.helpers.DefaultHandler;
-import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.lib.util.J2DoPrivHelper;
-import org.apache.openjpa.lib.util.Localizer.Message;
-import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.xml.Commentable;
-import org.apache.openjpa.lib.xml.DocTypeReader;
-import org.apache.openjpa.lib.xml.Location;
-import org.apache.openjpa.lib.xml.XMLFactory;
 
 /**
  * Custom SAX parser used by the system to quickly parse metadata files.
@@ -276,26 +277,31 @@ public abstract class XMLMetaDataParser extends DefaultHandler
     /**
      * Classloader to use for class name resolution.
      */
+    @Override
     public void setClassLoader(ClassLoader loader) {
         _loader = loader;
     }
 
+    @Override
     public List getResults() {
         if (_results == null)
             return Collections.emptyList();
         return _results;
     }
 
+    @Override
     public void parse(String rsrc) throws IOException {
         if (rsrc != null)
             parse(new ResourceMetaDataIterator(rsrc, _loader));
     }
 
+    @Override
     public void parse(URL url) throws IOException {
         if (url != null)
             parse(new URLMetaDataIterator(url));
     }
 
+    @Override
     public void parse(File file) throws IOException {
         if (file == null)
             return;
@@ -309,16 +315,19 @@ public abstract class XMLMetaDataParser extends DefaultHandler
         }
     }
 
+    @Override
     public void parse(Class cls, boolean topDown) throws IOException {
         String suff = (_suffix == null) ? "" : _suffix;
         parse(new ClassMetaDataIterator(cls, suff, topDown), !topDown);
     }
 
+    @Override
     public void parse(Reader xml, String sourceName) throws IOException {
         if (xml != null && (sourceName == null || !parsed(sourceName)))
             parseNewResource(xml, sourceName);
     }
 
+    @Override
     public void parse(MetaDataIterator itr) throws IOException {
         parse(itr, false);
     }
@@ -454,12 +463,12 @@ public abstract class XMLMetaDataParser extends DefaultHandler
         if (!_caching)
             return false;
         if (_parsed == null)
-            _parsed = new HashMap<ClassLoader, Set<String>>();
+            _parsed = new HashMap<>();
 
         ClassLoader loader = currentClassLoader();
         Set<String> set = _parsed.get(loader);
         if (set == null) {
-            set = new HashSet<String>();
+            set = new HashSet<>();
             _parsed.put(loader, set);
         }
         boolean added = set.add(src);
@@ -468,6 +477,7 @@ public abstract class XMLMetaDataParser extends DefaultHandler
         return !added;
     }
 
+    @Override
     public void clear() {
         if (_log != null && _log.isTraceEnabled())
             _log.trace(_loc.get("clear-parser", this));
@@ -475,18 +485,22 @@ public abstract class XMLMetaDataParser extends DefaultHandler
             _parsed.clear();
     }
 
+    @Override
     public void error(SAXParseException se) throws SAXException {
         throw getException(se.toString());
     }
 
+    @Override
     public void fatalError(SAXParseException se) throws SAXException {
         throw getException(se.toString());
     }
 
+    @Override
     public void setDocumentLocator(Locator locator) {
         _location.setLocator(locator);
     }
 
+    @Override
     public void startElement(String uri, String name, String qName,
         Attributes attrs) throws SAXException {
         _depth++;
@@ -500,6 +514,7 @@ public abstract class XMLMetaDataParser extends DefaultHandler
         }
     }
 
+    @Override
     public void endElement(String uri, String name, String qName)
         throws SAXException {
         if (_depth < _ignore) {
@@ -520,6 +535,7 @@ public abstract class XMLMetaDataParser extends DefaultHandler
         _depth--;
     }
 
+    @Override
     public void characters(char[] ch, int start, int length) {
         if (_parseText && _depth <= _ignore) {
             if (_text == null)
@@ -528,42 +544,49 @@ public abstract class XMLMetaDataParser extends DefaultHandler
         }
     }
 
+    @Override
     public void comment(char[] ch, int start, int length) throws SAXException {
         if (_parseComments && _depth <= _ignore) {
             if (_comments == null)
-                _comments = new ArrayList<String>(3);
+                _comments = new ArrayList<>(3);
             _comments.add(String.valueOf(ch, start, length));
         }
         if (_lh != null)
             _lh.comment(ch, start, length);
     }
 
+    @Override
     public void startCDATA() throws SAXException {
         if (_lh != null)
             _lh.startCDATA();
     }
 
+    @Override
     public void endCDATA() throws SAXException {
         if (_lh != null)
             _lh.endCDATA();
     }
 
+    @Override
     public void startDTD(String name, String publicId, String systemId)
         throws SAXException {
         if (_lh != null)
             _lh.startDTD(name, publicId, systemId);
     }
 
+    @Override
     public void endDTD() throws SAXException {
         if (_lh != null)
             _lh.endDTD();
     }
 
+    @Override
     public void startEntity(String name) throws SAXException {
         if (_lh != null)
             _lh.startEntity(name);
     }
 
+    @Override
     public void endEntity(String name) throws SAXException {
         if (_lh != null)
             _lh.endEntity(name);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java
index e69938380..c916d179e 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java
@@ -86,10 +86,12 @@ public abstract class XMLMetaDataSerializer implements MetaDataSerializer {
         _log = log;
     }
 
+    @Override
     public void serialize(int flags) throws IOException {
         serialize((Map) null, flags);
     }
 
+    @Override
     public void serialize(Map output, int flags)
         throws IOException {
         Map<File, Collection<Object>> files = getFileMap();
@@ -156,7 +158,7 @@ public abstract class XMLMetaDataSerializer implements MetaDataSerializer {
 
         // create a map of files to lists of objects
         Map<File, Collection<Object>> files =
-            new HashMap<File, Collection<Object>>();
+            new HashMap<>();
         File file;
         Collection<Object> fileObjs;
         for(Object obj : objs) {
@@ -169,7 +171,7 @@ public abstract class XMLMetaDataSerializer implements MetaDataSerializer {
 
             fileObjs = (Collection<Object>) files.get(file);
             if (fileObjs == null) {
-                fileObjs = new LinkedList<Object>();
+                fileObjs = new LinkedList<>();
                 files.put(file, fileObjs);
             }
             fileObjs.add(obj);
@@ -188,6 +190,7 @@ public abstract class XMLMetaDataSerializer implements MetaDataSerializer {
         return null;
     }
 
+    @Override
     public void serialize(File file, int flags) throws IOException {
         if (_log != null)
             _log.info(_loc.get("ser-file", file));
@@ -205,6 +208,7 @@ public abstract class XMLMetaDataSerializer implements MetaDataSerializer {
         }
     }
 
+    @Override
     public void serialize(Writer out, int flags) throws IOException {
         try {
             if ((flags & PRETTY) > 0)
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java
index 3036173ec..a23200024 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java
@@ -77,6 +77,7 @@ public class ZipFileMetaDataIterator
         _entries = (file == null) ? null : file.entries();
     }
 
+    @Override
     public boolean hasNext() throws IOException {
         if (_entries == null)
             return false;
@@ -90,6 +91,7 @@ public class ZipFileMetaDataIterator
         return _entry != null;
     }
 
+    @Override
     public String next() throws IOException {
         if (!hasNext())
             throw new NoSuchElementException();
@@ -99,18 +101,21 @@ public class ZipFileMetaDataIterator
         return ret;
     }
 
+    @Override
     public InputStream getInputStream() throws IOException {
         if (_last == null)
             throw new IllegalStateException();
         return _file.getInputStream(_last);
     }
 
+    @Override
     public File getFile() {
         if (_last == null)
             throw new IllegalStateException();
         return null;
     }
 
+    @Override
     public void close() {
         try {
            if (_file != null)
@@ -123,10 +128,12 @@ public class ZipFileMetaDataIterator
     // MetaDataFilter.Resource implementation
     //////////////////////////////////////////
 
+    @Override
     public String getName() {
         return _entry.getName();
     }
 
+    @Override
     public byte[] getContent() throws IOException {
         long size = _entry.getSize();
         if (size == 0)
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipStreamMetaDataIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipStreamMetaDataIterator.java
index dd7614414..040696b95 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipStreamMetaDataIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipStreamMetaDataIterator.java
@@ -50,6 +50,7 @@ public class ZipStreamMetaDataIterator
         _filter = filter;
     }
 
+    @Override
     public boolean hasNext() throws IOException {
         if (_stream == null)
             return false;
@@ -74,6 +75,7 @@ public class ZipStreamMetaDataIterator
         return _entry != null;
     }
 
+    @Override
     public String next() throws IOException {
         if (!hasNext())
             throw new NoSuchElementException();
@@ -83,6 +85,7 @@ public class ZipStreamMetaDataIterator
         return ret;
     }
 
+    @Override
     public InputStream getInputStream() {
         if (_last == null)
             throw new IllegalStateException();
@@ -92,10 +95,12 @@ public class ZipStreamMetaDataIterator
         return new NoCloseInputStream();
     }
 
+    @Override
     public File getFile() {
         return null;
     }
 
+    @Override
     public void close() {
         try {
             _stream.close();
@@ -107,10 +112,12 @@ public class ZipStreamMetaDataIterator
     // MetaDataFilter.Resource implementation
     //////////////////////////////////////////
 
+    @Override
     public String getName() {
         return _entry.getName();
     }
 
+    @Override
     public byte[] getContent() throws IOException {
         // buffer content so that future calls to getInputStream can read
         // the same data
@@ -128,18 +135,22 @@ public class ZipStreamMetaDataIterator
      */
     private class NoCloseInputStream extends InputStream {
 
+        @Override
         public int available() throws IOException {
             return _stream.available();
         }
 
+        @Override
         public int read() throws IOException {
             return _stream.read();
         }
 
+        @Override
         public int read(byte[] b, int off, int len) throws IOException {
             return _stream.read(b, off, len);
         }
 
+        @Override
         public void close() {
         }
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractListIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractListIterator.java
index 3ebb73aa6..2e17d3b79 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractListIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractListIterator.java
@@ -32,16 +32,19 @@ abstract class AbstractListIterator<E> implements ListIterator<E> {
     private static final Localizer _loc = Localizer.forPackage
         (AbstractListIterator.class);
 
+    @Override
     public void add(E o) {
         throw new UnsupportedOperationException(_loc.get("read-only")
             .getMessage());
     }
 
+    @Override
     public void set(E o) {
         throw new UnsupportedOperationException(_loc.get("read-only")
             .getMessage());
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException(_loc.get("read-only")
             .getMessage());
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java
index 6600f8e90..8ef233750 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java
@@ -38,6 +38,8 @@ import java.util.Objects;
 public abstract class AbstractNonSequentialResultList
     extends AbstractResultList {
 
+    
+    private static final long serialVersionUID = 1L;
     protected static final Object PAST_END = new Object();
 
     /**
@@ -46,6 +48,7 @@ public abstract class AbstractNonSequentialResultList
      */
     protected abstract Object getInternal(int index);
 
+    @Override
     public boolean contains(Object o) {
         assertOpen();
         Object obj;
@@ -59,6 +62,7 @@ public abstract class AbstractNonSequentialResultList
         return false;
     }
 
+    @Override
     public boolean containsAll(Collection c) {
         assertOpen();
         for (Iterator itr = c.iterator(); itr.hasNext();)
@@ -67,6 +71,7 @@ public abstract class AbstractNonSequentialResultList
         return true;
     }
 
+    @Override
     public Object get(int index) {
         assertOpen();
         Object obj = getInternal(index);
@@ -75,6 +80,7 @@ public abstract class AbstractNonSequentialResultList
         return obj;
     }
 
+    @Override
     public int indexOf(Object o) {
         assertOpen();
         Object obj;
@@ -88,6 +94,7 @@ public abstract class AbstractNonSequentialResultList
         return -1;
     }
 
+    @Override
     public int lastIndexOf(Object o) {
         assertOpen();
         int index = -1;
@@ -102,23 +109,28 @@ public abstract class AbstractNonSequentialResultList
         return index;
     }
 
+    @Override
     public boolean isEmpty() {
         assertOpen();
         return getInternal(0) == PAST_END;
     }
 
+    @Override
     public Iterator iterator() {
         return listIterator();
     }
 
+    @Override
     public ListIterator listIterator() {
         return listIterator(0);
     }
 
+    @Override
     public ListIterator listIterator(int index) {
         return new ResultListIterator(new Itr(index), this);
     }
 
+    @Override
     public Object[] toArray() {
         assertOpen();
         ArrayList list = new ArrayList();
@@ -132,6 +144,7 @@ public abstract class AbstractNonSequentialResultList
         return list.toArray();
     }
 
+    @Override
     public Object[] toArray(Object[] a) {
         assertOpen();
         ArrayList list = new ArrayList();
@@ -145,6 +158,7 @@ public abstract class AbstractNonSequentialResultList
         return list.toArray(a);
     }
 
+    @Override
     public List subList(int fromIndex, int toIndex) {
         throw new UnsupportedOperationException();
     }
@@ -158,29 +172,35 @@ public abstract class AbstractNonSequentialResultList
             _idx = index;
         }
 
+        @Override
         public int nextIndex() {
             return _idx;
         }
 
+        @Override
         public int previousIndex() {
             return _idx - 1;
         }
 
+        @Override
         public boolean hasNext() {
             _next = getInternal(_idx);
             return _next != PAST_END;
         }
 
+        @Override
         public boolean hasPrevious() {
             return _idx > 0;
         }
 
+        @Override
         public Object previous() {
             if (_idx == 0)
                 throw new NoSuchElementException();
             return getInternal(--_idx);
         }
 
+        @Override
         public Object next() {
             if (!hasNext())
                 throw new NoSuchElementException();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractResultList.java
index 75edf638d..8b5295e6f 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractResultList.java
@@ -28,13 +28,15 @@ import org.apache.openjpa.lib.util.Localizer;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public abstract class AbstractResultList<E> implements ResultList<E> {
+    private static final long serialVersionUID = 1L;
+
     private transient Object _userObject;
 
     private static final Localizer _loc = Localizer.forPackage
         (AbstractResultList.class);
 
+    @Override
     public void add(int index, Object element) {
         throw readOnly();
     }
@@ -44,38 +46,47 @@ public abstract class AbstractResultList<E> implements ResultList<E> {
             .getMessage());
     }
 
+    @Override
     public boolean add(Object o) {
         throw readOnly();
     }
 
+    @Override
     public boolean addAll(Collection<? extends E> c) {
         throw readOnly();
     }
 
+    @Override
     public boolean addAll(int index, Collection<? extends E> c) {
         throw readOnly();
     }
 
+    @Override
     public E remove(int index) {
         throw readOnly();
     }
 
+    @Override
     public boolean remove(Object o) {
         throw readOnly();
     }
 
+    @Override
     public boolean removeAll(Collection<?> c) {
         throw readOnly();
     }
 
+    @Override
     public boolean retainAll(Collection<?> c) {
         throw readOnly();
     }
 
+    @Override
     public E set(int index, Object element) {
         throw readOnly();
     }
 
+    @Override
     public void clear() {
         throw readOnly();
     }
@@ -85,10 +96,12 @@ public abstract class AbstractResultList<E> implements ResultList<E> {
             throw new NoSuchElementException(_loc.get("closed").getMessage());
     }
 
+    @Override
     public final Object getUserObject() {
         return _userObject;
     }
 
+    @Override
     public final void setUserObject(Object opaque) {
         _userObject = opaque;
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java
index 6f96748d6..1e4829406 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java
@@ -35,11 +35,15 @@ import java.util.Objects;
  */
 public abstract class AbstractSequentialResultList extends AbstractResultList {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Implement this method and {@link #size}.
      */
     protected abstract ListIterator itr(int index);
 
+    @Override
     public boolean contains(Object o) {
         assertOpen();
         for (Iterator itr = itr(0); itr.hasNext();)
@@ -48,6 +52,7 @@ public abstract class AbstractSequentialResultList extends AbstractResultList {
         return false;
     }
 
+    @Override
     public boolean containsAll(Collection c) {
         assertOpen();
         for (Iterator itr = c.iterator(); itr.hasNext();)
@@ -56,11 +61,13 @@ public abstract class AbstractSequentialResultList extends AbstractResultList {
         return true;
     }
 
+    @Override
     public Object get(int index) {
         assertOpen();
         return itr(index).next();
     }
 
+    @Override
     public int indexOf(Object o) {
         assertOpen();
         int index = 0;
@@ -70,6 +77,7 @@ public abstract class AbstractSequentialResultList extends AbstractResultList {
         return -1;
     }
 
+    @Override
     public int lastIndexOf(Object o) {
         assertOpen();
         int index = -1;
@@ -80,23 +88,28 @@ public abstract class AbstractSequentialResultList extends AbstractResultList {
         return index;
     }
 
+    @Override
     public boolean isEmpty() {
         assertOpen();
         return !itr(0).hasNext();
     }
 
+    @Override
     public Iterator iterator() {
         return listIterator();
     }
 
+    @Override
     public ListIterator listIterator() {
         return listIterator(0);
     }
 
+    @Override
     public ListIterator listIterator(int index) {
         return new ResultListIterator(itr(index), this);
     }
 
+    @Override
     public Object[] toArray() {
         assertOpen();
         ArrayList list = new ArrayList();
@@ -105,6 +118,7 @@ public abstract class AbstractSequentialResultList extends AbstractResultList {
         return list.toArray();
     }
 
+    @Override
     public Object[] toArray(Object[] a) {
         assertOpen();
         ArrayList list = new ArrayList();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/BatchedResultObjectProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/BatchedResultObjectProvider.java
index ba4ee04f9..a16b6299c 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/BatchedResultObjectProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/BatchedResultObjectProvider.java
@@ -39,6 +39,7 @@ public interface BatchedResultObjectProvider extends ResultObjectProvider {
     /**
      * Gets the next result object provider from its batch.
      */
+    @Override
     ResultObjectProvider getResultObject() throws Exception;
 
     /**
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/EagerResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/EagerResultList.java
index 535c65f27..c3450c409 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/EagerResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/EagerResultList.java
@@ -27,6 +27,9 @@ import java.util.ArrayList;
  */
 public class EagerResultList extends ListResultList implements ResultList {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public EagerResultList(ResultObjectProvider rop) {
         super(new ArrayList());
         try {
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/LazyForwardResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/LazyForwardResultList.java
index 82316fb8f..066d7452d 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/LazyForwardResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/LazyForwardResultList.java
@@ -55,14 +55,17 @@ public class LazyForwardResultList extends AbstractSequentialResultList
         }
     }
 
+    @Override
     public boolean isProviderOpen() {
         return _state == OPEN;
     }
 
+    @Override
     public boolean isClosed() {
         return _state == CLOSED;
     }
 
+    @Override
     public void close() {
         if (_state != CLOSED) {
             free();
@@ -70,6 +73,7 @@ public class LazyForwardResultList extends AbstractSequentialResultList
         }
     }
 
+    @Override
     public Object get(int index) {
         assertOpen();
 
@@ -82,10 +86,12 @@ public class LazyForwardResultList extends AbstractSequentialResultList
         return super.get(index);
     }
 
+    @Override
     protected ListIterator itr(int index) {
         return (_state != OPEN) ? _list.listIterator(index) : new Itr(index);
     }
 
+    @Override
     public int size() {
         assertOpen();
         if (_size != -1)
@@ -141,16 +147,19 @@ public class LazyForwardResultList extends AbstractSequentialResultList
         return _list;
     }
 
+    @Override
     public int hashCode() {
         // superclass tries to traverses entire list for hashcode
         return System.identityHashCode(this);
     }
 
+    @Override
     public boolean equals(Object other) {
         // superclass tries to traverse entire list for equality
         return other == this;
     }
 
+    @Override
     public List subList(int fromIndex, int toIndex) {
         assertOpen();
         return _list.subList(fromIndex, toIndex);
@@ -166,14 +175,17 @@ public class LazyForwardResultList extends AbstractSequentialResultList
                 next();
         }
 
+        @Override
         public int nextIndex() {
             return _idx;
         }
 
+        @Override
         public int previousIndex() {
             return _idx - 1;
         }
 
+        @Override
         public boolean hasNext() {
             if (_list.size() > _idx)
                 return true;
@@ -182,16 +194,19 @@ public class LazyForwardResultList extends AbstractSequentialResultList
             return addNext();
         }
 
+        @Override
         public boolean hasPrevious() {
             return _idx > 0;
         }
 
+        @Override
         public Object previous() {
             if (_idx == 0)
                 throw new NoSuchElementException();
             return _list.get(--_idx);
         }
 
+        @Override
         public Object next() {
             if (!hasNext())
                 throw new NoSuchElementException();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultList.java
index 2022df78a..14df190dd 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultList.java
@@ -30,6 +30,8 @@ import java.util.ListIterator;
  */
 public class ListResultList extends AbstractResultList {
 
+    
+    private static final long serialVersionUID = 1L;
     private final List _list;
     private boolean _closed = false;
 
@@ -47,70 +49,85 @@ public class ListResultList extends AbstractResultList {
         return _list;
     }
 
+    @Override
     public boolean isProviderOpen() {
         return false;
     }
 
+    @Override
     public boolean isClosed() {
         return _closed;
     }
 
+    @Override
     public void close() {
         _closed = true;
     }
 
+    @Override
     public boolean contains(Object o) {
         assertOpen();
         return _list.contains(o);
     }
 
+    @Override
     public boolean containsAll(Collection c) {
         assertOpen();
         return _list.containsAll(c);
     }
 
+    @Override
     public Object get(int index) {
         assertOpen();
         return _list.get(index);
     }
 
+    @Override
     public int indexOf(Object o) {
         assertOpen();
         return _list.indexOf(o);
     }
 
+    @Override
     public int lastIndexOf(Object o) {
         assertOpen();
         return _list.lastIndexOf(o);
     }
 
+    @Override
     public int size() {
         assertOpen();
         return _list.size();
     }
 
+    @Override
     public boolean isEmpty() {
         assertOpen();
         return _list.isEmpty();
     }
 
+    @Override
     public Iterator iterator() {
         return listIterator();
     }
 
+    @Override
     public ListIterator listIterator() {
         return new ResultListIterator(_list.listIterator(), this);
     }
 
+    @Override
     public ListIterator listIterator(int index) {
         return new ResultListIterator(_list.listIterator(index), this);
     }
 
+    @Override
     public Object[] toArray() {
         assertOpen();
         return _list.toArray();
     }
 
+    @Override
     public Object[] toArray(Object[] a) {
         assertOpen();
         return _list.toArray(a);
@@ -120,10 +137,12 @@ public class ListResultList extends AbstractResultList {
         return _list;
     }
 
+    @Override
     public String toString() {
     	return _list.toString();
     }
 
+    @Override
     public List subList(int fromIndex, int toIndex) {
         assertOpen();
         return _list.subList(fromIndex, toIndex);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java
index 2015b5cb8..880eadffd 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java
@@ -43,21 +43,26 @@ public class ListResultObjectProvider implements ResultObjectProvider {
         return _list;
     }
 
+    @Override
     public boolean supportsRandomAccess() {
         return true;
     }
 
+    @Override
     public void open() throws Exception {
     }
 
+    @Override
     public Object getResultObject() throws Exception {
         return _list.get(_idx);
     }
 
+    @Override
     public boolean next() throws Exception {
         return absolute(_idx + 1);
     }
 
+    @Override
     public boolean absolute(int pos) throws Exception {
         if (pos >= 0 && pos < _list.size()) {
             _idx = pos;
@@ -66,14 +71,17 @@ public class ListResultObjectProvider implements ResultObjectProvider {
         return false;
     }
 
+    @Override
     public int size() throws Exception {
         return _list.size();
     }
 
+    @Override
     public void reset() throws Exception {
         _idx = -1;
     }
 
+    @Override
     public void close() throws Exception {
         if (_list instanceof Closeable)
             try {
@@ -82,6 +90,7 @@ public class ListResultObjectProvider implements ResultObjectProvider {
             }
     }
 
+    @Override
     public void handleCheckedException(Exception e) {
         // shouldn't ever happen
         throw new RuntimeException(e);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java
index c8016a62e..3118bfe1e 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java
@@ -63,10 +63,12 @@ public class MergedResultObjectProvider implements ResultObjectProvider {
         _orderValues = (comp == null) ? null : new Object[rops.length];
     }
 
+    @Override
     public boolean supportsRandomAccess() {
         return false;
     }
 
+    @Override
     public void open() throws Exception {
         // if we have a comparator, then open all; else open first
         int len = (_comp != null) ? _rops.length : 1;
@@ -76,10 +78,12 @@ public class MergedResultObjectProvider implements ResultObjectProvider {
         }
     }
 
+    @Override
     public boolean absolute(int pos) throws Exception {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int size() throws Exception {
         if (_size != -1)
             return _size;
@@ -106,6 +110,7 @@ public class MergedResultObjectProvider implements ResultObjectProvider {
         return _size;
     }
 
+    @Override
     public void reset() throws Exception {
         for (int i = 0; i < _rops.length; i++)
             if (_status[i] != UNOPENED)
@@ -113,6 +118,7 @@ public class MergedResultObjectProvider implements ResultObjectProvider {
         clear();
     }
 
+    @Override
     public void close() throws Exception {
         Exception err = null;
         for (int i = 0; i < _rops.length; i++) {
@@ -141,12 +147,14 @@ public class MergedResultObjectProvider implements ResultObjectProvider {
         }
     }
 
+    @Override
     public void handleCheckedException(Exception e) {
         if (_rops.length == 0)
             throw new RuntimeException(e);
         _rops[0].handleCheckedException(e);
     }
 
+    @Override
     public boolean next() throws Exception {
         // initialize all rops with the latest values
         boolean hasValue = false;
@@ -209,6 +217,7 @@ public class MergedResultObjectProvider implements ResultObjectProvider {
         return true;
     }
 
+    @Override
     public Object getResultObject() throws Exception {
         return _cur;
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java
index 6ea555a8f..8f4ce5b80 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java
@@ -74,14 +74,17 @@ public class RandomAccessResultList extends AbstractNonSequentialResultList {
         return new HashMap();
     }
 
+    @Override
     public boolean isProviderOpen() {
         return _state == OPEN;
     }
 
+    @Override
     public boolean isClosed() {
         return _state == CLOSED;
     }
 
+    @Override
     public void close() {
         if (_state != CLOSED) {
             free();
@@ -89,6 +92,7 @@ public class RandomAccessResultList extends AbstractNonSequentialResultList {
         }
     }
 
+    @Override
     protected Object getInternal(int index) {
         if (_full != null) {
             if (index >= _full.length)
@@ -165,6 +169,7 @@ public class RandomAccessResultList extends AbstractNonSequentialResultList {
         }
     }
 
+    @Override
     public int size() {
         assertOpen();
         if (_size != -1)
@@ -204,6 +209,7 @@ public class RandomAccessResultList extends AbstractNonSequentialResultList {
         return list;
     }
 
+    @Override
     public String toString() {
         return getClass().getName()
             + "; identity: " + System.identityHashCode(this)
@@ -211,11 +217,13 @@ public class RandomAccessResultList extends AbstractNonSequentialResultList {
             + "; requests: " + _requests;
     }
 
+    @Override
     public int hashCode() {
         // superclass tries to traverses entire list for hashcode
         return System.identityHashCode(this);
     }
 
+    @Override
     public boolean equals(Object other) {
         // superclass tries to traverse entire list for equality
         return other == this;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RangeResultObjectProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RangeResultObjectProvider.java
index 04458c83f..df533d15f 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RangeResultObjectProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/RangeResultObjectProvider.java
@@ -65,20 +65,24 @@ public class RangeResultObjectProvider implements ResultObjectProvider {
         _endIdx = (int) endIdx;
     }
 
+    @Override
     public boolean supportsRandomAccess() {
         return _delegate.supportsRandomAccess();
     }
 
+    @Override
     public void open() throws Exception {
         _delegate.open();
     }
 
+    @Override
     public Object getResultObject() throws Exception {
         if (_idx < _startIdx || _idx >= _endIdx)
             throw new NoSuchElementException(String.valueOf(_idx));
         return _delegate.getResultObject();
     }
 
+    @Override
     public boolean next() throws Exception {
         // advance up to just behind _startIdx if we haven't already
         while (_idx < _startIdx - 1) {
@@ -101,6 +105,7 @@ public class RangeResultObjectProvider implements ResultObjectProvider {
         return _delegate.next();
     }
 
+    @Override
     public boolean absolute(int pos) throws Exception {
         _idx = pos + _startIdx;
         if (_idx >= _endIdx)
@@ -108,6 +113,7 @@ public class RangeResultObjectProvider implements ResultObjectProvider {
         return _delegate.absolute(_idx);
     }
 
+    @Override
     public int size() throws Exception {
         int size = _delegate.size();
         if (size == Integer.MAX_VALUE)
@@ -116,15 +122,18 @@ public class RangeResultObjectProvider implements ResultObjectProvider {
         return (size < 0) ? 0 : size;
     }
 
+    @Override
     public void reset() throws Exception {
         _idx = -1;
         _delegate.reset();
     }
 
+    @Override
     public void close() throws Exception {
         _delegate.close();
     }
 
+    @Override
     public void handleCheckedException(Exception e) {
         _delegate.handleCheckedException(e);
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultList.java
index ee29f69ed..a086779f6 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultList.java
@@ -42,26 +42,26 @@ public interface ResultList<E> extends List<E>, Serializable, Closeable {
     /**
      * Returns true if the provider backing this list is open.
      */
-    public boolean isProviderOpen();
+    boolean isProviderOpen();
 
     /**
      * Get the opaque user object attached to this receiver.
      */
-    public Object getUserObject();
+    Object getUserObject();
 
     /**
      * Set the opaque user object to this receiver.
      */
-    public void   setUserObject(Object opaque);
+    void   setUserObject(Object opaque);
 
     /**
      * Close the list.
      */
-    public void close();
+    @Override void close();
 
     /**
      * Returns true if the list has been closed.
      */
-    public boolean isClosed();
+    boolean isClosed();
 }
 
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultListIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultListIterator.java
index 26b44eae7..96db809a1 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultListIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultListIterator.java
@@ -46,30 +46,36 @@ public class ResultListIterator extends AbstractListIterator {
         return _rl;
     }
 
+    @Override
     public boolean hasNext() {
         if (_rl.isClosed())
             return false;
         return _li.hasNext();
     }
 
+    @Override
     public boolean hasPrevious() {
         return _li.hasPrevious();
     }
 
+    @Override
     public Object next() {
         if (_rl.isClosed())
             throw new NoSuchElementException(_loc.get("closed").getMessage());
         return _li.next();
     }
 
+    @Override
     public int nextIndex() {
         return _li.nextIndex();
     }
 
+    @Override
     public Object previous() {
         return _li.previous();
     }
 
+    @Override
     public int previousIndex() {
         return _li.previousIndex();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultObjectProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultObjectProvider.java
index fb67a7683..fd514d127 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultObjectProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultObjectProvider.java
@@ -38,25 +38,25 @@ public interface ResultObjectProvider extends Closeable {
     /**
      * Return true if this provider supports random access.
      */
-    public boolean supportsRandomAccess();
+    boolean supportsRandomAccess();
 
     /**
      * Open the result. This will be called before
      * {@link #next}, {@link #absolute}, or {@link #size}.
      */
-    public void open() throws Exception;
+    void open() throws Exception;
 
     /**
      * Instantiate the current result object. This method will only be
      * called after {@link #next} or {@link #absolute}.
      */
-    public Object getResultObject() throws Exception;
+    Object getResultObject() throws Exception;
 
     /**
      * Advance the input to the next position. Return <code>true</code> if
      * there is more data; otherwise <code>false</code>.
      */
-    public boolean next() throws Exception;
+    boolean next() throws Exception;
 
     /**
      * Move to the given 0-based position. This method is
@@ -65,13 +65,13 @@ public interface ResultObjectProvider extends Closeable {
      * otherwise <code>false</code>. This may be invoked in place of
      * {@link #next}.
      */
-    public boolean absolute(int pos) throws Exception;
+    boolean absolute(int pos) throws Exception;
 
     /**
      * Return the number of items in the input, or {@link Integer#MAX_VALUE}
      * if the size in unknown.
      */
-    public int size() throws Exception;
+    int size() throws Exception;
 
     /**
      * Reset this provider. This is an optional operation. If supported,
@@ -79,17 +79,17 @@ public interface ResultObjectProvider extends Closeable {
      * element. Non-random-access providers may be able to support this
      * method by re-acquiring all resources as if the result were just opened.
      */
-    public void reset() throws Exception;
+    void reset() throws Exception;
 
     /**
      * Free the resources associated with this provider.
      */
-    public void close() throws Exception;
+    @Override void close() throws Exception;
 
     /**
      * Any checked exceptions that are thrown will be passed to this method.
      * The provider should re-throw the exception as an appropriate unchecked
      * exception.
      */
-    public void handleCheckedException(Exception e);
+    void handleCheckedException(Exception e);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultObjectProviderIterator.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultObjectProviderIterator.java
index 06df707ae..7a754532d 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultObjectProviderIterator.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ResultObjectProviderIterator.java
@@ -44,6 +44,7 @@ public class ResultObjectProviderIterator implements Iterator, Closeable {
     /**
      * Close the underlying result object provider.
      */
+    @Override
     public void close() {
         if (Boolean.TRUE.equals(_open)) {
             try {
@@ -54,10 +55,12 @@ public class ResultObjectProviderIterator implements Iterator, Closeable {
         }
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean hasNext() {
         if (Boolean.FALSE.equals(_open))
             return false;
@@ -87,6 +90,7 @@ public class ResultObjectProviderIterator implements Iterator, Closeable {
         return true;
     }
 
+    @Override
     public Object next() {
         if (!hasNext())
             throw new NoSuchElementException();
@@ -104,6 +108,7 @@ public class ResultObjectProviderIterator implements Iterator, Closeable {
         }
     }
 
+    @Override
     protected void finalize() {
         close();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/SimpleResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/SimpleResultList.java
index e7752f549..48500d260 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/SimpleResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/SimpleResultList.java
@@ -50,14 +50,17 @@ public class SimpleResultList extends AbstractNonSequentialResultList {
         }
     }
 
+    @Override
     public boolean isProviderOpen() {
         return !_closed;
     }
 
+    @Override
     public boolean isClosed() {
         return _closed;
     }
 
+    @Override
     public void close() {
         if (!_closed) {
             _closed = true;
@@ -68,6 +71,7 @@ public class SimpleResultList extends AbstractNonSequentialResultList {
         }
     }
 
+    @Override
     public Object getInternal(int index) {
         try {
             if (!_rop.absolute(index))
@@ -83,6 +87,7 @@ public class SimpleResultList extends AbstractNonSequentialResultList {
         }
     }
 
+    @Override
     public int size() {
         assertOpen();
         if (_size != -1)
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/SoftRandomAccessResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/SoftRandomAccessResultList.java
index f3d10f0d0..fac8d4f4d 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/SoftRandomAccessResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/SoftRandomAccessResultList.java
@@ -34,6 +34,7 @@ public class SoftRandomAccessResultList extends RandomAccessResultList {
         super(rop);
     }
 
+    @Override
     protected Map newRowMap() {
         return new ReferenceMap();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/WindowResultList.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/WindowResultList.java
index 2d9d60226..2df1ef05d 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/WindowResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/WindowResultList.java
@@ -64,14 +64,17 @@ public class WindowResultList extends AbstractNonSequentialResultList {
         }
     }
 
+    @Override
     public boolean isProviderOpen() {
         return _state == OPEN;
     }
 
+    @Override
     public boolean isClosed() {
         return _state == CLOSED;
     }
 
+    @Override
     public void close() {
         if (_state != CLOSED) {
             free();
@@ -79,6 +82,7 @@ public class WindowResultList extends AbstractNonSequentialResultList {
         }
     }
 
+    @Override
     public int size() {
         assertOpen();
         if (_size != -1)
@@ -96,6 +100,7 @@ public class WindowResultList extends AbstractNonSequentialResultList {
         }
     }
 
+    @Override
     public Object getInternal(int index) {
         // out of range?
         if (index < 0 || (_size != -1 && index >= _size))
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/BytecodeWriter.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/BytecodeWriter.java
index ae8e5afb4..02abe1539 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/BytecodeWriter.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/BytecodeWriter.java
@@ -29,5 +29,5 @@ import serp.bytecode.BCClass;
  */
 public interface BytecodeWriter {
 
-    public void write(BCClass type) throws IOException;
+    void write(BCClass type) throws IOException;
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Clearable.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Clearable.java
index 403d68420..97c14e1aa 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Clearable.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Clearable.java
@@ -24,6 +24,6 @@ package org.apache.openjpa.lib.util;
  */
 public interface Clearable {
 
-    public void clear();
+    void clear();
 
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Closeable.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Closeable.java
index f46de1f4f..d34984b2a 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Closeable.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Closeable.java
@@ -26,5 +26,5 @@ package org.apache.openjpa.lib.util;
  */
 public interface Closeable {
 
-    public void close() throws Exception;
+    void close() throws Exception;
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/CodeFormat.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/CodeFormat.java
index cd4482e60..f92deeb95 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/CodeFormat.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/CodeFormat.java
@@ -571,6 +571,7 @@ public final class CodeFormat implements Cloneable {
     /**
      * Return the internal buffer as a string.
      */
+    @Override
     public String toString() {
         return _buf.toString();
     }
@@ -586,6 +587,7 @@ public final class CodeFormat implements Cloneable {
      * Make a copy of this code format object with all the same formatting
      * settings.
      */
+    @Override
     public Object clone() {
         CodeFormat format = new CodeFormat();
         format._tab = _tab;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/EventManager.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/EventManager.java
index 9302434f5..4ae1aab37 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/EventManager.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/EventManager.java
@@ -30,30 +30,30 @@ public interface EventManager {
     /**
      * Add an event listener.
      */
-    public void addListener(Object listener);
+    void addListener(Object listener);
 
     /**
      * Remove an event listener.
      */
-    public boolean removeListener(Object listener);
+    boolean removeListener(Object listener);
 
     /**
      * Return whether the given instance is in the list of listeners.
      */
-    public boolean hasListener(Object listener);
+    boolean hasListener(Object listener);
 
     /**
      * Return true if there are any registered listeners.
      */
-    public boolean hasListeners();
+    boolean hasListeners();
 
     /**
      * Return a read-only list of listeners.
      */
-    public Collection getListeners();
+    Collection getListeners();
 
     /**
      * Fire the given event to all listeners, returning any exceptions.
      */
-    public Exception[] fireEvent(Object event);
+    Exception[] fireEvent(Object event);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java
index 431b62e92..921fd28e3 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java
@@ -78,6 +78,9 @@ import java.util.Set;
  */
 public class FormatPreservingProperties extends Properties {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static Localizer _loc = Localizer.forPackage
         (FormatPreservingProperties.class);
 
@@ -186,14 +189,17 @@ public class FormatPreservingProperties extends Properties {
         return this.allowDuplicates;
     }
 
+    @Override
     public String getProperty(String key) {
         return super.getProperty(key);
     }
 
+    @Override
     public String getProperty(String key, String defaultValue) {
         return super.getProperty(key, defaultValue);
     }
 
+    @Override
     public Object setProperty(String key, String value) {
         return put(key, value);
     }
@@ -202,6 +208,7 @@ public class FormatPreservingProperties extends Properties {
      * Circumvents the superclass {@link #putAll} implementation,
      * putting all the key-value pairs via {@link #put}.
      */
+    @Override
     public synchronized void putAll(Map m) {
         Map.Entry e;
         for (Iterator iter = m.entrySet().iterator(); iter.hasNext();) {
@@ -213,11 +220,13 @@ public class FormatPreservingProperties extends Properties {
     /**
      * Removes the key from the bookkeeping collectiotns as well.
      */
+    @Override
     public synchronized Object remove(Object key) {
         newKeys.remove(key);
         return super.remove(key);
     }
 
+    @Override
     public synchronized void clear() {
         super.clear();
 
@@ -228,6 +237,7 @@ public class FormatPreservingProperties extends Properties {
         modifiedKeys.clear();
     }
 
+    @Override
     public synchronized Object clone() {
         FormatPreservingProperties c = (FormatPreservingProperties)
             super.clone();
@@ -257,6 +267,7 @@ public class FormatPreservingProperties extends Properties {
         isNotDeserializing = true;
     }
 
+    @Override
     public synchronized Object put(Object key, Object val) {
         Object o = super.put(key, val);
 
@@ -281,6 +292,7 @@ public class FormatPreservingProperties extends Properties {
      *
      * @see Properties#load
      */
+    @Override
     public synchronized void load(InputStream in) throws IOException {
         isLoading = true;
         try {
@@ -420,6 +432,7 @@ public class FormatPreservingProperties extends Properties {
         return Character.isWhitespace(ch);
     }
 
+    @Override
     public void save(OutputStream out, String header) {
         try {
             store(out, header);
@@ -427,6 +440,7 @@ public class FormatPreservingProperties extends Properties {
         }
     }
 
+    @Override
     public void store(OutputStream out, String header) throws IOException {
         boolean endWithNewline = source != null && source.endsInNewline;
 
@@ -557,6 +571,9 @@ public class FormatPreservingProperties extends Properties {
 
     public static class DuplicateKeyException extends RuntimeException {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public DuplicateKeyException(String key, Object firstVal,
             String secondVal) {
             super(_loc.get("dup-key", key, firstVal, secondVal).getMessage());
@@ -569,6 +586,8 @@ public class FormatPreservingProperties extends Properties {
      */
     private class PropertyLine implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         private final StringBuilder line = new StringBuilder();
         private String propertyKey;
         private String propertyValue;
@@ -680,12 +699,14 @@ public class FormatPreservingProperties extends Properties {
             this.source = source;
         }
 
+        @Override
         public int read() throws IOException {
             int c = super.read();
             source.endsInNewline = (c == '\n' || c == '\r');
             return c;
         }
 
+        @Override
         public int read(byte[] b, int off, int len) throws IOException {
             int n = super.read(b, off, len);
             if (n > 0)
@@ -698,6 +719,8 @@ public class FormatPreservingProperties extends Properties {
     static class PropertySource extends LinkedList
         implements Cloneable, Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         private boolean endsInNewline = false;
     }
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java
index ac2182787..0866d9caa 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java
@@ -175,6 +175,7 @@ public abstract class J2DoPrivHelper {
         if (lineSeparator == null) {
             lineSeparator =
                 AccessController.doPrivileged(new PrivilegedAction<String>() {
+                    @Override
                     public String run() {
                         return System.getProperty("line.separator");
                     }
@@ -193,6 +194,7 @@ public abstract class J2DoPrivHelper {
         if (pathSeparator == null) {
             pathSeparator =
                 AccessController.doPrivileged(new PrivilegedAction<String>() {
+                    @Override
                     public String run() {
                         return System.getProperty("path.separator");
                     }
@@ -210,6 +212,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Object> setAccessibleAction(
         final AccessibleObject aObj, final boolean flag) {
         return new PrivilegedAction<Object>() {
+            @Override
             public Object run() {
                 aObj.setAccessible(flag);
                 return (Object) null;
@@ -234,6 +237,7 @@ public abstract class J2DoPrivHelper {
         final String className, final boolean initializeBoolean,
         final ClassLoader classLoader) {
         return new PrivilegedExceptionAction<Class<?>>() {
+            @Override
             public Class<?> run() throws ClassNotFoundException {
                 return Class.forName(className, initializeBoolean, classLoader);
             }
@@ -258,6 +262,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<ClassLoader> getClassLoaderAction(
         final Class<?> clazz) {
         return new PrivilegedAction<ClassLoader>() {
+            @Override
             public ClassLoader run() {
                 return clazz.getClassLoader();
             }
@@ -276,6 +281,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedExceptionAction<Field> getDeclaredFieldAction(
         final Class<?> clazz, final String name) {
         return new PrivilegedExceptionAction<Field>() {
+            @Override
             public Field run() throws NoSuchFieldException {
                 return clazz.getDeclaredField(name);
             }
@@ -293,6 +299,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Field []> getDeclaredFieldsAction(
         final Class<?> clazz) {
         return new PrivilegedAction<Field []>() {
+            @Override
             public Field[] run() {
                 return clazz.getDeclaredFields();
             }
@@ -313,6 +320,7 @@ public abstract class J2DoPrivHelper {
             final Class<?> clazz, final String name,
             final Class<?>[] parameterTypes) {
         return new PrivilegedExceptionAction<Method>() {
+            @Override
             public Method run() throws NoSuchMethodException {
                 return clazz.getDeclaredMethod(name, parameterTypes);
             }
@@ -330,6 +338,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Method []> getDeclaredMethodsAction(
         final Class<?> clazz) {
         return new PrivilegedAction<Method []>() {
+            @Override
             public Method[] run() {
                 return clazz.getDeclaredMethods();
             }
@@ -347,6 +356,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<URL> getResourceAction(
         final Class<?> clazz, final String resource) {
         return new PrivilegedAction<URL>() {
+            @Override
             public URL run() {
                 return clazz.getResource(resource);
             }
@@ -367,6 +377,7 @@ public abstract class J2DoPrivHelper {
         final Class<T> clazz) throws IllegalAccessException,
         InstantiationException {
         return new PrivilegedExceptionAction<T>() {
+            @Override
             public T run() throws IllegalAccessException,
                     InstantiationException {
                 if (!Modifier.isAbstract(clazz.getModifiers())) {
@@ -394,6 +405,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<ProtectionDomain> getProtectionDomainAction(
         final Class<?> clazz) {
         return new PrivilegedAction<ProtectionDomain>() {
+            @Override
             public ProtectionDomain run() {
                 return clazz.getProtectionDomain();
             }
@@ -411,6 +423,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<ClassLoader> getParentAction(
         final ClassLoader loader) {
         return new PrivilegedAction<ClassLoader>() {
+            @Override
             public ClassLoader run() {
                 return loader.getParent();
             }
@@ -428,6 +441,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<URL> getResourceAction(
         final ClassLoader loader, final String resource) {
         return new PrivilegedAction<URL>() {
+            @Override
             public URL run() {
                 return loader.getResource(resource);
             }
@@ -447,6 +461,7 @@ public abstract class J2DoPrivHelper {
         getResourcesAction(
         final ClassLoader loader, final String resource) throws IOException {
         return new PrivilegedExceptionAction<Enumeration<URL>>() {
+            @Override
             public Enumeration<URL> run() throws IOException {
                 return loader.getResources(resource);
             }
@@ -464,6 +479,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<ClassLoader>
         getSystemClassLoaderAction() {
         return new PrivilegedAction<ClassLoader>() {
+            @Override
             public ClassLoader run() {
                 return ClassLoader.getSystemClassLoader();
             }
@@ -480,6 +496,7 @@ public abstract class J2DoPrivHelper {
      */
     public static PrivilegedAction<Boolean> deleteAction(final File f) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 return f.delete() ? Boolean.TRUE : Boolean.FALSE;
             }
@@ -496,6 +513,7 @@ public abstract class J2DoPrivHelper {
      */
     public static PrivilegedAction<Boolean> existsAction(final File f) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 try {
                     return f.exists() ? Boolean.TRUE : Boolean.FALSE;
@@ -515,6 +533,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Boolean> deleteOnExitAction(
         final File f) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 f.deleteOnExit();
                 return Boolean.TRUE;
@@ -533,6 +552,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<File> getAbsoluteFileAction(
             final File f) {
         return new PrivilegedAction<File>() {
+            @Override
             public File run() {
                 return f.getAbsoluteFile();
             }
@@ -550,6 +570,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<String>
         getAbsolutePathAction(final File f) {
         return new PrivilegedAction<String>() {
+            @Override
             public String run() {
                 return f.getAbsolutePath();
             }
@@ -569,6 +590,7 @@ public abstract class J2DoPrivHelper {
         getCanonicalPathAction(
         final File f) throws IOException {
         return new PrivilegedExceptionAction<String>() {
+            @Override
             public String run() throws IOException {
                 return f.getCanonicalPath();
             }
@@ -586,6 +608,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Boolean>
         isDirectoryAction(final File f) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 return f.isDirectory() ? Boolean.TRUE : Boolean.FALSE;
             }
@@ -602,6 +625,7 @@ public abstract class J2DoPrivHelper {
      */
     public static PrivilegedAction<Boolean> isFileAction(final File f) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 return f.isFile() ? Boolean.TRUE : Boolean.FALSE;
             }
@@ -618,6 +642,7 @@ public abstract class J2DoPrivHelper {
      */
     public static PrivilegedAction<Long> lengthAction(final File f) {
         return new PrivilegedAction<Long>() {
+            @Override
             public Long run() {
                 return Long.valueOf(f.length());
             }
@@ -635,6 +660,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<File []>
         listFilesAction(final File f) {
         return new PrivilegedAction<File []>() {
+            @Override
             public File [] run() {
                 return f.listFiles();
             }
@@ -651,6 +677,7 @@ public abstract class J2DoPrivHelper {
      */
     public static PrivilegedAction<Boolean> mkdirsAction(final File f) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 return f.mkdirs() ? Boolean.TRUE : Boolean.FALSE;
             }
@@ -668,6 +695,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Boolean> renameToAction(
         final File from, final File to) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 return from.renameTo(to) ? Boolean.TRUE : Boolean.FALSE;
             }
@@ -687,6 +715,7 @@ public abstract class J2DoPrivHelper {
         final File file)
         throws MalformedURLException {
         return new PrivilegedExceptionAction<URL>() {
+            @Override
             public URL run() throws MalformedURLException {
                 return file.toURL();
             }
@@ -706,6 +735,7 @@ public abstract class J2DoPrivHelper {
         newFileInputStreamAction(
         final File f) throws FileNotFoundException {
         return new PrivilegedExceptionAction<FileInputStream>() {
+            @Override
             public FileInputStream run() throws FileNotFoundException {
                 return new FileInputStream(f);
             }
@@ -725,6 +755,7 @@ public abstract class J2DoPrivHelper {
         newFileOutputStreamAction(
         final File f) throws FileNotFoundException {
         return new PrivilegedExceptionAction<FileOutputStream>() {
+            @Override
             public FileOutputStream run() throws FileNotFoundException {
                 return new FileOutputStream(f);
             }
@@ -744,6 +775,7 @@ public abstract class J2DoPrivHelper {
         newFileOutputStreamAction(
         final String f, final boolean append) throws FileNotFoundException {
         return new PrivilegedExceptionAction<FileOutputStream>() {
+            @Override
             public FileOutputStream run() throws FileNotFoundException {
                 return new FileOutputStream(f, append);
             }
@@ -762,6 +794,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedExceptionAction<InetAddress> getByNameAction(
         final String hostname) throws UnknownHostException {
         return new PrivilegedExceptionAction<InetAddress>() {
+            @Override
             public InetAddress run() throws UnknownHostException {
                 return InetAddress.getByName(hostname);
             }
@@ -780,6 +813,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedExceptionAction<Socket> newSocketAction(
         final InetAddress host, final int port) throws IOException {
         return new PrivilegedExceptionAction<Socket>() {
+            @Override
             public Socket run() throws IOException {
                 return new Socket(host, port);
             }
@@ -799,6 +833,7 @@ public abstract class J2DoPrivHelper {
             newServerSocketAction(
         final int port) throws IOException {
         return new PrivilegedExceptionAction<ServerSocket>() {
+            @Override
             public ServerSocket run() throws IOException {
                 return new ServerSocket(port);
             }
@@ -817,6 +852,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedExceptionAction<Socket> acceptAction(
         final ServerSocket ss) throws IOException {
         return new PrivilegedExceptionAction<Socket>() {
+            @Override
             public Socket run() throws IOException {
                 return ss.accept();
             }
@@ -833,6 +869,7 @@ public abstract class J2DoPrivHelper {
      */
     public static PrivilegedAction<Properties> getPropertiesAction() {
         return new PrivilegedAction<Properties>() {
+            @Override
             public Properties run() {
                 return System.getProperties();
             }
@@ -850,6 +887,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<String> getPropertyAction(
         final String name) {
         return new PrivilegedAction<String>() {
+            @Override
             public String run() {
                 return System.getProperty(name);
             }
@@ -867,6 +905,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<String> getPropertyAction(
         final String name, final String def) {
         return new PrivilegedAction<String>() {
+            @Override
             public String run() {
                 return System.getProperty(name, def);
             }
@@ -885,6 +924,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<ClassLoader>
             getContextClassLoaderAction() {
         return new PrivilegedAction<ClassLoader>() {
+            @Override
             public ClassLoader run() {
                 return Thread.currentThread().getContextClassLoader();
             }
@@ -903,6 +943,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Boolean>
             setContextClassLoaderAction(final ClassLoader loader) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 Thread.currentThread().setContextClassLoader(loader);
                 return Boolean.TRUE;
@@ -922,6 +963,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Thread> newDaemonThreadAction(
         final Runnable target, final String name) {
         return new PrivilegedAction<Thread>() {
+            @Override
             public Thread run() {
                 Thread thread = new Thread(target, name);
                 thread.setDaemon(true);
@@ -942,6 +984,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedExceptionAction<InputStream> openStreamAction(
         final URL url) throws IOException {
         return new PrivilegedExceptionAction<InputStream>() {
+            @Override
             public InputStream run() throws IOException {
                 return url.openStream();
             }
@@ -960,6 +1003,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedExceptionAction<Object> getContentAction(
         final URLConnection con) throws IOException {
         return new PrivilegedExceptionAction<Object>() {
+            @Override
             public Object run() throws IOException {
                 return con.getContent();
             }
@@ -979,6 +1023,7 @@ public abstract class J2DoPrivHelper {
         final File f)
         throws IOException {
         return new PrivilegedExceptionAction<ZipFile>() {
+            @Override
             public ZipFile run() throws IOException {
                 return new ZipFile(f);
             }
@@ -997,6 +1042,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedExceptionAction<JarFile> getJarFileAction(final JarURLConnection con)
         throws IOException {
         return new PrivilegedExceptionAction<JarFile>() {
+            @Override
             public JarFile run() throws IOException {
                 return con.getJarFile();
             }
@@ -1015,6 +1061,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedExceptionAction<JarEntry> getJarEntryAction(final JarURLConnection con)
         throws IOException {
         return new PrivilegedExceptionAction<JarEntry>() {
+            @Override
             public JarEntry run() throws IOException {
                 return con.getJarEntry();
             }
@@ -1031,6 +1078,7 @@ public abstract class J2DoPrivHelper {
      */
     public static PrivilegedAction<Code> newCodeAction() {
         return new PrivilegedAction<Code>() {
+            @Override
             public Code run() {
                 return new Code();
             }
@@ -1049,6 +1097,7 @@ public abstract class J2DoPrivHelper {
         newTemporaryClassLoaderAction(
         final ClassLoader parent) {
         return new PrivilegedAction<TemporaryClassLoader>() {
+            @Override
             public TemporaryClassLoader run() {
                 return new TemporaryClassLoader(parent);
             }
@@ -1065,6 +1114,7 @@ public abstract class J2DoPrivHelper {
      */
     public static PrivilegedAction<MultiClassLoader> newMultiClassLoaderAction() {
         return new PrivilegedAction() {
+            @Override
             public MultiClassLoader run() {
                 return new MultiClassLoader();
             }
@@ -1082,6 +1132,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<BCClassLoader> newBCClassLoaderAction(
         final Project project, final ClassLoader parent) {
         return new PrivilegedAction<BCClassLoader>() {
+            @Override
             public BCClassLoader run() {
                 return new BCClassLoader(project, parent);
             }
@@ -1091,6 +1142,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<BCClassLoader> newBCClassLoaderAction(
         final Project project) {
         return new PrivilegedAction<BCClassLoader>() {
+            @Override
             public BCClassLoader run() {
                 return new BCClassLoader(project);
             }
@@ -1108,6 +1160,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<BCField []> getBCClassFieldsAction(
         final BCClass bcClass, final String fieldName) {
         return new PrivilegedAction<BCField []>() {
+            @Override
             public BCField [] run() {
                 return bcClass.getFields(fieldName);
             }
@@ -1126,6 +1179,7 @@ public abstract class J2DoPrivHelper {
     (
         final FieldInstruction instruction) {
         return new PrivilegedAction<BCField>() {
+            @Override
             public BCField run() {
                 return instruction.getField();
             }
@@ -1143,6 +1197,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<BCClass> loadProjectClassAction(
         final Project project, final Class<?> clazz) {
         return new PrivilegedAction<BCClass>() {
+            @Override
             public BCClass run() {
                 return project.loadClass(clazz);
             }
@@ -1160,6 +1215,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<BCClass> loadProjectClassAction(
         final Project project, final String clazzName) {
         return new PrivilegedAction<BCClass>() {
+            @Override
             public BCClass run() {
                 return project.loadClass(clazzName);
             }
@@ -1177,6 +1233,7 @@ public abstract class J2DoPrivHelper {
     public static PrivilegedAction<Annotation []> getAnnotationsAction(
         final AnnotatedElement element) {
         return new PrivilegedAction<Annotation []>() {
+            @Override
             public Annotation [] run() {
                 return element.getAnnotations();
             }
@@ -1196,6 +1253,7 @@ public abstract class J2DoPrivHelper {
         getDeclaredAnnotationsAction(
         final AnnotatedElement element) {
         return new PrivilegedAction<Annotation[]>() {
+            @Override
             public Annotation [] run() {
                 return element.getDeclaredAnnotations();
             }
@@ -1215,6 +1273,7 @@ public abstract class J2DoPrivHelper {
         final AnnotatedElement element,
         final Class<? extends Annotation> annotationClazz) {
         return new PrivilegedAction<Boolean>() {
+            @Override
             public Boolean run() {
                 return element.isAnnotationPresent(annotationClazz)
                     ? Boolean.TRUE : Boolean.FALSE;
@@ -1236,6 +1295,7 @@ public abstract class J2DoPrivHelper {
         final AnnotatedElement element,
         final Class<T> annotationClazz) {
         return new PrivilegedAction<T>() {
+            @Override
             public T run() {
                 return (T) element.getAnnotation(annotationClazz);
             }
@@ -1250,6 +1310,7 @@ public abstract class J2DoPrivHelper {
     public static <T> PrivilegedAction<Set<ConstraintViolation<T>>> validateAction(
         final Validator validator, final T arg0, final Class<?>[] groups) {
         return new PrivilegedAction<Set<ConstraintViolation<T>>>() {
+            @Override
             public Set<ConstraintViolation<T>> run() {
                 return validator.validate(arg0, groups);
             }
@@ -1263,6 +1324,7 @@ public abstract class J2DoPrivHelper {
      */
     public static <T> PrivilegedAction<ValidatorFactory> buildDefaultValidatorFactoryAction() {
         return new PrivilegedAction<ValidatorFactory>() {
+            @Override
             public ValidatorFactory run() {
                 return Validation.buildDefaultValidatorFactory();
             }
@@ -1271,6 +1333,7 @@ public abstract class J2DoPrivHelper {
 
     public static PrivilegedExceptionAction<URL> createURL(final String url) throws MalformedURLException {
         return new PrivilegedExceptionAction<URL>() {
+            @Override
             public URL run() throws MalformedURLException {
                 return new URL(url);
             }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/LRUMap.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/LRUMap.java
index 3cbe57842..4065a8a83 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/LRUMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/LRUMap.java
@@ -32,6 +32,8 @@ import java.util.Map;
 public class LRUMap extends org.apache.commons.collections4.map.LRUMap
     implements SizedMap {
 
+    
+    private static final long serialVersionUID = 1L;
     private int _max = -1;
 
     public LRUMap() {
@@ -49,10 +51,12 @@ public class LRUMap extends org.apache.commons.collections4.map.LRUMap
         super(map);
     }
 
+    @Override
     public int getMaxSize() {
         return maxSize();
     }
 
+    @Override
     public void setMaxSize(int max) {
         if (max < 0)
             throw new IllegalArgumentException(String.valueOf(max));
@@ -65,27 +69,33 @@ public class LRUMap extends org.apache.commons.collections4.map.LRUMap
         }
     }
 
+    @Override
     public void overflowRemoved(Object key, Object value) {
     }
 
+    @Override
     public int maxSize() {
         return (_max == -1) ? super.maxSize() : _max;
     }
 
+    @Override
     public boolean isFull() {
         return (_max == -1) ? super.isFull() : size() >= _max;
     }
 
+    @Override
     protected boolean removeLRU(LinkEntry entry) {
         overflowRemoved(entry.getKey(), entry.getValue());
         return super.removeLRU(entry);
     }
 
+    @Override
     protected void doWriteObject(ObjectOutputStream out) throws IOException {
         out.writeInt(_max);
         super.doWriteObject(out);
     }
 
+    @Override
     protected void doReadObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         _max = in.readInt();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java
index 39bdacf71..ed75748ec 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java
@@ -28,7 +28,6 @@ import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.ResourceBundle;
-
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -48,11 +47,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
 public class Localizer {
 
     // static cache of package+loc name to localizer mappings
-    private static final Map<String,Localizer> _localizers = new ConcurrentHashMap<String,Localizer>();
+    private static final Map<String,Localizer> _localizers = new ConcurrentHashMap<>();
 
     // list of resource providers to delegate to when locating resources
     private static final Collection<ResourceBundleProvider> _providers =
-        new CopyOnWriteArraySet<ResourceBundleProvider>
+        new CopyOnWriteArraySet<>
         (Arrays.asList(new ResourceBundleProvider[]{
             new SimpleResourceBundleProvider(),
             new StreamResourceBundleProvider(),
@@ -305,6 +304,7 @@ public class Localizer {
             return _pkg;
         }
 
+        @Override
         public String toString() {
             return getMessage();
         }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
index 78994808d..2a9a25d02 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
@@ -51,7 +51,7 @@ public class MultiClassLoader extends ClassLoader {
         AccessController.doPrivileged(
             J2DoPrivHelper.getSystemClassLoaderAction());
 
-    private List<ClassLoader> _loaders = new ArrayList<ClassLoader>(5);
+    private List<ClassLoader> _loaders = new ArrayList<>(5);
 
     /**
      * Constructor; initializes the loader with an empty list of delegates.
@@ -207,6 +207,7 @@ public class MultiClassLoader extends ClassLoader {
         return _loaders.isEmpty();
     }
 
+    @Override
     protected Class<?> findClass(String name) throws ClassNotFoundException {
         ClassLoader loader;
         for (Iterator<ClassLoader> itr = _loaders.iterator(); itr.hasNext();) {
@@ -222,6 +223,7 @@ public class MultiClassLoader extends ClassLoader {
         throw new ClassNotFoundException(name);
     }
 
+    @Override
     protected URL findResource(String name) {
         ClassLoader loader;
         URL rsrc;
@@ -242,11 +244,12 @@ public class MultiClassLoader extends ClassLoader {
         return null;
     }
 
+    @Override
     protected Enumeration<URL> findResources(String name) throws IOException {
         ClassLoader loader;
         Enumeration<URL> rsrcs;
         URL rsrc;
-        Vector<URL> all = new Vector<URL>();
+        Vector<URL> all = new Vector<>();
         for (Iterator<ClassLoader> itr = _loaders.iterator(); itr.hasNext();) {
             loader = itr.next();
             if (loader == THREAD_LOADER)
@@ -271,6 +274,7 @@ public class MultiClassLoader extends ClassLoader {
         return all.elements();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -279,6 +283,7 @@ public class MultiClassLoader extends ClassLoader {
         return ((MultiClassLoader) other)._loaders.equals(_loaders);
     }
 
+    @Override
     public int hashCode() {
         return _loaders.hashCode();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java
index ef645176a..dc23a52ad 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java
@@ -47,8 +47,8 @@ import java.util.TreeSet;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class Options extends TypedProperties {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Immutable empty instance.
@@ -103,7 +103,7 @@ public class Options extends TypedProperties {
 
         String key = null;
         String value = null;
-        List<String> remainder = new LinkedList<String>();
+        List<String> remainder = new LinkedList<>();
         for (int i = 0; i < args.length + 1; i++) {
             if (i == args.length || args[i].startsWith("-")) {
                 key = trimQuote(key);
@@ -254,7 +254,7 @@ public class Options extends TypedProperties {
      * names will have initial caps. They will be ordered alphabetically.
      */
     public static Collection<String> findOptionsFor(Class<?> type) {
-        Collection<String> names = new TreeSet<String>();
+        Collection<String> names = new TreeSet<>();
         // look for a setter method matching the key
         Method[] meths = type.getMethods();
         Class<?>[] params;
@@ -626,10 +626,15 @@ public class Options extends TypedProperties {
      */
     private static class EmptyOptions extends Options {
 
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         public Object setProperty(String key, String value) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Object put(Object key, Object value) {
             throw new UnsupportedOperationException();
         }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/OrderedMap.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/OrderedMap.java
index cdf89c32d..0953dd3b7 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/OrderedMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/OrderedMap.java
@@ -30,15 +30,15 @@ import java.util.Set;
  * @author Pinaki Poddar
  * @since 2.0.0
  */
-@SuppressWarnings("serial")
 public class OrderedMap<K, V> implements Map<K, V>, Serializable {
+    private static final long serialVersionUID = 1L;
     private final LinkedHashMap<K, V> _del;
 
     /**
      * Construct with predictable insertion order.
      */
     public OrderedMap() {
-        _del = new LinkedHashMap<K, V>(6,0.1f,false);
+        _del = new LinkedHashMap<>(6,0.1f,false);
     }
 
     /**
@@ -46,7 +46,7 @@ public class OrderedMap<K, V> implements Map<K, V>, Serializable {
      * @param lru if true the iterator order is based on last access, false for order of insertion.
      */
     public OrderedMap(boolean lru) {
-        _del = new LinkedHashMap<K, V>(6,0.1f,lru);
+        _del = new LinkedHashMap<>(6,0.1f,lru);
     }
 
     public int indexOf(Object key) {
@@ -59,60 +59,72 @@ public class OrderedMap<K, V> implements Map<K, V>, Serializable {
         return -1;
     }
 
+    @Override
     public void clear() {
     }
 
 
+    @Override
     public boolean containsKey(Object key) {
         return _del.containsKey(key);
     }
 
 
+    @Override
     public boolean containsValue(Object value) {
         return _del.containsValue(value);
     }
 
 
+    @Override
     public Set<java.util.Map.Entry<K, V>> entrySet() {
         return _del.entrySet();
     }
 
 
+    @Override
     public V get(Object key) {
         return _del.get(key);
     }
 
 
+    @Override
     public boolean isEmpty() {
         return _del.isEmpty();
     }
 
 
+    @Override
     public Set<K> keySet() {
         return _del.keySet();
     }
 
 
+    @Override
     public V put(K key, V value) {
         return _del.put(key, value);
     }
 
 
+    @Override
     public void putAll(Map<? extends K, ? extends V> m) {
         _del.putAll(m);
     }
 
 
+    @Override
     public V remove(Object key) {
         return _del.remove(key);
     }
 
 
+    @Override
     public int size() {
         return _del.size();
     }
 
 
+    @Override
     public Collection<V> values() {
         return _del.values();
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java
index c1b26f0a7..7163720c8 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java
@@ -194,6 +194,7 @@ public class ParameterTemplate {
      * Return a copy of the internal value template with all parameters
      * substituted with their current values.
      */
+    @Override
     public String toString() {
         if (_buf.length() == 0 || _params.isEmpty())
             return _buf.toString();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java
index d3b08b47b..e2028ee82 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java
@@ -27,6 +27,9 @@ package org.apache.openjpa.lib.util;
  */
 public class ParseException extends RuntimeException {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public ParseException() {
     }
 
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceHashMap.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceHashMap.java
index 25ec0002e..77d604d7b 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceHashMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceHashMap.java
@@ -21,7 +21,6 @@ package org.apache.openjpa.lib.util;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.lang.ref.Reference;
 
 /**
  * Map in which the key, value, or both may be weak/soft references.
@@ -33,6 +32,8 @@ public class ReferenceHashMap
     extends org.apache.commons.collections4.map.ReferenceMap
     implements ReferenceMap, SizedMap {
 
+    
+    private static final long serialVersionUID = 1L;
     private int _maxSize = Integer.MAX_VALUE;
 
     public ReferenceHashMap(ReferenceStrength keyType, ReferenceStrength valueType) {
@@ -44,29 +45,36 @@ public class ReferenceHashMap
         super(keyType, valueType, capacity, loadFactor);
     }
 
+    @Override
     public int getMaxSize() {
         return _maxSize;
     }
 
+    @Override
     public void setMaxSize(int maxSize) {
         _maxSize = (maxSize < 0) ? Integer.MAX_VALUE : maxSize;
         if (_maxSize != Integer.MAX_VALUE)
             removeOverflow(_maxSize);
     }
 
+    @Override
     public boolean isFull() {
         return size() >= _maxSize;
     }
 
+    @Override
     public void overflowRemoved(Object key, Object value) {
     }
 
+    @Override
     public void valueExpired(Object key) {
     }
 
+    @Override
     public void keyExpired(Object value) {
     }
 
+    @Override
     public void removeExpired() {
         purge();
     }
@@ -82,6 +90,7 @@ public class ReferenceHashMap
         }
     }
 
+    @Override
     protected void addMapping(int hashIndex, int hashCode, Object key,
         Object value) {
         if (_maxSize != Integer.MAX_VALUE)
@@ -89,16 +98,19 @@ public class ReferenceHashMap
         super.addMapping(hashIndex, hashCode, key, value);
     }
 
+    @Override
     protected ReferenceEntry createEntry(HashEntry next, int hashCode, Object key,
         Object value) {
         return new AccessibleEntry(this, next, hashCode, key, value);
     }
 
+    @Override
     protected void doWriteObject(ObjectOutputStream out) throws IOException {
         out.writeInt(_maxSize);
         super.doWriteObject(out);
     }
 
+    @Override
     protected void doReadObject(ObjectInputStream in)
         throws ClassNotFoundException, IOException {
         _maxSize = in.readInt();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceHashSet.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceHashSet.java
index ca188148d..f35cb5d10 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceHashSet.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceHashSet.java
@@ -33,7 +33,14 @@ import org.apache.commons.collections4.set.MapBackedSet;
  * @author Abe White
  */
 public class ReferenceHashSet implements Set, Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Object DUMMY_VAL = new Serializable() {
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         public String toString() {
             return ReferenceHashSet.class.getName() + ".DUMMY_VAL";
         }
@@ -53,62 +60,77 @@ public class ReferenceHashSet implements Set, Serializable {
         }
     }
 
+    @Override
     public boolean add(Object obj) {
         return _set.add(obj);
     }
 
+    @Override
     public boolean addAll(Collection coll) {
         return _set.addAll(coll);
     }
 
+    @Override
     public void clear() {
         _set.clear();
     }
 
+    @Override
     public boolean contains(Object obj) {
         return _set.contains(obj);
     }
 
+    @Override
     public boolean containsAll(Collection coll) {
         return _set.containsAll(coll);
     }
 
+    @Override
     public boolean isEmpty() {
         return _set.isEmpty();
     }
 
+    @Override
     public Iterator iterator() {
         return _set.iterator();
     }
 
+    @Override
     public boolean remove(Object obj) {
         return _set.remove(obj);
     }
 
+    @Override
     public boolean removeAll(Collection coll) {
         return _set.removeAll(coll);
     }
 
+    @Override
     public boolean retainAll(Collection coll) {
         return _set.retainAll(coll);
     }
 
+    @Override
     public int size() {
         return _set.size();
     }
 
+    @Override
     public Object[] toArray() {
         return _set.toArray();
     }
 
+    @Override
     public Object[] toArray(Object[] arr) {
         return _set.toArray(arr);
     }
 
+    @Override
     public int hashCode() {
         return _set.hashCode();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj)
             return true;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceMap.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceMap.java
index ee5596488..0fb4ef406 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ReferenceMap.java
@@ -30,19 +30,19 @@ public interface ReferenceMap extends Map {
     /**
      * Purge stale entries.
      */
-    public void removeExpired();
+    void removeExpired();
 
     /**
      * Overridable callback for when a key reference expires.
      *
      * @param value the value for the expired key
      */
-    public void keyExpired(Object value);
+    void keyExpired(Object value);
 
     /**
      * Overridable callback for when a value reference expires.
      *
      * @param key the key for the expired value
      */
-    public void valueExpired(Object key);
+    void valueExpired(Object key);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ResourceBundleProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ResourceBundleProvider.java
index 146cfc281..a72daf5f5 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ResourceBundleProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ResourceBundleProvider.java
@@ -33,7 +33,7 @@ interface ResourceBundleProvider {
      * Find a ResourceBundle with the given name, locale, and class loader
      * (which may be null).
      */
-    public ResourceBundle findResource(String name, Locale locale,
+    ResourceBundle findResource(String name, Locale locale,
         ClassLoader loader);
 }
 
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/SimpleResourceBundleProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/SimpleResourceBundleProvider.java
index 04f14dfd6..e230780f9 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/SimpleResourceBundleProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/SimpleResourceBundleProvider.java
@@ -29,6 +29,7 @@ import java.util.ResourceBundle;
  */
 class SimpleResourceBundleProvider implements ResourceBundleProvider {
 
+    @Override
     public ResourceBundle findResource(String name, Locale locale,
         ClassLoader loader) {
         ResourceBundle bundle = null;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/SizedMap.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/SizedMap.java
index 0c3382998..54eff59d5 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/SizedMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/SizedMap.java
@@ -31,20 +31,20 @@ public interface SizedMap extends Map {
     /**
      * The maximum number of entries, or Integer.MAX_VALUE for no limit.
      */
-    public int getMaxSize();
+    int getMaxSize();
 
     /**
      * The maximum number of entries, or Integer.MAX_VALUE for no limit.
      */
-    public void setMaxSize(int max);
+    void setMaxSize(int max);
 
     /**
      * Whether the map is full.
      */
-    public boolean isFull();
+    boolean isFull();
 
     /**
      * Overridable callback for when an overflow entry is automatically removed.
      */
-    public void overflowRemoved(Object key, Object value);
+    void overflowRemoved(Object key, Object value);
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java
index e193d7b72..cd9abb366 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java
@@ -34,6 +34,7 @@ import java.util.ResourceBundle;
  */
 class StreamResourceBundleProvider implements ResourceBundleProvider {
 
+    @Override
     public ResourceBundle findResource(String name, Locale locale,
         ClassLoader loader) {
         String rsrc = name.replace('.', '/') + ".properties";
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
index 9eda12192..f56f2fc46 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
@@ -38,10 +38,12 @@ public class TemporaryClassLoader extends ClassLoader {
         super(parent);
     }
 
+    @Override
     public Class loadClass(String name) throws ClassNotFoundException {
         return loadClass(name, false);
     }
 
+    @Override
     protected Class loadClass(String name, boolean resolve)
         throws ClassNotFoundException {
         // see if we've already loaded it
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TypedProperties.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TypedProperties.java
index 773aff4c6..32ecf4913 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TypedProperties.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TypedProperties.java
@@ -29,6 +29,9 @@ import java.util.Properties;
  */
 public class TypedProperties extends Properties {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Default constructor.
      */
@@ -154,6 +157,7 @@ public class TypedProperties extends Properties {
      *
      * @see Properties#setProperty(String,String)
      */
+    @Override
     public Object setProperty(String key, String val) {
         if (val == null)
             return remove(key);
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java
index 97ced56bd..c7767f381 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java
@@ -36,6 +36,7 @@ import java.util.zip.ZipInputStream;
  */
 class ZipResourceBundleProvider implements ResourceBundleProvider {
 
+    @Override
     public ResourceBundle findResource(String name, Locale locale,
         ClassLoader loader) {
         String rsrc = name.replace('.', '/') + ".properties";
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/AbstractConcurrentEventManager.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/AbstractConcurrentEventManager.java
index 1b49f7605..c6ae679ab 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/AbstractConcurrentEventManager.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/AbstractConcurrentEventManager.java
@@ -40,6 +40,9 @@ import org.apache.openjpa.lib.util.EventManager;
 public abstract class AbstractConcurrentEventManager
     implements EventManager, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private static final Exception[] EMPTY_EXCEPTIONS = new Exception[0];
 
     protected final Collection _listeners;
@@ -69,6 +72,7 @@ public abstract class AbstractConcurrentEventManager
     /**
      * Register an event listener.
      */
+    @Override
     public void addListener(Object listener) {
         if (listener != null)
             _listeners.add(listener);
@@ -77,6 +81,7 @@ public abstract class AbstractConcurrentEventManager
     /**
      * Remove an event listener.
      */
+    @Override
     public boolean removeListener(Object listener) {
         return _listeners.remove(listener);
     }
@@ -84,6 +89,7 @@ public abstract class AbstractConcurrentEventManager
     /**
      * Return whether the given instance is in the list of listeners.
      */
+    @Override
     public boolean hasListener(Object listener) {
         return _listeners.contains(listener);
     }
@@ -91,6 +97,7 @@ public abstract class AbstractConcurrentEventManager
     /**
      * Return true if there are any registered listeners.
      */
+    @Override
     public boolean hasListeners() {
         return !_listeners.isEmpty();
     }
@@ -98,6 +105,7 @@ public abstract class AbstractConcurrentEventManager
     /**
      * Return a read-only list of listeners.
      */
+    @Override
     public Collection getListeners() {
         return Collections.unmodifiableCollection(_listeners);
     }
@@ -105,6 +113,7 @@ public abstract class AbstractConcurrentEventManager
     /**
      * Fire the given event to all listeners.
      */
+    @Override
     public Exception[] fireEvent(Object event) {
         if (_listeners.isEmpty())
             return EMPTY_EXCEPTIONS;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentHashMap.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentHashMap.java
index dc3c0318f..d1b924b20 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentHashMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentHashMap.java
@@ -233,20 +233,24 @@ public class ConcurrentHashMap extends AbstractMap
         return loadFactor;
     }
 
+    @Override
     public int getMaxSize() {
         return maxSize;
     }
 
+    @Override
     public void setMaxSize(int maxSize) {
         this.maxSize = (maxSize < 0) ? Integer.MAX_VALUE : maxSize;
         if (this.maxSize != Integer.MAX_VALUE)
             removeOverflow(this.maxSize);
     }
 
+    @Override
     public boolean isFull() {
         return maxSize != Integer.MAX_VALUE && size() >= maxSize;
     }
 
+    @Override
     public void overflowRemoved(Object key, Object value) {
     }
 
@@ -255,6 +259,7 @@ public class ConcurrentHashMap extends AbstractMap
      *
      * @return the number of key-value mappings in this map.
      */
+    @Override
     public final int size() {
         return size;
     }
@@ -264,6 +269,7 @@ public class ConcurrentHashMap extends AbstractMap
      *
      * @return <tt>true</tt> if this map contains no key-value mappings.
      */
+    @Override
     public final boolean isEmpty() {
         return size == 0;
     }
@@ -281,6 +287,7 @@ public class ConcurrentHashMap extends AbstractMap
      * <tt>null</tt> if the map contains no mapping for this key.
      * @see #put(Object, Object)
      */
+    @Override
     public Object get(Object key) {
         Entry e = getEntry(key);
         return e == null ? null : e.value;
@@ -294,6 +301,7 @@ public class ConcurrentHashMap extends AbstractMap
      * @return <tt>true</tt> if this map contains a mapping for the specified
      * key.
      */
+    @Override
     public final boolean containsKey(Object key) {
         return getEntry(key) != null;
     }
@@ -325,6 +333,7 @@ public class ConcurrentHashMap extends AbstractMap
      * also indicate that the ConcurrentHashMap previously associated
      * <tt>null</tt> with the specified key.
      */
+    @Override
     public Object put(Object key, Object value) {
         Object k = maskNull(key);
         int hash = hash(k);
@@ -359,6 +368,7 @@ public class ConcurrentHashMap extends AbstractMap
         }
     }
 
+    @Override
     public Object putIfAbsent(Object key, Object value) {
         Object k = maskNull(key);
         int hash = hash(k);
@@ -416,6 +426,7 @@ public class ConcurrentHashMap extends AbstractMap
      * @param t mappings to be stored in this map.
      * @throws NullPointerException if the specified map is null.
      */
+    @Override
     public final synchronized void putAll(Map t) {
         // Expand enough to hold t's elements without resizing.
         int n = t.size();
@@ -443,6 +454,7 @@ public class ConcurrentHashMap extends AbstractMap
      * also indicate that the map previously associated <tt>null</tt>
      * with the specified key.
      */
+    @Override
     public Object remove(Object key) {
         Entry e = removeEntryForKey(key);
         return (e == null ? e : e.value);
@@ -514,6 +526,7 @@ public class ConcurrentHashMap extends AbstractMap
     /**
      * Removes all mappings from this map.
      */
+    @Override
     public synchronized void clear() {
         table = new Entry[table.length];
         size = 0;
@@ -528,6 +541,7 @@ public class ConcurrentHashMap extends AbstractMap
         return (int) (RANDOMS[randomEntry++] * table.length);
     }
 
+    @Override
     public Map.Entry removeRandom() {
         if (size == 0)
             return null;
@@ -564,6 +578,7 @@ public class ConcurrentHashMap extends AbstractMap
         }
     }
 
+    @Override
     public Iterator randomEntryIterator() {
         // pass index so calculated before iterator refs table, in case table
         // gets replace with a larger one
@@ -578,6 +593,7 @@ public class ConcurrentHashMap extends AbstractMap
      * @return <tt>true</tt> if this map maps one or more keys to the
      * specified value.
      */
+    @Override
     public final boolean containsValue(Object value) {
         if (value == null) return containsNullValue();
 
@@ -609,6 +625,7 @@ public class ConcurrentHashMap extends AbstractMap
      *
      * @return a shallow copy of this map.
      */
+    @Override
     public final Object clone() {
         return new ConcurrentHashMap(this);
     }
@@ -634,20 +651,24 @@ public class ConcurrentHashMap extends AbstractMap
             hash = h;
         }
 
+        @Override
         public Object getKey() {
             return unmaskNull(key);
         }
 
+        @Override
         public Object getValue() {
             return value;
         }
 
+        @Override
         public Object setValue(Object newValue) {
             Object oldValue = value;
             value = newValue;
             return oldValue;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof Map.Entry)) return false;
             Map.Entry e = (Map.Entry) o;
@@ -662,15 +683,18 @@ public class ConcurrentHashMap extends AbstractMap
             return false;
         }
 
+        @Override
         public int hashCode() {
             return (key == NULL_KEY ? 0 : key.hashCode()) ^
                 (value == null ? 0 : value.hashCode());
         }
 
+        @Override
         public String toString() {
             return getKey() + "=" + getValue();
         }
 
+        @Override
         protected Object clone() {
             // It is the callers responsibility to set the next field
             // correctly.
@@ -702,6 +726,7 @@ public class ConcurrentHashMap extends AbstractMap
             index = startIndex;
         }
 
+        @Override
         public boolean hasNext() {
             if (entry != null) {
                 return true;
@@ -723,6 +748,7 @@ public class ConcurrentHashMap extends AbstractMap
             return false;
         }
 
+        @Override
         public Object next() {
             if (!hasNext())
                 throw new NoSuchElementException();
@@ -731,6 +757,7 @@ public class ConcurrentHashMap extends AbstractMap
             return type == KEYS ? e.key : (type == VALUES ? e.value : e);
         }
 
+        @Override
         public void remove() {
             if (lastReturned == null)
                 throw new IllegalStateException();
@@ -772,6 +799,7 @@ public class ConcurrentHashMap extends AbstractMap
      *
      * @return a set view of the keys contained in this map.
      */
+    @Override
     public final Set keySet() {
         Set ks = keySet;
         return (ks != null ? ks : (keySet = new KeySet()));
@@ -779,22 +807,27 @@ public class ConcurrentHashMap extends AbstractMap
 
     private final class KeySet extends AbstractSet {
 
+        @Override
         public Iterator iterator() {
             return new HashIterator(KEYS, table.length - 1);
         }
 
+        @Override
         public int size() {
             return size;
         }
 
+        @Override
         public boolean contains(Object o) {
             return containsKey(o);
         }
 
+        @Override
         public boolean remove(Object o) {
             return ConcurrentHashMap.this.removeEntryForKey(o) != null;
         }
 
+        @Override
         public void clear() {
             ConcurrentHashMap.this.clear();
         }
@@ -811,6 +844,7 @@ public class ConcurrentHashMap extends AbstractMap
      *
      * @return a collection view of the values contained in this map.
      */
+    @Override
     public final Collection values() {
         Collection vs = values;
         return (vs != null ? vs : (values = new Values()));
@@ -818,18 +852,22 @@ public class ConcurrentHashMap extends AbstractMap
 
     private final class Values extends AbstractCollection {
 
+        @Override
         public Iterator iterator() {
             return new HashIterator(VALUES, table.length - 1);
         }
 
+        @Override
         public int size() {
             return size;
         }
 
+        @Override
         public boolean contains(Object o) {
             return containsValue(o);
         }
 
+        @Override
         public void clear() {
             ConcurrentHashMap.this.clear();
         }
@@ -848,6 +886,7 @@ public class ConcurrentHashMap extends AbstractMap
      * @return a collection view of the mappings contained in this map.
      * @see Map.Entry
      */
+    @Override
     public final Set entrySet() {
         Set es = entrySet;
         return (es != null ? es : (entrySet = new EntrySet()));
@@ -855,10 +894,12 @@ public class ConcurrentHashMap extends AbstractMap
 
     private final class EntrySet extends AbstractSet {
 
+        @Override
         public Iterator iterator() {
             return new HashIterator(ENTRIES, table.length - 1);
         }
 
+        @Override
         public boolean contains(Object o) {
             if (!(o instanceof Map.Entry)) return false;
             Map.Entry e = (Map.Entry) o;
@@ -866,14 +907,17 @@ public class ConcurrentHashMap extends AbstractMap
             return candidate != null && candidate.equals(e);
         }
 
+        @Override
         public boolean remove(Object o) {
             return removeMapping(o) != null;
         }
 
+        @Override
         public int size() {
             return size;
         }
 
+        @Override
         public void clear() {
             ConcurrentHashMap.this.clear();
         }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentMap.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentMap.java
index e16f52523..b5ccd4aed 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentMap.java
@@ -34,11 +34,11 @@ public interface ConcurrentMap extends Map {
      *
      * @return the removed entry, or null if map is empty
      */
-    public Map.Entry removeRandom();
+    Map.Entry removeRandom();
 
     /**
      * Iterate over map entries, beginning at an arbitrary
      * (not strictly random) entry.
      */
-    public Iterator randomEntryIterator();
+    Iterator randomEntryIterator();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashMap.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashMap.java
index 5ee3e4e01..cf272d629 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashMap.java
@@ -197,20 +197,24 @@ public class ConcurrentReferenceHashMap extends AbstractMap
         putAll(t);
     }
 
+    @Override
     public int getMaxSize() {
         return maxSize;
     }
 
+    @Override
     public void setMaxSize(int maxSize) {
         this.maxSize = (maxSize < 0) ? Integer.MAX_VALUE : maxSize;
         if (this.maxSize != Integer.MAX_VALUE)
             removeOverflow(this.maxSize);
     }
 
+    @Override
     public boolean isFull() {
         return maxSize != Integer.MAX_VALUE && size() >= maxSize;
     }
 
+    @Override
     public void overflowRemoved(Object key, Object value) {
     }
 
@@ -220,6 +224,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      * that will be removed before next attempted access because they
      * are no longer referenced.
      */
+    @Override
     public int size() {
         return count;
     }
@@ -230,6 +235,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      * that will be removed before next attempted access because they
      * are no longer referenced.
      */
+    @Override
     public boolean isEmpty() {
         return count == 0;
     }
@@ -240,6 +246,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      *
      * @param value value whose presence in this Map is to be tested.
      */
+    @Override
     public boolean containsValue(Object value) {
         Entry[] tab = table;
 
@@ -264,6 +271,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      *
      * @param key key whose presence in this Map is to be tested.
      */
+    @Override
     public boolean containsKey(Object key) {
         if (key == null && keyType != ReferenceStrength.HARD)
             return false;
@@ -283,6 +291,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      *
      * @param key key whose associated value is to be returned.
      */
+    @Override
     public Object get(Object key) {
         if (key == null && keyType != ReferenceStrength.HARD)
             return null;
@@ -344,6 +353,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      * was no mapping for key. A null return can also indicate that
      * the HashMap previously associated null with the specified key.
      */
+    @Override
     public Object put(Object key, Object value) {
         if ((key == null && keyType != ReferenceStrength.HARD)
             || (value == null && valueType != ReferenceStrength.HARD))
@@ -427,6 +437,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      * was no mapping for key. A null return can also indicate that
      * the HashMap previously associated null with the specified key.
      */
+    @Override
     public Object remove(Object key) {
         if (key == null && keyType != ReferenceStrength.HARD)
             return null;
@@ -455,15 +466,18 @@ public class ConcurrentReferenceHashMap extends AbstractMap
         return null;
     }
 
+    @Override
     public void removeExpired() {
         synchronized (this) {
             expungeStaleEntries();
         }
     }
 
+    @Override
     public void keyExpired(Object value) {
     }
 
+    @Override
     public void valueExpired(Object key) {
     }
 
@@ -476,6 +490,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
         return (int) (RANDOMS[randomEntry++] * table.length);
     }
 
+    @Override
     public Map.Entry removeRandom() {
         synchronized (this) {
             expungeStaleEntries();
@@ -513,6 +528,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
         }
     }
 
+    @Override
     public Iterator randomEntryIterator() {
         // pass index so calculated before iterator refs table, in case table
         // gets replace with a larger one
@@ -526,6 +542,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      *
      * @param t Mappings to be stored in this Map.
      */
+    @Override
     public void putAll(Map t) {
         Iterator i = t.entrySet().iterator();
         while (i.hasNext()) {
@@ -537,6 +554,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
     /**
      * Removes all mappings from this HashMap.
      */
+    @Override
     public synchronized void clear() {
         // clear out ref queue. We don't need to expunge entries
         // since table is getting cleared.
@@ -555,6 +573,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      * Returns a shallow copy of this HashMap. The keys and values
      * themselves are not cloned.
      */
+    @Override
     public synchronized Object clone() {
         try {
             expungeStaleEntries();
@@ -597,25 +616,31 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      * Set.remove, removeAll retainAll, and clear operations. It does not
      * support the add or addAll operations.
      */
+    @Override
     public Set keySet() {
         if (keySet == null) {
             keySet = new java.util.AbstractSet() {
+                @Override
                 public Iterator iterator() {
                     return new HashIterator(KEYS, table.length - 1);
                 }
 
+                @Override
                 public int size() {
                     return count;
                 }
 
+                @Override
                 public boolean contains(Object o) {
                     return containsKey(o);
                 }
 
+                @Override
                 public boolean remove(Object o) {
                     return ConcurrentReferenceHashMap.this.remove(o) != null;
                 }
 
+                @Override
                 public void clear() {
                     ConcurrentReferenceHashMap.this.clear();
                 }
@@ -633,21 +658,26 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      * retainAll and clear operations. It does not support the add or addAll
      * operations.
      */
+    @Override
     public Collection values() {
         if (values == null) {
             values = new java.util.AbstractCollection() {
+                @Override
                 public Iterator iterator() {
                     return new HashIterator(VALUES, table.length - 1);
                 }
 
+                @Override
                 public int size() {
                     return count;
                 }
 
+                @Override
                 public boolean contains(Object o) {
                     return containsValue(o);
                 }
 
+                @Override
                 public void clear() {
                     ConcurrentReferenceHashMap.this.clear();
                 }
@@ -667,13 +697,16 @@ public class ConcurrentReferenceHashMap extends AbstractMap
      *
      * @see Map.Entry
      */
+    @Override
     public Set entrySet() {
         if (entrySet == null) {
             entrySet = new java.util.AbstractSet() {
+                @Override
                 public Iterator iterator() {
                     return new HashIterator(ENTRIES, table.length - 1);
                 }
 
+                @Override
                 public boolean contains(Object o) {
                     if (!(o instanceof Map.Entry))
                         return false;
@@ -689,6 +722,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
                     return false;
                 }
 
+                @Override
                 public boolean remove(Object o) {
                     if (!(o instanceof Map.Entry))
                         return false;
@@ -715,10 +749,12 @@ public class ConcurrentReferenceHashMap extends AbstractMap
                     }
                 }
 
+                @Override
                 public int size() {
                     return count;
                 }
 
+                @Override
                 public void clear() {
                     ConcurrentReferenceHashMap.this.clear();
                 }
@@ -761,15 +797,15 @@ public class ConcurrentReferenceHashMap extends AbstractMap
     /**
      * HashMap collision list entry.
      */
-    private static interface Entry extends Map.Entry {
+    private interface Entry extends Map.Entry {
 
-        public int getHash();
+        int getHash();
 
-        public Entry getNext();
+        Entry getNext();
 
-        public void setNext(Entry next);
+        void setNext(Entry next);
 
-        public Object clone(ReferenceQueue queue);
+        Object clone(ReferenceQueue queue);
     }
 
     /**
@@ -789,18 +825,22 @@ public class ConcurrentReferenceHashMap extends AbstractMap
             this.next = next;
         }
 
+        @Override
         public int getHash() {
             return hash;
         }
 
+        @Override
         public Entry getNext() {
             return next;
         }
 
+        @Override
         public void setNext(Entry next) {
             this.next = next;
         }
 
+        @Override
         public Object clone(ReferenceQueue queue) {
             // It is the callers responsibility to set the next field
             // correctly.
@@ -809,20 +849,24 @@ public class ConcurrentReferenceHashMap extends AbstractMap
 
         // Map.Entry Ops
 
+        @Override
         public Object getKey() {
             return key;
         }
 
+        @Override
         public Object getValue() {
             return value;
         }
 
+        @Override
         public Object setValue(Object value) {
             Object oldValue = this.value;
             this.value = value;
             return oldValue;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof Map.Entry)) return false;
             Map.Entry e = (Map.Entry) o;
@@ -835,10 +879,12 @@ public class ConcurrentReferenceHashMap extends AbstractMap
                     : eq(value, e.getValue()));
         }
 
+        @Override
         public int hashCode() {
             return hash ^ (value == null ? 0 : value.hashCode());
         }
 
+        @Override
         public String toString() {
             return key + "=" + value.toString();
         }
@@ -863,18 +909,22 @@ public class ConcurrentReferenceHashMap extends AbstractMap
             this.next = next;
         }
 
+        @Override
         public int getHash() {
             return hash;
         }
 
+        @Override
         public Entry getNext() {
             return next;
         }
 
+        @Override
         public void setNext(Entry next) {
             this.next = next;
         }
 
+        @Override
         public Object clone(ReferenceQueue queue) {
             // It is the callers responsibility to set the next field
             // correctly.
@@ -884,14 +934,17 @@ public class ConcurrentReferenceHashMap extends AbstractMap
 
         // Map.Entry Ops
 
+        @Override
         public Object getKey() {
             return (keyRef) ? super.get() : hard;
         }
 
+        @Override
         public Object getValue() {
             return (keyRef) ? hard : super.get();
         }
 
+        @Override
         public Object setValue(Object value) {
             if (!keyRef)
                 throw new Error("Attempt to reset reference value.");
@@ -901,17 +954,20 @@ public class ConcurrentReferenceHashMap extends AbstractMap
             return oldValue;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof Map.Entry)) return false;
             Map.Entry e = (Map.Entry) o;
             return eq(getKey(), e.getKey()) && eq(getValue(), e.getValue());
         }
 
+        @Override
         public int hashCode() {
             Object val = getValue();
             return hash ^ (val == null ? 0 : val.hashCode());
         }
 
+        @Override
         public String toString() {
             return getKey() + "=" + getValue();
         }
@@ -936,18 +992,22 @@ public class ConcurrentReferenceHashMap extends AbstractMap
             this.next = next;
         }
 
+        @Override
         public int getHash() {
             return hash;
         }
 
+        @Override
         public Entry getNext() {
             return next;
         }
 
+        @Override
         public void setNext(Entry next) {
             this.next = next;
         }
 
+        @Override
         public Object clone(ReferenceQueue queue) {
             // It is the callers responsibility to set the next field
             // correctly.
@@ -957,14 +1017,17 @@ public class ConcurrentReferenceHashMap extends AbstractMap
 
         // Map.Entry Ops
 
+        @Override
         public Object getKey() {
             return (keyRef) ? super.get() : hard;
         }
 
+        @Override
         public Object getValue() {
             return (keyRef) ? hard : super.get();
         }
 
+        @Override
         public Object setValue(Object value) {
             if (!keyRef)
                 throw new Error("Attempt to reset reference value.");
@@ -974,17 +1037,20 @@ public class ConcurrentReferenceHashMap extends AbstractMap
             return oldValue;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof Map.Entry)) return false;
             Map.Entry e = (Map.Entry) o;
             return eq(getKey(), e.getKey()) && eq(getValue(), e.getValue());
         }
 
+        @Override
         public int hashCode() {
             Object val = getValue();
             return hash ^ (val == null ? 0 : val.hashCode());
         }
 
+        @Override
         public String toString() {
             return getKey() + "=" + getValue();
         }
@@ -1014,6 +1080,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
             index = startIndex;
         }
 
+        @Override
         public boolean hasNext() {
             if (entry != null) {
                 return true;
@@ -1035,6 +1102,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
             return false;
         }
 
+        @Override
         public Object next() {
             if (!hasNext())
                 throw new NoSuchElementException();
@@ -1044,6 +1112,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap
                 : (type == VALUES ? e.getValue() : e);
         }
 
+        @Override
         public void remove() {
             if (lastReturned == null)
                 throw new IllegalStateException();
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashSet.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashSet.java
index 30d041fe9..d1495181c 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashSet.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashSet.java
@@ -35,8 +35,9 @@ import org.apache.commons.collections4.set.MapBackedSet;
  *
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class ConcurrentReferenceHashSet<E> implements Set<E>, Serializable {
+    private static final long serialVersionUID = 1L;
+
     private static final Object DUMMY_VAL = new Object();
 
     private final Set<E> _set;
@@ -46,69 +47,84 @@ public class ConcurrentReferenceHashSet<E> implements Set<E>, Serializable {
      */
     public ConcurrentReferenceHashSet(ReferenceStrength refType) {
         if (refType == ReferenceStrength.HARD)
-            _set = MapBackedSet.mapBackedSet(new ConcurrentHashMap(), DUMMY_VAL);
+            _set = MapBackedSet.mapBackedSet(new ConcurrentHashMap<>(), DUMMY_VAL);
         else {
             _set = MapBackedSet.mapBackedSet(new ConcurrentReferenceHashMap
                 (refType, ReferenceStrength.HARD), DUMMY_VAL);
         }
     }
 
+    @Override
     public boolean add(E obj) {
         return _set.add(obj);
     }
 
+    @Override
     public boolean addAll(Collection<? extends E> coll) {
         return _set.addAll(coll);
     }
 
+    @Override
     public void clear() {
         _set.clear();
     }
 
+    @Override
     public boolean contains(Object obj) {
         return _set.contains(obj);
     }
 
+    @Override
     public boolean containsAll(Collection<?> coll) {
         return _set.containsAll(coll);
     }
 
+    @Override
     public boolean isEmpty() {
         return _set.isEmpty();
     }
 
+    @Override
     public Iterator<E> iterator() {
         return _set.iterator();
     }
 
+    @Override
     public boolean remove(Object obj) {
         return _set.remove(obj);
     }
 
+    @Override
     public boolean removeAll(Collection<?> coll) {
         return _set.removeAll(coll);
     }
 
+    @Override
     public boolean retainAll(Collection<?> coll) {
         return _set.retainAll(coll);
     }
 
+    @Override
     public int size() {
         return _set.size();
     }
 
+    @Override
     public Object[] toArray() {
         return _set.toArray();
     }
 
+    @Override
     public <T> T[] toArray(T[] arr) {
         return _set.toArray(arr);
     }
 
+    @Override
     public int hashCode() {
         return _set.hashCode();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj)
             return true;
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Commentable.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Commentable.java
index 91dfb552b..df2772dd4 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Commentable.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Commentable.java
@@ -25,15 +25,15 @@ package org.apache.openjpa.lib.xml;
  */
 public interface Commentable {
 
-    public static final String[] EMPTY_COMMENTS = new String[0];
+    String[] EMPTY_COMMENTS = new String[0];
 
     /**
      * Set comments.
      */
-    public void setComments(String[] comments);
+    void setComments(String[] comments);
 
     /**
      * Return comments, or empty array if none.
      */
-    public String[] getComments();
+    String[] getComments();
 }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java
index 78a4af943..5b40370e7 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java
@@ -71,6 +71,7 @@ public class DocTypeReader extends Reader {
         _xml = bufferHeader(xml);
     }
 
+    @Override
     public int read() throws IOException {
         int ch = readHeader();
         if (ch != -1)
@@ -83,10 +84,12 @@ public class DocTypeReader extends Reader {
         return _xml.read();
     }
 
+    @Override
     public int read(char[] buf) throws IOException {
         return read(buf, 0, buf.length);
     }
 
+    @Override
     public int read(char[] buf, int off, int len) throws IOException {
         int headerRead = readHeader(buf, off, len);
         off += headerRead;
@@ -99,26 +102,32 @@ public class DocTypeReader extends Reader {
         return headerRead + docRead + _xml.read(buf, off, len);
     }
 
+    @Override
     public long skip(long len) throws IOException {
         return _xml.skip(len);
     }
 
+    @Override
     public boolean ready() throws IOException {
         return _xml.ready();
     }
 
+    @Override
     public boolean markSupported() {
         return _xml.markSupported();
     }
 
+    @Override
     public void mark(int readAheadLimit) throws IOException {
         _xml.mark(readAheadLimit);
     }
 
+    @Override
     public void reset() throws IOException {
         _xml.reset();
     }
 
+    @Override
     public void close() throws IOException {
         _xml.close();
         if (_docType != null)
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java
index fe141240c..2f04628da 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/Location.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.lib.xml;
 
 import java.text.MessageFormat;
 
-import org.xml.sax.Locator;
 import org.apache.openjpa.lib.util.Localizer;
+import org.xml.sax.Locator;
 
 /**
  * @author Stephen Kim
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java
index d7466c770..eff4db675 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java
@@ -31,14 +31,17 @@ import org.xml.sax.SAXParseException;
  */
 public class ValidatingErrorHandler implements ErrorHandler {
 
+    @Override
     public void warning(SAXParseException e) throws SAXException {
         throw e;
     }
 
+    @Override
     public void error(SAXParseException e) throws SAXException {
         throw e;
     }
 
+    @Override
     public void fatalError(SAXParseException e) throws SAXException {
         throw e;
     }
diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLWriter.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLWriter.java
index 6c961a85b..11e4cdeaa 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLWriter.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLWriter.java
@@ -47,16 +47,19 @@ public class XMLWriter extends FilterWriter {
         super(out);
     }
 
+    @Override
     public void write(char[] cbuf, int off, int len) throws IOException {
         for (int i = 0; i < len; i++)
             write(cbuf[off + i]);
     }
 
+    @Override
     public void write(String str, int off, int len) throws IOException {
         for (int i = 0; i < len; i++)
             write(str.charAt(off + i));
     }
 
+    @Override
     public void write(int c) throws IOException {
         // the basic idea of this method is to make sure that when a tag
         // or a text block starts, it is placed on a separate line and
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestConfigurationProviderPrefixes.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestConfigurationProviderPrefixes.java
index 6614abb37..23fc12332 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestConfigurationProviderPrefixes.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestConfigurationProviderPrefixes.java
@@ -35,6 +35,7 @@ public class TestConfigurationProviderPrefixes
 
     private String[] _origPrefixes;
 
+    @Override
     public void setUp() {
         _origPrefixes = ProductDerivations.getConfigurationPrefixes();
         List l = new ArrayList(Arrays.asList(_origPrefixes));
@@ -43,6 +44,7 @@ public class TestConfigurationProviderPrefixes
             (String[]) l.toArray(new String[0]));
     }
 
+    @Override
     public void tearDown() {
         ProductDerivations.setConfigurationPrefixes(_origPrefixes);
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java
index 08e75d94d..af4a9db47 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java
@@ -24,21 +24,26 @@ public class TestValue extends TestCase {
 
     private static class SimpleValue extends Value {
 
+        @Override
         protected String getInternalString() {
             return null;
         }
 
+        @Override
         public Class getValueType() {
             return null;
         }
 
+        @Override
         protected void setInternalObject(Object obj) {
 
         }
 
+        @Override
         protected void setInternalString(String str) {
         }
 
+        @Override
         public Object get() {
             return null;
         }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/ConfigurationTestProductDerivation.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/ConfigurationTestProductDerivation.java
index e35a91a1a..501ccf6c8 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/ConfigurationTestProductDerivation.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/ConfigurationTestProductDerivation.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.lib.conf.test;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.MissingResourceException;
 import java.util.Properties;
@@ -43,14 +43,17 @@ public class ConfigurationTestProductDerivation
 
     public static boolean closed = false;
 
+    @Override
     public int getType() {
         return ProductDerivation.TYPE_PRODUCT;
     }
 
+    @Override
     public void beforeConfigurationClose(Configuration conf) {
         closed = true;
     }
 
+    @Override
     public ConfigurationProvider loadGlobals(ClassLoader loader)
         throws IOException {
         return load(null, loader);
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java
index 9565d0c85..bd711313a 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/test/TestConfigurationImpl.java
@@ -24,7 +24,12 @@ import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.Properties;
 
-import org.apache.openjpa.lib.conf.*;
+import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.lib.conf.ConfigurationImpl;
+import org.apache.openjpa.lib.conf.ObjectValue;
+import org.apache.openjpa.lib.conf.PluginValue;
+import org.apache.openjpa.lib.conf.StringValue;
+import org.apache.openjpa.lib.conf.Value;
 import org.apache.openjpa.lib.test.AbstractTestCase;
 
 /**
@@ -48,10 +53,12 @@ public class TestConfigurationImpl extends AbstractTestCase {
         super(test);
     }
 
+    @Override
     public void setUp() {
         System.setProperty("openjpatest.properties", "test.properties");
     }
 
+    @Override
     public void tearDown() throws Exception {
         System.setProperty("openjpatest.properties", "");
     	super.tearDown();
@@ -317,6 +324,7 @@ public class TestConfigurationImpl extends AbstractTestCase {
             _objectKey.set(val, true);
         }
 
+        @Override
         protected boolean isInvalidProperty(String s) {
             if ("openjpatest.properties".equals(s))
                 return false;
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/TestDepthFirstAnalysis.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/TestDepthFirstAnalysis.java
index 2140e76e1..68fe705e2 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/TestDepthFirstAnalysis.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/TestDepthFirstAnalysis.java
@@ -34,6 +34,7 @@ public class TestDepthFirstAnalysis
 
     private DepthFirstAnalysis _dfa = null;
 
+    @Override
     public void setUp() {
         setUpGraph1();
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/TestGraph.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/TestGraph.java
index 3b21530ff..11c2e83cd 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/TestGraph.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/TestGraph.java
@@ -41,6 +41,7 @@ public class TestGraph
     private Edge _edge3 = new Edge(_node1, _node3, false);
     private Edge _edge4 = new Edge(_node2, _node2, false);
 
+    @Override
     public void setUp() {
         _graph.addNode(_node1);
         _graph.addNode(_node2);
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/DefaultTestIdRule.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/DefaultTestIdRule.java
index 93bca22de..81da1b8d8 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/DefaultTestIdRule.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/DefaultTestIdRule.java
@@ -18,8 +18,6 @@
  */
 package org.apache.openjpa.lib.identifier;
 
-import org.apache.openjpa.lib.identifier.IdentifierRule;
-
 public class DefaultTestIdRule extends IdentifierRule {
 
 }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/IdConfigurationTestImpl.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/IdConfigurationTestImpl.java
index fa342cfeb..7c67879de 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/IdConfigurationTestImpl.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/IdConfigurationTestImpl.java
@@ -21,13 +21,9 @@ package org.apache.openjpa.lib.identifier;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.openjpa.lib.identifier.IdentifierConfiguration;
-import org.apache.openjpa.lib.identifier.IdentifierRule;
-import org.apache.openjpa.lib.identifier.IdentifierUtil;
-
 public class IdConfigurationTestImpl implements IdentifierConfiguration {
 
-    Map<String, IdentifierRule> _rules = new HashMap<String, IdentifierRule>();
+    Map<String, IdentifierRule> _rules = new HashMap<>();
     private final String conversionKey = getLeadingDelimiter() + getIdentifierDelimiter() + getTrailingDelimiter();
 
     public IdConfigurationTestImpl() {
@@ -36,30 +32,37 @@ public class IdConfigurationTestImpl implements IdentifierConfiguration {
 
     private IdentifierRule _defRule = new IdentifierRule();
 
+    @Override
     public boolean delimitAll() {
         return false;
     }
 
+    @Override
     public IdentifierRule getDefaultIdentifierRule() {
         return _defRule;
     }
 
+    @Override
     public String getDelimitedCase() {
         return IdentifierUtil.CASE_PRESERVE;
     }
 
+    @Override
     public String getLeadingDelimiter() {
         return "`";
     }
 
+    @Override
     public String getIdentifierDelimiter() {
         return ":";
     }
 
+    @Override
     public String getIdentifierConcatenator() {
         return "-";
     }
 
+    @Override
     public <T> IdentifierRule getIdentifierRule(T t) {
         IdentifierRule r =  _rules.get(t);
         if (r == null) {
@@ -68,23 +71,28 @@ public class IdConfigurationTestImpl implements IdentifierConfiguration {
         return r;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> Map<T, IdentifierRule> getIdentifierRules() {
         return (Map<T, IdentifierRule>) _rules;
     }
 
+    @Override
     public String getTrailingDelimiter() {
         return "`";
     }
 
+    @Override
     public String getSchemaCase() {
         return IdentifierUtil.CASE_UPPER;
     }
 
+    @Override
     public boolean getSupportsDelimitedIdentifiers() {
         return true;
     }
 
+    @Override
     public String getConversionKey() {
         return conversionKey;
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/NewIdConfigurationTestImpl.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/NewIdConfigurationTestImpl.java
index 924888bde..da319b5ba 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/NewIdConfigurationTestImpl.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/NewIdConfigurationTestImpl.java
@@ -21,13 +21,9 @@ package org.apache.openjpa.lib.identifier;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.openjpa.lib.identifier.IdentifierConfiguration;
-import org.apache.openjpa.lib.identifier.IdentifierRule;
-import org.apache.openjpa.lib.identifier.IdentifierUtil;
-
 public class NewIdConfigurationTestImpl implements IdentifierConfiguration {
 
-    Map<String, IdentifierRule> _rules = new HashMap<String, IdentifierRule>();
+    Map<String, IdentifierRule> _rules = new HashMap<>();
     private final String conversionKey = getLeadingDelimiter() + getIdentifierDelimiter() + getTrailingDelimiter();
 
     public NewIdConfigurationTestImpl() {
@@ -36,30 +32,37 @@ public class NewIdConfigurationTestImpl implements IdentifierConfiguration {
 
     private IdentifierRule _defRule = new IdentifierRule();
 
+    @Override
     public boolean delimitAll() {
         return false;
     }
 
+    @Override
     public IdentifierRule getDefaultIdentifierRule() {
         return _defRule;
     }
 
+    @Override
     public String getDelimitedCase() {
         return IdentifierUtil.CASE_PRESERVE;
     }
 
+    @Override
     public String getLeadingDelimiter() {
         return "\"";
     }
 
+    @Override
     public String getIdentifierDelimiter() {
         return ".";
     }
 
+    @Override
     public String getIdentifierConcatenator() {
         return "_";
     }
 
+    @Override
     public <T> IdentifierRule getIdentifierRule(T t) {
         IdentifierRule r =  _rules.get(t);
         if (r == null) {
@@ -68,23 +71,28 @@ public class NewIdConfigurationTestImpl implements IdentifierConfiguration {
         return r;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> Map<T, IdentifierRule> getIdentifierRules() {
         return (Map<T, IdentifierRule>) _rules;
     }
 
+    @Override
     public String getTrailingDelimiter() {
         return "\"";
     }
 
+    @Override
     public String getSchemaCase() {
         return IdentifierUtil.CASE_UPPER;
     }
 
+    @Override
     public boolean getSupportsDelimitedIdentifiers() {
         return true;
     }
 
+    @Override
     public String getConversionKey() {
         return conversionKey;
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/TestIdentifiers.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/TestIdentifiers.java
index 41ce14f11..2eb0caf20 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/TestIdentifiers.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/identifier/TestIdentifiers.java
@@ -18,9 +18,6 @@
  */
 package org.apache.openjpa.lib.identifier;
 
-import org.apache.openjpa.lib.identifier.IdentifierConfiguration;
-import org.apache.openjpa.lib.identifier.IdentifierUtil;
-import org.apache.openjpa.lib.identifier.IdentifierUtilImpl;
 import org.apache.openjpa.lib.test.AbstractTestCase;
 
 public class TestIdentifiers extends AbstractTestCase {
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/ResultListTest.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/ResultListTest.java
index f2c2054db..1a0e45fca 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/ResultListTest.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/ResultListTest.java
@@ -63,6 +63,7 @@ public abstract class ResultListTest extends AbstractTestCase {
         };
     }
 
+    @Override
     public void setUp() {
         List results = new ArrayList(100);
         for (int i = 0; i < 100; i++)
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestEagerResultList.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestEagerResultList.java
index 848bad088..dcf0e6216 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestEagerResultList.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestEagerResultList.java
@@ -29,6 +29,7 @@ public class TestEagerResultList extends ResultListTest {
         super(test, true);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new EagerResultList(provider);
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestLazyForwardResultList.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestLazyForwardResultList.java
index c382449d1..fa0d822f6 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestLazyForwardResultList.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestLazyForwardResultList.java
@@ -29,6 +29,7 @@ public class TestLazyForwardResultList extends ResultListTest {
         super(test, true);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new LazyForwardResultList(provider);
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestListResultList.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestListResultList.java
index 6e253780c..46d13d101 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestListResultList.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestListResultList.java
@@ -29,6 +29,7 @@ public class TestListResultList extends ResultListTest {
         super(test, true);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new ListResultList(((ListResultObjectProvider) provider).
             getDelegate());
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestMergedResultObjectProvider.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestMergedResultObjectProvider.java
index 120ee0432..8f40765a2 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestMergedResultObjectProvider.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestMergedResultObjectProvider.java
@@ -32,10 +32,12 @@ public class TestMergedResultObjectProvider extends ResultListTest {
         super(test);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new WindowResultList(provider, 10);
     }
 
+    @Override
     protected ResultObjectProvider[] getResultObjectProviders(List list) {
         // test 3 merges:
         // 1. first rop empty,
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestOrderedMergedResultObjectProvider.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestOrderedMergedResultObjectProvider.java
index e84839473..9fe240e2f 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestOrderedMergedResultObjectProvider.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestOrderedMergedResultObjectProvider.java
@@ -34,10 +34,12 @@ public class TestOrderedMergedResultObjectProvider extends ResultListTest {
         super(test);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new WindowResultList(provider, 10);
     }
 
+    @Override
     protected ResultObjectProvider[] getResultObjectProviders(List list) {
         Collections.shuffle(list);
         int quart = list.size() / 4;
@@ -68,6 +70,7 @@ public class TestOrderedMergedResultObjectProvider extends ResultListTest {
 
     private static class IntValueComparator implements Comparator {
 
+        @Override
         public int compare(Object o1, Object o2) {
             return Integer.valueOf(o1.toString()).
                 compareTo(Integer.valueOf(o2.toString()));
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestRandomAccessResultList.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestRandomAccessResultList.java
index bc04a72ae..a9902b14b 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestRandomAccessResultList.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestRandomAccessResultList.java
@@ -29,6 +29,7 @@ public class TestRandomAccessResultList extends ResultListTest {
         super(test);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new RandomAccessResultList(provider);
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestRangeResultObjectProvider.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestRangeResultObjectProvider.java
index fbbb861a8..3ebe13c08 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestRangeResultObjectProvider.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestRangeResultObjectProvider.java
@@ -32,10 +32,12 @@ public class TestRangeResultObjectProvider extends ResultListTest {
         super(test);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new WindowResultList(provider, 10);
     }
 
+    @Override
     protected ResultObjectProvider[] getResultObjectProviders(List list) {
         // test 3 ranges:
         // 1. 0 to infinite
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestSimpleResultList.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestSimpleResultList.java
index 4825a450b..be058eb83 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestSimpleResultList.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestSimpleResultList.java
@@ -29,6 +29,7 @@ public class TestSimpleResultList extends ResultListTest {
         super(test);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new SimpleResultList(provider);
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestSoftRandomAccessResultList.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestSoftRandomAccessResultList.java
index 35303b740..f58f2ea5d 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestSoftRandomAccessResultList.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestSoftRandomAccessResultList.java
@@ -29,6 +29,7 @@ public class TestSoftRandomAccessResultList extends ResultListTest {
         super(test);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new SoftRandomAccessResultList(provider);
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestWindowResultList.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestWindowResultList.java
index 9463fd3e2..8e606a0e3 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestWindowResultList.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/rop/TestWindowResultList.java
@@ -29,6 +29,7 @@ public class TestWindowResultList extends ResultListTest {
         super(test);
     }
 
+    @Override
     protected ResultList getResultList(ResultObjectProvider provider) {
         return new WindowResultList(provider, 10);
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
index de6f8ef1b..adb72fdc2 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
@@ -53,18 +53,19 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.textui.TestRunner;
+import org.apache.openjpa.lib.log.Log;
+import org.apache.openjpa.lib.log.LogFactoryImpl;
+import org.apache.openjpa.lib.util.Localizer;
 import org.apache.regexp.RE;
 import org.apache.regexp.RESyntaxException;
 import org.apache.regexp.REUtil;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
-import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.lib.log.LogFactoryImpl;
-import org.apache.openjpa.lib.util.Localizer;
+
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.textui.TestRunner;
 
 /**
  * TestCase framework to run various tests against solarmetric code.
@@ -138,6 +139,7 @@ public abstract class AbstractTestCase extends TestCase {
     protected void preTimeout() {
     }
 
+    @Override
     public void run(TestResult result) {
         if (skipTest()) {
             // keep track of the tests we skip so that we can get an
@@ -220,6 +222,7 @@ public abstract class AbstractTestCase extends TestCase {
     public void tearDownTestClass() throws Exception {
     }
 
+    @Override
     public void tearDown() throws Exception {
         if ("true".equals(System.getProperty("meminfo")))
             printMemoryInfo();
@@ -571,6 +574,7 @@ public abstract class AbstractTestCase extends TestCase {
             }
         }
 
+        @Override
         public Class findClass(String name) throws ClassNotFoundException {
             // don't isolate PC and related classes in kodo.enhnace
             if (name.indexOf(".enhance.") != -1)
@@ -954,6 +958,7 @@ public abstract class AbstractTestCase extends TestCase {
      */
     public static void main() {
         String caller = new SecurityManager() {
+            @Override
             public String toString() {
                 return getClassContext()[2].getName();
             }
@@ -1035,6 +1040,7 @@ public abstract class AbstractTestCase extends TestCase {
             _timeoutms = timeoutMin * 60 * 1000;
         }
 
+        @Override
         public void run() {
             while (true) {
                 try {
@@ -1045,6 +1051,7 @@ public abstract class AbstractTestCase extends TestCase {
                 if (_endtime > 0 && System.currentTimeMillis() > _endtime) {
                     Thread preTimeout = new Thread
                         ("Attempting pre-timeout for " + _curtest) {
+                        @Override
                         public void run() {
                             _curtest.preTimeout();
                         }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestAbstractEventManager.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestAbstractEventManager.java
index e2357cb05..2e018be5d 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestAbstractEventManager.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestAbstractEventManager.java
@@ -18,11 +18,12 @@
  */
 package org.apache.openjpa.lib.util;
 
+import org.apache.openjpa.lib.util.concurrent.AbstractConcurrentEventManager;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
-import org.apache.openjpa.lib.util.concurrent.AbstractConcurrentEventManager;
 
 /**
  * Tests the {@link AbstractConcurrentEventManager}.
@@ -70,6 +71,10 @@ public class TestAbstractEventManager extends TestCase {
 
     private static class EventManager extends AbstractConcurrentEventManager {
 
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         protected void fireEvent(Object event, Object listener) {
             ((Listener) listener).fire();
         }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java
index c1cdc5225..4aca0e970 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java
@@ -21,14 +21,14 @@ package org.apache.openjpa.lib.util;
 import java.util.Locale;
 import java.util.MissingResourceException;
 
+import org.apache.openjpa.lib.util.Localizer.Message;
+import org.apache.openjpa.lib.util.testlocalizer.LocalizerTestHelper;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
-import org.apache.openjpa.lib.util.Localizer.Message;
-import org.apache.openjpa.lib.util.testlocalizer.LocalizerTestHelper;
-
 /**
  * Tests the Localizer.
  *
@@ -42,6 +42,7 @@ public class TestLocalizer extends TestCase {
         super(test);
     }
 
+    @Override
     public void setUp() {
         _locals = Localizer.forPackage(LocalizerTestHelper.class);
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestMultiClassLoader.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestMultiClassLoader.java
index 0cf5fd850..d69b84edb 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestMultiClassLoader.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestMultiClassLoader.java
@@ -40,6 +40,7 @@ public class TestMultiClassLoader extends TestCase {
         super(test);
     }
 
+    @Override
     public void setUp() {
         _loader.addClassLoader(MultiClassLoader.THREAD_LOADER);
         _loader.addClassLoader(SYSTEM_LOADER);
@@ -55,7 +56,7 @@ public class TestMultiClassLoader extends TestCase {
         assertEquals(Thread.currentThread().getContextClassLoader(),
             _loader.getClassLoaders()[1]);
         assertTrue(_loader.getClassLoader(0) == SYSTEM_LOADER);
-        assertTrue(!_loader.addClassLoader(_loader.THREAD_LOADER));
+        assertTrue(!_loader.addClassLoader(MultiClassLoader.THREAD_LOADER));
 
         FooLoader foo = new FooLoader();
         assertTrue(_loader.addClassLoader(foo));
@@ -63,8 +64,8 @@ public class TestMultiClassLoader extends TestCase {
         assertEquals(3, _loader.size());
         assertEquals(foo, _loader.getClassLoaders()[2]);
 
-        assertTrue(_loader.removeClassLoader(_loader.THREAD_LOADER));
-        assertTrue(!_loader.removeClassLoader(_loader.THREAD_LOADER));
+        assertTrue(_loader.removeClassLoader(MultiClassLoader.THREAD_LOADER));
+        assertTrue(!_loader.removeClassLoader(MultiClassLoader.THREAD_LOADER));
         assertEquals(2, _loader.size());
         assertTrue(_loader.getClassLoaders()[0] == SYSTEM_LOADER);
         assertEquals(foo, _loader.getClassLoaders()[1]);
@@ -141,12 +142,14 @@ public class TestMultiClassLoader extends TestCase {
 
     private static final class FooLoader extends ClassLoader {
 
+        @Override
         protected Class findClass(String name) throws ClassNotFoundException {
             if ("foo".equals(name))
                 return Integer.class;
             throw new ClassNotFoundException(name);
         }
 
+        @Override
         protected URL findResource(String name) {
             try {
                 if ("foo".equals(name))
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestOptions.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestOptions.java
index b10ee3abd..48efa77eb 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestOptions.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestOptions.java
@@ -43,6 +43,7 @@ public class TestOptions extends TestCase {
         super(test);
     }
 
+    @Override
     public void setUp() {
         Properties defs = new Properties();
         defs.setProperty("default", "value");
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestPropertiesParser.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestPropertiesParser.java
index 7866c577c..dfdf341f1 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestPropertiesParser.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestPropertiesParser.java
@@ -33,10 +33,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 
-import junit.framework.TestCase;
 import org.apache.openjpa.lib.util.FormatPreservingProperties.
         DuplicateKeyException;
 
+import junit.framework.TestCase;
+
 // things to test:
 // - delimiters in keys
 // - escape chars, including \:, \= in files(as generated by Properties)
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestReferenceSet.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestReferenceSet.java
index 0ba4303c2..a43869e15 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestReferenceSet.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestReferenceSet.java
@@ -40,6 +40,7 @@ public class TestReferenceSet extends TestCase {
         super(test);
     }
 
+    @Override
     public void setUp() {
         _coll.add(_heldValue);
         _coll.add(new Integer(1));
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestTypedProperties.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestTypedProperties.java
index 270ecfe2b..0ae66f602 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestTypedProperties.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestTypedProperties.java
@@ -37,6 +37,7 @@ public class TestTypedProperties extends TestCase {
         super(test);
     }
 
+    @Override
     public void setUp() {
         _props = new TypedProperties();
         _props.setProperty("bool", "true");
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
index 7465d4d58..419f2af76 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
@@ -86,6 +86,7 @@ public class TestUUIDGenerator extends TestCase {
         // those fields are null. Wrap this  method in doPrivledgedAction so it
         // doesn't fail when running with security.
         AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+            @Override
             public Object run() throws Exception {
                 Class uuid = UUIDGenerator.class;
                 Field[] fields = uuid.getDeclaredFields();
@@ -99,6 +100,7 @@ public class TestUUIDGenerator extends TestCase {
                     }
                 }
                 Thread t = new Thread() {
+                    @Override
                     public void run() {
                         UUIDGenerator.createType1();
                     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestDocTypeReader.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestDocTypeReader.java
index 7c6a11683..033a453a2 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestDocTypeReader.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestDocTypeReader.java
@@ -23,16 +23,18 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
+
 import javax.xml.parsers.SAXParser;
 
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * Tests the {@link DocTypeReader} by comparing the results of passing
@@ -54,6 +56,7 @@ public class TestDocTypeReader extends TestCase {
         super(test);
     }
 
+    @Override
     public void setUp() {
         StringBuffer docType = new StringBuffer();
         docType.append("<!DOCTYPE foo [\n");
@@ -206,10 +209,12 @@ public class TestDocTypeReader extends TestCase {
 
     private static class Handler extends DefaultHandler {
 
+        @Override
         public void error(SAXParseException spe) throws SAXException {
             throw spe;
         }
 
+        @Override
         public void fatalError(SAXParseException spe) throws SAXException {
             throw spe;
         }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestXMLWriter.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestXMLWriter.java
index 738ceb01c..39bad0e5c 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestXMLWriter.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/xml/TestXMLWriter.java
@@ -20,16 +20,18 @@ package org.apache.openjpa.lib.xml;
 
 import java.io.InputStreamReader;
 import java.io.StringWriter;
+
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import org.apache.openjpa.lib.util.StringUtil;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
-import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Tests the {@link XMLWriter} by comparing the results of passing the
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
index 108f83d42..592328ab2 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
@@ -18,6 +18,85 @@
  */
 package org.apache.openjpa.persistence.jdbc;
 
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ASSOC_OVERRIDE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ASSOC_OVERRIDES;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ATTR_OVERRIDE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ATTR_OVERRIDES;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.CLASS_CRIT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COLLECTION_TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COLUMN_RESULT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.CONTAINER_TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.DATASTORE_ID_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.DISCRIM_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.DISCRIM_STRAT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.DISCRIM_VAL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.EAGER_FETCH_MODE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_CLASS_CRIT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_EMBEDDED_MAPPING;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_FK;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_INDEX;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_JOIN_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_NONPOLY;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ELEM_STRAT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.EMBEDDED_MAPPING;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ENTITY_RESULT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ENUMERATED;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.FIELD_RESULT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.FK;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.INDEX;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.INHERITANCE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.JOIN_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.JOIN_TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_CLASS_CRIT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_EMBEDDED_MAPPING;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_FK;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_INDEX;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_JOIN_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_NONPOLY;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.KEY_STRAT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAPPING_OVERRIDE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAPPING_OVERRIDES;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_ENUMERATED;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_JOIN_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_TEMPORAL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.NONPOLY;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ORDER_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ORDER_COLUMN;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.PK_JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.PK_JOIN_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.SECONDARY_TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.SECONDARY_TABLES;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.SQL_RESULT_SET_MAPPING;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.SQL_RESULT_SET_MAPPINGS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.STRAT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.SUBCLASS_FETCH_MODE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.TABLE_GEN;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.TEMPORAL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.UNIQUE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.VERSION_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.VERSION_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.VERSION_STRAT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.X_EMBEDDED_MAPPING;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.X_JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.X_JOIN_COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.X_MAPPING_OVERRIDE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.X_MAPPING_OVERRIDES;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.X_SECONDARY_TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.X_SECONDARY_TABLES;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.X_TABLE;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Modifier;
@@ -28,6 +107,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.AssociationOverride;
 import javax.persistence.AssociationOverrides;
 import javax.persistence.AttributeOverride;
@@ -61,11 +141,10 @@ import javax.persistence.TableGenerator;
 import javax.persistence.Temporal;
 import javax.persistence.UniqueConstraint;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
+import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.ClassMappingInfo;
@@ -75,6 +154,7 @@ import org.apache.openjpa.jdbc.meta.FieldMappingInfo;
 import org.apache.openjpa.jdbc.meta.MappingInfo;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.meta.QueryResultMapping;
+import org.apache.openjpa.jdbc.meta.QueryResultMapping.PCResult;
 import org.apache.openjpa.jdbc.meta.SequenceMapping;
 import org.apache.openjpa.jdbc.meta.ValueMapping;
 import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
@@ -87,14 +167,15 @@ import org.apache.openjpa.jdbc.schema.Schemas;
 import org.apache.openjpa.jdbc.schema.Unique;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.log.Log;
+import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.MetaDataContext;
 import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataParser;
-import static org.apache.openjpa.persistence.jdbc.MappingTag.*;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
 import org.apache.openjpa.util.UnsupportedException;
@@ -117,7 +198,7 @@ public class AnnotationPersistenceMappingParser
         (AnnotationPersistenceMappingParser.class);
 
     private static final Map<Class<?>, MappingTag> _tags =
-        new HashMap<Class<?>, MappingTag>();
+        new HashMap<>();
 
     private DBDictionary _dict;
 
@@ -265,7 +346,7 @@ public class AnnotationPersistenceMappingParser
         meta.setInitialValue(gen.initialValue());
         meta.setAllocate(gen.allocationSize());
         meta.setSource(getSourceFile(), (el instanceof Class) ? el : null,
-            meta.SRC_ANNOTATIONS);
+            SourceTracker.SRC_ANNOTATIONS);
 
         switch (gen.uniqueConstraints().length) {
         case 0:
@@ -437,7 +518,7 @@ public class AnnotationPersistenceMappingParser
                         sup, assoc.name()));
 
             if (scols != null && scols.length > 0) {
-                jcols = new ArrayList<Column>(scols.length);
+                jcols = new ArrayList<>(scols.length);
                 unique = 0;
                 for (JoinColumn scol : scols) {
                     unique |= (scol.unique()) ? TRUE : FALSE;
@@ -473,7 +554,7 @@ public class AnnotationPersistenceMappingParser
      */
     private void parsePrimaryKeyJoinColumns(ClassMapping cm,
         PrimaryKeyJoinColumn... joins) {
-        List<Column> cols = new ArrayList<Column>(joins.length);
+        List<Column> cols = new ArrayList<>(joins.length);
         for (PrimaryKeyJoinColumn join : joins)
             cols.add(newColumn(join));
         cm.getMappingInfo().setColumns(cols);
@@ -511,7 +592,7 @@ public class AnnotationPersistenceMappingParser
                 sName = QualifiedDBIdentifier.newPath(sSchema, sName);
             }
             if (table.pkJoinColumns().length > 0) {
-                joins = new ArrayList<Column>(table.pkJoinColumns().length);
+                joins = new ArrayList<>(table.pkJoinColumns().length);
                 for (PrimaryKeyJoinColumn join : table.pkJoinColumns())
                     joins.add(newColumn(join));
                 info.setSecondaryTableJoinColumns(sName, joins);
@@ -607,13 +688,13 @@ public class AnnotationPersistenceMappingParser
 
             result = repos.addQueryResultMapping(null, anno.name());
             result.setSource(getSourceFile(), cm.getDescribedType(),
-                result.SRC_ANNOTATIONS);
+                SourceTracker.SRC_ANNOTATIONS);
 
             for (EntityResult entity : anno.entities()) {
                 QueryResultMapping.PCResult entityResult = result.addPCResult
                     (entity.entityClass());
                 if (!StringUtil.isEmpty(entity.discriminatorColumn()))
-                    entityResult.addMapping(entityResult.DISCRIMINATOR,
+                    entityResult.addMapping(PCResult.DISCRIMINATOR,
                         entity.discriminatorColumn());
 
                 for (FieldResult field : entity.fields()) {
@@ -847,7 +928,7 @@ public class AnnotationPersistenceMappingParser
         if (vcols.length == 0)
             return;
 
-        List<Column> cols = new ArrayList<Column>(vcols.length);
+        List<Column> cols = new ArrayList<>(vcols.length);
         for (VersionColumn vcol : vcols)
             cols.add(newColumn(vcol, delimit()));
         cm.getVersion().getMappingInfo().setColumns(cols);
@@ -939,7 +1020,7 @@ public class AnnotationPersistenceMappingParser
         if (pcols.length == 0)
             return;
 
-        List<Column> cols = new ArrayList<Column>(pcols.length);
+        List<Column> cols = new ArrayList<>(pcols.length);
         int unique = 0;
         for (int i = 0; i < pcols.length; i++) {
             cols.add(newColumn(pcols[i], delimit()));
@@ -975,7 +1056,7 @@ public class AnnotationPersistenceMappingParser
         if (joins.length == 0)
             return;
 
-        List<Column> cols = new ArrayList<Column>(joins.length);
+        List<Column> cols = new ArrayList<>(joins.length);
         int unique = 0;
         for (int i = 0; i < joins.length; i++) {
             cols.add(newColumn(joins[i], delimit()));
@@ -1311,7 +1392,7 @@ public class AnnotationPersistenceMappingParser
                     fm, assoc.name()));
             if (ecols != null && ecols.length > 0) {
                 unique = 0;
-                jcols = new ArrayList<Column>(ecols.length);
+                jcols = new ArrayList<>(ecols.length);
                 for (JoinColumn ecol : ecols) {
                     unique |= (ecol.unique()) ? TRUE : FALSE;
                     jcols.add(newColumn(ecol));
@@ -1576,7 +1657,7 @@ public class AnnotationPersistenceMappingParser
                 setupColumn((Column) cols.get(i), pcols[i], delimit());
             else {
                 if (cols.isEmpty())
-                    cols = new ArrayList<Column>(pcols.length);
+                    cols = new ArrayList<>(pcols.length);
                 cols.add(newColumn(pcols[i], delimit()));
             }
             if (xmlRootElementClass != null
@@ -1691,7 +1772,7 @@ public class AnnotationPersistenceMappingParser
         if (joins.length == 0)
             return;
 
-        List<Column> cols = new ArrayList<Column>(joins.length);
+        List<Column> cols = new ArrayList<>(joins.length);
         int unique = 0;
         DBIdentifier sSecondary = DBIdentifier.NULL;
 
@@ -1774,7 +1855,7 @@ public class AnnotationPersistenceMappingParser
         if (pcols.length == 0)
             return;
 
-        List<Column> cols = new ArrayList<Column>(pcols.length);
+        List<Column> cols = new ArrayList<>(pcols.length);
         int unique = 0;
         for (int i = 0; i < pcols.length; i++) {
             cols.add(newColumn(pcols[i], delimit()));
@@ -1808,7 +1889,7 @@ public class AnnotationPersistenceMappingParser
      */
     private void parsePrimaryKeyJoinColumns(FieldMapping fm,
         PrimaryKeyJoinColumn... joins) {
-        List<Column> cols = new ArrayList<Column>(joins.length);
+        List<Column> cols = new ArrayList<>(joins.length);
         for (PrimaryKeyJoinColumn join : joins)
             cols.add(newColumn(join));
         setColumns(fm, fm.getValueInfo(), cols, 0);
@@ -1822,7 +1903,7 @@ public class AnnotationPersistenceMappingParser
         if (joins.length == 0)
             return;
 
-        List<Column> cols = new ArrayList<Column>(joins.length);
+        List<Column> cols = new ArrayList<>(joins.length);
         int unique = 0;
         DBIdentifier sSecondary = DBIdentifier.NULL;
         for (int i = 0; i < joins.length; i++) {
@@ -2002,7 +2083,7 @@ public class AnnotationPersistenceMappingParser
         if (joins.length == 0)
             return;
 
-        List<Column> cols = new ArrayList<Column>(joins.length);
+        List<Column> cols = new ArrayList<>(joins.length);
         int unique = 0;
         for (int i = 0; i < joins.length; i++) {
             cols.add(newColumn(joins[i], delimit()));
@@ -2075,7 +2156,7 @@ public class AnnotationPersistenceMappingParser
      */
     protected void setMapKeyColumn(FieldMapping fm, MappingInfo info,
         Column col, int unique) {
-        List<Column> cols = new ArrayList<Column>();
+        List<Column> cols = new ArrayList<>();
         cols.add(col);
         info.setColumns(cols);
         if (unique == TRUE)
@@ -2090,7 +2171,7 @@ public class AnnotationPersistenceMappingParser
         if (joins.length == 0)
             return;
 
-        List<Column> cols = new ArrayList<Column>(joins.length);
+        List<Column> cols = new ArrayList<>(joins.length);
         int unique = 0;
         for (int i = 0; i < joins.length; i++) {
             cols.add(newColumn(joins[i]));
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java
index 888f109d2..aa8190a12 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java
@@ -18,67 +18,68 @@
  */
 package org.apache.openjpa.persistence.jdbc;
 
-import org.apache.openjpa.lib.util.ClassUtil;
-import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataSerializer;
-import org.apache.openjpa.persistence.PersistenceStrategy;
-import org.apache.openjpa.persistence.AnnotationBuilder;
-import org.apache.openjpa.jdbc.meta.QueryResultMapping;
-import org.apache.openjpa.jdbc.meta.MappingRepository;
-import org.apache.openjpa.jdbc.meta.ClassMapping;
-import org.apache.openjpa.jdbc.meta.FieldMapping;
-import org.apache.openjpa.jdbc.meta.ClassMappingInfo;
-import org.apache.openjpa.jdbc.meta.DiscriminatorMappingInfo;
-import org.apache.openjpa.jdbc.meta.MappingInfo;
-import org.apache.openjpa.jdbc.meta.SequenceMapping;
-import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
-import org.apache.openjpa.jdbc.meta.strats.FlatClassStrategy;
-import org.apache.openjpa.jdbc.meta.strats.VerticalClassStrategy;
-import org.apache.openjpa.jdbc.meta.strats.FullClassStrategy;
-import org.apache.openjpa.jdbc.meta.strats.EnumValueHandler;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.schema.*;
-import org.apache.openjpa.jdbc.schema.Unique;
-import org.apache.openjpa.jdbc.sql.DBDictionary;
-import org.apache.openjpa.meta.MetaDataRepository;
-import org.apache.openjpa.meta.ClassMetaData;
-import org.apache.openjpa.meta.FieldMetaData;
-import org.apache.openjpa.meta.JavaTypes;
-import org.apache.openjpa.meta.SequenceMetaData;
-import org.apache.openjpa.meta.MetaDataModes;
-import org.apache.openjpa.lib.util.StringUtil;
-
-import java.util.List;
+import java.lang.annotation.Annotation;
+import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 import java.util.HashMap;
-import java.sql.Types;
-import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
-import javax.persistence.TemporalType;
-import javax.persistence.EnumType;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-import javax.persistence.SecondaryTable;
-import javax.persistence.Inheritance;
-import javax.persistence.DiscriminatorValue;
+import javax.persistence.ColumnResult;
 import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.EntityResult;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FieldResult;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
 import javax.persistence.JoinTable;
 import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.Enumerated;
-import javax.persistence.UniqueConstraint;
-import javax.persistence.TableGenerator;
-import javax.persistence.JoinColumns;
-import javax.persistence.JoinColumn;
 import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.PrimaryKeyJoinColumns;
+import javax.persistence.SecondaryTable;
 import javax.persistence.SqlResultSetMapping;
-import javax.persistence.EntityResult;
-import javax.persistence.FieldResult;
-import javax.persistence.ColumnResult;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.UniqueConstraint;
+
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.ClassMappingInfo;
+import org.apache.openjpa.jdbc.meta.DiscriminatorMappingInfo;
+import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.jdbc.meta.MappingInfo;
+import org.apache.openjpa.jdbc.meta.MappingRepository;
+import org.apache.openjpa.jdbc.meta.QueryResultMapping;
+import org.apache.openjpa.jdbc.meta.QueryResultMapping.PCResult;
+import org.apache.openjpa.jdbc.meta.SequenceMapping;
+import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
+import org.apache.openjpa.jdbc.meta.strats.EnumValueHandler;
+import org.apache.openjpa.jdbc.meta.strats.FlatClassStrategy;
+import org.apache.openjpa.jdbc.meta.strats.FullClassStrategy;
+import org.apache.openjpa.jdbc.meta.strats.VerticalClassStrategy;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.Unique;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.lib.util.ClassUtil;
+import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.meta.MetaDataModes;
+import org.apache.openjpa.meta.MetaDataRepository;
+import org.apache.openjpa.meta.SequenceMetaData;
+import org.apache.openjpa.persistence.AnnotationBuilder;
+import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataSerializer;
+import org.apache.openjpa.persistence.PersistenceStrategy;
 
 
 /**
@@ -126,7 +127,7 @@ public class AnnotationPersistenceMappingSerializer
      */
     public void addQueryResultMapping(QueryResultMapping meta) {
         if (_results == null)
-            _results = new ArrayList<QueryResultMapping>();
+            _results = new ArrayList<>();
         _results.add(meta);
     }
 
@@ -168,11 +169,10 @@ public class AnnotationPersistenceMappingSerializer
     protected void addAnnotation(AnnotationBuilder ab, QueryResultMapping meta)
     {
         if (_rsmAnnos == null)
-            _rsmAnnos = new HashMap<QueryResultMapping,
-                    List<AnnotationBuilder>>();
+            _rsmAnnos = new HashMap<>();
         List<AnnotationBuilder> list = _rsmAnnos.get(meta);
         if (list == null) {
-            list = new ArrayList<AnnotationBuilder>();
+            list = new ArrayList<>();
             _rsmAnnos.put(meta, list);
         }
         list.add(ab);
@@ -647,7 +647,7 @@ public class AnnotationPersistenceMappingSerializer
                 continue;
 
             if (result == null)
-                result = new ArrayList<QueryResultMapping>(_results.size() - i);
+                result = new ArrayList<>(_results.size() - i);
             result.add(element);
         }
         return (result == null)
@@ -680,7 +680,7 @@ public class AnnotationPersistenceMappingSerializer
                 newAnnotationBuilder(EntityResult.class);
             ab.add("entities", abEntRes);
             abEntRes.add("entityClass", pc.getCandidateType());
-            Object discrim = pc.getMapping(pc.DISCRIMINATOR);
+            Object discrim = pc.getMapping(PCResult.DISCRIMINATOR);
             if (discrim != null)
                 abEntRes.add("discriminatorColumn", discrim.toString());
 
@@ -779,6 +779,10 @@ public class AnnotationPersistenceMappingSerializer
     protected class MappingSerializationComparator
         extends SerializationComparator {
 
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         protected int compareUnknown(Object o1, Object o2) {
             if (!(o1 instanceof QueryResultMapping))
                 return super.compareUnknown(o1, o2);
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ClassCriteria.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ClassCriteria.java
index bd2a6ab56..75defb073 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ClassCriteria.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ClassCriteria.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Columns.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Columns.java
index 293d6cf0c..5e19a7ee1 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Columns.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Columns.java
@@ -20,9 +20,11 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import javax.persistence.Column;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ContainerTable.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ContainerTable.java
index 7d63137b0..e4ed3b55e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ContainerTable.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ContainerTable.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/DataStoreIdColumn.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/DataStoreIdColumn.java
index ec34b8a74..48fac79de 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/DataStoreIdColumn.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/DataStoreIdColumn.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/DiscriminatorStrategy.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/DiscriminatorStrategy.java
index 3b6469648..f6b23a276 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/DiscriminatorStrategy.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/DiscriminatorStrategy.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java
index 63d37f1d8..ae964db70 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementClassCriteria.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementClassCriteria.java
index c4dfc607b..b51489a80 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementClassCriteria.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementClassCriteria.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementColumn.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementColumn.java
index 4f40d52d1..a16e56dbf 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementColumn.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementColumn.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementColumns.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementColumns.java
index af682fbeb..7024cd9a9 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementColumns.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementColumns.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementEmbeddedMapping.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementEmbeddedMapping.java
index a4c2062c0..28fba7e4a 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementEmbeddedMapping.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementEmbeddedMapping.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementForeignKey.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementForeignKey.java
index 222bd6416..f1609d801 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementForeignKey.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementForeignKey.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementIndex.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementIndex.java
index 523d46cdf..0001860bc 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementIndex.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementIndex.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementJoinColumn.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementJoinColumn.java
index 47200cc67..7d4e0684e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementJoinColumn.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementJoinColumn.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementJoinColumns.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementJoinColumns.java
index dec19d2f0..3f006bee1 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementJoinColumns.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementJoinColumns.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementNonpolymorphic.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementNonpolymorphic.java
index 4b29db174..721b83d24 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementNonpolymorphic.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementNonpolymorphic.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementStrategy.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementStrategy.java
index 9dfb75c97..1f1e0f617 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementStrategy.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ElementStrategy.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EmbeddedMapping.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EmbeddedMapping.java
index 0aaca0c7c..69f84c3ed 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EmbeddedMapping.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EmbeddedMapping.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java
index 9669e7693..76148ecb2 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java
@@ -42,6 +42,7 @@ public enum FetchMode implements OpenJPAEnum<FetchMode>{
         _names = names;
     }
 
+    @Override
     public int toKernelConstant() {
         return eagerFetchConstant;
     }
@@ -62,10 +63,12 @@ public enum FetchMode implements OpenJPAEnum<FetchMode>{
         }
     }
 
+    @Override
     public int convertToKernelConstant(String s) {
         return FetchMode.toKernelConstantFromString(s);
     }
 
+    @Override
     public int convertToKernelConstant(int i) {
         if (i == FetchConfiguration.DEFAULT)
             return i;
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKey.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKey.java
index 853fa0def..18485c345 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKey.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKey.java
@@ -18,9 +18,12 @@
  */
 package org.apache.openjpa.persistence.jdbc;
 
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Index.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Index.java
index 5fc21415f..98d57aa4e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Index.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Index.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/IsolationLevel.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/IsolationLevel.java
index 782b2cf3d..a144d7389 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/IsolationLevel.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/IsolationLevel.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc;
 
 import java.sql.Connection;
 
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
+import org.apache.openjpa.kernel.FetchConfiguration;
 import org.apache.openjpa.persistence.OpenJPAEnum;
 
 /**
@@ -52,7 +52,7 @@ public enum IsolationLevel implements OpenJPAEnum<IsolationLevel>{
     public static IsolationLevel fromConnectionConstant(int constant) {
         switch(constant) {
             case -1:
-            case JDBCFetchConfiguration.DEFAULT:
+            case FetchConfiguration.DEFAULT:
                 return DEFAULT;
 
             case Connection.TRANSACTION_NONE:
@@ -80,6 +80,7 @@ public enum IsolationLevel implements OpenJPAEnum<IsolationLevel>{
         return IsolationLevel.fromConnectionConstant(i);
     }
 
+    @Override
     public int toKernelConstant() {
         return getConnectionConstant();
     }
@@ -94,10 +95,12 @@ public enum IsolationLevel implements OpenJPAEnum<IsolationLevel>{
         throw new IllegalArgumentException(s + " is not a valid name for " + IsolationLevel.class.getName());
     }
 
+    @Override
     public int convertToKernelConstant(String s) {
         return IsolationLevel.toKernelConstantFromString(s);
     }
 
+    @Override
     public int convertToKernelConstant(int i) {
         return IsolationLevel.fromConnectionConstant(i).toKernelConstant();
     }
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
index 8d6fc5268..729eecf8e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import java.util.Collection;
+
 import javax.persistence.LockModeType;
 
 import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
@@ -40,62 +41,62 @@ public interface JDBCFetchPlan
     /**
      * Eager fetch mode in loading relations.
      */
-    public FetchMode getEagerFetchMode();
+    FetchMode getEagerFetchMode();
 
     /**
      * Eager fetch mode in loading relations.
      */
-    public JDBCFetchPlan setEagerFetchMode(FetchMode mode);
+    JDBCFetchPlan setEagerFetchMode(FetchMode mode);
 
     /**
      * Eager fetch mode in loading subclasses.
      */
-    public FetchMode getSubclassFetchMode();
+    FetchMode getSubclassFetchMode();
 
     /**
      * Eager fetch mode in loading subclasses.
      */
-    public JDBCFetchPlan setSubclassFetchMode(FetchMode mode);
+    JDBCFetchPlan setSubclassFetchMode(FetchMode mode);
 
     /**
      * Type of JDBC result set to use for query results.
      */
-    public ResultSetType getResultSetType();
+    ResultSetType getResultSetType();
 
     /**
      * Type of JDBC result set to use for query results.
      */
-    public JDBCFetchPlan setResultSetType(ResultSetType type);
+    JDBCFetchPlan setResultSetType(ResultSetType type);
 
     /**
      * Result set fetch direction.
      */
-    public FetchDirection getFetchDirection();
+    FetchDirection getFetchDirection();
 
     /**
      * Result set fetch direction.
      */
-    public JDBCFetchPlan setFetchDirection(FetchDirection direction);
+    JDBCFetchPlan setFetchDirection(FetchDirection direction);
 
     /**
      * How to determine the size of a large result set.
      */
-    public LRSSizeAlgorithm getLRSSizeAlgorithm();
+    LRSSizeAlgorithm getLRSSizeAlgorithm();
 
     /**
      * How to determine the size of a large result set.
      */
-    public JDBCFetchPlan setLRSSizeAlgorithm(LRSSizeAlgorithm lrsSizeAlgorithm);
+    JDBCFetchPlan setLRSSizeAlgorithm(LRSSizeAlgorithm lrsSizeAlgorithm);
 
     /**
      * SQL join syntax.
      */
-    public JoinSyntax getJoinSyntax();
+    JoinSyntax getJoinSyntax();
 
     /**
      * SQL join syntax.
      */
-    public JDBCFetchPlan setJoinSyntax(JoinSyntax syntax);
+    JDBCFetchPlan setJoinSyntax(JoinSyntax syntax);
 
     /**
      * The isolation level for queries issued to the database. This overrides
@@ -104,7 +105,7 @@ public interface JDBCFetchPlan
      *
      * @since 0.9.7
      */
-    public IsolationLevel getIsolation();
+    IsolationLevel getIsolation();
 
     /**
      * The isolation level for queries issued to the database. This overrides
@@ -113,120 +114,120 @@ public interface JDBCFetchPlan
      *
      * @since 0.9.7
      */
-    public JDBCFetchPlan setIsolation(IsolationLevel level);
+    JDBCFetchPlan setIsolation(IsolationLevel level);
 
 
     // covariant type support for return vals
 
-    public JDBCFetchPlan addFetchGroup(String group);
-    public JDBCFetchPlan addFetchGroups(Collection groups);
-    public JDBCFetchPlan addFetchGroups(String... groups);
-    public JDBCFetchPlan addField(Class cls, String field);
-    public JDBCFetchPlan addField(String field);
-    public JDBCFetchPlan addFields(Class cls, Collection fields);
-    public JDBCFetchPlan addFields(Class cls, String... fields);
-    public JDBCFetchPlan addFields(Collection fields);
-    public JDBCFetchPlan addFields(String... fields);
-    public JDBCFetchPlan clearFetchGroups();
-    public JDBCFetchPlan clearFields();
-    public JDBCFetchPlan removeFetchGroup(String group);
-    public JDBCFetchPlan removeFetchGroups(Collection groups);
-    public JDBCFetchPlan removeFetchGroups(String... groups);
-    public JDBCFetchPlan removeField(Class cls, String field);
-    public JDBCFetchPlan removeField(String field);
-    public JDBCFetchPlan removeFields(Class cls, Collection fields);
-    public JDBCFetchPlan removeFields(Class cls, String... fields);
-    public JDBCFetchPlan removeFields(String... fields);
-    public JDBCFetchPlan removeFields(Collection fields);
-    public JDBCFetchPlan resetFetchGroups();
-    public JDBCFetchPlan setQueryResultCacheEnabled(boolean cache);
-    public JDBCFetchPlan setFetchBatchSize(int fetchBatchSize);
-    public JDBCFetchPlan setLockTimeout(int timeout);
-    public JDBCFetchPlan setMaxFetchDepth(int depth);
-    public JDBCFetchPlan setReadLockMode(LockModeType mode);
-    public JDBCFetchPlan setWriteLockMode(LockModeType mode);
-    public JDBCFetchPlan setQueryTimeout(int timeout);
+    @Override JDBCFetchPlan addFetchGroup(String group);
+    @Override JDBCFetchPlan addFetchGroups(Collection groups);
+    @Override JDBCFetchPlan addFetchGroups(String... groups);
+    @Override JDBCFetchPlan addField(Class cls, String field);
+    @Override JDBCFetchPlan addField(String field);
+    @Override JDBCFetchPlan addFields(Class cls, Collection fields);
+    @Override JDBCFetchPlan addFields(Class cls, String... fields);
+    @Override JDBCFetchPlan addFields(Collection fields);
+    @Override JDBCFetchPlan addFields(String... fields);
+    @Override JDBCFetchPlan clearFetchGroups();
+    @Override JDBCFetchPlan clearFields();
+    @Override JDBCFetchPlan removeFetchGroup(String group);
+    @Override JDBCFetchPlan removeFetchGroups(Collection groups);
+    @Override JDBCFetchPlan removeFetchGroups(String... groups);
+    @Override JDBCFetchPlan removeField(Class cls, String field);
+    @Override JDBCFetchPlan removeField(String field);
+    @Override JDBCFetchPlan removeFields(Class cls, Collection fields);
+    @Override JDBCFetchPlan removeFields(Class cls, String... fields);
+    @Override JDBCFetchPlan removeFields(String... fields);
+    @Override JDBCFetchPlan removeFields(Collection fields);
+    @Override JDBCFetchPlan resetFetchGroups();
+    @Override JDBCFetchPlan setQueryResultCacheEnabled(boolean cache);
+    @Override JDBCFetchPlan setFetchBatchSize(int fetchBatchSize);
+    @Override JDBCFetchPlan setLockTimeout(int timeout);
+    @Override JDBCFetchPlan setMaxFetchDepth(int depth);
+    @Override JDBCFetchPlan setReadLockMode(LockModeType mode);
+    @Override JDBCFetchPlan setWriteLockMode(LockModeType mode);
+    @Override JDBCFetchPlan setQueryTimeout(int timeout);
 
     /**
      * @deprecated use the {@link FetchMode} enum instead.
      */
-    public static final int EAGER_NONE = EagerFetchModes.EAGER_NONE;
+    @Deprecated int EAGER_NONE = EagerFetchModes.EAGER_NONE;
 
     /**
      * @deprecated use the {@link FetchMode} enum instead.
      */
-    public static final int EAGER_JOIN = EagerFetchModes.EAGER_JOIN;
+    @Deprecated int EAGER_JOIN = EagerFetchModes.EAGER_JOIN;
 
     /**
      * @deprecated use the {@link FetchMode} enum instead.
      */
-    public static final int EAGER_PARALLEL = EagerFetchModes.EAGER_PARALLEL;
+    @Deprecated int EAGER_PARALLEL = EagerFetchModes.EAGER_PARALLEL;
 
     /**
      * @deprecated use the {@link LRSSizeAlgorithm} enum instead.
      */
-    public static final int SIZE_UNKNOWN = LRSSizes.SIZE_UNKNOWN;
+    @Deprecated int SIZE_UNKNOWN = LRSSizes.SIZE_UNKNOWN;
 
     /**
      * @deprecated use the {@link LRSSizeAlgorithm} enum instead.
      */
-    public static final int SIZE_LAST = LRSSizes.SIZE_LAST;
+    @Deprecated int SIZE_LAST = LRSSizes.SIZE_LAST;
 
     /**
      * @deprecated use the {@link LRSSizeAlgorithm} enum instead.
      */
-    public static final int SIZE_QUERY = LRSSizes.SIZE_QUERY;
+    @Deprecated int SIZE_QUERY = LRSSizes.SIZE_QUERY;
 
     /**
      * @deprecated use the {@link JoinSyntax} enum instead.
      */
-    public static final int SYNTAX_SQL92 = JoinSyntaxes.SYNTAX_SQL92;
+    @Deprecated int SYNTAX_SQL92 = JoinSyntaxes.SYNTAX_SQL92;
 
     /**
      * @deprecated use the {@link JoinSyntax} enum instead.
      */
-    public static final int SYNTAX_TRADITIONAL =
+    @Deprecated int SYNTAX_TRADITIONAL =
         JoinSyntaxes.SYNTAX_TRADITIONAL;
 
     /**
      * @deprecated use the {@link JoinSyntax} enum instead.
      */
-    public static final int SYNTAX_DATABASE = JoinSyntaxes.SYNTAX_DATABASE;
+    @Deprecated int SYNTAX_DATABASE = JoinSyntaxes.SYNTAX_DATABASE;
 
     /**
      * @deprecated use {@link #setEagerFetchMode(FetchMode)} instead.
      */
-    public JDBCFetchPlan setEagerFetchMode(int mode);
+    @Deprecated JDBCFetchPlan setEagerFetchMode(int mode);
 
     /**
      * @deprecated use {@link #setSubclassFetchMode(FetchMode)} instead.
      */
-    public JDBCFetchPlan setSubclassFetchMode(int mode);
+    @Deprecated JDBCFetchPlan setSubclassFetchMode(int mode);
 
     /**
      * @deprecated use {@link #setResultSetType(ResultSetType)} instead.
      */
-    public JDBCFetchPlan setResultSetType(int mode);
+    @Deprecated JDBCFetchPlan setResultSetType(int mode);
 
     /**
      * @deprecated use {@link #setFetchDirection(FetchDirection)} instead.
      */
-    public JDBCFetchPlan setFetchDirection(int direction);
+    @Deprecated JDBCFetchPlan setFetchDirection(int direction);
 
     /**
      * @deprecated use {@link #getLRSSizeAlgorithm()} instead.
      */
-    public int getLRSSize();
+    @Deprecated int getLRSSize();
 
     /**
      * @deprecated use {@link #setLRSSizeAlgorithm(LRSSizeAlgorithm)} instead.
      */
-    public JDBCFetchPlan setLRSSize(int lrsSizeMode);
+    @Deprecated JDBCFetchPlan setLRSSize(int lrsSizeMode);
 
     /**
      * @deprecated use {@link #setJoinSyntax(JoinSyntax)} instead.
      */
-    public JDBCFetchPlan setJoinSyntax(int syntax);
+    @Deprecated JDBCFetchPlan setJoinSyntax(int syntax);
 
     /**
      * Affirms if foreign key for a relation field will be pre-fetched as part of the owning object irrespective of
@@ -236,7 +237,7 @@ public interface JDBCFetchPlan
      *
      * @since 2.2.0
      */
-    public boolean getIgnoreDfgForFkSelect();
+    boolean getIgnoreDfgForFkSelect();
 
     /**
      * Affirms if foreign key for a relation field will be pre-fetched as part of the owning object irrespective of
@@ -246,5 +247,5 @@ public interface JDBCFetchPlan
      *
      * @since 2.2.0
      */
-    public void setIgnoreDfgForFkSelect(boolean b);
+    void setIgnoreDfgForFkSelect(boolean b);
 }
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
index a63997581..333644187 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
@@ -103,99 +103,120 @@ public class JDBCFetchPlanImpl
         return _fetch;
     }
 
+    @Override
     public FetchMode getEagerFetchMode() {
         return FetchMode.fromKernelConstant(_fetch.getEagerFetchMode());
     }
 
+    @Override
     public JDBCFetchPlanImpl setEagerFetchMode(FetchMode mode) {
         _fetch.setEagerFetchMode(mode.toKernelConstant());
         return this;
     }
 
+    @Override
     public JDBCFetchPlan setEagerFetchMode(int mode) {
         _fetch.setEagerFetchMode(mode);
         return this;
     }
 
+    @Override
     public FetchMode getSubclassFetchMode() {
         return FetchMode.fromKernelConstant(_fetch.getSubclassFetchMode());
     }
 
+    @Override
     public JDBCFetchPlanImpl setSubclassFetchMode(FetchMode mode) {
         _fetch.setSubclassFetchMode(mode.toKernelConstant());
         return this;
     }
 
+    @Override
     public JDBCFetchPlan setSubclassFetchMode(int mode) {
         _fetch.setSubclassFetchMode(mode);
         return this;
     }
 
+    @Override
     public ResultSetType getResultSetType() {
         return ResultSetType.fromKernelConstant(_fetch.getResultSetType());
     }
 
+    @Override
     public JDBCFetchPlanImpl setResultSetType(ResultSetType type) {
         _fetch.setResultSetType(type.toKernelConstant());
         return this;
     }
 
+    @Override
     public JDBCFetchPlan setResultSetType(int mode) {
         _fetch.setResultSetType(mode);
         return this;
     }
 
+    @Override
     public FetchDirection getFetchDirection() {
         return FetchDirection.fromKernelConstant(_fetch.getFetchDirection());
     }
 
+    @Override
     public JDBCFetchPlanImpl setFetchDirection(FetchDirection direction) {
         _fetch.setFetchDirection(direction.toKernelConstant());
         return this;
     }
 
+    @Override
     public JDBCFetchPlan setFetchDirection(int direction) {
         _fetch.setFetchDirection(direction);
         return this;
     }
 
+    @Override
     public LRSSizeAlgorithm getLRSSizeAlgorithm() {
         return LRSSizeAlgorithm.fromKernelConstant(_fetch.getLRSSize());
     }
 
+    @Override
     public JDBCFetchPlanImpl setLRSSizeAlgorithm(
             LRSSizeAlgorithm lrsSizeAlgorithm) {
         _fetch.setLRSSize(lrsSizeAlgorithm.toKernelConstant());
         return this;
     }
 
+    @Override
     public int getLRSSize() {
         return _fetch.getLRSSize();
     }
 
+    @Override
     public JDBCFetchPlan setLRSSize(int lrsSizeMode) {
         _fetch.setLRSSize(lrsSizeMode);
         return this;
     }
 
+    @Override
     public JoinSyntax getJoinSyntax() {
         return JoinSyntax.fromKernelConstant(_fetch.getJoinSyntax());
     }
 
+    @Override
     public JDBCFetchPlanImpl setJoinSyntax(JoinSyntax syntax) {
         _fetch.setJoinSyntax(syntax.toKernelConstant());
         return this;
     }
 
+    @Override
     public JDBCFetchPlan setJoinSyntax(int syntax) {
         _fetch.setJoinSyntax(syntax);
         return this;
     }
 
+    @Override
     public IsolationLevel getIsolation() {
         return IsolationLevel.fromConnectionConstant(_fetch.getIsolation());
     }
 
+    @Override
     public JDBCFetchPlan setIsolation(IsolationLevel level) {
         _fetch.setIsolation(level.getConnectionConstant());
         return this;
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
index 88d7b2623..5fa68987f 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
@@ -48,9 +48,11 @@ public class JDBCPersistenceProductDerivation
     implements OpenJPAProductDerivation {
 
 
+    @Override
     public void putBrokerFactoryAliases(Map<String,String> m) {
     }
 
+    @Override
     public int getType() {
         return TYPE_SPEC_STORE;
     }
@@ -117,7 +119,7 @@ public class JDBCPersistenceProductDerivation
      * Hint keys correspond to some (not all) bean-style mutable property name in JDBCFetchConfiguration.
      * The fully qualified key is prefixed with <code>openjpa.jdbc</code>.
      */
-    private static Set<String> _hints = new HashSet<String>();
+    private static Set<String> _hints = new HashSet<>();
     static {
         _hints.add("openjpa.FetchPlan.EagerFetchMode");
         _hints.add("openjpa.FetchPlan.FetchDirection");
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyClassCriteria.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyClassCriteria.java
index 8dbf22332..7807ac21d 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyClassCriteria.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyClassCriteria.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyColumn.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyColumn.java
index 7046272f7..eeac46834 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyColumn.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyColumn.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyColumns.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyColumns.java
index 0505c5967..a9b58b95d 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyColumns.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyColumns.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyEmbeddedMapping.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyEmbeddedMapping.java
index 89472aa62..c381bc17e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyEmbeddedMapping.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyEmbeddedMapping.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyForeignKey.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyForeignKey.java
index dfc13a52f..61e5d2ac2 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyForeignKey.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyForeignKey.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyIndex.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyIndex.java
index 20d1709f2..4319c284e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyIndex.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyIndex.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyJoinColumn.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyJoinColumn.java
index 391b0af45..ac052c37e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyJoinColumn.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyJoinColumn.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyJoinColumns.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyJoinColumns.java
index 8ff094655..bcd667893 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyJoinColumns.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyJoinColumns.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyNonpolymorphic.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyNonpolymorphic.java
index 05d6fcde0..e0cee48c4 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyNonpolymorphic.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyNonpolymorphic.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyStrategy.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyStrategy.java
index 629247b9a..d93ca3e0e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyStrategy.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/KeyStrategy.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java
index ed6342d0a..6e9cc987f 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeAlgorithm.java
@@ -41,6 +41,7 @@ public enum LRSSizeAlgorithm implements OpenJPAEnum<Enum<?>> {
         _names = aliases;
     }
 
+    @Override
     public int toKernelConstant() {
         return lrsConstant;
     }
@@ -61,10 +62,12 @@ public enum LRSSizeAlgorithm implements OpenJPAEnum<Enum<?>> {
         }
     }
 
+    @Override
     public int convertToKernelConstant(String s) {
         return LRSSizeAlgorithm.toKernelConstantFromString(s);
     }
 
+    @Override
     public int convertToKernelConstant(int i) {
         try {
             if (i == FetchConfiguration.DEFAULT)
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverride.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverride.java
index 6ebc33e8f..64ca184e1 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverride.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverride.java
@@ -19,9 +19,11 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import javax.persistence.Column;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverrides.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverrides.java
index 40fdac3c2..33851c91e 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverrides.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/MappingOverrides.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Nonpolymorphic.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Nonpolymorphic.java
index 5562b6a6d..4af0404c7 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Nonpolymorphic.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Nonpolymorphic.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/OrderColumn.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/OrderColumn.java
index 49d8f6558..da2c51dda 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/OrderColumn.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/OrderColumn.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
index 2cd37be7d..71122da23 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc;
 
-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
+import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.Discriminator;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
@@ -216,6 +216,7 @@ public class PersistenceMappingDefaults
             foreign, col, target, inverse, pos, cols);
     }
 
+    @Override
     public void populateForeignKeyColumn(ValueMapping vm, DBIdentifier sName,
         Table local, Table foreign, Column col, Object target, boolean inverse,
         int pos, int cols) {
@@ -238,7 +239,7 @@ public class PersistenceMappingDefaults
                     sName = DBIdentifier.newColumn(vm.getFieldMapping().getName());
                 if (isRemoveHungarianNotation())
                     sName = DBIdentifier.newColumn(Normalizer.removeHungarianNotation(sName.getName()));
-                sName = sName.combine(sName, ((Column)target).getIdentifier().getName());
+                sName = DBIdentifier.combine(sName, ((Column)target).getIdentifier().getName());
 
                 // No need to check for uniqueness.
                 sName = dict.getValidColumnName(sName, local, false);
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java
index 53c5daa48..41fb0c7de 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingFactory.java
@@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.jdbc;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.meta.MetaDataFactory;
+import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataParser;
+import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataSerializer;
 import org.apache.openjpa.persistence.PersistenceMetaDataFactory;
 import org.apache.openjpa.persistence.XMLPersistenceMetaDataParser;
 import org.apache.openjpa.persistence.XMLPersistenceMetaDataSerializer;
-import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataParser;
-import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataSerializer;
 
 /**
  * {@link MetaDataFactory} for JPA mapping information.
@@ -49,6 +49,7 @@ public class PersistenceMappingFactory
         return parser;
     }
 
+    @Override
     protected AnnotationPersistenceMetaDataSerializer newAnnotationSerializer()
     {
         AnnotationPersistenceMappingSerializer ser =
@@ -70,6 +71,7 @@ public class PersistenceMappingFactory
         return parser;
     }
 
+    @Override
     protected XMLPersistenceMetaDataSerializer newXMLSerializer() {
         XMLPersistenceMappingSerializer ser =
             new XMLPersistenceMappingSerializer((JDBCConfiguration)
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ResultSetType.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ResultSetType.java
index 2b696ebdf..67237ea29 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ResultSetType.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ResultSetType.java
@@ -40,6 +40,7 @@ public enum ResultSetType implements OpenJPAEnum<ResultSetType>{
         resultSetConstant = value;
     }
 
+    @Override
     public int toKernelConstant() {
         return resultSetConstant;
     }
@@ -60,10 +61,12 @@ public enum ResultSetType implements OpenJPAEnum<ResultSetType>{
         }
     }
 
+    @Override
     public int convertToKernelConstant(String s) {
         return ResultSetType.toKernelConstantFromString(s);
     }
 
+    @Override
     public int convertToKernelConstant(int i) {
         if (i == FetchConfiguration.DEFAULT)
             return i;
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Strategy.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Strategy.java
index e2d123485..39f220315 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Strategy.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Strategy.java
@@ -18,9 +18,12 @@
  */
 package org.apache.openjpa.persistence.jdbc;
 
-import static java.lang.annotation.ElementType.*;
-import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java
index c80c46778..1f1bb3ca5 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Unique.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Unique.java
index 3e7a5eb51..889b6bb75 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Unique.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/Unique.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionColumn.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionColumn.java
index 605eaf10e..72ec59c99 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionColumn.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionColumn.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionColumns.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionColumns.java
index c15e75381..4f95124a9 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionColumns.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionColumns.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionStrategy.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionStrategy.java
index ac8529bfb..5283f3b84 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionStrategy.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/VersionStrategy.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XEmbeddedMapping.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XEmbeddedMapping.java
index b7401d43e..f88e74a91 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XEmbeddedMapping.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XEmbeddedMapping.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XJoinColumn.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XJoinColumn.java
index c55e10544..545135569 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XJoinColumn.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XJoinColumn.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XJoinColumns.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XJoinColumns.java
index b58176383..ed02a674d 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XJoinColumns.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XJoinColumns.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
index f089cc9b8..cc0f4640c 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
@@ -18,6 +18,43 @@
  */
 package org.apache.openjpa.persistence.jdbc;
 
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ASSOC_OVERRIDE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ATTR_OVERRIDE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COLLECTION_TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COLS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COLUMN_NAME;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.COLUMN_RESULT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.DATASTORE_ID_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.DELIMITED_IDS;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.DISCRIM_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.DISCRIM_VAL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ENTITY_RESULT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ENUMERATED;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.FIELD_RESULT;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.FK;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.FK_COL_NAME;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.FK_COL_NAMES;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.INDEX;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.INHERITANCE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.JOIN_TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_ENUMERATED;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.MAP_KEY_TEMPORAL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.NAME;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.ORDER_COLUMN;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.PK_JOIN_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.SECONDARY_TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.SQL_RESULT_SET_MAPPING;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.TABLE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.TABLE_GEN;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.TEMPORAL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.UNIQUE;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.VERSION_COL;
+import static org.apache.openjpa.persistence.jdbc.MappingTag.VERSION_COLS;
+
 import java.lang.reflect.Modifier;
 import java.sql.Types;
 import java.util.ArrayList;
@@ -33,7 +70,6 @@ import javax.persistence.EnumType;
 import javax.persistence.InheritanceType;
 import javax.persistence.TemporalType;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
@@ -46,8 +82,8 @@ import org.apache.openjpa.jdbc.meta.FieldMappingInfo;
 import org.apache.openjpa.jdbc.meta.MappingInfo;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.meta.QueryResultMapping;
-import org.apache.openjpa.jdbc.meta.SequenceMapping;
 import org.apache.openjpa.jdbc.meta.QueryResultMapping.PCResult;
+import org.apache.openjpa.jdbc.meta.SequenceMapping;
 import org.apache.openjpa.jdbc.meta.strats.EnumValueHandler;
 import org.apache.openjpa.jdbc.meta.strats.FlatClassStrategy;
 import org.apache.openjpa.jdbc.meta.strats.FullClassStrategy;
@@ -59,6 +95,7 @@ import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
@@ -69,8 +106,6 @@ import org.apache.openjpa.util.UserException;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
-
-import static org.apache.openjpa.persistence.jdbc.MappingTag.*;
 /**
  * Custom SAX parser used by the system to parse persistence mapping files.
  *
@@ -80,7 +115,7 @@ public class XMLPersistenceMappingParser
     extends XMLPersistenceMetaDataParser {
 
     private static final Map<String, MappingTag> _elems =
-        new HashMap<String, MappingTag>();
+        new HashMap<>();
 
     static {
         _elems.put("association-override", ASSOC_OVERRIDE);
@@ -148,8 +183,7 @@ public class XMLPersistenceMappingParser
     private List<Column> _versionColumnsList = null;
 
     private final Map<Class<?>, ArrayList<DeferredEmbeddableOverrides>>
-        _deferredMappings = new HashMap<Class<?>,
-             ArrayList<DeferredEmbeddableOverrides>>();
+        _deferredMappings = new HashMap<>();
 
     /**
      * Constructor; supply configuration.
@@ -692,7 +726,7 @@ public class XMLPersistenceMappingParser
                 fm.getDeclaredTypeCode();
             Class<?> type = fm.isElementCollection() ? fm.getElement().getDeclaredType() : fm.getDeclaredType();
             if (_cols == null) {
-                _cols = new ArrayList<Column>(1);
+                _cols = new ArrayList<>(1);
                 _cols.add(new Column());
             }
             for (Column col : _cols) {
@@ -938,17 +972,17 @@ public class XMLPersistenceMappingParser
         // pk join columns on fields act as field cols
         if (currentElement() instanceof FieldMapping) {
             if (_cols == null)
-                _cols = new ArrayList<Column>(3);
+                _cols = new ArrayList<>(3);
             _cols.add(col);
         } else if (currentParent() == SECONDARY_TABLE) {
             // pk join columns in secondary table acts as join cols
             if (_joinCols == null)
-                _joinCols = new ArrayList<Column>(3);
+                _joinCols = new ArrayList<>(3);
             _joinCols.add(col);
         } else {
             // must be pk join cols from this class to superclass
             if (_supJoinCols == null)
-                _supJoinCols = new ArrayList<Column>(3);
+                _supJoinCols = new ArrayList<>(3);
             _supJoinCols.add(col);
         }
         return true;
@@ -967,7 +1001,7 @@ public class XMLPersistenceMappingParser
             Column col = parseColumn(attrs);
             List<Column> colList = fm.getMappingInfo().getColumns();
             if (colList.isEmpty()) {
-                colList = new ArrayList<Column>();
+                colList = new ArrayList<>();
                 fm.getMappingInfo().setColumns(colList);
             }
             colList.add(col);
@@ -979,7 +1013,7 @@ public class XMLPersistenceMappingParser
             return startColumn(attrs);
 
         if (_joinCols == null)
-            _joinCols = new ArrayList<Column>(3);
+            _joinCols = new ArrayList<>(3);
         _joinCols.add(parseColumn(attrs));
         return true;
     }
@@ -999,7 +1033,7 @@ public class XMLPersistenceMappingParser
                 !fm.getElementMapping().isEmbedded()) {
                 List<Column> list = fm.getElementMapping().getValueInfo().getColumns();
                 if (list.size() == 0) {
-                    list = new ArrayList<Column>();
+                    list = new ArrayList<>();
                     fm.getElementMapping().getValueInfo().setColumns(list);
                 }
                 list.add(col);
@@ -1007,7 +1041,7 @@ public class XMLPersistenceMappingParser
             }
         }
         if (_cols == null)
-            _cols = new ArrayList<Column>(3);
+            _cols = new ArrayList<>(3);
         _cols.add(col);
         return true;
     }
@@ -1020,7 +1054,7 @@ public class XMLPersistenceMappingParser
         FieldMapping fm = (FieldMapping) peekElement();
         Column col = parseColumn(attrs);
         MappingInfo info = fm.getKeyMapping().getValueInfo();
-        List<Column> cols = new ArrayList<Column>();
+        List<Column> cols = new ArrayList<>();
         cols.add(col);
         info.setColumns(cols);
         return true;
@@ -1322,6 +1356,7 @@ public class XMLPersistenceMappingParser
     /**
      * Process OrderColumn.
      */
+    @Override
     protected boolean startOrderColumn(Attributes attrs)
         throws SAXException {
         Column col = parseOrderColumn(attrs);
@@ -1416,7 +1451,7 @@ public class XMLPersistenceMappingParser
         ArrayList<DeferredEmbeddableOverrides> defMappings =
             _deferredMappings.get(cls);
         if (defMappings == null) {
-            defMappings = new ArrayList<DeferredEmbeddableOverrides>();
+            defMappings = new ArrayList<>();
             _deferredMappings.put(cls, defMappings);
         }
         defMappings.add(defMap);
@@ -1443,7 +1478,7 @@ public class XMLPersistenceMappingParser
             _deferredMappings.get(cls);
 
         if (defMappings == null && create) {
-            defMappings = new ArrayList<DeferredEmbeddableOverrides>();
+            defMappings = new ArrayList<>();
             _deferredMappings.put(cls, defMappings);
         }
         DeferredEmbeddableOverrides dfm =
@@ -1477,6 +1512,7 @@ public class XMLPersistenceMappingParser
     /**
      * Process all deferred embeddables using an unknown access type.
      */
+    @Override
     protected void addDeferredEmbeddableMetaData() {
         super.addDeferredEmbeddableMetaData();
         if (_deferredMappings.size() > 0) {
@@ -1706,7 +1742,7 @@ public class XMLPersistenceMappingParser
 
     private boolean startFKColumnNames(Attributes attrs)
         throws SAXException {
-        _columnNamesList = new ArrayList<String>();
+        _columnNamesList = new ArrayList<>();
         return true;
     }
 
@@ -1724,7 +1760,7 @@ public class XMLPersistenceMappingParser
     private boolean startVersionColumns(Attributes attrs)
         throws SAXException {
 
-        _versionColumnsList = new ArrayList<Column>();
+        _versionColumnsList = new ArrayList<>();
 
         return true;
     }
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
index 9bc9c15e1..a44ef251f 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc;
 
+import static org.apache.openjpa.meta.MetaDataModes.MODE_MAPPING;
+
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,9 +32,6 @@ import java.util.Objects;
 import javax.persistence.EnumType;
 import javax.persistence.TemporalType;
 
-import org.apache.openjpa.lib.util.StringUtil;
-import org.apache.openjpa.lib.util.ClassUtil;
-import org.xml.sax.SAXException;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.ClassMappingInfo;
@@ -41,6 +40,7 @@ import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.meta.MappingInfo;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.meta.QueryResultMapping;
+import org.apache.openjpa.jdbc.meta.QueryResultMapping.PCResult;
 import org.apache.openjpa.jdbc.meta.SequenceMapping;
 import org.apache.openjpa.jdbc.meta.ValueMappingImpl;
 import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
@@ -51,14 +51,17 @@ import org.apache.openjpa.jdbc.meta.strats.VerticalClassStrategy;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.Unique;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.lib.meta.SourceTracker;
+import org.apache.openjpa.lib.util.ClassUtil;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
-import static org.apache.openjpa.meta.MetaDataModes.MODE_MAPPING;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.SequenceMetaData;
 import org.apache.openjpa.persistence.PersistenceStrategy;
 import org.apache.openjpa.persistence.XMLPersistenceMetaDataSerializer;
+import org.xml.sax.SAXException;
 
 /**
  * Serializes persistence mapping to XML.
@@ -74,7 +77,7 @@ public class XMLPersistenceMappingSerializer
     private static final Map<ColType, String> _names;
 
     static {
-        _names = new EnumMap<ColType, String>(ColType.class);
+        _names = new EnumMap<>(ColType.class);
         _names.put(ColType.COL, "column");
         _names.put(ColType.JOIN, "join-column");
         _names.put(ColType.INVERSE, "inverse-join-column");
@@ -113,7 +116,7 @@ public class XMLPersistenceMappingSerializer
      */
     public void addQueryResultMapping(QueryResultMapping meta) {
         if (_results == null)
-            _results = new ArrayList<QueryResultMapping>();
+            _results = new ArrayList<>();
         _results.add(meta);
     }
 
@@ -451,6 +454,7 @@ public class XMLPersistenceMappingSerializer
     /**
      * Serialize order column.
      */
+    @Override
     protected void serializeOrderColumn(FieldMetaData fmd)
         throws SAXException {
         FieldMapping field = (FieldMapping) fmd;
@@ -622,7 +626,7 @@ public class XMLPersistenceMappingSerializer
                 continue;
 
             if (result == null)
-                result = new ArrayList<QueryResultMapping>(_results.size() - i);
+                result = new ArrayList<>(_results.size() - i);
             result.add(element);
         }
         return (result == null)
@@ -649,14 +653,14 @@ public class XMLPersistenceMappingSerializer
     private void serializeQueryResultMapping(QueryResultMapping meta)
         throws SAXException {
         if (!getSerializeAnnotations()
-            && meta.getSourceType() == meta.SRC_ANNOTATIONS)
+            && meta.getSourceType() == SourceTracker.SRC_ANNOTATIONS)
             return;
 
         addAttribute("name", meta.getName());
         startElement("sql-result-set-mapping");
         for (QueryResultMapping.PCResult pc : meta.getPCResults()) {
             addAttribute("entity-class", pc.getCandidateType().getName());
-            Object discrim = pc.getMapping(pc.DISCRIMINATOR);
+            Object discrim = pc.getMapping(PCResult.DISCRIMINATOR);
             if (discrim != null)
                 addAttribute("discriminator-column", discrim.toString());
 
@@ -681,7 +685,7 @@ public class XMLPersistenceMappingSerializer
     protected void serializeSequence(SequenceMetaData meta)
         throws SAXException {
         if (!getSerializeAnnotations()
-            && meta.getSourceType() == meta.SRC_ANNOTATIONS)
+            && meta.getSourceType() == SourceTracker.SRC_ANNOTATIONS)
             return;
         if (SequenceMapping.IMPL_VALUE_TABLE.equals(meta.getSequencePlugin())) {
             super.serializeSequence(meta);
@@ -735,6 +739,10 @@ public class XMLPersistenceMappingSerializer
     protected class MappingSerializationComparator
         extends SerializationComparator {
 
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         protected int compareUnknown(Object o1, Object o2) {
             if (!(o1 instanceof QueryResultMapping))
                 return super.compareUnknown(o1, o2);
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverride.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverride.java
index b083800e5..3e0accbea 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverride.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverride.java
@@ -19,9 +19,11 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import javax.persistence.Column;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverrides.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverrides.java
index a439e55c3..86e2a208a 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverrides.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMappingOverrides.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTable.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTable.java
index 563407bd2..e2b30c5fc 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTable.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTable.java
@@ -19,9 +19,11 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import javax.persistence.PrimaryKeyJoinColumn;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTables.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTables.java
index 0d0fa0045..7b0bca773 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTables.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XSecondaryTables.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XTable.java b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XTable.java
index 121cf082e..3e5779b9c 100644
--- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XTable.java
+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XTable.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence.jdbc;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/AuditedEntry.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/AuditedEntry.java
index b38137cca..6c12a0e63 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/AuditedEntry.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/AuditedEntry.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.audit;
 
 import java.sql.Timestamp;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -36,6 +37,7 @@ import javax.persistence.TemporalType;
 
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.kernel.Audited;
+import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.persistence.Type;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestAudit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestAudit.java
index cc1f7f994..1e8f54d30 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestAudit.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestAudit.java
@@ -26,11 +26,11 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.Persistence;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 
+import junit.framework.TestCase;
+
 /**
  * A test for audit facility.
  *
@@ -44,6 +44,7 @@ public class TestAudit extends TestCase {
 
 	EntityManager em;
 
+    @Override
     public void setUp() {
     	if (emf == null) {
     		emf = OpenJPAPersistence.cast(Persistence.createEntityManagerFactory("audit"));
@@ -178,9 +179,9 @@ public class TestAudit extends TestCase {
     }
 
 	public boolean ensureGarbageCollection() {
-		ReferenceQueue<Object> detector = new ReferenceQueue<Object>();
+		ReferenceQueue<Object> detector = new ReferenceQueue<>();
 		Object marker = new Object();
-		WeakReference<Object> ref = new WeakReference<Object>(marker, detector);
+		WeakReference<Object> ref = new WeakReference<>(marker, detector);
 		marker = null;
 		System.gc();
 		try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java
index 748d52b7d..dcb51bb57 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java
@@ -18,6 +18,11 @@
  */
 package org.apache.openjpa.audit;
 
+import java.util.Collection;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
 import org.apache.openjpa.ee.ManagedRuntime;
 import org.apache.openjpa.kernel.Audited;
 import org.apache.openjpa.kernel.Broker;
@@ -25,12 +30,9 @@ import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import java.util.Collection;
-
 public class TestBeginEventOnTransactionListener extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(X.class, AuditedEntry.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java
index 70b1bbaa1..af0dae42b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java
@@ -84,7 +84,8 @@ public class X {
 		return true;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return "X[" + id + "]";
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java
index a62989c5d..ee7608a2c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestAutoDetachProperty.java
@@ -18,18 +18,24 @@
  */
 package org.apache.openjpa.conf;
 
-import java.util.*;
+import java.util.EnumSet;
+import java.util.HashMap;
 
-import javax.persistence.*;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
 
-import junit.framework.*;
+import org.apache.openjpa.persistence.AutoDetachType;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
 
-import org.apache.openjpa.persistence.*;
+import junit.framework.TestCase;
 
 public class TestAutoDetachProperty extends TestCase {
     private EntityManager em;
     private EntityManagerFactory emf;
 
+    @Override
     public void setUp() throws Exception {
         // Don't modify system props, as we are trying to get as close as
         // possible to testing props in persistence.xml
@@ -41,6 +47,7 @@ public class TestAutoDetachProperty extends TestCase {
         em = emf.createEntityManager();
     }
 
+    @Override
     public void tearDown() throws Exception {
         em.close();
         em = null;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
index 55238596e..1f4b605d9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
@@ -25,11 +25,11 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 import javax.persistence.PersistenceException;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.util.UserException;
 
+import junit.framework.TestCase;
+
 /**
  * Verifies appropriate exception is thrown when an incorrect protocol or
  * sub-protocol is specified in the JDBC URL. Per the JDBC specification, the
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java
index de0e2a660..294ace203 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshaller.java
@@ -26,6 +26,7 @@ public class TestCacheMarshaller
 
     private CacheMarshaller cm;
 
+    @Override
     public void setUp() {
         setUp(new Object[] { "openjpa.CacheMarshallers",
             "default(Id=" + getClass().getName() + ", ValidationPolicy="
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java
index 4db085cfa..811f7ba1d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestCacheMarshallerEndToEnd.java
@@ -21,15 +21,16 @@ package org.apache.openjpa.conf;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
+import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.query.NamedQueryEntity;
 import org.apache.openjpa.persistence.simple.AllFieldTypes;
 import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
-import org.apache.openjpa.lib.log.Log;
 
 public class TestCacheMarshallerEndToEnd
     extends AbstractCachedEMFTestCase  {
@@ -106,64 +107,79 @@ public class TestCacheMarshallerEndToEnd
     }
 
     private class LogImpl implements Log {
-        private List<String> lines = new ArrayList<String>();
+        private List<String> lines = new ArrayList<>();
 
+        @Override
         public boolean isTraceEnabled() {
             return true;
         }
 
+        @Override
         public boolean isInfoEnabled() {
             return true;
         }
 
+        @Override
         public boolean isWarnEnabled() {
             return true;
         }
 
+        @Override
         public boolean isErrorEnabled() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean isFatalEnabled() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void trace(Object o) {
             lines.add(o.toString());
         }
 
+        @Override
         public void trace(Object o, Throwable t) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void info(Object o) {
             lines.add(o.toString());
         }
 
+        @Override
         public void info(Object o, Throwable t) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void warn(Object o) {
             lines.add(o.toString());
         }
 
+        @Override
         public void warn(Object o, Throwable t) {
             lines.add(o.toString());
         }
 
+        @Override
         public void error(Object o) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void error(Object o, Throwable t) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void fatal(Object o) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void fatal(Object o, Throwable t) {
             throw new UnsupportedOperationException();
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java
index c8e1714bd..fe5e8e87f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestDynamicConfiguration.java
@@ -34,7 +34,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestDynamicConfiguration extends SingleEMFTestCase {
 
-	public void setUp() throws Exception {
+	@Override
+    public void setUp() throws Exception {
 		super.setUp(PObject.class);
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestGetProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestGetProperty.java
index e0c698727..ae1748f7e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestGetProperty.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestGetProperty.java
@@ -18,22 +18,27 @@
  */
 package org.apache.openjpa.conf;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
 
-import javax.persistence.*;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
 
-import junit.framework.*;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 
-import org.apache.openjpa.persistence.*;
+import junit.framework.TestCase;
 
 public class TestGetProperty extends TestCase {
     private EntityManagerFactory emf;
 
+    @Override
     public void setUp() throws Exception {
         emf = (OpenJPAEntityManagerFactory) Persistence
                 .createEntityManagerFactory("test");
     }
 
+    @Override
     public void tearDown() throws Exception {
         emf.close();
         emf = null;
@@ -41,7 +46,7 @@ public class TestGetProperty extends TestCase {
 
     public void testGetProperty() {
         try {
-            Collection<Thread> tests = new ArrayList<Thread>();
+            Collection<Thread> tests = new ArrayList<>();
             for (int i = 0; i < 10; i++) {
                 Test test = new Test();
                 test.start();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryHints.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryHints.java
index c2b54de48..6f3020940 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryHints.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryHints.java
@@ -42,6 +42,7 @@ public class TestQueryHints extends SingleEMFTestCase {
     EntityManager em;
     OpenJPAQuery<?> query;
 
+    @Override
     public void setUp() {
        super.setUp((Object[])null);
        em = emf.createEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
index cbe466418..ba91e4ed3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
@@ -52,7 +52,7 @@ public class TestQueryProperties extends SingleEMFTestCase {
         // setup using a simple entity
         super.setUp(QTimeout.class, CLEAR_TABLES);
         // create the Map to test overrides
-        props = new HashMap<String,String>();
+        props = new HashMap<>();
         props.put("javax.persistence.lock.timeout", "12000");
         props.put("javax.persistence.query.timeout", "7000");
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java
index 49cb5e538..d6d82947a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/AbstractUnenhancedClassTest.java
@@ -18,26 +18,26 @@
  */
 package org.apache.openjpa.enhance;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
 import java.io.ByteArrayInputStream;
-import java.util.List;
-import java.util.Collections;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.lang.reflect.Field;
-import org.apache.openjpa.conf.OpenJPAConfiguration;
+import java.util.Collections;
+import java.util.List;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.event.AbstractLifecycleListener;
+import org.apache.openjpa.event.LifecycleEvent;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.util.ImplHelper;
-import org.apache.openjpa.event.AbstractLifecycleListener;
-import org.apache.openjpa.event.LifecycleEvent;
 
 public abstract class AbstractUnenhancedClassTest
     extends SingleEMFTestCase {
@@ -52,6 +52,7 @@ public abstract class AbstractUnenhancedClassTest
     //   * Java 5 with javaagent
     //   * Java 5 without javaagent
 
+    @Override
     public void setUp() {
         setUp(getUnenhancedClass(), getUnenhancedSubclass(), CLEAR_TABLES);
         // trigger class redefinition
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSubClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSubClass.java
index ee7f8cc4b..adadbd4d9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSubClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSubClass.java
@@ -19,9 +19,10 @@
 package org.apache.openjpa.enhance;
 
 
-import javax.persistence.Entity;
 import java.io.Serializable;
 
+import javax.persistence.Entity;
+
 /**
  * @see TestClassHierarchyEnhancement
  */
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSuperClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSuperClass.java
index bf5bc4285..a00a674d8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSuperClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/EnhancedSuperClass.java
@@ -19,10 +19,11 @@
 package org.apache.openjpa.enhance;
 
 
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import java.io.Serializable;
 
 /**
  * @see TestClassHierarchyEnhancement
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
index 89b203630..25eaa5af5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
@@ -32,10 +32,10 @@ import org.apache.openjpa.meta.MetaDataRepository;
  * especially useful in the case where all pu's are enhanced generically,
  * automatically picking up all entities in the classpath.
  */
-@SuppressWarnings("serial")
 public class RestrictedMetaDataRepository extends MetaDataRepository {
 
-    private Set<String> _excludedTypes = new HashSet<String>();
+    private static final long serialVersionUID = 1L;
+    private Set<String> _excludedTypes = new HashSet<>();
 
     public String getExcludedTypes() {
         return _excludedTypes.toString();
@@ -48,6 +48,7 @@ public class RestrictedMetaDataRepository extends MetaDataRepository {
         }
     }
 
+    @Override
     public Set<String> getPersistentTypeNames(boolean devpath, ClassLoader envLoader) {
         Set<String> types = super.getPersistentTypeNames(devpath, envLoader);
         String[] typeArray = types.toArray(new String[types.size()]);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestClassHierarchyEnhancement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestClassHierarchyEnhancement.java
index 4af15e10d..349a3edbe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestClassHierarchyEnhancement.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestClassHierarchyEnhancement.java
@@ -19,14 +19,14 @@
 package org.apache.openjpa.enhance;
 
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
 
 /**
  * This unit test checks the enhancement of a superclass/subclass
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
index 04fe9cae5..adb9fdb65 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
+
 import serp.bytecode.BCClass;
 import serp.bytecode.Project;
 
@@ -88,9 +89,10 @@ public class TestEnhancementWithMultiplePUs
 
         // build up a writer that just stores to a list so that we don't
         // mutate the disk.
-        final List<String> written = new ArrayList<String>();
+        final List<String> written = new ArrayList<>();
         BytecodeWriter writer = new BytecodeWriter() {
 
+            @Override
             public void write(BCClass type) throws IOException {
                 assertTrue(Arrays.asList(type.getInterfaceNames()).contains(
                     PersistenceCapable.class.getName()));
@@ -128,9 +130,10 @@ public class TestEnhancementWithMultiplePUs
 
         // build up a writer that just stores to a list so that we don't
         // mutate the disk.
-        final List<String> written = new ArrayList<String>();
+        final List<String> written = new ArrayList<>();
         BytecodeWriter writer = new BytecodeWriter() {
 
+            @Override
             public void write(BCClass type) throws IOException {
                 assertTrue(Arrays.asList(type.getInterfaceNames()).contains(
                     PersistenceCapable.class.getName()));
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestPCEnhancerEnhancementContractVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestPCEnhancerEnhancementContractVersion.java
index 76fc961dd..6012e2f39 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestPCEnhancerEnhancementContractVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestPCEnhancerEnhancementContractVersion.java
@@ -20,13 +20,14 @@ package org.apache.openjpa.enhance;
 
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.log.NoneLogFactory.NoneLog;
-import org.apache.openjpa.persistence.DummyPersistenceCapeable;
 import org.apache.openjpa.persistence.Country;
+import org.apache.openjpa.persistence.DummyPersistenceCapeable;
 import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
 
 public class TestPCEnhancerEnhancementContractVersion extends AbstractPersistenceTestCase {
     Log log = NoneLog.getInstance();
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         // Create to trigger static initializer to run.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestRelationToUnlistedClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestRelationToUnlistedClass.java
index 771b66ccd..63b0043ba 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestRelationToUnlistedClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestRelationToUnlistedClass.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestRelationToUnlistedClass
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(UnenhancedUnlistedReferer.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestSimpleUnenhancedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestSimpleUnenhancedQuery.java
index d3c146853..1d70c326f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestSimpleUnenhancedQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestSimpleUnenhancedQuery.java
@@ -33,7 +33,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  *
  */
 public class TestSimpleUnenhancedQuery extends SingleEMFTestCase {
-	public void setUp() throws Exception {
+	@Override
+    public void setUp() throws Exception {
 		setUp(CLEAR_TABLES, UnenhancedPObject.class,"openjpa.RuntimeUnenhancedClasses", "supported");
 		EntityManager em = emf.createEntityManager();
 		em.getTransaction().begin();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedCompoundPK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedCompoundPK.java
index e7c9ac0ee..fd6767df7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedCompoundPK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedCompoundPK.java
@@ -23,6 +23,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestUnenhancedCompoundPK
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(UnenhancedCompoundPKFieldAccess.class,
             UnenhancedCompoundPKPropertyAccess.class, CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedCompoundPKSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedCompoundPKSubclass.java
index 866bbc5be..9f986b230 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedCompoundPKSubclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedCompoundPKSubclass.java
@@ -21,6 +21,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestUnenhancedCompoundPKSubclass extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(UnenhancedCompoundPKFieldAccessSuperclass.class,
             UnenhancedCompoundPKFieldAccessSubclass.class, CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedFieldAccess.java
index 1e69bf917..f67c1acee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedFieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedFieldAccess.java
@@ -21,22 +21,27 @@ package org.apache.openjpa.enhance;
 public class TestUnenhancedFieldAccess
     extends AbstractUnenhancedClassTest {
 
+    @Override
     protected Class<? extends UnenhancedType> getUnenhancedClass() {
         return UnenhancedFieldAccess.class;
     }
 
+    @Override
     protected UnenhancedType newUnenhancedInstance() {
         return new UnenhancedFieldAccess();
     }
 
+    @Override
     protected Class<? extends UnenhancedSubtype> getUnenhancedSubclass() {
         return UnenhancedFieldAccessSubclass.class;
     }
 
+    @Override
     protected UnenhancedSubtype newUnenhancedSubclassInstance() {
         return new UnenhancedFieldAccessSubclass();
     }
 
+    @Override
     protected boolean isFieldAccessTest() {
         return true;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedFieldAccessPrimitiveWrapper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedFieldAccessPrimitiveWrapper.java
index 01b3294f5..8c7986108 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedFieldAccessPrimitiveWrapper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedFieldAccessPrimitiveWrapper.java
@@ -20,22 +20,27 @@ package org.apache.openjpa.enhance;
 public class TestUnenhancedFieldAccessPrimitiveWrapper
     extends AbstractUnenhancedClassTest {
 
+    @Override
     protected Class<? extends UnenhancedType> getUnenhancedClass() {
         return UnenhancedFieldAccessPrimitiveWrapper.class;
     }
 
+    @Override
     protected UnenhancedType newUnenhancedInstance() {
         return new UnenhancedFieldAccessPrimitiveWrapper();
     }
 
+    @Override
     protected Class<? extends UnenhancedSubtype> getUnenhancedSubclass() {
         return UnenhancedFieldAccessPrimitiveWrapperSubclass.class;
     }
 
+    @Override
     protected UnenhancedSubtype newUnenhancedSubclassInstance() {
         return new UnenhancedFieldAccessPrimitiveWrapperSubclass();
     }
 
+    @Override
     protected boolean isFieldAccessTest() {
         return true;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedOneToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedOneToMany.java
index 116ed5014..8a9b7d3f4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedOneToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedOneToMany.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestUnenhancedOneToMany extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(UnenhancedOne.class, UnenhancedMany.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedPropertyAccess.java
index df0913e97..0f12474d3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedPropertyAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestUnenhancedPropertyAccess.java
@@ -21,22 +21,27 @@ package org.apache.openjpa.enhance;
 public class TestUnenhancedPropertyAccess
     extends AbstractUnenhancedClassTest {
 
+    @Override
     protected Class<? extends UnenhancedType> getUnenhancedClass() {
         return UnenhancedPropertyAccess.class;
     }
 
+    @Override
     protected UnenhancedType newUnenhancedInstance() {
         return new UnenhancedPropertyAccess();
     }
 
+    @Override
     protected Class<? extends UnenhancedSubtype> getUnenhancedSubclass() {
         return UnenhancedPropertyAccessSubclass.class;
     }
 
+    @Override
     protected UnenhancedSubtype newUnenhancedSubclassInstance() {
         return new UnenhancedPropertyAccessSubclass();
     }
 
+    @Override
     protected boolean isFieldAccessTest() {
         return false;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccess.java
index 33298a5cf..106b057ff 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccess.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.enhance;
 
 import javax.persistence.Entity;
-import javax.persistence.IdClass;
 import javax.persistence.Id;
+import javax.persistence.IdClass;
 
 import org.apache.openjpa.enhance.UnenhancedCompoundPKFieldAccess.PK;
 
@@ -61,11 +61,13 @@ public class UnenhancedCompoundPKFieldAccess {
             id1 = i1;
         }
 
+        @Override
         public String toString() {
             return String.valueOf(id0)
                 + "::" + String.valueOf(id1);
         }
 
+        @Override
         public int hashCode() {
             int rs = 17;
             rs = rs * 37 + (int) (id0 ^ (id1 >>> 32));
@@ -73,6 +75,7 @@ public class UnenhancedCompoundPKFieldAccess {
             return rs;
         }
 
+        @Override
         public boolean equals(Object obj) {
             if(this == obj)
                 return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSuperclass.java
index 0b101412e..cdaf3f1f5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKFieldAccessSuperclass.java
@@ -61,11 +61,13 @@ public class UnenhancedCompoundPKFieldAccessSuperclass {
             id1 = i1;
         }
 
+        @Override
         public String toString() {
             return String.valueOf(id0)
                 + "::" + String.valueOf(id1);
         }
 
+        @Override
         public int hashCode() {
             int rs = 17;
             rs = rs * 37 + (int) (id0 ^ (id1 >>> 32));
@@ -73,6 +75,7 @@ public class UnenhancedCompoundPKFieldAccessSuperclass {
             return rs;
         }
 
+        @Override
         public boolean equals(Object obj) {
             if (this == obj)
                 return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKPropertyAccess.java
index 03e33912f..8db7d8a8a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKPropertyAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedCompoundPKPropertyAccess.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.enhance;
 
 import javax.persistence.Entity;
-import javax.persistence.IdClass;
 import javax.persistence.Id;
+import javax.persistence.IdClass;
 
 import org.apache.openjpa.enhance.UnenhancedCompoundPKPropertyAccess.PK;
 
@@ -96,11 +96,13 @@ public class UnenhancedCompoundPKPropertyAccess {
             this.id1 = id1;
         }
 
+        @Override
         public String toString() {
             return String.valueOf(id0)
                 + "::" + String.valueOf(id1);
         }
 
+        @Override
         public int hashCode() {
             int rs = 17;
             rs = rs * 37 + (int) (id0 ^ (id1 >>> 32));
@@ -108,6 +110,7 @@ public class UnenhancedCompoundPKPropertyAccess {
             return rs;
         }
 
+        @Override
         public boolean equals(Object obj) {
             if(this == obj)
                 return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccess.java
index 19d0d6305..49770a988 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccess.java
@@ -19,15 +19,16 @@
 package org.apache.openjpa.enhance;
 
 import java.io.Serializable;
+
+import javax.persistence.Basic;
 import javax.persistence.Entity;
-import javax.persistence.Version;
-import javax.persistence.Id;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
-import javax.persistence.Basic;
-import javax.persistence.FetchType;
+import javax.persistence.Version;
 
 @Entity
 @Table(name="UN_FIELD")
@@ -35,6 +36,8 @@ import javax.persistence.FetchType;
 public class UnenhancedFieldAccess
     implements UnenhancedType, Serializable, Cloneable {
 
+    
+    private static final long serialVersionUID = 1L;
     @Id @GeneratedValue private int id;
     @Version public int version;
     protected String stringField = "foo";
@@ -42,22 +45,27 @@ public class UnenhancedFieldAccess
     @Basic(fetch = FetchType.LAZY)
     private String lazyField = "lazy";
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setStringField(String s) {
         stringField = s;
     }
 
+    @Override
     public String getStringField() {
         return stringField;
     }
 
+    @Override
     public String getLazyField() {
         return lazyField;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == this)
             return true;
@@ -69,10 +77,12 @@ public class UnenhancedFieldAccess
         return id == ((UnenhancedFieldAccess) o).id;
     }
 
+    @Override
     public int hashCode() {
         return id;
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapper.java
index 31c009a84..c41382ae6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapper.java
@@ -18,6 +18,7 @@
 package org.apache.openjpa.enhance;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -34,6 +35,8 @@ import javax.persistence.Version;
 public class UnenhancedFieldAccessPrimitiveWrapper
     implements UnenhancedType, Serializable, Cloneable {
 
+    
+    private static final long serialVersionUID = 1L;
     @Id
     @GeneratedValue
     private Integer id;
@@ -44,22 +47,27 @@ public class UnenhancedFieldAccessPrimitiveWrapper
     @Basic(fetch = FetchType.LAZY)
     private String lazyField = "lazy";
 
+    @Override
     public int getId() {
         return id == null ? -1 : id;
     }
 
+    @Override
     public void setStringField(String s) {
         stringField = s;
     }
 
+    @Override
     public String getStringField() {
         return stringField;
     }
 
+    @Override
     public String getLazyField() {
         return lazyField;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == this)
             return true;
@@ -71,10 +79,12 @@ public class UnenhancedFieldAccessPrimitiveWrapper
         return id == ((UnenhancedFieldAccessPrimitiveWrapper) o).id;
     }
 
+    @Override
     public int hashCode() {
         return id == null ? 0 : id;
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapperSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapperSubclass.java
index d8780d021..931e666ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapperSubclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessPrimitiveWrapperSubclass.java
@@ -26,26 +26,33 @@ public class UnenhancedFieldAccessPrimitiveWrapperSubclass
     extends UnenhancedFieldAccessPrimitiveWrapper
     implements UnenhancedSubtype {
 
+    
+    private static final long serialVersionUID = 1L;
     @OneToOne(cascade = CascadeType.ALL)
     private UnenhancedFieldAccessPrimitiveWrapper related;
     private int intField;
 
+    @Override
     public UnenhancedType getRelated() {
         return related;
     }
 
+    @Override
     public void setRelated(UnenhancedType related) {
         this.related = (UnenhancedFieldAccessPrimitiveWrapper) related;
     }
 
+    @Override
     public void setIntField(int i) {
         intField = i;
     }
 
+    @Override
     public int getIntField() {
         return intField;
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException {
         UnenhancedFieldAccessPrimitiveWrapperSubclass un =
             (UnenhancedFieldAccessPrimitiveWrapperSubclass) super.clone();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessSubclass.java
index 89af04417..662063efd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessSubclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedFieldAccessSubclass.java
@@ -18,35 +18,42 @@
  */
 package org.apache.openjpa.enhance;
 
-import javax.persistence.OneToOne;
-import javax.persistence.Entity;
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
 
 @Entity
 public class UnenhancedFieldAccessSubclass
     extends UnenhancedFieldAccess
     implements UnenhancedSubtype {
 
+    
+    private static final long serialVersionUID = 1L;
     @OneToOne(cascade = CascadeType.ALL)
     private UnenhancedFieldAccess related;
     private int intField;
 
+    @Override
     public UnenhancedType getRelated() {
         return related;
     }
 
+    @Override
     public void setRelated(UnenhancedType related) {
         this.related = (UnenhancedFieldAccess) related;
     }
 
+    @Override
     public void setIntField(int i) {
         intField = i;
     }
 
+    @Override
     public int getIntField() {
         return intField;
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException {
         UnenhancedFieldAccessSubclass un =
             (UnenhancedFieldAccessSubclass) super.clone();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedMany.java
index f034ac9ec..6513e2be8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedMany.java
@@ -17,10 +17,11 @@
  */
 package org.apache.openjpa.enhance;
 
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import java.io.Serializable;
 
 @Entity
 public class UnenhancedMany implements Serializable, Cloneable {
@@ -51,6 +52,7 @@ public class UnenhancedMany implements Serializable, Cloneable {
         this.one = one;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == this) return true;
         if (o == null) return false;
@@ -59,10 +61,12 @@ public class UnenhancedMany implements Serializable, Cloneable {
         return id == ((UnenhancedMany) o).id;
     }
 
+    @Override
     public int hashCode() {
         return id;
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedOne.java
index a8bdbcef7..82591a376 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedOne.java
@@ -17,13 +17,14 @@
  */
 package org.apache.openjpa.enhance;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashSet;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
 @Entity
 public class UnenhancedOne implements Serializable, Cloneable {
     private static final long serialVersionUID = -5834998517804641711L;
@@ -32,7 +33,7 @@ public class UnenhancedOne implements Serializable, Cloneable {
     private int id;
 
     @OneToMany
-    Collection<UnenhancedMany> many = new HashSet<UnenhancedMany>();
+    Collection<UnenhancedMany> many = new HashSet<>();
 
     public UnenhancedOne() {
     }
@@ -49,6 +50,7 @@ public class UnenhancedOne implements Serializable, Cloneable {
         return many;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == this) return true;
         if (o == null) return false;
@@ -57,10 +59,12 @@ public class UnenhancedOne implements Serializable, Cloneable {
         return id == ((UnenhancedOne) o).id;
     }
 
+    @Override
     public int hashCode() {
         return id;
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccess.java
index ce535dec7..0ba2fb78b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccess.java
@@ -19,15 +19,16 @@
 package org.apache.openjpa.enhance;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Version;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
+
 import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
-import javax.persistence.FetchType;
+import javax.persistence.Version;
 
 @Entity
 @Table(name="UN_PROP")
@@ -35,11 +36,14 @@ import javax.persistence.FetchType;
 public class UnenhancedPropertyAccess
     implements UnenhancedType, Serializable, Cloneable {
 
+    
+    private static final long serialVersionUID = 1L;
     private int id;
     private int version;
     private String sf = "foo";
     private String lazyField = "lazy";
 
+    @Override
     @Id @GeneratedValue
     public int getId() {
         return id;
@@ -58,15 +62,18 @@ public class UnenhancedPropertyAccess
         version = v;
     }
 
+    @Override
     @Basic
     public String getStringField() {
         return sf;
     }
 
+    @Override
     public void setStringField(String s) {
         sf = s;
     }
 
+    @Override
     @Basic(fetch = FetchType.LAZY)
     public String getLazyField() {
         return lazyField;
@@ -76,6 +83,7 @@ public class UnenhancedPropertyAccess
         lazyField = s;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == this)
             return true;
@@ -87,10 +95,12 @@ public class UnenhancedPropertyAccess
         return getId() == ((UnenhancedPropertyAccess) o).getId();
     }
 
+    @Override
     public int hashCode() {
         return getId();
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccessSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccessSubclass.java
index 2b98d30b3..c198a345f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccessSubclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/UnenhancedPropertyAccessSubclass.java
@@ -18,9 +18,9 @@
  */
 package org.apache.openjpa.enhance;
 
-import javax.persistence.OneToOne;
-import javax.persistence.Entity;
 import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
 
 import org.apache.openjpa.persistence.Type;
 
@@ -29,27 +29,34 @@ public class UnenhancedPropertyAccessSubclass
     extends UnenhancedPropertyAccess
     implements UnenhancedSubtype {
 
+    
+    private static final long serialVersionUID = 1L;
     private UnenhancedPropertyAccess related;
     private int intField;
 
+    @Override
     @OneToOne(cascade = CascadeType.ALL)
     @Type(UnenhancedPropertyAccess.class)
     public UnenhancedType getRelated() {
         return related;
     }
 
+    @Override
     public void setRelated(UnenhancedType related) {
         this.related = (UnenhancedPropertyAccess) related;
     }
 
+    @Override
     public void setIntField(int i) {
         intField = i;
     }
 
+    @Override
     public int getIntField() {
         return intField;
     }
 
+    @Override
     public Object clone() throws CloneNotSupportedException {
         UnenhancedPropertyAccessSubclass un =
             (UnenhancedPropertyAccessSubclass) super.clone();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestLifecycleListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestLifecycleListener.java
index 963694f3c..11edffecb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestLifecycleListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestLifecycleListener.java
@@ -20,12 +20,13 @@ package org.apache.openjpa.event;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestLifecycleListener
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestSJVMRemoteCommitProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestSJVMRemoteCommitProvider.java
index b661171f7..02b9e1b05 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestSJVMRemoteCommitProvider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/event/TestSJVMRemoteCommitProvider.java
@@ -18,15 +18,16 @@
  */
 package org.apache.openjpa.event;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Collections;
+
 import javax.persistence.Persistence;
 
-import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
 
 public class TestSJVMRemoteCommitProvider
 extends AbstractCachedEMFTestCase {
@@ -36,6 +37,7 @@ extends AbstractCachedEMFTestCase {
     private ListenerImpl listen1;
     private ListenerImpl listen2;
 
+    @Override
     public void setUp() {
         Map sjvm1 = new HashMap();
         sjvm1.put("openjpa.RemoteCommitProvider", "sjvm");
@@ -55,6 +57,7 @@ extends AbstractCachedEMFTestCase {
             listen2 = new ListenerImpl());
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         clear(emf1);
@@ -84,10 +87,12 @@ extends AbstractCachedEMFTestCase {
 
         private int eventCount;
 
+        @Override
         public void afterCommit(RemoteCommitEvent event) {
             eventCount++;
         }
 
+        @Override
         public void close() {
         }
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/BrokerLevelInstrument.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/BrokerLevelInstrument.java
index 5369ba647..e83be5082 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/BrokerLevelInstrument.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/BrokerLevelInstrument.java
@@ -37,14 +37,17 @@ public class BrokerLevelInstrument extends AbstractInstrument {
         setInitialized(true);
     }
 
+    @Override
     public void start() {
         setStarted(true);
     }
 
+    @Override
     public void stop() {
         setStarted(false);
     }
 
+    @Override
     public InstrumentationLevel getLevel() {
         return InstrumentationLevel.BROKER;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/DCInstrument.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/DCInstrument.java
index 71ac7998f..fc54adaf2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/DCInstrument.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/DCInstrument.java
@@ -29,15 +29,18 @@ public class DCInstrument extends AbstractDataCacheInstrument {
         return NAME;
     }
 
+    @Override
     public void initialize() {
         OpenJPAConfiguration config = (OpenJPAConfiguration)getProvider().getConfiguration();
         setDataCache(config.getDataCacheManagerInstance().getSystemDataCache());
     }
 
+    @Override
     public void start() {
         setStarted(true);
     }
 
+    @Override
     public void stop() {
         setStarted(false);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/DynamicProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/DynamicProvider.java
index 10d2097f3..c3e62879c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/DynamicProvider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/DynamicProvider.java
@@ -25,10 +25,12 @@ public class DynamicProvider extends AbstractInstrumentationProvider {
 
     public static final String[] DYNAMIC_INSTRUMENT_ALIASES = { };
 
+    @Override
     public void start() {
         setStarted(true);
     }
 
+    @Override
     public void stop() {
         setStarted(false);
         for (Instrument inst : getInstruments()) {
@@ -36,10 +38,12 @@ public class DynamicProvider extends AbstractInstrumentationProvider {
         }
     }
 
+    @Override
     public void startInstrument(Instrument instrument) {
         instrument.start();
     }
 
+    @Override
     public void stopInstrument(Instrument instrument, boolean force) {
         instrument.stop();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/QCInstrument.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/QCInstrument.java
index e298dfda3..57434065a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/QCInstrument.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/QCInstrument.java
@@ -29,15 +29,18 @@ public class QCInstrument extends AbstractQueryCacheInstrument {
         return NAME;
     }
 
+    @Override
     public void initialize() {
         OpenJPAConfiguration config = (OpenJPAConfiguration)getProvider().getConfiguration();
         setQueryCache(config.getDataCacheManagerInstance().getSystemQueryCache());
     }
 
+    @Override
     public void start() {
         setStarted(true);
     }
 
+    @Override
     public void stop() {
         setStarted(false);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/QSCInstrument.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/QSCInstrument.java
index a43c57e6b..cb9398b6d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/QSCInstrument.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/QSCInstrument.java
@@ -35,10 +35,12 @@ public class QSCInstrument extends AbstractPreparedQueryCacheInstrument {
         setPreparedQueryCache(config.getQuerySQLCacheInstance());
     }
 
+    @Override
     public void start() {
         setStarted(true);
     }
 
+    @Override
     public void stop() {
         setStarted(false);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/SecondProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/SecondProvider.java
index c4952be12..1343a8e2d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/SecondProvider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/SecondProvider.java
@@ -29,10 +29,12 @@ public class SecondProvider extends AbstractInstrumentationProvider {
         "QuerySQLCache","org.apache.openjpa.instrumentation.QSCInstrument"
     };
 
+    @Override
     public void start() {
         setStarted(true);
     }
 
+    @Override
     public void stop() {
         setStarted(false);
         for (Instrument inst : getInstruments()) {
@@ -40,10 +42,12 @@ public class SecondProvider extends AbstractInstrumentationProvider {
         }
     }
 
+    @Override
     public void startInstrument(Instrument instrument) {
         instrument.start();
     }
 
+    @Override
     public void stopInstrument(Instrument instrument, boolean force) {
         instrument.stop();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/SimpleProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/SimpleProvider.java
index de0bb9026..9e2fd8a07 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/SimpleProvider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/SimpleProvider.java
@@ -29,10 +29,12 @@ public class SimpleProvider extends AbstractInstrumentationProvider {
         "QuerySQLCache","org.apache.openjpa.instrumentation.QSCInstrument"
     };
 
+    @Override
     public void start() {
         setStarted(true);
     }
 
+    @Override
     public void stop() {
         setStarted(false);
         for (Instrument inst : getInstruments()) {
@@ -40,10 +42,12 @@ public class SimpleProvider extends AbstractInstrumentationProvider {
         }
     }
 
+    @Override
     public void startInstrument(Instrument instrument) {
         instrument.start();
     }
 
+    @Override
     public void stopInstrument(Instrument instrument, boolean force) {
         instrument.stop();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/TestInstrumentationProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/TestInstrumentationProvider.java
index 5edc62e8d..9a1911bc9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/TestInstrumentationProvider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/instrumentation/TestInstrumentationProvider.java
@@ -47,6 +47,7 @@ public class TestInstrumentationProvider extends SingleEMFTestCase {
     public static final String DC_PROVIDER =
         "org.apache.openjpa.instrumentation.SimpleProvider(Instrument='DataCache')";
 
+    @Override
     public void setUp() throws Exception {
         super.setUp("openjpa.Instrumentation",
                     SINGLE_PROVIDER,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/A.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/A.java
index 4102c047f..787e0be42 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/A.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/A.java
@@ -20,9 +20,17 @@ package org.apache.openjpa.jdbc.kernel;
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.jdbc.*;
-import org.apache.openjpa.persistence.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.apache.openjpa.persistence.PersistentMap;
+import org.apache.openjpa.persistence.jdbc.ContainerTable;
+import org.apache.openjpa.persistence.jdbc.ElementColumn;
+import org.apache.openjpa.persistence.jdbc.KeyColumn;
+import org.apache.openjpa.persistence.jdbc.XJoinColumn;
 
 @Entity
 @Table(name = "JPA_A")
@@ -44,7 +52,7 @@ public class A {
          joinColumns = @XJoinColumn(name = "MAP_ID"))
     @KeyColumn(name="MAP_KEY")
     @ElementColumn(name="MAP_VALUE")
-    private Map<String,String> map = new HashMap<String,String>();
+    private Map<String,String> map = new HashMap<>();
 
     public A() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityD.java
index a4d92fdd5..1fb345efb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityD.java
@@ -18,16 +18,16 @@
  */
 package org.apache.openjpa.jdbc.kernel;
 
-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Version;
-import javax.persistence.OneToOne;
 import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
 
 @Entity
 public class EntityD {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityF.java
index 5bbc946e9..d378636a6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/EntityF.java
@@ -19,7 +19,10 @@
 package org.apache.openjpa.jdbc.kernel;
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 @Entity
 public class EntityF  {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java
index 4cd9956ec..18ca3a923 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiDepartment.java
@@ -36,7 +36,7 @@ public class M2MBiDepartment {
 	String name;
 
 	@ManyToMany(mappedBy="departments", fetch=FetchType.EAGER)
-    public Collection<M2MBiEmployee> employees = new ArrayList<M2MBiEmployee>();
+    public Collection<M2MBiEmployee> employees = new ArrayList<>();
 
 	@Version
     private int version;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java
index 06d350b5d..bddd88551 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/M2MBiEmployee.java
@@ -38,7 +38,7 @@ public class M2MBiEmployee {
 
     @ManyToMany(fetch=FetchType.EAGER)
     public Collection<M2MBiDepartment> departments = new ArrayList
-        <M2MBiDepartment>();
+        <>();
 
     public String name;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestCollectionTracking.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestCollectionTracking.java
index f693b52bd..d8e4ade12 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestCollectionTracking.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestCollectionTracking.java
@@ -18,8 +18,11 @@
  */
 package org.apache.openjpa.jdbc.kernel;
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.Iterator;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -27,6 +30,7 @@ public class TestCollectionTracking extends SingleEMFTestCase {
 
     private JDBCConfiguration _conf;
 
+    @Override
     public void setUp() {
         super.setUp(A.class,"openjpa.Compatibility","autoOff=false");
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestForeignKeyCountViolation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestForeignKeyCountViolation.java
index b46e99ee6..df5520a02 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestForeignKeyCountViolation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestForeignKeyCountViolation.java
@@ -43,6 +43,7 @@ public class TestForeignKeyCountViolation extends SingleEMFTestCase {
 
     private JDBCConfiguration _conf;
 
+    @Override
     public void setUp() {
         super.setUp(EntityF.class, EntityG.class);
         Map props = new HashMap(System.getProperties());
@@ -58,7 +59,7 @@ public class TestForeignKeyCountViolation extends SingleEMFTestCase {
         EntityF f = new EntityF();
         f.setId(1);
 
-        List<EntityG> listG = new ArrayList<EntityG>();
+        List<EntityG> listG = new ArrayList<>();
         EntityG g1 = new EntityG();
         g1.setId(1);
         listG.add(g1);
@@ -112,7 +113,7 @@ public class TestForeignKeyCountViolation extends SingleEMFTestCase {
         EntityF f = new EntityF();
         f.setId(1);
 
-        List<EntityG> listG = new ArrayList<EntityG>();
+        List<EntityG> listG = new ArrayList<>();
         EntityG g1 = new EntityG();
         g1.setId(1);
         listG.add(g1);
@@ -151,8 +152,8 @@ public class TestForeignKeyCountViolation extends SingleEMFTestCase {
             , tableG.getName(), c);
 
 
-        ArrayList<String> fkListfromDB = new ArrayList<String>();
-        ArrayList<String> fkListfromTable = new ArrayList<String>();
+        ArrayList<String> fkListfromDB = new ArrayList<>();
+        ArrayList<String> fkListfromTable = new ArrayList<>();
 
         for (int i=0; i< fkfromDB.length; i++) {
             fkListfromDB.add(fkfromDB[i].getName());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestInsertOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestInsertOrder.java
index 7a6843228..bf31d9608 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestInsertOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestInsertOrder.java
@@ -34,6 +34,7 @@ public class TestInsertOrder extends SQLListenerTestCase {
     private String taskTableName;
     private String storyTableName;
 
+    @Override
     public void setUp() {
         setUp(Employee.class, Task.class, Story.class);
         empTableName = getMapping(Employee.class).getTable().getFullName();
@@ -99,10 +100,10 @@ public class TestInsertOrder extends SQLListenerTestCase {
         Story s = new Story();
         s.setId(id);
 
-        Collection<Task> tasks = new ArrayList<Task>();
+        Collection<Task> tasks = new ArrayList<>();
         tasks.add(t);
 
-        Collection<Story> stories = new ArrayList<Story>();
+        Collection<Story> stories = new ArrayList<>();
         stories.add(s);
 
         e.setTasks(tasks);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java
index ad09b43a2..73d005223 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM21UniVersion.java
@@ -31,6 +31,7 @@ public class TestM21UniVersion extends SingleEMFTestCase {
     public static String EMPLOYEE3ID = "EMPLOYEE3";
 
 
+    @Override
     public void setUp() {
         setUp(
                 M21UniDepartment.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java
index 580f63904..2f94250fd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestM2MBiVersion.java
@@ -33,6 +33,7 @@ public class TestM2MBiVersion extends SingleEMFTestCase {
     public static String EMPLOYEE2ID = "EMPLOYEE2";
     public static String EMPLOYEE3ID = "EMPLOYEE3";
 
+    @Override
     public void setUp() {
         setUp(
                 M2MBiDepartment.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java
index 6d53a1b98..6413e38bb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/kernel/TestNoForeignKeyViolation.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.jdbc.kernel;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
@@ -39,6 +40,7 @@ public class TestNoForeignKeyViolation
     private EntityC entityC;
     private EntityD entityD;
 
+    @Override
     public void setUp() {
         setUp(EntityA.class, EntityB.class, EntityC.class, EntityD.class,
               EntityE.class, EntityF.class, EntityG.class);
@@ -194,7 +196,7 @@ public class TestNoForeignKeyViolation
             EntityF f = new EntityF();
             f.setId(1);
 
-            List<EntityG> listG = new ArrayList<EntityG>();
+            List<EntityG> listG = new ArrayList<>();
             EntityG g1 = new EntityG();
             g1.setId(1);
             listG.add(g1);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java
index 2396a8dd7..baa537911 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/EntityBool.java
@@ -17,7 +17,9 @@
  * under the License.
  */
 package org.apache.openjpa.jdbc.meta;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 public class EntityBool {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java
index 6f0250f71..1d1f1a4bc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestBooleanValue.java
@@ -18,14 +18,17 @@
  */
 package org.apache.openjpa.jdbc.meta;
 
-import javax.persistence.*;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestBooleanValue extends SingleEMFTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(EntityBool.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestCalendarField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestCalendarField.java
index 3eb2aac9f..90bf2d95f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestCalendarField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestCalendarField.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.util.ProxyCalendar;
 
 public class TestCalendarField extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(TemporalFieldTypes.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolAutoDelete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolAutoDelete.java
index 684a78ad3..1fbf1f28b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolAutoDelete.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolAutoDelete.java
@@ -28,8 +28,8 @@ import javax.persistence.Persistence;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.schema.SchemaTool;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.simple.AllFieldTypes;
 
 import junit.framework.TestCase;
@@ -41,6 +41,7 @@ public class TestMappingToolAutoDelete
     private JDBCConfiguration _conf;
     private OpenJPAEntityManagerFactorySPI emf;
 
+    @Override
     public void setUp() {
         Map props = new HashMap(System.getProperties());
         props.put("openjpa.MetaDataFactory",
@@ -56,6 +57,7 @@ public class TestMappingToolAutoDelete
         em.close();
     }
 
+    @Override
     public void tearDown() {
         emf.close();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolRefresh.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolRefresh.java
index c12719e5e..a85bd8775 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolRefresh.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolRefresh.java
@@ -20,7 +20,6 @@ import java.io.StringWriter;
 import java.net.URL;
 import java.util.Map;
 
-
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.schema.SchemaTool;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolTemporal.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolTemporal.java
index 0d6d4284f..1a3432fa0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolTemporal.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingToolTemporal.java
@@ -21,13 +21,14 @@ package org.apache.openjpa.jdbc.meta;
 import java.io.IOException;
 import java.sql.SQLException;
 
-import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.simple.TemporalFieldTypes;
 import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestMappingToolTemporal extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(TemporalFieldTypes.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
index f40e515c5..52cae827d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
@@ -50,10 +50,11 @@ public abstract class AbstractLobTest extends SingleEMFTestCase {
     protected static boolean firstTestExecuted;
 
     protected List<Class<?>> supportedDatabases =
-        new ArrayList<Class<?>>
+        new ArrayList<>
             (Arrays.asList(MySQLDictionary.class, OracleDictionary.class, SQLServerDictionary.class,
                     DB2Dictionary.class));
 
+    @Override
     public void setUp() throws Exception {
         setSupportedDatabases(supportedDatabases.toArray(new Class<?>[] {}));
         if (isTestsDisabled()) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamLobEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamLobEntity.java
index 10c888094..0281a90bc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamLobEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamLobEntity.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.jdbc.meta.strats;
 
 import java.io.InputStream;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -40,18 +41,22 @@ public class InputStreamLobEntity implements LobEntity {
     @Persistent
     private InputStream stream;
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public Object getStream() {
         return stream;
     }
 
+    @Override
     public void setStream(Object o) {
         stream = (InputStream) o;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamWrapper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamWrapper.java
index 1bc5ea0f1..95234f693 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamWrapper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/InputStreamWrapper.java
@@ -39,18 +39,22 @@ public class InputStreamWrapper extends InputStream {
         this.is = new ByteArrayInputStream(s.getBytes());
     }
 
+    @Override
     public int read() throws IOException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int available() throws IOException {
         return is.available();
     }
 
+    @Override
     public void close() throws IOException {
         is.close();
     }
 
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         StackTraceElement[] ste = Thread.currentThread().getStackTrace();
         for (StackTraceElement element : ste) {
@@ -61,6 +65,7 @@ public class InputStreamWrapper extends InputStream {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int read(byte[] b) throws IOException {
         throw new UnsupportedOperationException();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/LobEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/LobEntity.java
index b82f0d798..29db1aeaa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/LobEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/LobEntity.java
@@ -27,11 +27,11 @@ package org.apache.openjpa.jdbc.meta.strats;
  */
 public interface LobEntity {
 
-    public void setStream(Object o);
+    void setStream(Object o);
 
-    public void setId(int id);
+    void setId(int id);
 
-    public Object getStream();
+    Object getStream();
 
-    public int getId();
+    int getId();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderLobEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderLobEntity.java
index efa1d27fb..dead3049a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderLobEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderLobEntity.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.jdbc.meta.strats;
 
 import java.io.Reader;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -40,18 +41,22 @@ public class ReaderLobEntity implements LobEntity {
     @Persistent
     private Reader stream;
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public Object getStream() {
         return stream;
     }
 
+    @Override
     public void setStream(Object o) {
         this.stream = (Reader) o;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderWrapper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderWrapper.java
index 4cf0af8fe..7d26dc040 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderWrapper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/ReaderWrapper.java
@@ -39,10 +39,12 @@ public class ReaderWrapper extends Reader {
         this.reader = new CharArrayReader(s.toCharArray());
     }
 
+    @Override
     public void close() throws IOException {
         reader.close();
     }
 
+    @Override
     public int read(char[] cbuf, int off, int len) throws IOException {
         StackTraceElement[] ste = Thread.currentThread().getStackTrace();
         for (StackTraceElement element : ste) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/TestInputStreamLob.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/TestInputStreamLob.java
index aa82c8eb7..1fe57aea1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/TestInputStreamLob.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/TestInputStreamLob.java
@@ -40,6 +40,7 @@ public class TestInputStreamLob extends AbstractLobTest {
         super.setUp();
     }
 
+    @Override
     protected LobEntity newLobEntity(String s, int id) {
         InputStreamLobEntity isle = new InputStreamLobEntity();
         isle.setId(id);
@@ -51,6 +52,7 @@ public class TestInputStreamLob extends AbstractLobTest {
         return isle;
     }
 
+    @Override
     protected LobEntity newLobEntityForLoadContent(String s, int id) {
         InputStreamLobEntity isle = new InputStreamLobEntity();
         isle.setId(id);
@@ -58,14 +60,17 @@ public class TestInputStreamLob extends AbstractLobTest {
         return isle;
     }
 
+    @Override
     protected Class getLobEntityClass() {
         return InputStreamLobEntity.class;
     }
 
+    @Override
     protected String getSelectQuery() {
         return "SELECT o FROM InputStreamLobEntity o";
     }
 
+    @Override
     protected String getStreamContentAsString(Object o) throws IOException {
         InputStream is = (InputStream) o;
         String content = "";
@@ -80,6 +85,7 @@ public class TestInputStreamLob extends AbstractLobTest {
         } while (true);
     }
 
+    @Override
     protected void changeStream(LobEntity le, String s) {
         le.setStream(new ByteArrayInputStream(s.getBytes()));
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/TestReaderLob.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/TestReaderLob.java
index 3a06cdbe3..d98cfde37 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/TestReaderLob.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/TestReaderLob.java
@@ -32,6 +32,7 @@ import java.io.Reader;
 
 public class TestReaderLob extends AbstractLobTest {
 
+    @Override
     protected LobEntity newLobEntity(String s, int id) {
         ReaderLobEntity rle = new ReaderLobEntity();
         rle.setId(id);
@@ -43,6 +44,7 @@ public class TestReaderLob extends AbstractLobTest {
         return rle;
     }
 
+    @Override
     protected LobEntity newLobEntityForLoadContent(String s, int id) {
         ReaderLobEntity rle = new ReaderLobEntity();
         rle.setId(id);
@@ -50,14 +52,17 @@ public class TestReaderLob extends AbstractLobTest {
         return rle;
     }
 
+    @Override
     protected Class getLobEntityClass() {
         return ReaderLobEntity.class;
     }
 
+    @Override
     protected String getSelectQuery() {
         return "SELECT o FROM ReaderLobEntity o";
     }
 
+    @Override
     protected String getStreamContentAsString(Object o) throws IOException {
         Reader r = (Reader) o;
         String content = "";
@@ -72,6 +77,7 @@ public class TestReaderLob extends AbstractLobTest {
         } while (true);
     }
 
+    @Override
     protected void changeStream(LobEntity le, String s) {
         le.setStream(new CharArrayReader(s.toCharArray()));
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/TestOracleXmlColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/TestOracleXmlColumn.java
index 4f7776a81..6dadba3f5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/TestOracleXmlColumn.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/oracle/TestOracleXmlColumn.java
@@ -47,6 +47,7 @@ public class TestOracleXmlColumn extends AbstractPersistenceTestCase {
         return !(dict instanceof OracleDictionary);
     }
 
+    @Override
     public void setUp() throws SQLException {
         OpenJPAEntityManagerFactorySPI emf = createEMF();
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Book.java
index ad62252c8..aebdabd15 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Book.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Book.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.jdbc.persistence.classcriteria;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
 
 @Entity
 @DiscriminatorValue(value = "BOOK")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Item.java
index fe26acb39..6ca29dc89 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Item.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Item.java
@@ -77,6 +77,7 @@ public class Item implements Serializable {
         return rating;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
@@ -90,6 +91,7 @@ public class Item implements Serializable {
         return id == item.id;
     }
 
+    @Override
     public int hashCode() {
         return id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Movie.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Movie.java
index b76d0d509..781e61a59 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Movie.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/Movie.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.jdbc.persistence.classcriteria;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
 
 @Entity
 @DiscriminatorValue(value = "MOVIE")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/TestQuerySubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/TestQuerySubclass.java
index 0e337282a..348621611 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/TestQuerySubclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/persistence/classcriteria/TestQuerySubclass.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.jdbc.persistence.classcriteria;
 
 import java.util.Collection;
+
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -26,6 +27,7 @@ public class TestQuerySubclass extends SingleEMFTestCase {
 
     private OpenJPAEntityManager em;
 
+    @Override
     public void setUp() {
         setUp("openjpa.Compatibility",
             "superclassDiscriminatorStrategyByDefault=true", CLEAR_TABLES,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/TestStoredProcedure.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/TestStoredProcedure.java
index 0cbeb70a2..5d8ef187c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/TestStoredProcedure.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/TestStoredProcedure.java
@@ -18,17 +18,18 @@
  */
 package org.apache.openjpa.jdbc.procedure;
 
+import java.util.Iterator;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import javax.persistence.StoredProcedureQuery;
+
 import org.apache.openjpa.jdbc.procedure.derby.Procedures;
 import org.apache.openjpa.jdbc.procedure.entity.EntityWithStoredProcedure;
 import org.apache.openjpa.jdbc.sql.DerbyDictionary;
 import org.apache.openjpa.persistence.test.DatabasePlatform;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
-import java.util.Iterator;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.StoredProcedureQuery;
-
 @DatabasePlatform("org.apache.derby.jdbc.EmbeddedDriver")
 public class TestStoredProcedure extends SingleEMFTestCase {
     @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/derby/Procedures.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/derby/Procedures.java
index dab74b51b..74bbcae95 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/derby/Procedures.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/derby/Procedures.java
@@ -18,12 +18,12 @@
  */
 package org.apache.openjpa.jdbc.procedure.derby;
 
+import static junit.framework.Assert.fail;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 
-import static junit.framework.Assert.fail;
-
 public final class Procedures {
     public static boolean simpleCalled;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/entity/EntityWithStoredProcedure.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/entity/EntityWithStoredProcedure.java
index e145c7848..673e8c1b2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/entity/EntityWithStoredProcedure.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/procedure/entity/EntityWithStoredProcedure.java
@@ -18,6 +18,9 @@
  */
 package org.apache.openjpa.jdbc.procedure.entity;
 
+import static javax.persistence.ParameterMode.INOUT;
+import static javax.persistence.ParameterMode.OUT;
+
 import javax.persistence.Entity;
 import javax.persistence.EntityResult;
 import javax.persistence.Id;
@@ -27,9 +30,6 @@ import javax.persistence.SqlResultSetMapping;
 import javax.persistence.SqlResultSetMappings;
 import javax.persistence.StoredProcedureParameter;
 
-import static javax.persistence.ParameterMode.INOUT;
-import static javax.persistence.ParameterMode.OUT;
-
 @Entity
 @NamedStoredProcedureQueries({
         @NamedStoredProcedureQuery(
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/TestBadVersionField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/TestBadVersionField.java
index 22ebe82dd..2f3bb10df 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/TestBadVersionField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jira1100/TestBadVersionField.java
@@ -41,6 +41,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  *
  */
 public class TestBadVersionField extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Data.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/JTAManagedRuntime.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/JTAManagedRuntime.java
index 82429c72a..c2ee30f0f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/JTAManagedRuntime.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/JTAManagedRuntime.java
@@ -34,22 +34,27 @@ import org.apache.openjpa.ee.ManagedRuntime;
 public class JTAManagedRuntime implements ManagedRuntime {
     private SimpleTransactionManager txm = new SimpleTransactionManager();
 
+    @Override
     public void doNonTransactionalWork(Runnable runnable) throws NotSupportedException {
         throw new NotSupportedException();
     }
 
+    @Override
     public Throwable getRollbackCause() throws Exception {
         return txm.getTransaction().getRollbackCause();
     }
 
+    @Override
     public Object getTransactionKey() throws Exception, SystemException {
         return getTransactionManager().getTransaction().hashCode();
     }
 
+    @Override
     public TransactionManager getTransactionManager() throws Exception {
         return txm;
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause) throws Exception {
         txm.getTransaction().setRollbackOnly(cause);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransaction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransaction.java
index a1bd1c689..71974f6ea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransaction.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransaction.java
@@ -39,19 +39,20 @@ import javax.transaction.xa.XAResource;
  *
  */
 public class SimpleTransaction implements Transaction {
-    private final Set<Synchronization> synchs = new HashSet<Synchronization>();
+    private final Set<Synchronization> synchs = new HashSet<>();
     private Throwable rollbackCause;
     private volatile int status = Status.STATUS_UNKNOWN;
 
     /**
      * Commits this transaction.
      */
+    @Override
     public void commit() throws HeuristicMixedException, HeuristicRollbackException, RollbackException,
             SecurityException, SystemException {
         if (status == Status.STATUS_MARKED_ROLLBACK)
             throw new RuntimeException(this + " can not commit. Marked for rollback");
         status = Status.STATUS_COMMITTING;
-        List<Throwable> errors = new ArrayList<Throwable>();
+        List<Throwable> errors = new ArrayList<>();
         for (Synchronization synch : synchs) {
             try {
                 synch.beforeCompletion();
@@ -75,6 +76,7 @@ public class SimpleTransaction implements Transaction {
      * Not implemented.
      * Raises UnsupportedOperationException.
      */
+    @Override
     public boolean delistResource(XAResource arg0, int arg1) throws IllegalStateException, SystemException {
         throw new UnsupportedOperationException();
     }
@@ -83,6 +85,7 @@ public class SimpleTransaction implements Transaction {
      * Not implemented.
      * Raises UnsupportedOperationException.
      */
+    @Override
     public boolean enlistResource(XAResource arg0) throws IllegalStateException, RollbackException, SystemException {
         return false;
     }
@@ -91,6 +94,7 @@ public class SimpleTransaction implements Transaction {
      * Gets the status of this transaction.
      * Raises UnsupportedOperationException.
      */
+    @Override
     public int getStatus() throws SystemException {
         return status;
     }
@@ -103,6 +107,7 @@ public class SimpleTransaction implements Transaction {
     /**
      * Registers the given synchronization element.
      */
+    @Override
     public void registerSynchronization(Synchronization synch) throws IllegalStateException, RollbackException,
             SystemException {
         synchs.add(synch);
@@ -111,9 +116,10 @@ public class SimpleTransaction implements Transaction {
     /**
      * Rolls back this transaction.
      */
+    @Override
     public void rollback() throws IllegalStateException, SystemException {
         status = Status.STATUS_ROLLING_BACK;
-        List<Throwable> errors = new ArrayList<Throwable>();
+        List<Throwable> errors = new ArrayList<>();
         for (Synchronization synch : synchs) {
             try {
                 synch.beforeCompletion();
@@ -137,6 +143,7 @@ public class SimpleTransaction implements Transaction {
     /**
      * Marks this transaction for rollback only.
      */
+    @Override
     public void setRollbackOnly() throws IllegalStateException, SystemException {
         setRollbackOnly(null);
     }
@@ -153,6 +160,7 @@ public class SimpleTransaction implements Transaction {
         return rollbackCause;
     }
 
+    @Override
     public String toString() {
         return "TXN:"+hashCode() +"["+statusCode()+"]";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransactionManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransactionManager.java
index 73b1ec3b1..79ac5a2d6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransactionManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jta/SimpleTransactionManager.java
@@ -37,12 +37,13 @@ import javax.transaction.TransactionManager;
  *
  */
 public class SimpleTransactionManager implements TransactionManager {
-    private static ThreadLocal<SimpleTransaction> txns = new ThreadLocal<SimpleTransaction>();
+    private static ThreadLocal<SimpleTransaction> txns = new ThreadLocal<>();
 
     /**
      * Begins a new transaction associated with the current thread.
      *
      */
+    @Override
     public void begin() throws NotSupportedException, SystemException {
         SimpleTransaction txn = getTransaction();
         int status = txn.getStatus();
@@ -58,6 +59,7 @@ public class SimpleTransactionManager implements TransactionManager {
      * Raises IllegalStateException if no transaction is associated with the current thread.
      *
      */
+    @Override
     public void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException,
             RollbackException, SecurityException, SystemException {
         assertActiveTransaction();
@@ -74,6 +76,7 @@ public class SimpleTransactionManager implements TransactionManager {
     /**
      * Gets the status of the transaction associated with the current thread.
      */
+    @Override
     public int getStatus() throws SystemException {
         if (txns.get() == null)
             return Status.STATUS_NO_TRANSACTION;
@@ -85,6 +88,7 @@ public class SimpleTransactionManager implements TransactionManager {
      * If no transaction is associated then creates a transaction and
      * associates with the current thread.
      */
+    @Override
     public SimpleTransaction getTransaction() throws SystemException {
         SimpleTransaction txn = txns.get();
         if (txn == null) {
@@ -99,6 +103,7 @@ public class SimpleTransactionManager implements TransactionManager {
      * Not implemented.
      * Raises UnsupportedOperationException.
      */
+    @Override
     public void resume(Transaction arg0) throws IllegalStateException, InvalidTransactionException, SystemException {
         throw new UnsupportedOperationException();
     }
@@ -108,6 +113,7 @@ public class SimpleTransactionManager implements TransactionManager {
      * Raises IllegalStateException if no transaction is associated with the current thread.
      *
      */
+    @Override
     public void rollback() throws IllegalStateException, SecurityException, SystemException {
         assertActiveTransaction();
         try {
@@ -124,6 +130,7 @@ public class SimpleTransactionManager implements TransactionManager {
      * Raises IllegalStateException if no transaction is associated with the current thread.
      *
      */
+    @Override
     public void setRollbackOnly() throws IllegalStateException, SystemException {
         assertActiveTransaction();
         getTransaction().setRollbackOnly();
@@ -133,6 +140,7 @@ public class SimpleTransactionManager implements TransactionManager {
      * Not implemented.
      * Raises UnsupportedOperationException.
      */
+    @Override
     public void setTransactionTimeout(int arg0) throws SystemException {
         throw new UnsupportedOperationException();
     }
@@ -141,6 +149,7 @@ public class SimpleTransactionManager implements TransactionManager {
      * Not implemented.
      * Raises UnsupportedOperationException.
      */
+    @Override
     public Transaction suspend() throws SystemException {
         throw new UnsupportedOperationException();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
index d5a5ee909..cce78c6cb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
@@ -26,6 +26,7 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.event.AbstractLifecycleListener;
@@ -58,6 +59,7 @@ public abstract class AbstractBrokerSerializationTest<T>
 
     private Object id;
 
+    @Override
     public void setUp() {
         testGlobalRefreshCount = 0;
         deserializedLifeListener = null;
@@ -408,6 +410,8 @@ public abstract class AbstractBrokerSerializationTest<T>
         extends AbstractTransactionListener
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         private int beginCount = 0;
 
         public TxListener() {
@@ -431,6 +435,8 @@ public abstract class AbstractBrokerSerializationTest<T>
         extends AbstractLifecycleListener
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         private int refreshCount = 0;
 
         @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBroker.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBroker.java
index 11db65153..2c067d323 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBroker.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBroker.java
@@ -23,6 +23,7 @@ import org.apache.openjpa.persistence.EntityManagerImpl;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestBroker extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         super.setUp(A.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryEventManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryEventManager.java
index f240d27db..025679e16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryEventManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryEventManager.java
@@ -20,11 +20,12 @@ package org.apache.openjpa.kernel;
 
 import javax.persistence.Persistence;
 
-import junit.framework.TestCase;
-import org.apache.openjpa.event.BrokerFactoryListener;
 import org.apache.openjpa.event.BrokerFactoryEvent;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.event.BrokerFactoryListener;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+
+import junit.framework.TestCase;
 
 public class TestBrokerFactoryEventManager
     extends TestCase {
@@ -45,6 +46,7 @@ public class TestBrokerFactoryEventManager
 
         boolean createEventReceived = false;
 
+        @Override
         public void eventFired(BrokerFactoryEvent event) {
             if (event.getEventType()
                 == BrokerFactoryEvent.BROKER_FACTORY_CREATED)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java
index 69d0830cb..0caf2440e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java
@@ -20,13 +20,13 @@ package org.apache.openjpa.kernel;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.apache.openjpa.persistence.simple.AllFieldTypes;
 import org.apache.openjpa.event.AbstractLifecycleListener;
 import org.apache.openjpa.event.AbstractTransactionListener;
 import org.apache.openjpa.event.LifecycleEvent;
 import org.apache.openjpa.event.TransactionEvent;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestBrokerFactoryListenerRegistry
     extends SingleEMFTestCase {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java
index 72338de5c..20177e166 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestDynamicClassRegistration.java
@@ -19,11 +19,12 @@
 package org.apache.openjpa.kernel;
 
 import java.util.Collections;
+
 import javax.persistence.EntityManager;
 
+import org.apache.openjpa.enhance.ManagedClassSubclasser;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.UnenhancedFieldAccess;
-import org.apache.openjpa.enhance.ManagedClassSubclasser;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
@@ -43,6 +44,7 @@ public class TestDynamicClassRegistration
         emf1 = createNamedEMF("empty-pu");
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         clear(emf1);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEnhancedInstanceBrokerSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEnhancedInstanceBrokerSerialization.java
index 1415f53a2..89ae2e59d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEnhancedInstanceBrokerSerialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEnhancedInstanceBrokerSerialization.java
@@ -31,10 +31,12 @@ public class TestEnhancedInstanceBrokerSerialization
         super.setUp();
     }
 
+    @Override
     protected Class<SimpleEntity> getManagedType() {
         return SimpleEntity.class;
     }
 
+    @Override
     protected SimpleEntity newManagedInstance() {
         SimpleEntity e = new SimpleEntity();
         e.setName("foo");
@@ -42,10 +44,12 @@ public class TestEnhancedInstanceBrokerSerialization
         return e;
     }
 
+    @Override
     protected void modifyInstance(SimpleEntity e) {
         e.setValue("modified");
     }
 
+    @Override
     protected Object getModifiedValue(SimpleEntity e) {
         return e.getValue();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java
index 0e14c966a..5b9c930a7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestEntityManagerFactoryPool.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.kernel;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
@@ -28,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestEntityManagerFactoryPool
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp("openjpa.EntityManagerFactoryPool", Boolean.TRUE);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestInstanceGraphBrokerSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestInstanceGraphBrokerSerialization.java
index 5993cdde0..0aba63df0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestInstanceGraphBrokerSerialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestInstanceGraphBrokerSerialization.java
@@ -23,10 +23,12 @@ import org.apache.openjpa.persistence.query.ManyOneEntity;
 public class TestInstanceGraphBrokerSerialization
     extends AbstractBrokerSerializationTest<ManyOneEntity> {
 
+    @Override
     protected Class<ManyOneEntity> getManagedType() {
         return ManyOneEntity.class;
     }
 
+    @Override
     protected ManyOneEntity newManagedInstance() {
         ManyOneEntity e = new ManyOneEntity();
         e.setName("foo");
@@ -36,10 +38,12 @@ public class TestInstanceGraphBrokerSerialization
         return e;
     }
 
+    @Override
     protected void modifyInstance(ManyOneEntity e) {
         e.getRel().setName("modified");
     }
 
+    @Override
     protected Object getModifiedValue(ManyOneEntity e) {
         return e.getRel().getName();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestQueryCompilationCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestQueryCompilationCache.java
index fa5422c65..2d497cff2 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestQueryCompilationCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestQueryCompilationCache.java
@@ -26,9 +26,9 @@ import javax.persistence.Persistence;
 import org.apache.openjpa.kernel.QueryImpl.Compilation;
 import org.apache.openjpa.kernel.jpql.JPQLExpressionBuilder.ParsedJPQL;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.OpenJPAQuery;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.simple.NamedEntity;
 
 import junit.framework.TestCase;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedFieldAccessInstanceBrokerSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedFieldAccessInstanceBrokerSerialization.java
index 7263075e9..ca9cbd836 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedFieldAccessInstanceBrokerSerialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedFieldAccessInstanceBrokerSerialization.java
@@ -25,20 +25,24 @@ import org.apache.openjpa.persistence.test.AllowFailure;
 public class TestUnenhancedFieldAccessInstanceBrokerSerialization
     extends AbstractBrokerSerializationTest<UnenhancedFieldAccess> {
 
+    @Override
     protected Class<UnenhancedFieldAccess> getManagedType() {
         return UnenhancedFieldAccess.class;
     }
 
+    @Override
     protected UnenhancedFieldAccess newManagedInstance() {
         UnenhancedFieldAccess e = new UnenhancedFieldAccess();
         e.setStringField("foo");
         return e;
     }
 
+    @Override
     protected void modifyInstance(UnenhancedFieldAccess e) {
         e.setStringField("modified");
     }
 
+    @Override
     protected Object getModifiedValue(UnenhancedFieldAccess e) {
         return e.getStringField();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedFieldAccessWithRelationInstanceBrokerSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedFieldAccessWithRelationInstanceBrokerSerialization.java
index 91cdbdfa0..d451e0bd0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedFieldAccessWithRelationInstanceBrokerSerialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedFieldAccessWithRelationInstanceBrokerSerialization.java
@@ -27,14 +27,17 @@ public class TestUnenhancedFieldAccessWithRelationInstanceBrokerSerialization
     extends AbstractUnenhancedRelationBrokerSerializationTest
         <UnenhancedFieldAccessSubclass> {
 
+    @Override
     protected Class getSecondaryType() {
         return UnenhancedFieldAccess.class;
     }
 
+    @Override
     protected Class<UnenhancedFieldAccessSubclass> getManagedType() {
         return UnenhancedFieldAccessSubclass.class;
     }
 
+    @Override
     protected UnenhancedFieldAccessSubclass newManagedInstance() {
         UnenhancedFieldAccessSubclass e = new UnenhancedFieldAccessSubclass();
         e.setStringField("foo");
@@ -44,10 +47,12 @@ public class TestUnenhancedFieldAccessWithRelationInstanceBrokerSerialization
         return e;
     }
 
+    @Override
     protected void modifyInstance(UnenhancedFieldAccessSubclass e) {
         e.getRelated().setStringField("modified");
     }
 
+    @Override
     protected Object getModifiedValue(UnenhancedFieldAccessSubclass e) {
         return e.getRelated().getStringField();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedPropertyAccessInstanceBrokerSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedPropertyAccessInstanceBrokerSerialization.java
index d129875b2..9a6a209a5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedPropertyAccessInstanceBrokerSerialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedPropertyAccessInstanceBrokerSerialization.java
@@ -25,20 +25,24 @@ import org.apache.openjpa.persistence.test.AllowFailure;
 public class TestUnenhancedPropertyAccessInstanceBrokerSerialization
     extends AbstractBrokerSerializationTest<UnenhancedPropertyAccess> {
 
+    @Override
     protected Class<UnenhancedPropertyAccess> getManagedType() {
         return UnenhancedPropertyAccess.class;
     }
 
+    @Override
     protected UnenhancedPropertyAccess newManagedInstance() {
         UnenhancedPropertyAccess e = new UnenhancedPropertyAccess();
         e.setStringField("foo");
         return e;
     }
 
+    @Override
     protected void modifyInstance(UnenhancedPropertyAccess e) {
         e.setStringField("modified");
     }
 
+    @Override
     protected Object getModifiedValue(UnenhancedPropertyAccess e) {
         return e.getStringField();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedPropertyAccessWithRelationInstanceBrokerSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedPropertyAccessWithRelationInstanceBrokerSerialization.java
index 5ec4ddef4..26d8d2879 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedPropertyAccessWithRelationInstanceBrokerSerialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestUnenhancedPropertyAccessWithRelationInstanceBrokerSerialization.java
@@ -27,14 +27,17 @@ public class TestUnenhancedPropertyAccessWithRelationInstanceBrokerSerialization
     extends AbstractUnenhancedRelationBrokerSerializationTest
         <UnenhancedPropertyAccessSubclass> {
 
+    @Override
     protected Class getSecondaryType() {
         return UnenhancedPropertyAccess.class;
     }
 
+    @Override
     protected Class<UnenhancedPropertyAccessSubclass> getManagedType() {
         return UnenhancedPropertyAccessSubclass.class;
     }
 
+    @Override
     protected UnenhancedPropertyAccessSubclass newManagedInstance() {
         UnenhancedPropertyAccessSubclass e =
             new UnenhancedPropertyAccessSubclass();
@@ -45,10 +48,12 @@ public class TestUnenhancedPropertyAccessWithRelationInstanceBrokerSerialization
         return e;
     }
 
+    @Override
     protected void modifyInstance(UnenhancedPropertyAccessSubclass e) {
         e.getRelated().setStringField("modified");
     }
 
+    @Override
     protected Object getModifiedValue(UnenhancedPropertyAccessSubclass e) {
         return e.getRelated().getStringField();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java
index 7e40e915b..4b6be364b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestAnchorParsing.java
@@ -18,16 +18,17 @@
  */
 package org.apache.openjpa.lib.conf;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.List;
 import java.util.MissingResourceException;
-import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
+
+import org.apache.openjpa.lib.util.Options;
 
 import junit.framework.TestCase;
-import org.apache.openjpa.lib.util.Options;
 
 public class TestAnchorParsing extends TestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java
index 32e14f83a..bda50053d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java
@@ -18,10 +18,10 @@
  */
 package org.apache.openjpa.meta;
 
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
 
 @MappedSuperclass
 public class AbstractThing {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Artist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Artist.java
index ff573eff5..c7fdeb224 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Artist.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Artist.java
@@ -21,8 +21,8 @@ package org.apache.openjpa.meta;
 import javax.persistence.Entity;
 
 @Entity
-public class Artist
-    extends Person {
+public class Artist extends Person {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Default constructor required for enhancement.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java
index 8beb7ab73..9dcabd811 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java
@@ -19,12 +19,11 @@
 package org.apache.openjpa.meta;
 
 import java.util.Set;
+
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.apache.openjpa.meta.C;
-
 @Entity
 @Table(name="meta_B")
 public class B extends AbstractThing {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java
index 08c592021..3a3276a69 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java
@@ -18,11 +18,11 @@
  */
 package org.apache.openjpa.meta;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.ManyToOne;
-import javax.persistence.Column;
-import javax.persistence.Id;
 import javax.persistence.Table;
 
 import org.apache.openjpa.meta.C.Identity;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Item.java
index 680ec988b..3ff7b9e0d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Item.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Item.java
@@ -31,6 +31,9 @@ import javax.persistence.Table;
 @Table(name="META_ITEM")
 public class Item implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private int id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Painter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Painter.java
index 6326fb12e..081be1549 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Painter.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Painter.java
@@ -23,6 +23,9 @@ import javax.persistence.Entity;
 @Entity
 public class Painter extends Artist {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public Painter() {
         super();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Person.java
index fe7f17ea3..b68ac4c03 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/Person.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.meta;
 
 import java.io.Serializable;
 import java.util.Collection;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
@@ -27,6 +28,9 @@ import javax.persistence.OneToMany;
 @Entity
 public class Person implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private String name;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java
index 29ef0d070..6a11ccb82 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java
@@ -23,6 +23,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestGetMetaData extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Item.class, Person.class, Artist.class, Painter.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java
index 4ad801f8c..79b753254 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.meta;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestMetaDataInheritanceComparator extends SingleEMFTestCase {
 
@@ -27,6 +27,7 @@ public class TestMetaDataInheritanceComparator extends SingleEMFTestCase {
         inheritanceComparatorHelper(true);
     }
 
+    @Override
     public void setUp() {
         setUp(A.class, B.class, C.class, AbstractThing.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestSecondaryTable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestSecondaryTable.java
index 07f0c540b..5f60f18a7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestSecondaryTable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestSecondaryTable.java
@@ -22,6 +22,7 @@ import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestSecondaryTable extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(Parent.class, PChild.class, PChildBi.class
         // Hard code to 2.0 p.xml value. If the p.xml is 1.0, this value will be changed to false, and the test
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/OpenJPA2018Test.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/OpenJPA2018Test.java
index e07b21291..821b08613 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/OpenJPA2018Test.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/openjpa2018/OpenJPA2018Test.java
@@ -18,16 +18,17 @@
  */
 package org.apache.openjpa.openjpa2018;
 
-import org.apache.openjpa.persistence.test.SingleEMTestCase;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Root;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+
+import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 /**
  * This test verifies that select IN statements with
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Country.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Country.java
index 7fd682ac3..e359b4c90 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Country.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Country.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 @Entity
 @Table(name="COUNTRY1")
 public class Country {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/DummyPersistenceCapeable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/DummyPersistenceCapeable.java
index db18e44b9..016410be1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/DummyPersistenceCapeable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/DummyPersistenceCapeable.java
@@ -46,106 +46,133 @@ public class DummyPersistenceCapeable implements PersistenceCapable {
             "DummyPersistenceCapeable", new DummyPersistenceCapeable());
     }
 
+    @Override
     public int pcGetEnhancementContractVersion() {
         return PCEnhancer.ENHANCER_VERSION - 1;
     }
 
+    @Override
     public PersistenceCapable pcNewInstance(StateManager sm, boolean clear) {
         return new DummyPersistenceCapeable();
     }
 
+    @Override
     public void pcCopyFields(Object fromObject, int[] fields) {
 
     }
 
+    @Override
     public void pcCopyKeyFieldsFromObjectId(FieldConsumer consumer, Object obj) {
     }
 
+    @Override
     public void pcCopyKeyFieldsToObjectId(FieldSupplier supplier, Object obj) {
     }
 
+    @Override
     public void pcCopyKeyFieldsToObjectId(Object obj) {
     }
 
+    @Override
     public void pcDirty(String fieldName) {
     }
 
+    @Override
     public Object pcFetchObjectId() {
         return null;
     }
 
+    @Override
     public Object pcGetDetachedState() {
         return null;
     }
 
+    @Override
     public Object pcGetGenericContext() {
         return null;
     }
 
+    @Override
     public StateManager pcGetStateManager() {
         return null;
     }
 
+    @Override
     public Object pcGetVersion() {
         return null;
     }
 
+    @Override
     public boolean pcIsDeleted() {
         return false;
     }
 
+    @Override
     public Boolean pcIsDetached() {
         return null;
     }
 
+    @Override
     public boolean pcIsDirty() {
         return false;
     }
 
+    @Override
     public boolean pcIsNew() {
         return false;
     }
 
+    @Override
     public boolean pcIsPersistent() {
         return false;
     }
 
+    @Override
     public boolean pcIsTransactional() {
         return false;
     }
 
+    @Override
     public PersistenceCapable pcNewInstance(StateManager sm, Object obj, boolean clear) {
         return null;
     }
 
+    @Override
     public Object pcNewObjectIdInstance() {
         return null;
     }
 
+    @Override
     public Object pcNewObjectIdInstance(Object obj) {
         return null;
     }
 
+    @Override
     public void pcProvideField(int fieldIndex) {
 
     }
 
+    @Override
     public void pcProvideFields(int[] fieldIndices) {
 
     }
 
+    @Override
     public void pcReplaceField(int fieldIndex) {
 
     }
 
+    @Override
     public void pcReplaceFields(int[] fieldIndex) {
 
     }
 
+    @Override
     public void pcReplaceStateManager(StateManager sm) {
 
     }
 
+    @Override
     public void pcSetDetachedState(Object state) {
 
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Embed.java
index 9a6c75bae..64040152e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Embed.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Embed.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 package org.apache.openjpa.persistence;
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class Embed {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Security.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Security.java
index f14162fa2..008b1a2e2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Security.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/Security.java
@@ -17,7 +17,14 @@
  * under the License.
  */
 package org.apache.openjpa.persistence;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="SECURITY1")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java
index b52e6c69a..5c00ac5e2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java
@@ -25,10 +25,12 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 // org.apache.openjpa.persistence.TestMixedMappingLocation
 public class TestMixedMappingLocation extends SingleEMFTestCase {
 
+    @Override
     protected String getPersistenceUnitName() {
         return "xml-persistence-unit";
     }
 
+    @Override
     public void setUp() {
         setUp(DROP_TABLES,MixedMappingLocationEmbeddedId.class, MixedMappingLocation.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java
index 78ae6611e..47dbb1608 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java
@@ -21,17 +21,17 @@ package org.apache.openjpa.persistence;
 import javax.persistence.EntityManager;
 import javax.persistence.spi.LoadState;
 
-import junit.framework.Assert;
 import org.apache.openjpa.persistence.entity.EntityA;
 import org.apache.openjpa.persistence.entity.EntityB;
 import org.apache.openjpa.persistence.entity.EntityC;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
-/**
- *
- */
+import junit.framework.Assert;
+
+
 public class TestOpenJPA2330 extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(EntityA.class, EntityB.class, EntityC.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenjpaIdNotRecognizedMessage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenjpaIdNotRecognizedMessage.java
index 7e9c5c5d6..f8ae7bf4b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenjpaIdNotRecognizedMessage.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenjpaIdNotRecognizedMessage.java
@@ -22,6 +22,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestOpenjpaIdNotRecognizedMessage extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Issue428Entity.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestUnwrap.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestUnwrap.java
index 38036e7b2..b6fe689e9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestUnwrap.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestUnwrap.java
@@ -106,7 +106,7 @@ public class TestUnwrap extends SingleEMFTestCase {
             assertNotNull(c);
             assertTrue(DelegatingConnection.class.isAssignableFrom(c.getClass()));
 
-            List<Class> acceptedConnectionClassTypes = new ArrayList<Class>();
+            List<Class> acceptedConnectionClassTypes = new ArrayList<>();
             if (DerbyDictionary.class.getName().equals(dbDict)) {
                 // Connection type can be network or embedded
                 String[] connectionTypes = {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java
index 30eafa4db..6b5a5fa36 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestXMLPersistenceMetaDataParser.java
@@ -23,19 +23,22 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import javax.persistence.EntityManager;
+
 import org.apache.openjpa.kernel.QueryHints;
 import org.apache.openjpa.meta.QueryMetaData;
 import org.apache.openjpa.persistence.meta.MetamodelImpl;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
-import javax.persistence.*;
 
 public class TestXMLPersistenceMetaDataParser extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Security1.class, Country1.class,
             Security.class, Country.class);
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "test-persistence-xml-orm";
     }
@@ -62,10 +65,10 @@ public class TestXMLPersistenceMetaDataParser extends SQLListenerTestCase {
         em.getTransaction().commit();
         em.clear();
 
-        ArrayList<String> XMLsql = new ArrayList<String>();
-        ArrayList<String> Annsql = new ArrayList<String>();
+        ArrayList<String> XMLsql = new ArrayList<>();
+        ArrayList<String> Annsql = new ArrayList<>();
 
-        super.sql = new ArrayList<String>();
+        super.sql = new ArrayList<>();
         aUS_country = em.find(Country1.class, aUS_sid);
         Iterator itr = super.sql.iterator();
         while (itr.hasNext()) {
@@ -73,7 +76,7 @@ public class TestXMLPersistenceMetaDataParser extends SQLListenerTestCase {
         }
         super.sql.clear();
 
-        super.sql = new ArrayList<String>();
+        super.sql = new ArrayList<>();
         aUS_countryAnn = em.find(Country.class, aUS_sid);
         itr = super.sql.iterator();
         while (itr.hasNext()) {
@@ -84,7 +87,7 @@ public class TestXMLPersistenceMetaDataParser extends SQLListenerTestCase {
         Annsql.clear();
         XMLsql.clear();
 
-        super.sql = new ArrayList<String>();
+        super.sql = new ArrayList<>();
         aI_security = em.find(Security1.class, aI_sid);
         itr = super.sql.iterator();
         while (itr.hasNext()) {
@@ -92,7 +95,7 @@ public class TestXMLPersistenceMetaDataParser extends SQLListenerTestCase {
         }
         super.sql.clear();
 
-        super.sql = new ArrayList<String>();
+        super.sql = new ArrayList<>();
         aI_securityAnn = em.find(Security.class, aI_sid);
         itr = super.sql.iterator();
         while (itr.hasNext()) {
@@ -103,7 +106,7 @@ public class TestXMLPersistenceMetaDataParser extends SQLListenerTestCase {
         Annsql.clear();
         XMLsql.clear();
 
-        super.sql = new ArrayList<String>();
+        super.sql = new ArrayList<>();
         Country1 aUS_country1 = aI_security.getCountry1();
         itr = super.sql.iterator();
         while (itr.hasNext()) {
@@ -111,7 +114,7 @@ public class TestXMLPersistenceMetaDataParser extends SQLListenerTestCase {
         }
         super.sql.clear();
 
-        super.sql = new ArrayList<String>();
+        super.sql = new ArrayList<>();
         Country aUS_country2 = aI_securityAnn.getCountry();
         itr = super.sql.iterator();
         while (itr.hasNext()) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperField.java
index f4d96f155..7f38b685c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperField.java
@@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.access;
 import java.util.Date;
 
 import javax.persistence.Access;
+import javax.persistence.AccessType;
 import javax.persistence.Basic;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
-import javax.persistence.AccessType;
 
 @MappedSuperclass
 @Access(AccessType.FIELD)
@@ -59,6 +59,7 @@ public abstract class AbstractMappedSuperField {
 
     abstract public void setCreateDate(Date date);
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof AbstractMappedSuperField) {
             AbstractMappedSuperField ps = (AbstractMappedSuperField)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperProperty.java
index 2e8806ccf..516a1f7a1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperProperty.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/AbstractMappedSuperProperty.java
@@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.access;
 import java.util.Date;
 
 import javax.persistence.Access;
+import javax.persistence.AccessType;
 import javax.persistence.Basic;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
-import javax.persistence.AccessType;
 import javax.persistence.Transient;
 
 @MappedSuperclass
@@ -61,6 +61,7 @@ public abstract class AbstractMappedSuperProperty {
 
     abstract public void setCreateDate(Date date);
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof AbstractMappedSuperProperty) {
             AbstractMappedSuperProperty ps = (AbstractMappedSuperProperty)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefFieldMixedPropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefFieldMixedPropAccess.java
index 228d04055..20f28fbd5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefFieldMixedPropAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefFieldMixedPropAccess.java
@@ -18,6 +18,9 @@
  */
 package org.apache.openjpa.persistence.access;
 
+import static javax.persistence.AccessType.FIELD;
+import static javax.persistence.AccessType.PROPERTY;
+
 import javax.persistence.Access;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -27,9 +30,6 @@ import javax.persistence.NamedQuery;
 import javax.persistence.Transient;
 import javax.persistence.Version;
 
-import static javax.persistence.AccessType.FIELD;
-import static javax.persistence.AccessType.PROPERTY;
-
 @Entity(name="DFMPA")
 @Access(value=FIELD)
 @NamedQueries( {
@@ -76,6 +76,7 @@ public class DefFieldMixedPropAccess {
         return getStrField();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof DefFieldMixedPropAccess) {
             DefFieldMixedPropAccess fa = (DefFieldMixedPropAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefPropMixedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefPropMixedFieldAccess.java
index 6b0ad74a9..04bd92298 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefPropMixedFieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/DefPropMixedFieldAccess.java
@@ -18,6 +18,9 @@
  */
 package org.apache.openjpa.persistence.access;
 
+import static javax.persistence.AccessType.FIELD;
+import static javax.persistence.AccessType.PROPERTY;
+
 import javax.persistence.Access;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -27,9 +30,6 @@ import javax.persistence.NamedQuery;
 import javax.persistence.Transient;
 import javax.persistence.Version;
 
-import static javax.persistence.AccessType.FIELD;
-import static javax.persistence.AccessType.PROPERTY;
-
 @Entity(name="DPMFA")
 @Access(value=PROPERTY)
 @NamedQueries( {
@@ -76,6 +76,7 @@ public class DefPropMixedFieldAccess {
         return strField;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof DefPropMixedFieldAccess) {
             DefPropMixedFieldAccess dpmfa = (DefPropMixedFieldAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedFieldAccess.java
index f72eaecd2..d82d210a2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedFieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedFieldAccess.java
@@ -45,6 +45,7 @@ public class EmbedFieldAccess {
         lName = lname;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof EmbedFieldAccess) {
             EmbedFieldAccess ps = (EmbedFieldAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedId.java
index 961a54897..28818fb64 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedId.java
@@ -45,10 +45,12 @@ public class EmbedId {
         code = c;
     }
 
+    @Override
     public int hashCode() {
         return super.hashCode();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof EmbedId) {
             EmbedId eid = (EmbedId)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedInnerProp.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedInnerProp.java
index ea81116eb..669a51c74 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedInnerProp.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedInnerProp.java
@@ -48,6 +48,7 @@ public class EmbedInnerProp {
         eof = eo;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof EmbedInnerProp) {
             EmbedInnerProp ps = (EmbedInnerProp)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedMixedAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedMixedAccess.java
index f23eb1fa3..535e680c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedMixedAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedMixedAccess.java
@@ -58,6 +58,7 @@ public class EmbedMixedAccess {
         mName = mname;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof EmbedMixedAccess) {
             EmbedMixedAccess ps = (EmbedMixedAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedOuterField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedOuterField.java
index fe9a5269d..543cf70c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedOuterField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedOuterField.java
@@ -36,6 +36,7 @@ public class EmbedOuterField {
         outName = outerName;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof EmbedOuterField) {
             EmbedOuterField ps = (EmbedOuterField)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedPropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedPropAccess.java
index a05572e58..d3397899f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedPropAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/EmbedPropAccess.java
@@ -53,6 +53,7 @@ public class EmbedPropAccess {
         lName = lname;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof EmbedPropAccess) {
             EmbedPropAccess ps = (EmbedPropAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccess.java
index 1547bbf77..09654f1f0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccess.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.persistence.access;
 
+import static javax.persistence.AccessType.FIELD;
+
 import javax.persistence.Access;
 import javax.persistence.Basic;
 import javax.persistence.Entity;
@@ -26,8 +28,6 @@ import javax.persistence.Id;
 import javax.persistence.NamedQuery;
 import javax.persistence.Version;
 
-import static javax.persistence.AccessType.FIELD;
-
 @Entity
 @Access(value=FIELD)
 @NamedQuery(name="FieldAccess.query",
@@ -69,6 +69,7 @@ public class FieldAccess {
         return getStrField();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof FieldAccess) {
             FieldAccess fa = (FieldAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccessPropStratsEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccessPropStratsEntity.java
index 73387423a..cb03fc0ba 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccessPropStratsEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldAccessPropStratsEntity.java
@@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.access;
 import java.util.Collection;
 
 import javax.persistence.Access;
+import javax.persistence.AccessType;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.ElementCollection;
 import javax.persistence.Embedded;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
-import javax.persistence.AccessType;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldEmbedEntity.java
index 4324369fa..6b10a518c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldEmbedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldEmbedEntity.java
@@ -75,6 +75,7 @@ public class FieldEmbedEntity {
         epa = ep;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof FieldEmbedEntity) {
             FieldEmbedEntity ps = (FieldEmbedEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub.java
index bfc469da1..25ab6084d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub.java
@@ -52,6 +52,7 @@ public class FieldSub extends AbstractMappedSuperProperty {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof FieldSub) {
             FieldSub ps = (FieldSub)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub2.java
index 017120e4a..24021ad79 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub2.java
@@ -47,6 +47,7 @@ public class FieldSub2 extends MappedSuperProperty {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof FieldSub2) {
             FieldSub2 ps = (FieldSub2)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub3.java
index 78496a9c8..8bf91c833 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/FieldSub3.java
@@ -50,6 +50,7 @@ public class FieldSub3 extends SuperPropertyEntity {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof FieldSub3) {
             FieldSub3 ps = (FieldSub3)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperField.java
index 846ea21c3..eb81c1f33 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperField.java
@@ -59,6 +59,7 @@ public class MappedSuperField {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof MappedSuperField) {
             MappedSuperField ps = (MappedSuperField)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperProperty.java
index e042c26e1..920ebed57 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperProperty.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MappedSuperProperty.java
@@ -53,6 +53,7 @@ public class MappedSuperProperty {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof MappedSuperProperty) {
             MappedSuperProperty ps = (MappedSuperProperty)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedFieldSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedFieldSub.java
index fe9eda1ee..f29c5563d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedFieldSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedFieldSub.java
@@ -56,6 +56,7 @@ public class MixedFieldSub extends MixedMappedSuper {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof MixedFieldSub) {
             MixedFieldSub ps = (MixedFieldSub)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMappedSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMappedSuper.java
index fbe08a8dc..a04a33d3c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMappedSuper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMappedSuper.java
@@ -60,6 +60,7 @@ public class MixedMappedSuper {
         return mname;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof MixedMappedSuper) {
             MixedMappedSuper ps = (MixedMappedSuper)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMultEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMultEmbedEntity.java
index 5db07f389..61756d147 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMultEmbedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedMultEmbedEntity.java
@@ -96,6 +96,7 @@ public class MixedMultEmbedEntity {
         efa = ef;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof MixedMultEmbedEntity) {
             MixedMultEmbedEntity ps = (MixedMultEmbedEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedNestedEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedNestedEmbedEntity.java
index 15d26865c..ab6252c75 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedNestedEmbedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/MixedNestedEmbedEntity.java
@@ -78,6 +78,7 @@ public class MixedNestedEmbedEntity {
         eip = ep;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof MixedNestedEmbedEntity) {
             MixedNestedEmbedEntity ps = (MixedNestedEmbedEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccess.java
index 2dc6f281a..4291646b2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccess.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.persistence.access;
 
+import static javax.persistence.AccessType.PROPERTY;
+
 import javax.persistence.Access;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,8 +27,6 @@ import javax.persistence.Id;
 import javax.persistence.NamedQuery;
 import javax.persistence.Version;
 
-import static javax.persistence.AccessType.PROPERTY;
-
 @Entity
 @Access(value=PROPERTY)
 @NamedQuery(name="PropertyAccess.query",
@@ -67,6 +67,7 @@ public class PropAccess {
         return strField;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof PropAccess) {
             PropAccess pa = (PropAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccessFieldStratsEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccessFieldStratsEntity.java
index 645c897cf..6e2acec9f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccessFieldStratsEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropAccessFieldStratsEntity.java
@@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.access;
 import java.util.Collection;
 
 import javax.persistence.Access;
+import javax.persistence.AccessType;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.ElementCollection;
 import javax.persistence.Embedded;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
-import javax.persistence.AccessType;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEmbedEntity.java
index a58014de2..38b11efd1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEmbedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropEmbedEntity.java
@@ -75,6 +75,7 @@ public class PropEmbedEntity {
         efa = ef;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof PropEmbedEntity) {
             PropEmbedEntity ps = (PropEmbedEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropMixedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropMixedEntity.java
index 0b4c158a1..b22e4bf89 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropMixedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropMixedEntity.java
@@ -83,6 +83,7 @@ public class PropMixedEntity {
         ema = ef;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof PropMixedEntity) {
             PropMixedEntity ps = (PropMixedEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub.java
index 9f3f1ce07..384a5d8c2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub.java
@@ -52,6 +52,7 @@ public class PropertySub extends AbstractMappedSuperField {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof PropertySub) {
             PropertySub ps = (PropertySub)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub2.java
index e99c34069..3708e0734 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub2.java
@@ -48,6 +48,7 @@ public class PropertySub2 extends MappedSuperField {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof PropertySub2) {
             PropertySub2 ps = (PropertySub2)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub3.java
index 8c5e6e2ec..3f02031e7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/PropertySub3.java
@@ -50,6 +50,7 @@ public class PropertySub3 extends SuperFieldEntity {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof PropertySub3) {
             PropertySub3 ps = (PropertySub3)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperFieldEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperFieldEntity.java
index b9fed7611..c3f19ea5f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperFieldEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperFieldEntity.java
@@ -64,6 +64,7 @@ public class SuperFieldEntity {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof SuperFieldEntity) {
             SuperFieldEntity sfe = (SuperFieldEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperPropertyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperPropertyEntity.java
index 2340f319a..0bfca3ce3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperPropertyEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/SuperPropertyEntity.java
@@ -64,6 +64,7 @@ public class SuperPropertyEntity {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof SuperPropertyEntity) {
             SuperPropertyEntity sfe = (SuperPropertyEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java
index 926510546..e319dcba3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestDefaultAccess.java
@@ -34,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestDefaultAccess extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES,
             PropEntity.class, MappedCallbackSup.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
index a44159f93..71e105928 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestExplicitAccess.java
@@ -36,6 +36,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestExplicitAccess extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES,
             PropAccess.class, FieldAccess.class,
@@ -898,7 +899,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
         eid.setCode("IdCode");
         pa.setEmbedId(eid); // embedded id
 
-        Collection<EmbedPropAccess> elc = new ArrayList<EmbedPropAccess>();
+        Collection<EmbedPropAccess> elc = new ArrayList<>();
         EmbedPropAccess epa1 = new EmbedPropAccess("Abe", "Lincoln");
         EmbedPropAccess epa2 = new EmbedPropAccess("John", "Kennedy");
         elc.add(epa1);
@@ -916,7 +917,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
         propa.setStrProp("PropAccess");
         pa.setManyToOne(propa); // many to one
 
-        Collection<FieldAccess> fac = new ArrayList<FieldAccess>();
+        Collection<FieldAccess> fac = new ArrayList<>();
         FieldAccess fa = new FieldAccess();
         fa.setStrField("FieldAccess");
         fac.add(fa);
@@ -990,7 +991,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
         eid.setCode("IdCode");
         fa.setEmbedId(eid); // embedded id
 
-        Collection<EmbedPropAccess> elc = new ArrayList<EmbedPropAccess>();
+        Collection<EmbedPropAccess> elc = new ArrayList<>();
         EmbedPropAccess epa1 = new EmbedPropAccess("George", "Washington");
         EmbedPropAccess epa2 = new EmbedPropAccess("James", "Carter");
         elc.add(epa1);
@@ -1008,7 +1009,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
         propa.setStrProp("PropAccess");
         fa.setManyToOne(propa); // many to one
 
-        Collection<FieldAccess> fac = new ArrayList<FieldAccess>();
+        Collection<FieldAccess> fac = new ArrayList<>();
         FieldAccess fae = new FieldAccess();
         fae.setStrField("FieldAccess");
         fac.add(fae);
@@ -1076,7 +1077,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
         MenuItem mi = new MenuItem();
         mi.setName("PB & J Sandwich");
 
-        Map<String, Ingredient> ingredients = new HashMap<String, Ingredient>();
+        Map<String, Ingredient> ingredients = new HashMap<>();
         mi.setIngredients(ingredients);
 
         Ingredient i1 = new Ingredient("Peanut Butter");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestPropertyAccessCapitalization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestPropertyAccessCapitalization.java
index fc2d4644c..4c29bc445 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestPropertyAccessCapitalization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/TestPropertyAccessCapitalization.java
@@ -25,6 +25,7 @@ import javax.persistence.EntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestPropertyAccessCapitalization extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(DROP_TABLES, PropertyAccessCapitalization.class, PropertyAccessCapitalizationOldBehavior.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java
index 15c1a10df..7bc73dbac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/TestXMLExplicitAccess.java
@@ -31,10 +31,12 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestXMLExplicitAccess extends SingleEMFTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperField.java
index 6e4ea4d51..36011c515 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperField.java
@@ -46,6 +46,7 @@ public abstract class XMLAbstractMappedSuperField {
 
     abstract public void setCreateDate(Date date);
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLAbstractMappedSuperField) {
             XMLAbstractMappedSuperField ps = (XMLAbstractMappedSuperField)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperProperty.java
index bed80d21d..3d2ee8766 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperProperty.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLAbstractMappedSuperProperty.java
@@ -46,6 +46,7 @@ public abstract class XMLAbstractMappedSuperProperty {
 
     abstract public void setCreateDate(Date date);
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLAbstractMappedSuperProperty) {
             XMLAbstractMappedSuperProperty ps =
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefFieldMixedPropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefFieldMixedPropAccess.java
index 612daf2cf..a4cabaac1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefFieldMixedPropAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefFieldMixedPropAccess.java
@@ -50,6 +50,7 @@ public class XMLDefFieldMixedPropAccess {
         return strField;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLDefFieldMixedPropAccess) {
             XMLDefFieldMixedPropAccess fa = (XMLDefFieldMixedPropAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefFieldMixedPropAccess2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefFieldMixedPropAccess2.java
index 7d63959fe..4f28848f8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefFieldMixedPropAccess2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefFieldMixedPropAccess2.java
@@ -50,6 +50,7 @@ public class XMLDefFieldMixedPropAccess2 {
         return strField;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLDefFieldMixedPropAccess2) {
             XMLDefFieldMixedPropAccess2 fa = (XMLDefFieldMixedPropAccess2)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefPropMixedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefPropMixedFieldAccess.java
index fb8a7a8f9..ece239e7c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefPropMixedFieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefPropMixedFieldAccess.java
@@ -50,6 +50,7 @@ public class XMLDefPropMixedFieldAccess {
         return getStrField();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLDefPropMixedFieldAccess) {
             XMLDefPropMixedFieldAccess dpmfa = (XMLDefPropMixedFieldAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefPropMixedFieldAccess2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefPropMixedFieldAccess2.java
index f05cce573..d205ba729 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefPropMixedFieldAccess2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLDefPropMixedFieldAccess2.java
@@ -50,6 +50,7 @@ public class XMLDefPropMixedFieldAccess2 {
         return getStrField();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLDefPropMixedFieldAccess2) {
             XMLDefPropMixedFieldAccess2 dpmfa =
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedFieldAccess.java
index 0beffb6c8..cb11eac40 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedFieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedFieldAccess.java
@@ -39,6 +39,7 @@ public class XMLEmbedFieldAccess {
         lName = lname;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLEmbedFieldAccess) {
             XMLEmbedFieldAccess ps = (XMLEmbedFieldAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedMixedAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedMixedAccess.java
index cf76c8db4..da9503983 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedMixedAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedMixedAccess.java
@@ -49,6 +49,7 @@ public class XMLEmbedMixedAccess {
         setMName(mname);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLEmbedMixedAccess) {
             XMLEmbedMixedAccess ps = (XMLEmbedMixedAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedPropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedPropAccess.java
index 50d43bcc8..0731285c8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedPropAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLEmbedPropAccess.java
@@ -47,6 +47,7 @@ public class XMLEmbedPropAccess {
         lName = lname;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLEmbedPropAccess) {
             XMLEmbedPropAccess ps = (XMLEmbedPropAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldAccess.java
index 10f09064e..b76fae2fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldAccess.java
@@ -50,6 +50,7 @@ public class XMLFieldAccess {
         return getStrField();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLFieldAccess) {
             XMLFieldAccess fa = (XMLFieldAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldAccess2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldAccess2.java
index 7aaab46fe..ccf26db6a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldAccess2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldAccess2.java
@@ -50,6 +50,7 @@ public class XMLFieldAccess2 {
         return getStrField();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLFieldAccess2) {
             XMLFieldAccess2 fa = (XMLFieldAccess2)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldEmbedEntity.java
index f65b89da2..58b0d0678 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldEmbedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldEmbedEntity.java
@@ -50,6 +50,7 @@ public class XMLFieldEmbedEntity {
         epa = ep;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLFieldEmbedEntity) {
             XMLFieldEmbedEntity ps = (XMLFieldEmbedEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub.java
index 4818fe392..ddd843629 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub.java
@@ -34,6 +34,7 @@ public class XMLFieldSub extends XMLAbstractMappedSuperProperty {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLFieldSub) {
             XMLFieldSub ps = (XMLFieldSub)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub2.java
index 434d40fac..773f82a4c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub2.java
@@ -32,6 +32,7 @@ public class XMLFieldSub2 extends XMLMappedSuperProperty {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLFieldSub2) {
             XMLFieldSub2 ps = (XMLFieldSub2)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub3.java
index 79bdd2a60..8f2620cca 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLFieldSub3.java
@@ -32,6 +32,7 @@ public class XMLFieldSub3 extends XMLSuperPropertyEntity {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLFieldSub3) {
             XMLFieldSub3 ps = (XMLFieldSub3)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMappedSuperField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMappedSuperField.java
index b8ecca35a..ea606c420 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMappedSuperField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMappedSuperField.java
@@ -44,6 +44,7 @@ public class XMLMappedSuperField {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLMappedSuperField) {
             XMLMappedSuperField ps = (XMLMappedSuperField)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMappedSuperProperty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMappedSuperProperty.java
index 40d45685a..6f96d46c2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMappedSuperProperty.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMappedSuperProperty.java
@@ -40,6 +40,7 @@ public class XMLMappedSuperProperty {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLMappedSuperProperty) {
             XMLMappedSuperProperty ps = (XMLMappedSuperProperty)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMixedFieldSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMixedFieldSub.java
index 7f430914e..86f3bd510 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMixedFieldSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMixedFieldSub.java
@@ -34,6 +34,7 @@ public class XMLMixedFieldSub extends XMLMixedMappedSuper {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLMixedFieldSub) {
             XMLMixedFieldSub ps = (XMLMixedFieldSub)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMixedMappedSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMixedMappedSuper.java
index ac4906332..f66fa356d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMixedMappedSuper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLMixedMappedSuper.java
@@ -44,6 +44,7 @@ public class XMLMixedMappedSuper {
         return mname;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLMixedMappedSuper) {
             XMLMixedMappedSuper ps = (XMLMixedMappedSuper)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropAccess.java
index b58e1174a..a9a19f6cd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropAccess.java
@@ -50,6 +50,7 @@ public class XMLPropAccess {
         return strField;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLPropAccess) {
             XMLPropAccess pa = (XMLPropAccess)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropAccess2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropAccess2.java
index 9c6143cc1..4d4442a30 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropAccess2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropAccess2.java
@@ -50,6 +50,7 @@ public class XMLPropAccess2 {
         return strField;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLPropAccess2) {
             XMLPropAccess2 pa = (XMLPropAccess2)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropEmbedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropEmbedEntity.java
index 90ea755f3..c0a514f43 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropEmbedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropEmbedEntity.java
@@ -50,6 +50,7 @@ public class XMLPropEmbedEntity {
         efa = ef;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLPropEmbedEntity) {
             XMLPropEmbedEntity ps = (XMLPropEmbedEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropMixedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropMixedEntity.java
index cf597dc35..172fcba7f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropMixedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropMixedEntity.java
@@ -51,6 +51,7 @@ public class XMLPropMixedEntity {
         setEma(ef);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLPropMixedEntity) {
             XMLPropMixedEntity ps = (XMLPropMixedEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub.java
index 29c4ef10e..f4a346e26 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub.java
@@ -34,6 +34,7 @@ public class XMLPropertySub extends XMLAbstractMappedSuperField {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLPropertySub) {
             XMLPropertySub ps = (XMLPropertySub)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub2.java
index 946a8ab06..b2bb4501d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub2.java
@@ -30,6 +30,7 @@ public class XMLPropertySub2 extends XMLMappedSuperField {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLPropertySub2) {
             XMLPropertySub2 ps = (XMLPropertySub2)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub3.java
index d34da23b3..e12e100b9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLPropertySub3.java
@@ -32,6 +32,7 @@ public class XMLPropertySub3 extends XMLSuperFieldEntity {
         crtDate = date;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLPropertySub3) {
             XMLPropertySub3 ps = (XMLPropertySub3)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLSuperFieldEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLSuperFieldEntity.java
index 52e25205d..6d453f684 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLSuperFieldEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLSuperFieldEntity.java
@@ -40,6 +40,7 @@ public class XMLSuperFieldEntity {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLSuperFieldEntity) {
             XMLSuperFieldEntity sfe = (XMLSuperFieldEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLSuperPropertyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLSuperPropertyEntity.java
index 36ed885ca..525530290 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLSuperPropertyEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/access/xml/XMLSuperPropertyEntity.java
@@ -40,6 +40,7 @@ public class XMLSuperPropertyEntity {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof XMLSuperPropertyEntity) {
             XMLSuperPropertyEntity sfe = (XMLSuperPropertyEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA.java
index 072536f8a..5ff3e4863 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA.java
@@ -36,7 +36,7 @@ public class PColl_EntityA {
     private int id;
 
     @PersistentCollection(elementEmbedded = true)
-    private Set<PColl_EmbedB> embedCollection = new HashSet<PColl_EmbedB>();
+    private Set<PColl_EmbedB> embedCollection = new HashSet<>();
 
     @Version
     private int version;
@@ -61,6 +61,7 @@ public class PColl_EntityA {
         this.embedCollection.add(element);
     }
 
+    @Override
     public String toString() {
         return "PColl_EntityD<id=" + id + ",ver=" + version
             + ",embedBCollection#=" + embedCollection.size() + ">";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA1.java
index 59e67da81..6573f4878 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityA1.java
@@ -36,7 +36,7 @@ public class PColl_EntityA1 {
     private int id;
 
     @PersistentCollection(elementEmbedded = true)
-    private Set<PColl_EntityB> embedCollection = new HashSet<PColl_EntityB>();
+    private Set<PColl_EntityB> embedCollection = new HashSet<>();
 
     @Version
     private int version;
@@ -61,6 +61,7 @@ public class PColl_EntityA1 {
         this.embedCollection.add(element);
     }
 
+    @Override
     public String toString() {
         return "PColl_EntityD<id=" + id + ",ver=" + version
             + ",embedBCollection#=" + embedCollection.size() + ">";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityC.java
index 81c220a18..546a3c33d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityC.java
@@ -42,6 +42,7 @@ public class PColl_EntityC {
         this.id = id;
     }
 
+    @Override
     public String toString() {
         return "PColl_EntityC<id=" + id + ",ver=" + version + ">";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringEager.java
index fe3299823..ce2d32106 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringEager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringEager.java
@@ -33,7 +33,7 @@ public class PColl_EntityStringEager {
     private int id;
 
     @PersistentCollection(fetch=FetchType.EAGER)
-    private Set<String> collectionOfStrings = new HashSet<String>();
+    private Set<String> collectionOfStrings = new HashSet<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringLazy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringLazy.java
index 60828e536..a76306e1b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringLazy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/PColl_EntityStringLazy.java
@@ -33,7 +33,7 @@ public class PColl_EntityStringLazy {
     private int id;
 
     @PersistentCollection(fetch=FetchType.LAZY)
-    private Set<String> collectionOfStrings = new HashSet<String>();
+    private Set<String> collectionOfStrings = new HashSet<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java
index 0d4220bce..32dfd3227 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java
@@ -22,10 +22,10 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
-import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.FlightSchedule;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Schedule;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="excluded")
 public class TestAdvAnnot extends AnnotationTestCase
@@ -35,7 +35,8 @@ public class TestAdvAnnot extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
-	public void setUp() {
+	@Override
+    public void setUp() {
 		deleteAll(Schedule.class);
 		deleteAll(FlightSchedule.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java
index 9f1da4423..68bbadc81 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java
@@ -18,11 +18,10 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import org.apache.openjpa.meta.*;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
-
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Entity1;
 
 public class TestAnnotationBasics extends AnnotationTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java
index 9d0efa57a..03a1d8610 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java
@@ -20,9 +20,11 @@ package org.apache.openjpa.persistence.annotations;
 
 import java.util.List;
 
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.CallbackStorage;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.LifeCycleDDEntity;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.LifeCycleDDEntity2;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="excluded")
 public class TestDDCallbackMethods extends AnnotationTestCase
@@ -33,7 +35,8 @@ public class TestDDCallbackMethods extends AnnotationTestCase
 		super(name, "ddcactusapp");
 	}
 
-	public void setUp()
+	@Override
+    public void setUp()
 	{
 		deleteAll(LifeCycleDDEntity.class);
 		deleteAll(LifeCycleDDEntity2.class);
@@ -73,7 +76,7 @@ public class TestDDCallbackMethods extends AnnotationTestCase
 
 		assertNotNull(lcd);
 		CallbackStorage store = CallbackStorage.getInstance();
-		store.clearStore();
+		CallbackStorage.clearStore();
 
 		em.remove(lcd);
 
@@ -163,7 +166,7 @@ public class TestDDCallbackMethods extends AnnotationTestCase
         LifeCycleDDEntity2 lc = new LifeCycleDDEntity2("Bill", "Clinton");
 
 		CallbackStorage store = CallbackStorage.getInstance();
-		store.clearStore();
+		CallbackStorage.clearStore();
 
 		em.persist(lc);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java
index 57b2705ce..4670a75be 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java
@@ -21,9 +21,8 @@ package org.apache.openjpa.persistence.annotations;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 //import kodo.persistence.test.*;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.EmbedOwner;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.EmbedValue;
 import org.apache.openjpa.persistence.test.AllowFailure;
 
 /**
@@ -49,6 +48,7 @@ public class TestEJBEmbedded extends AnnotationTestCase
         CLOB = buf.toString();
     }
 
+    @Override
     public void setUp()
     {
         deleteAll (EmbedOwner.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddableSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddableSuperclass.java
index 24fedcac4..d6e564df3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddableSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddableSuperclass.java
@@ -19,10 +19,7 @@
 package org.apache.openjpa.persistence.annotations;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.EmbeddableSuperSub;
 
 /**
  * <p>Test embeddable superclasses.</p>
@@ -37,6 +34,7 @@ public class TestEmbeddableSuperclass extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp() {
         deleteAll(EmbeddableSuperSub.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java
index 0a5be8b6c..2f9a8b854 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEmbeddedId.java
@@ -18,13 +18,12 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import javax.persistence.*;
+import javax.persistence.Query;
 
-import org.apache.openjpa.enhance.*;
+import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.EmbeddedIdClass;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.EmbeddedIdEntity;
 
 /**
  * <p>Test embedded id classes.</p>
@@ -42,6 +41,7 @@ public class TestEmbeddedId extends AnnotationTestCase
     EmbeddedIdClass _oid;
     EmbeddedIdClass _roid;
 
+    @Override
     public void setUp() {
         deleteAll(EmbeddedIdEntity.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
index afac8b71c..7298a5b3e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
@@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.annotations;
 
 import java.util.List;
 
-import org.apache.openjpa.persistence.test.AllowFailure;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.CallbackStorage;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.ContractEmployee;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Employee;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="excluded")
 public class TestEntityListenerAnnot extends AnnotationTestCase
@@ -35,7 +35,8 @@ public class TestEntityListenerAnnot extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
-	public void setUp()
+	@Override
+    public void setUp()
 	{
 		deleteAll(Employee.class);
 		deleteAll(ContractEmployee.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java
index 1819b5505..552ecbe0b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java
@@ -18,12 +18,10 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import java.util.*;
+import java.util.List;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.OrderByEntity;
 import org.apache.openjpa.persistence.test.AllowFailure;
 
 /**
@@ -42,6 +40,7 @@ public class TestEntityOrderBy extends AnnotationTestCase
 
 //    private ClassMetaData _meta;
 
+    @Override
     public void setUp()
     {
 //        _meta = ((OpenJPAConfiguration) getConfiguration()).
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java
index 831524239..73b364a10 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEnumerated.java
@@ -18,12 +18,11 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import org.apache.openjpa.persistence.*;
+import javax.persistence.InheritanceType;
 
-import javax.persistence.*;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1;
 
 
 
@@ -42,6 +41,7 @@ public class TestEnumerated extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp() {
         deleteAll(AnnoTest1.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestFlatInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestFlatInheritance.java
index 1b74c121e..ddec59f4f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestFlatInheritance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestFlatInheritance.java
@@ -18,10 +18,9 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Flat1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Flat2;
 
 
 /**
@@ -37,6 +36,7 @@ public class TestFlatInheritance extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp()
     {
         deleteAll(Flat1.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java
index 055bd3411..ac66db786 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestGenerators.java
@@ -18,12 +18,10 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import javax.persistence.*;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import javax.persistence.Query;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Generator;
 
 /**
  * Test for generators
@@ -38,6 +36,7 @@ public class TestGenerators extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp()
         throws Exception {
         deleteAll(Generator.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestJoinedInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestJoinedInheritance.java
index 813b6c3f0..ff9e3f73e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestJoinedInheritance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestJoinedInheritance.java
@@ -18,10 +18,10 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest2;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest3;
 
 
 /**
@@ -37,6 +37,7 @@ public class TestJoinedInheritance extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp()
     {
         new AnnoTest1();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestManyToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestManyToMany.java
index 3702e43ea..987a99e1a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestManyToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestManyToMany.java
@@ -18,12 +18,11 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import java.util.*;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import java.util.Set;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest2;
 
 /**
  * Test for m-m
@@ -37,6 +36,7 @@ public class TestManyToMany extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp() {
         deleteAll(AnnoTest1.class);
         deleteAll(AnnoTest2.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java
index 304a74ce4..1e44675d4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMapKey.java
@@ -18,12 +18,12 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import javax.persistence.*;
+import javax.persistence.MapKey;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest2;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.Flat1;
 
 
 /**
@@ -43,6 +43,7 @@ public class TestMapKey extends AnnotationTestCase
 
     //private ClassMapping _mapping;
 
+    @Override
     public void setUp()
     {
         deleteAll(Flat1.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMappedSuperClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMappedSuperClass.java
index d26190177..2a0ae14fb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMappedSuperClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestMappedSuperClass.java
@@ -45,6 +45,7 @@ public class TestMappedSuperClass extends AnnotationTestCase {
         super(name, "annotationMappedSuperclassApp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(Store.class);
         deleteAll(Site.class);
@@ -105,7 +106,7 @@ public class TestMappedSuperClass extends AnnotationTestCase {
             store.setSiteId(site.getPartyId());
             store.setSite(site);
 
-            List<Store> stores = new ArrayList<Store>();
+            List<Store> stores = new ArrayList<>();
             stores.add(store);
             site.setStores(stores);
 
@@ -163,7 +164,7 @@ public class TestMappedSuperClass extends AnnotationTestCase {
             store.setCreateDate(new Date());
             store.setSite(site);
 
-            List<Store1> stores = new ArrayList<Store1>();
+            List<Store1> stores = new ArrayList<>();
             stores.add(store);
             site.setStores(stores);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToMany.java
index 74a57f6de..8280155a8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToMany.java
@@ -18,12 +18,11 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import java.util.*;
+import java.util.Collection;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest2;
 
 
 /**
@@ -38,6 +37,7 @@ public class TestOneToMany extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp() {
         deleteAll(AnnoTest1.class);
         deleteAll(AnnoTest2.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java
index 805434644..f1045b61d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java
@@ -18,10 +18,9 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest2;
 
 /**
  * Test for 1-1
@@ -36,6 +35,7 @@ public class TestOneToOne extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp() {
         deleteAll(AnnoTest1.class);
         deleteAll(AnnoTest2.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java
index cd8d8560a..6bdafd933 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java
@@ -33,6 +33,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestPersistentCollection extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(PColl_EntityA.class, PColl_EmbedB.class, PColl_EntityC.class,
                 PColl_EntityA1.class, PColl_EntityB.class, PColl_EntityStringEager.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java
index a89f007bc..2eb17357d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java
@@ -20,10 +20,7 @@ package org.apache.openjpa.persistence.annotations;
 
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
-
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.PropertyAccess1;
 import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="excluded")
@@ -34,6 +31,7 @@ public class TestPropertyAccess extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
+    @Override
     public void setUp() {
         deleteAll(PropertyAccess1.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestSerializedLobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestSerializedLobs.java
index cb9282240..6b793846d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestSerializedLobs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestSerializedLobs.java
@@ -18,13 +18,13 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
 import java.util.Date;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1;
 
 
 /**
@@ -42,6 +42,7 @@ public class TestSerializedLobs extends AnnotationTestCase
 
     private static final Date DATE = new Date();
 
+    @Override
     public void setUp() {
         deleteAll(AnnoTest1.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java
index a62202360..f1d0aba88 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java
@@ -19,9 +19,9 @@
 package org.apache.openjpa.persistence.annotations;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.EmbedValue;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.TablePerClass1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.TablePerClass2;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
index 474e86a28..ff1b9cc3a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
@@ -18,19 +18,19 @@
  */
 package org.apache.openjpa.persistence.annotations;
 
-import javax.persistence.* ;
-
-import org.apache.openjpa.jdbc.conf.* ;
-import org.apache.openjpa.jdbc.meta.* ;
-import org.apache.openjpa.jdbc.meta.strats.* ;
-
-import
-    org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
-import org.apache.openjpa.persistence.test.AllowFailure;
+import javax.persistence.EntityManager;
 
+import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.strats.NoneVersionStrategy;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest1;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest2;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.AnnoTest3;
+import org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.EmbedOwner;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 /*
    Test for opt-lock
@@ -51,7 +51,8 @@ public class TestVersion extends AnnotationTestCase
 		super(name, "annotationcactusapp");
 	}
 
-	public void setUp()
+	@Override
+    public void setUp()
 	{
 		new AnnoTest1();
 		new AnnoTest2();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java
index b8b4b4c56..720844e74 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest1.java
@@ -19,11 +19,38 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.ManyToMany;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.SecondaryTable;
+import javax.persistence.SecondaryTables;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
-import org.apache.openjpa.persistence.jdbc.*;
+import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
 
 @Entity
 @Table(name = "ANNOTEST1")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java
index 89beb22de..7e19661da 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest2.java
@@ -20,9 +20,27 @@ package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 @Entity
 @Table(name = "ANNOTEST2")
@@ -122,6 +140,8 @@ public class AnnoTest2 {
 
     public static class Oid implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public long pk1;
         public String pk2;
 
@@ -143,6 +163,7 @@ public class AnnoTest2 {
             }
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == this)
                 return true;
@@ -156,10 +177,12 @@ public class AnnoTest2 {
             return pk2.equals(other.pk2);
         }
 
+        @Override
         public int hashCode() {
             return ((int) pk1) + (pk2 == null ? 0 : pk2.hashCode());
         }
 
+        @Override
         public String toString() {
             return pk1 + "," + (pk2 == null ? "null" : pk2);
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java
index 2e64c9e6c..e88efce91 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/AnnoTest3.java
@@ -19,7 +19,15 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.PrimaryKeyJoinColumns;
+import javax.persistence.Table;
 
 @Entity
 @DiscriminatorValue("ANNO3")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/CallbackStorage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/CallbackStorage.java
index df4df1207..169cdc186 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/CallbackStorage.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/CallbackStorage.java
@@ -19,8 +19,8 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Singleton class to store callback invocation hits
@@ -31,7 +31,7 @@ public class CallbackStorage
 {
 	private static CallbackStorage store = new CallbackStorage();
 
-	private static List<String> clist = new ArrayList<String>();
+	private static List<String> clist = new ArrayList<>();
 
 	private CallbackStorage()
 	{}
@@ -53,7 +53,7 @@ public class CallbackStorage
 
 	public static void clearStore()
 	{
-		clist = new ArrayList<String>();
+		clist = new ArrayList<>();
 	}
 
 	public static boolean isEmpty()
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java
index 0b47c145f..2460e395e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/ContractEmployee.java
@@ -19,7 +19,10 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.ExcludeSuperclassListeners;
+import javax.persistence.PrePersist;
 
 @Entity
 @ExcludeSuperclassListeners
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java
index 37b591ba8..d97103f48 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DateValidator.java
@@ -19,7 +19,8 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.PostPersist;
+import javax.persistence.PrePersist;
 
 public class DateValidator
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java
index d91963906..d1fcc0c7c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/DefaultCallbackListener.java
@@ -19,13 +19,13 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.PrePersist;
+import javax.persistence.PostLoad;
 import javax.persistence.PostPersist;
-import javax.persistence.PreRemove;
 import javax.persistence.PostRemove;
 import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
+import javax.persistence.PreRemove;
 import javax.persistence.PreUpdate;
-import javax.persistence.PostLoad;
 
 public class DefaultCallbackListener
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java
index c393334d1..e26defb65 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedOwner.java
@@ -19,7 +19,18 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.AssociationOverride;
+import javax.persistence.AttributeOverride;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.SqlResultSetMapping;
 
 @Entity
 @SqlResultSetMapping(name = "EmbedMapping", entities = {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java
index 44bd54c14..3d20caff5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue.java
@@ -19,7 +19,12 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
 
 @Embeddable
 public class EmbedValue {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java
index cef5ccb21..75c58d4db 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbedValue2.java
@@ -19,7 +19,9 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 
 /**
  * Same as EmbedValue but no blobs for suitable use as key/value/element
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java
index 1567cadf5..672f6a7eb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuper.java
@@ -19,7 +19,13 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 @MappedSuperclass
 public class EmbeddableSuper {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java
index b9170a1dd..a90a9d9ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddableSuperSub.java
@@ -19,7 +19,12 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
 
 @Entity
 @DiscriminatorColumn(name = "DISC")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java
index 65c19491c..b123a8356 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdClass.java
@@ -19,7 +19,9 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.GeneratedValue;
 
 @Embeddable
 public class EmbeddedIdClass {
@@ -58,14 +60,17 @@ public class EmbeddedIdClass {
         this.pk3 = pk3;
     }
 
+    @Override
     public String toString() {
         return pk1 + ":" + pk2 + ":" + pk3;
     }
 
+    @Override
     public int hashCode() {
         return (int) ((pk1 ^ pk2 ^ pk3) % Integer.MAX_VALUE);
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java
index ecee7d4c9..5934ac10f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/EmbeddedIdEntity.java
@@ -19,7 +19,16 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.SqlResultSetMapping;
+import javax.persistence.Table;
 
 @Entity
 @Table(name = "EMIDENTITY")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java
index f907fea50..6157645e9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Employee.java
@@ -19,7 +19,18 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PostLoad;
+import javax.persistence.PostPersist;
+import javax.persistence.PostUpdate;
+import javax.persistence.Transient;
 
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -47,7 +58,8 @@ public class Employee implements NamedEntity
 		this.name = name;
 	}
 
-	public String getName()
+	@Override
+    public String getName()
 	{
 		return name;
 	}
@@ -93,7 +105,8 @@ public class Employee implements NamedEntity
 		store.getClist().add("employeepou");
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return "Name: " + name + " of " + this.getClass().getName()
             + " Id: " + id + " Synctime: " + syncTime;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java
index e054465ba..8200dc980 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity1.java
@@ -112,7 +112,8 @@ public class Entity1 implements Serializable
 		return entity2Field;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return("PK: " + pk + " StringField: " + stringField
                 + " IntField: " + intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java
index 99f956d46..49e3995f3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Entity2.java
@@ -34,9 +34,7 @@ import javax.persistence.InheritanceType;
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
 public class Entity2 implements Serializable
 {
-	/**
-	 *
-	 */
+	
 	private static final long serialVersionUID = 4723739219953167343L;
 
 	@Id
@@ -89,7 +87,8 @@ public class Entity2 implements Serializable
 		return intField;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return("PK: " + pk + " StringField: " + stringField
                 + " IntField: " + intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java
index 9ba57ced3..da2e0ff28 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat1.java
@@ -19,7 +19,14 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Version;
 
 @Entity
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java
index 5eaf7ca0f..52a93ec33 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Flat2.java
@@ -19,7 +19,8 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
 
 @Entity
 public class Flat2
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java
index d409c1391..166781838 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/FlightSchedule.java
@@ -19,9 +19,16 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import java.util.Calendar;
+import java.util.Date;
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 
 @Entity
 @DiscriminatorValue("fsched")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java
index f8b3d6178..f25d82dda 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Generator.java
@@ -19,9 +19,15 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import java.util.*;
+import java.util.StringTokenizer;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.TableGenerator;
 
 @Entity
 // non-psql/ora dbs cause issues with SequenceGenerator in auto-mapping
@@ -85,6 +91,7 @@ public class Generator {
             pk3 = Long.valueOf(tok.nextToken());
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == null || !(o instanceof Oid))
                 return false;
@@ -98,11 +105,13 @@ public class Generator {
             return pk2.equals(other.pk2);
         }
 
+        @Override
         public int hashCode() {
             return pk + (pk2 == null ? 0 : pk2.hashCode())
                 + (int) (pk3 % Integer.MAX_VALUE);
         }
 
+        @Override
         public String toString() {
             return pk + "," + pk2 + "," + pk3;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java
index 64c8d62b0..7d09d1d31 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/LongNameValidator.java
@@ -19,7 +19,8 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
 
 public class LongNameValidator
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java
index 70f44879b..3d1919937 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NameValidator.java
@@ -19,7 +19,10 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.PostRemove;
+import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
+import javax.persistence.PreRemove;
 
 public class NameValidator
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NamedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NamedEntity.java
index 17d5e49c3..13d6f95ee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NamedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/NamedEntity.java
@@ -22,6 +22,6 @@ package
 
 public interface NamedEntity
 {
-	public String getName();
+	String getName();
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java
index 152be0cfb..56b2aa5e7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/OrderByEntity.java
@@ -19,11 +19,17 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OrderBy;
 
-import org.apache.openjpa.persistence.*;
+import org.apache.openjpa.persistence.PersistentCollection;
 
 /**
  * <p>Entity used to test parsing of @OrderBy.</p>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PartyId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PartyId.java
index 42607d6a4..04014fe62 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PartyId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PartyId.java
@@ -42,12 +42,14 @@ public class PartyId implements Serializable{
         return this.id;
     }
 
+    @Override
     public boolean equals(Object o) {
         return (o instanceof PartyId) &&
             partyName.equals(((PartyId)o).getPartyName()) &&
             id == (((PartyId)o).getId());
     }
 
+    @Override
     public int hashCode() {
         return partyName.hashCode() + id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java
index 3ff539eed..496745ac4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/PropertyAccess1.java
@@ -19,7 +19,8 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
 /**
  * Entity test object that uses property access mode.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java
index 4ebdb2410..2e2aadcfd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Schedule.java
@@ -19,10 +19,20 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import java.util.Date;
 import java.util.Calendar;
+import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 
 @Entity
 @Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
@@ -94,7 +104,8 @@ public class Schedule
 		this.name = name;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
 		return "Schedule "+name+" Date "+startDate;
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java
index fcf4cab1e..1bd2316c5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site.java
@@ -20,11 +20,12 @@ package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
 import java.util.List;
+
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.FetchType;
-import javax.persistence.CascadeType;
 
 @Entity
 @Table(name = "Site")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java
index 083f404d3..7e23a8037 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/Site1.java
@@ -21,11 +21,11 @@ package
 
 import java.util.List;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.FetchType;
-import javax.persistence.CascadeType;
 
 @Entity
 @Table(name = "Site1")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/StringValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/StringValidator.java
index 55bb44bb3..0ff97be62 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/StringValidator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/StringValidator.java
@@ -19,7 +19,8 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.PostPersist;
+import javax.persistence.PrePersist;
 
 public class StringValidator
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass1.java
index aadbe8caf..2f7eb7a38 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass1.java
@@ -19,7 +19,15 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass2.java
index 7a45fc985..084c83352 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TablePerClass2.java
@@ -19,7 +19,8 @@
 package
     org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
 
 @Entity
 public class TablePerClass2
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TxRollbackEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TxRollbackEntity.java
index 441a76f5c..e54edd45d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TxRollbackEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/annotype/TxRollbackEntity.java
@@ -22,11 +22,11 @@ package
 import java.util.ArrayList;
 
 import javax.persistence.Basic;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.PostLoad;
-import javax.persistence.Entity;
 import javax.persistence.PostRemove;
 import javax.persistence.Table;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/CallbackStorage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/CallbackStorage.java
index 6d87956fb..ec2eb7380 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/CallbackStorage.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/CallbackStorage.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Singleton class to store callback invocation hits
@@ -30,7 +30,7 @@ public class CallbackStorage
 {
 	private static CallbackStorage store = new CallbackStorage();
 
-	private static List<String> clist = new ArrayList<String>();
+	private static List<String> clist = new ArrayList<>();
 
 	private CallbackStorage()
 	{}
@@ -52,7 +52,7 @@ public class CallbackStorage
 
 	public static void clearStore()
 	{
-		clist = new ArrayList<String>();
+		clist = new ArrayList<>();
 	}
 
 	public static boolean isEmpty()
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/ContractEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/ContractEmployee.java
index eeb76708e..cdff61c4a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/ContractEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/ContractEmployee.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.ExcludeSuperclassListeners;
+import javax.persistence.PrePersist;
 
 @Entity
 @ExcludeSuperclassListeners
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DateValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DateValidator.java
index 2ee29b30a..25dd0ee30 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DateValidator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DateValidator.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
+import javax.persistence.PostPersist;
+import javax.persistence.PrePersist;
 
 public class DateValidator
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DefaultCallbackListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DefaultCallbackListener.java
index c7fadaea5..972f309b0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DefaultCallbackListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/DefaultCallbackListener.java
@@ -18,9 +18,6 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.
-        CallbackStorage;
-
 public class DefaultCallbackListener
 {
 	public DefaultCallbackListener()
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Employee.java
index 292babb35..ce183ede1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Employee.java
@@ -18,7 +18,18 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.PostLoad;
+import javax.persistence.PostPersist;
+import javax.persistence.PostUpdate;
+import javax.persistence.Transient;
 
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -46,7 +57,8 @@ public class Employee implements NamedEntity
 		this.name = name;
 	}
 
-	public String getName()
+	@Override
+    public String getName()
 	{
 		return name;
 	}
@@ -92,7 +104,8 @@ public class Employee implements NamedEntity
 		store.getClist().add("employeepou");
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return "Name: " + name + " of " + this.getClass().getName()
             + " Id: " + id + " Synctime: " + syncTime;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java
index 0561a0b4f..6b5631b5e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity1.java
@@ -111,7 +111,8 @@ public class Entity1 implements Serializable
 		return entity2Field;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return("PK: " + pk + " StringField: " + stringField
                 + " IntField: " + intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity2.java
index f21ab8974..df0068c70 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Entity2.java
@@ -33,9 +33,7 @@ import javax.persistence.InheritanceType;
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
 public class Entity2 implements Serializable
 {
-	/**
-	 *
-	 */
+	
 	private static final long serialVersionUID = 4723739219953167343L;
 
 	@Id
@@ -88,7 +86,8 @@ public class Entity2 implements Serializable
 		return intField;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return("PK: " + pk + " StringField: " + stringField
                 + " IntField: " + intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/EntityDDListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/EntityDDListener.java
index ce229551e..d82c98bc4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/EntityDDListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/EntityDDListener.java
@@ -18,9 +18,6 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.
-        CallbackStorage;
-
 public class EntityDDListener
 {
 	public EntityDDListener()
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/EntityDDListener2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/EntityDDListener2.java
index 40b7088c6..b90ab6046 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/EntityDDListener2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/EntityDDListener2.java
@@ -18,9 +18,6 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.
-        CallbackStorage;
-
 public class EntityDDListener2
 {
 	public void verifyPreUpdate(Object lcd)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/FlightSchedule.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/FlightSchedule.java
index cc306a865..fc2efa94e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/FlightSchedule.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/FlightSchedule.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
+import java.util.Calendar;
+import java.util.Date;
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 
 @Entity
 @DiscriminatorValue("fsched")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity.java
index 9043ad9dc..77ea14d50 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity.java
@@ -18,10 +18,11 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
-
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.
-        CallbackStorage;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 
 @Entity
 public class LifeCycleDDEntity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity2.java
index ac5eca786..be28f53b5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntity2.java
@@ -27,9 +27,6 @@ import javax.persistence.PostPersist;
 import javax.persistence.PrePersist;
 import javax.persistence.PreRemove;
 
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.
-        CallbackStorage;
-
 @Entity
 public class LifeCycleDDEntity2
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntitySub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntitySub.java
index c32e56f04..4ba6c976f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntitySub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LifeCycleDDEntitySub.java
@@ -18,10 +18,8 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
-
-import org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.
-        CallbackStorage;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
 
 @Entity
 @DiscriminatorValue("SUB")
@@ -35,18 +33,21 @@ public class LifeCycleDDEntitySub extends LifeCycleDDEntity
 		super(n, sn);
 	}
 
-	public void verifyPrePersist()
+	@Override
+    public void verifyPrePersist()
 	{
 		CallbackStorage store = CallbackStorage.getInstance();
 		store.getClist().add("over-verifyprp");
 	}
 
-	public void verifyPostPersist()
+	@Override
+    public void verifyPostPersist()
 	{
 		CallbackStorage store = CallbackStorage.getInstance();
 		store.getClist().add("over-verifypop");
 	}
 
+    @Override
     public void verifyPreRemove()
     {
 		CallbackStorage store = CallbackStorage.getInstance();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LongNameValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LongNameValidator.java
index 83de641c0..ae8eb758e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LongNameValidator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/LongNameValidator.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
+import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
 
 public class LongNameValidator
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NameValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NameValidator.java
index 73e594d82..8153d37bb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NameValidator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NameValidator.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
+import javax.persistence.PostRemove;
+import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
+import javax.persistence.PreRemove;
 
 public class NameValidator
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NamedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NamedEntity.java
index 7254c3379..f5a3b4477 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NamedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/NamedEntity.java
@@ -21,6 +21,6 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
 public interface NamedEntity
 {
-	public String getName();
+	String getName();
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Schedule.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Schedule.java
index 489b199bd..4e373dd1e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Schedule.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/Schedule.java
@@ -18,10 +18,19 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import java.util.Date;
 import java.util.Calendar;
+import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 
 @Entity
 //@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
@@ -94,7 +103,8 @@ public class Schedule
 		this.name = name;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
 		return "Schedule "+name+" Date "+startDate;
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/StringValidator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/StringValidator.java
index e33bee10b..1447faab2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/StringValidator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/StringValidator.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 
-import javax.persistence.*;
+import javax.persistence.PostPersist;
+import javax.persistence.PrePersist;
 
 public class StringValidator
 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/TxRollbackEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/TxRollbackEntity.java
index f94cfcdea..14c557e10 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/TxRollbackEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/common/apps/annotApp/ddtype/TxRollbackEntity.java
@@ -21,11 +21,11 @@ package org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype;
 import java.util.ArrayList;
 
 import javax.persistence.Basic;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.PostLoad;
-import javax.persistence.Entity;
 import javax.persistence.PostRemove;
 import javax.persistence.Table;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/TestMetaDataComplete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/TestMetaDataComplete.java
index 258d1558c..8b739a365 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/TestMetaDataComplete.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/xml/TestMetaDataComplete.java
@@ -48,7 +48,8 @@ public class TestMetaDataComplete extends SingleEMFTestCase {
 	private static ClassMetaData entityA, entityB, derivedA, derivedB;
 	private static int currentTest = 0;
 
-	public void setUp() throws Exception {
+	@Override
+    public void setUp() throws Exception {
         currentTest++;
 		if (oemf == null) {
             super.setUp(EntityA.class, EntityB.class, DerivedA.class,
@@ -65,7 +66,8 @@ public class TestMetaDataComplete extends SingleEMFTestCase {
 		}
 	}
 
-	public void tearDown() throws Exception {
+	@Override
+    public void tearDown() throws Exception {
 	    // only cleanup after the last test has run
 	    if (currentTest >= 6) {
 	        closeEMF(oemf);
@@ -78,7 +80,8 @@ public class TestMetaDataComplete extends SingleEMFTestCase {
 	    }
 	}
 
-	protected String getPersistenceUnitName() {
+	@Override
+    protected String getPersistenceUnitName() {
 		return "test-metadata-complete";
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestAnnoExceptionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestAnnoExceptionEntity.java
index 056594b13..a6a85713b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestAnnoExceptionEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/arrays/TestAnnoExceptionEntity.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestAnnoExceptionEntity extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(AnnoExceptionEntity.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/Ent1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/Ent1.java
index 558543b03..ad1e07eac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/Ent1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/Ent1.java
@@ -38,6 +38,7 @@ public class Ent1 {
     public Ent1() {}
     public Ent1(int pk, String str) {this.pk = pk;name=str;}
 
+    @Override
     public String toString(){
         return "Ent1 [pk = " + pk + ", " + name +"]";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java
index ae658eb4d..765fff73f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/batch/exception/TestBatchLimitException.java
@@ -61,6 +61,7 @@ public class TestBatchLimitException extends AbstractPersistenceTestCase {
         return emf;
     }
 
+    @Override
     public void setUp() {
         expectedFailedObject = null;
         expectedFailedObjectOracle = null;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/TestBlobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/TestBlobs.java
index 68c34da72..ad0b7d866 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/TestBlobs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/TestBlobs.java
@@ -36,6 +36,7 @@ public class TestBlobs extends SingleEMFTestCase {
 
     QueryBuilder qb = null;
 
+    @Override
     public void setUp() {
         super.setUp(BlobEntity.class, RETAIN_DATA);
         cleanup();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/TestBlobColumnType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/TestBlobColumnType.java
index 210f1f67e..a9a571781 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/TestBlobColumnType.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/blob/mysql/TestBlobColumnType.java
@@ -36,6 +36,7 @@ public class TestBlobColumnType extends SingleEMFTestCase {
     private static boolean _firstRun=true;
     private boolean _runTest = false; // only test with MySQL
 
+    @Override
     public void setUp() throws Exception {
 
         // create EMF solely to obtain a DBDictionary.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java
index aa9534e74..89ef96d96 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/AbstractCacheModeTestCase.java
@@ -38,6 +38,7 @@ import org.apache.openjpa.persistence.cache.jpa.model.XmlCacheableEntity;
 import org.apache.openjpa.persistence.cache.jpa.model.XmlUncacheableEntity;
 
 public abstract class AbstractCacheModeTestCase extends AbstractCacheTestCase {
+    @Override
     public abstract OpenJPAEntityManagerFactorySPI getEntityManagerFactory();
 
     public abstract List<String> getSql();
@@ -150,7 +151,7 @@ public abstract class AbstractCacheModeTestCase extends AbstractCacheTestCase {
      * the number of SQL statements that result.
      */
     public interface Action {
-        public void run();
+        void run();
     }
 
     // =======================================================================
@@ -169,6 +170,7 @@ public abstract class AbstractCacheModeTestCase extends AbstractCacheTestCase {
      */
     public void testReadModeByass() {
         assertSqlInc(new Action() {
+            @Override
             public void run() {
                 EntityManager em = getEntityManagerFactory().createEntityManager();
                 em.setProperty(RETRIEVE_MODE_PROP, CacheRetrieveMode.BYPASS);
@@ -205,6 +207,7 @@ public abstract class AbstractCacheModeTestCase extends AbstractCacheTestCase {
     public void testRetrieveModeUse() {
         if (getCacheEnabled()) {
             assertNoSql(new Action() {
+                @Override
                 public void run() {
                     EntityManager em = getEntityManagerFactory().createEntityManager();
                     em.setProperty(RETRIEVE_MODE_PROP, CacheRetrieveMode.USE);
@@ -216,6 +219,7 @@ public abstract class AbstractCacheModeTestCase extends AbstractCacheTestCase {
                 }
             });
             assertSqlInc(new Action() {
+                @Override
                 public void run() {
                     EntityManager em = getEntityManagerFactory().createEntityManager();
                     em.setProperty(RETRIEVE_MODE_PROP, CacheRetrieveMode.USE);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAll.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAll.java
index 49552edfc..6609801c0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAll.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAll.java
@@ -36,7 +36,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestCacheModeAll extends AbstractCacheModeTestCase {
 
     protected static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache = persistentTypes;
@@ -58,6 +58,7 @@ public class TestCacheModeAll extends AbstractCacheModeTestCase {
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -65,6 +66,7 @@ public class TestCacheModeAll extends AbstractCacheModeTestCase {
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAllDataCacheCustomized.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAllDataCacheCustomized.java
index 562bfce55..548422d78 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAllDataCacheCustomized.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAllDataCacheCustomized.java
@@ -33,7 +33,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 public class TestCacheModeAllDataCacheCustomized extends TestCacheModeAll {
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put("openjpa.DataCache",
             "org.apache.openjpa.persistence.cache.jpa.DataCacheTestExtension(CacheSize=5000, "
                 + "ExcludedTypes=org.apache.openjpa.persistence.cache.jpa.model.UncacheableEntity)");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAllDataCacheTrue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAllDataCacheTrue.java
index e36c09b84..eefe4f901 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAllDataCacheTrue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeAllDataCacheTrue.java
@@ -34,7 +34,7 @@ public class TestCacheModeAllDataCacheTrue extends TestCacheModeAll {
 
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put("openjpa.DataCache", "true(CacheSize=5000, "
             + "ExcludedTypes=org.apache.openjpa.persistence.cache.jpa.model.UncacheableEntity)");
         props.put("openjpa.RemoteCommitProvider", "sjvm");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelective.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelective.java
index 6404fcbb4..bde4b0e5c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelective.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeDisableSelective.java
@@ -36,7 +36,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestCacheModeDisableSelective extends AbstractCacheModeTestCase {
 
     protected static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache =
@@ -56,6 +56,7 @@ public class TestCacheModeDisableSelective extends AbstractCacheModeTestCase {
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener =  new FilteringJDBCListener(getSql());
@@ -63,6 +64,7 @@ public class TestCacheModeDisableSelective extends AbstractCacheModeTestCase {
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEmpty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEmpty.java
index dd56cab4b..cc30614fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEmpty.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEmpty.java
@@ -33,7 +33,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestCacheModeEmpty extends AbstractCacheModeTestCase {
 
     private static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache = persistentTypes;
@@ -51,6 +51,7 @@ public class TestCacheModeEmpty extends AbstractCacheModeTestCase {
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener =  new FilteringJDBCListener(getSql());
@@ -58,6 +59,7 @@ public class TestCacheModeEmpty extends AbstractCacheModeTestCase {
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelectedDataCacheTrue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelectedDataCacheTrue.java
index 27e1589f3..19e4232eb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelectedDataCacheTrue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelectedDataCacheTrue.java
@@ -32,7 +32,7 @@ public class TestCacheModeEnableSelectedDataCacheTrue  extends TestCacheModeEnab
 
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
-    	Map<String,Object> props = new HashMap<String,Object>();
+    	Map<String,Object> props = new HashMap<>();
     	//exclude types will be ignored since shared cache mode take precedence
    	 	props.put("openjpa.DataCache", "true(ExcludedTypes=" +
    	 			"org.apache.openjpa.persistence.cache.jpa.model.CacheableEntity)");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelective.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelective.java
index cfc101d91..8c1d468f4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelective.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeEnableSelective.java
@@ -36,7 +36,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestCacheModeEnableSelective extends AbstractCacheModeTestCase {
 
     protected static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache =
@@ -56,6 +56,7 @@ public class TestCacheModeEnableSelective extends AbstractCacheModeTestCase {
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -63,6 +64,7 @@ public class TestCacheModeEnableSelective extends AbstractCacheModeTestCase {
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNone.java
index 857e6ac76..dc4540be5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNone.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNone.java
@@ -33,7 +33,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestCacheModeNone extends AbstractCacheModeTestCase {
 
     protected static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache = {};
@@ -51,6 +51,7 @@ public class TestCacheModeNone extends AbstractCacheModeTestCase {
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -58,6 +59,7 @@ public class TestCacheModeNone extends AbstractCacheModeTestCase {
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNoneDataCacheCustomized.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNoneDataCacheCustomized.java
index 70bffb134..ad3a685c6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNoneDataCacheCustomized.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNoneDataCacheCustomized.java
@@ -27,7 +27,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 public class TestCacheModeNoneDataCacheCustomized extends TestCacheModeNone {
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put("openjpa.DataCache",
             "org.apache.openjpa.persistence.cache.jpa.DataCacheTestExtension(CacheSize=5000, "
                 + "ExcludedTypes=org.apache.openjpa.persistence.cache.jpa.model.UncacheableEntity)");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNoneDataCacheTrue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNoneDataCacheTrue.java
index c9463eb23..af94d7c35 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNoneDataCacheTrue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeNoneDataCacheTrue.java
@@ -31,7 +31,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 public class TestCacheModeNoneDataCacheTrue extends TestCacheModeNone{
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
-        Map<String,Object> props = new HashMap<String,Object>();
+        Map<String,Object> props = new HashMap<>();
         props.put("openjpa.DataCache", "true");
         props.put("openjpa.RemoteCommitProvider", "sjvm");
         if (emf == null) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecified.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecified.java
index cc9740bc9..8fb3f2586 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecified.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecified.java
@@ -33,7 +33,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestCacheModeUnspecified extends AbstractCacheModeTestCase {
 
     private static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache = persistentTypes;
@@ -51,6 +51,7 @@ public class TestCacheModeUnspecified extends AbstractCacheModeTestCase {
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -58,6 +59,7 @@ public class TestCacheModeUnspecified extends AbstractCacheModeTestCase {
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecifiedDataCacheTrue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecifiedDataCacheTrue.java
index 5a4d7a2a9..db2d3045c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecifiedDataCacheTrue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestCacheModeUnspecifiedDataCacheTrue.java
@@ -35,7 +35,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
  */
 public class TestCacheModeUnspecifiedDataCacheTrue extends AbstractCacheModeTestCase{
     private static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache = persistentTypes;
@@ -43,7 +43,7 @@ public class TestCacheModeUnspecifiedDataCacheTrue extends AbstractCacheModeTest
 
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
-    	Map<String,Object> props = new HashMap<String,Object>();
+    	Map<String,Object> props = new HashMap<>();
     	props.put("openjpa.DataCache", "true");
     	props.put("openjpa.RemoteCommitProvider", "sjvm");
     	if (emf == null) {
@@ -55,6 +55,7 @@ public class TestCacheModeUnspecifiedDataCacheTrue extends AbstractCacheModeTest
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -62,6 +63,7 @@ public class TestCacheModeUnspecifiedDataCacheTrue extends AbstractCacheModeTest
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestMultiEMFCacheModes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestMultiEMFCacheModes.java
index 1f3698929..8c6c59a32 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestMultiEMFCacheModes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestMultiEMFCacheModes.java
@@ -27,7 +27,6 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.LockModeType;
 
-
 import org.apache.openjpa.persistence.cache.jpa.model.CacheableEntity;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -38,6 +37,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestMultiEMFCacheModes extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp( CLEAR_TABLES, CacheableEntity.class,
                "openjpa.ConnectionFactoryProperties", "PrintParameters=true",
@@ -93,7 +93,7 @@ public class TestMultiEMFCacheModes extends SingleEMFTestCase {
 
         // Refresh the entity - this will load the entity into the L1 and with storeMode=REFRESH,
         // should also refresh it in the L2
-        java.util.Map<String, Object> cacheStoreModeMap = new java.util.HashMap<String, Object>();
+        java.util.Map<String, Object> cacheStoreModeMap = new java.util.HashMap<>();
         cacheStoreModeMap.put("javax.persistence.cache.storeMode", CacheStoreMode.REFRESH);
         em.refresh(ce, cacheStoreModeMap);
 
@@ -168,7 +168,7 @@ public class TestMultiEMFCacheModes extends SingleEMFTestCase {
 
         // Refresh the entity with storeMode=REFRESH.  The entity has been deleted so it will be
         // purged from the L2 cache when the DB load fails.
-        java.util.Map<String, Object> cacheStoreModeMap = new java.util.HashMap<String, Object>();
+        java.util.Map<String, Object> cacheStoreModeMap = new java.util.HashMap<>();
         cacheStoreModeMap.put("javax.persistence.cache.storeMode", CacheStoreMode.REFRESH);
         try {
             em.refresh(ce, cacheStoreModeMap);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeAll.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeAll.java
index d583c828e..3fd74d67b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeAll.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeAll.java
@@ -32,7 +32,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestPropertyCacheModeAll extends AbstractCacheModeTestCase {
 
     private static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache = persistentTypes;
@@ -41,7 +41,7 @@ public class TestPropertyCacheModeAll extends AbstractCacheModeTestCase {
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
         if (emf == null) {
-            Map<String, Object> propertyMap = new HashMap<String, Object>();
+            Map<String, Object> propertyMap = new HashMap<>();
             propertyMap.put("javax.persistence.sharedCache.mode", "ALL");
             emf = createEntityManagerFactory("cache-mode-empty",propertyMap);
             assertNotNull(emf);
@@ -51,6 +51,7 @@ public class TestPropertyCacheModeAll extends AbstractCacheModeTestCase {
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -58,6 +59,7 @@ public class TestPropertyCacheModeAll extends AbstractCacheModeTestCase {
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeDisableSelective.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeDisableSelective.java
index 809f00278..edbba459e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeDisableSelective.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeDisableSelective.java
@@ -38,7 +38,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestPropertyCacheModeDisableSelective extends AbstractCacheModeTestCase {
 
     private static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache =
@@ -49,7 +49,7 @@ public class TestPropertyCacheModeDisableSelective extends AbstractCacheModeTest
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
         if (emf == null) {
-            Map<String, Object> propertyMap = new HashMap<String, Object>();
+            Map<String, Object> propertyMap = new HashMap<>();
             propertyMap.put("javax.persistence.sharedCache.mode", "DISABLE_SELECTIVE");
             emf = createEntityManagerFactory("cache-mode-empty", propertyMap);
             assertNotNull(emf);
@@ -59,6 +59,7 @@ public class TestPropertyCacheModeDisableSelective extends AbstractCacheModeTest
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -66,6 +67,7 @@ public class TestPropertyCacheModeDisableSelective extends AbstractCacheModeTest
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeEnableSelective.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeEnableSelective.java
index aaebb74fc..0290e7242 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeEnableSelective.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeEnableSelective.java
@@ -38,7 +38,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestPropertyCacheModeEnableSelective extends AbstractCacheModeTestCase {
 
     private static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache =
@@ -49,7 +49,7 @@ public class TestPropertyCacheModeEnableSelective extends AbstractCacheModeTestC
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
         if (emf == null) {
-            Map<String, Object> propertyMap = new HashMap<String, Object>();
+            Map<String, Object> propertyMap = new HashMap<>();
             propertyMap.put("javax.persistence.sharedCache.mode", "ENABLE_SELECTIVE");
             emf = createEntityManagerFactory("cache-mode-empty", propertyMap);
             assertNotNull(emf);
@@ -59,6 +59,7 @@ public class TestPropertyCacheModeEnableSelective extends AbstractCacheModeTestC
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -66,6 +67,7 @@ public class TestPropertyCacheModeEnableSelective extends AbstractCacheModeTestC
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeInvalid.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeInvalid.java
index 303ba55cf..bca0b095c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeInvalid.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeInvalid.java
@@ -33,7 +33,7 @@ public class TestPropertyCacheModeInvalid extends AbstractCacheTestCase {
     public void testInvalidPropertyValue() {
         boolean exceptionCaught = false;
         try {
-            Map<String, Object> propertyMap = new HashMap<String, Object>();
+            Map<String, Object> propertyMap = new HashMap<>();
             propertyMap.put("javax.persistence.sharedCache.mode", "INVALID");
             emf = createEntityManagerFactory("cache-mode-empty",propertyMap);
         } catch (Throwable e) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeNone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeNone.java
index 9404f525e..1d8f70a29 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeNone.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeNone.java
@@ -32,7 +32,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestPropertyCacheModeNone extends AbstractCacheModeTestCase {
 
     private static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache = {};
@@ -41,7 +41,7 @@ public class TestPropertyCacheModeNone extends AbstractCacheModeTestCase {
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
         if (emf == null) {
-            Map<String, Object> propertyMap = new HashMap<String, Object>();
+            Map<String, Object> propertyMap = new HashMap<>();
             propertyMap.put("javax.persistence.sharedCache.mode", "NONE");
             emf = createEntityManagerFactory("cache-mode-empty", propertyMap);
             assertNotNull(emf);
@@ -51,6 +51,7 @@ public class TestPropertyCacheModeNone extends AbstractCacheModeTestCase {
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -58,6 +59,7 @@ public class TestPropertyCacheModeNone extends AbstractCacheModeTestCase {
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeUnspecified.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeUnspecified.java
index 302002c58..d7ea867bf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeUnspecified.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/TestPropertyCacheModeUnspecified.java
@@ -35,7 +35,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 public class TestPropertyCacheModeUnspecified extends AbstractCacheModeTestCase {
 
     private static Cache cache = null;
-    private static List<String> sql = new ArrayList<String>();
+    private static List<String> sql = new ArrayList<>();
     private static JDBCListener listener;
 
     private static Class<?>[] expectedInCache = persistentTypes;
@@ -44,7 +44,7 @@ public class TestPropertyCacheModeUnspecified extends AbstractCacheModeTestCase
     @Override
     public OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
         if (emf == null) {
-            Map<String, Object> propertyMap = new HashMap<String, Object>();
+            Map<String, Object> propertyMap = new HashMap<>();
             propertyMap.put("javax.persistence.sharedCache.mode", "UNSPECIFIED");
             emf = createEntityManagerFactory("cache-mode-empty", propertyMap);
             assertNotNull(emf);
@@ -54,6 +54,7 @@ public class TestPropertyCacheModeUnspecified extends AbstractCacheModeTestCase
         return emf;
     }
 
+    @Override
     public JDBCListener getListener() {
         if (listener == null) {
             listener = new FilteringJDBCListener(getSql());
@@ -61,6 +62,7 @@ public class TestPropertyCacheModeUnspecified extends AbstractCacheModeTestCase
         return listener;
     }
 
+    @Override
     public List<String> getSql() {
         return sql;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheEntity.java
index c1cfc06b9..170852bd8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheEntity.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.cache.jpa.model;
 
 public interface CacheEntity {
 
-    public void setId(int id);
-    public void setName(String name);
-    public String getName();
+    void setId(int id);
+    void setName(String name);
+    String getName();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java
index 04b96124e..454b7280d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/CacheableEntity.java
@@ -41,6 +41,7 @@ public class CacheableEntity  implements CacheEntity {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
@@ -53,10 +54,12 @@ public class CacheableEntity  implements CacheEntity {
         this.version = version;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java
index d75ce61cf..be75edfbb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedCachableEntity.java
@@ -39,10 +39,12 @@ public class NegatedCachableEntity implements CacheEntity  {
 
     private String name;
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
@@ -51,6 +53,7 @@ public class NegatedCachableEntity implements CacheEntity  {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java
index 18720b76e..0234717d6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/NegatedUncacheableEntity.java
@@ -39,10 +39,12 @@ public class NegatedUncacheableEntity implements CacheEntity {
 
     private String name;
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
@@ -51,6 +53,7 @@ public class NegatedUncacheableEntity implements CacheEntity {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java
index c1b04eeef..cc3fae863 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UncacheableEntity.java
@@ -37,10 +37,12 @@ public class UncacheableEntity implements CacheEntity {
 
     private String name;
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
@@ -49,6 +51,7 @@ public class UncacheableEntity implements CacheEntity {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java
index bec198161..2f760958a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/UnspecifiedEntity.java
@@ -35,10 +35,12 @@ public class UnspecifiedEntity implements CacheEntity {
 
     private String name;
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
@@ -47,6 +49,7 @@ public class UnspecifiedEntity implements CacheEntity {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java
index c5a0e4698..f7df2ecb0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlCacheableEntity.java
@@ -42,6 +42,7 @@ public class XmlCacheableEntity implements CacheEntity {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
@@ -54,10 +55,12 @@ public class XmlCacheableEntity implements CacheEntity {
         this.version = version;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java
index 482146af8..55cbe6f3e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cache/jpa/model/XmlUncacheableEntity.java
@@ -38,10 +38,12 @@ public class XmlUncacheableEntity implements CacheEntity {
 
     private String name;
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
@@ -50,6 +52,7 @@ public class XmlUncacheableEntity implements CacheEntity {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/AddListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/AddListenerEntity.java
index 27074868b..110595992 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/AddListenerEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/AddListenerEntity.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 public class AddListenerEntity {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/DuplicateListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/DuplicateListenerEntity.java
index c4db8f726..0180c0d31 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/DuplicateListenerEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/DuplicateListenerEntity.java
@@ -19,9 +19,9 @@
 package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 @EntityListeners(value = {ListenerImpl.class, ListenerImpl.class})
@@ -31,6 +31,7 @@ public class DuplicateListenerEntity implements ListenerTestEntity {
 
     private int value;
 
+    @Override
     public long getId() {
         return id;
     }
@@ -39,10 +40,12 @@ public class DuplicateListenerEntity implements ListenerTestEntity {
         this.id = id;
     }
 
+    @Override
     public int getValue() {
         return value;
     }
 
+    @Override
     public void setValue(int value) {
         this.value = value;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerEntity.java
index 05ed3493f..a9e310b4a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerEntity.java
@@ -19,9 +19,9 @@
 package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 @EntityListeners(value = ListenerImpl.class)
@@ -31,6 +31,7 @@ public class EntityListenerEntity implements ListenerTestEntity {
 
     private int value;
 
+    @Override
     public long getId() {
         return id;
     }
@@ -39,10 +40,12 @@ public class EntityListenerEntity implements ListenerTestEntity {
         this.id = id;
     }
 
+    @Override
     public int getValue() {
         return value;
     }
 
+    @Override
     public void setValue(int value) {
         this.value = value;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerPostLoadTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerPostLoadTest.java
index c61a6d793..ce3a4e8b1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerPostLoadTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/EntityListenerPostLoadTest.java
@@ -23,6 +23,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class EntityListenerPostLoadTest extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ExceptionsFromCallbacksEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ExceptionsFromCallbacksEntity.java
index aef8ad724..5b3717d4f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ExceptionsFromCallbacksEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ExceptionsFromCallbacksEntity.java
@@ -19,17 +19,17 @@
 package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.PostLoad;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
-import javax.persistence.Version;
-import javax.persistence.PreRemove;
+import javax.persistence.PostPersist;
 import javax.persistence.PostRemove;
 import javax.persistence.PostUpdate;
-import javax.persistence.PostPersist;
-import javax.persistence.GeneratedValue;
+import javax.persistence.PrePersist;
+import javax.persistence.PreRemove;
+import javax.persistence.PreUpdate;
 import javax.persistence.Transient;
+import javax.persistence.Version;
 
 @Entity
 public class ExceptionsFromCallbacksEntity {
@@ -128,5 +128,8 @@ public class ExceptionsFromCallbacksEntity {
 
     public class CallbackTestException
         extends RuntimeException {
+
+        
+        private static final long serialVersionUID = 1L;
     }
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/GlobalListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/GlobalListenerEntity.java
index 254bad0b3..094c3328b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/GlobalListenerEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/GlobalListenerEntity.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 public class GlobalListenerEntity implements ListenerTestEntity {
@@ -29,6 +29,7 @@ public class GlobalListenerEntity implements ListenerTestEntity {
 
     private int value;
 
+    @Override
     public long getId() {
         return id;
     }
@@ -37,10 +38,12 @@ public class GlobalListenerEntity implements ListenerTestEntity {
         this.id = id;
     }
 
+    @Override
     public int getValue() {
         return value;
     }
 
+    @Override
     public void setValue(int value) {
         this.value = value;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerImpl.java
index b7bf175d3..c83c27299 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerImpl.java
@@ -18,13 +18,13 @@
  */
 package org.apache.openjpa.persistence.callbacks;
 
-import javax.persistence.PrePersist;
-import javax.persistence.PostPersist;
 import javax.persistence.PostLoad;
-import javax.persistence.PreUpdate;
-import javax.persistence.PostUpdate;
-import javax.persistence.PreRemove;
+import javax.persistence.PostPersist;
 import javax.persistence.PostRemove;
+import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
+import javax.persistence.PreRemove;
+import javax.persistence.PreUpdate;
 
 public class ListenerImpl {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerInEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerInEntity.java
index be6ba1c88..60bbe9011 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerInEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerInEntity.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import javax.persistence.PostLoad;
 import javax.persistence.PostPersist;
 import javax.persistence.PostRemove;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerTestEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerTestEntity.java
index 7d009a87d..f2c127984 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerTestEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/ListenerTestEntity.java
@@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.callbacks;
 
 public interface ListenerTestEntity {
 
-    public long getId();
+    long getId();
 
-    public int getValue();
+    int getValue();
 
-    public void setValue(int val);
+    void setValue(int val);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java
index 4fe04f203..5ad4d247d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MSCListenerEntity.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 public class MSCListenerEntity extends EntityListenerMappedSuperClass implements ListenerTestEntity {
@@ -29,6 +29,7 @@ public class MSCListenerEntity extends EntityListenerMappedSuperClass implements
 
     private int value;
 
+    @Override
     public long getId() {
         return id;
     }
@@ -37,10 +38,12 @@ public class MSCListenerEntity extends EntityListenerMappedSuperClass implements
         this.id = id;
     }
 
+    @Override
     public int getValue() {
         return value;
     }
 
+    @Override
     public void setValue(int value) {
         this.value = value;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MessageListenerImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MessageListenerImpl.java
index 9141e1e71..61fc218ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MessageListenerImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/MessageListenerImpl.java
@@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.callbacks;
 
 import java.util.Date;
 
-import javax.persistence.PrePersist;
-import javax.persistence.PostPersist;
 import javax.persistence.PostLoad;
-import javax.persistence.PreUpdate;
-import javax.persistence.PostUpdate;
-import javax.persistence.PreRemove;
+import javax.persistence.PostPersist;
 import javax.persistence.PostRemove;
+import javax.persistence.PostUpdate;
+import javax.persistence.PrePersist;
+import javax.persistence.PreRemove;
+import javax.persistence.PreUpdate;
 
 public class MessageListenerImpl {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerEntity.java
index 1f1cc9a95..7e9464245 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/PostLoadListenerEntity.java
@@ -19,9 +19,9 @@
 package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestEntityListeners.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestEntityListeners.java
index 97addd815..3660fa97a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestEntityListeners.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestEntityListeners.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.callbacks;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestEntityListeners extends SingleEMFTestCase {
 
@@ -27,6 +27,7 @@ public class TestEntityListeners extends SingleEMFTestCase {
     private static final int GLOBAL_LISTENER_ENTITY = 2;
     private static final int DUPLICATE_LISTENER_ENTITY = 3;
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES);
         ListenerImpl.prePersistCount = 0;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestExceptionsFromCallbacks.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestExceptionsFromCallbacks.java
index 697b1db4c..94c00ad19 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestExceptionsFromCallbacks.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestExceptionsFromCallbacks.java
@@ -18,16 +18,17 @@
  */
 package org.apache.openjpa.persistence.callbacks;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
+
 import javax.persistence.EntityManager;
 import javax.persistence.RollbackException;
 
+import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.callbacks.ExceptionsFromCallbacksEntity.
         CallbackTestException;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.enhance.PersistenceCapable;
 
 /**
  * Tests against JPA section 3.5's description of callback exception handling.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMSCEntityListeners.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMSCEntityListeners.java
index cd55b10f7..06cdddc5d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMSCEntityListeners.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMSCEntityListeners.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.callbacks;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 /*
  * Separate testcase from TestEntityListeners to avoid the declaration of
@@ -29,6 +29,7 @@ public class TestMSCEntityListeners extends SingleEMFTestCase {
 
     private static final int MSC_LISTENER_ENTITY = 4;
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES);
         ListenerImpl.prePersistCount = 0;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMessageListeners.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMessageListeners.java
index 7e5e77eea..bd03d763d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMessageListeners.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMessageListeners.java
@@ -20,11 +20,12 @@ package org.apache.openjpa.persistence.callbacks;
 
 import javax.persistence.Query;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestMessageListeners extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(DROP_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMultiEmEntityListeners.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMultiEmEntityListeners.java
index 29fc7eead..c136cf4c7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMultiEmEntityListeners.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/callbacks/TestMultiEmEntityListeners.java
@@ -24,6 +24,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestMultiEmEntityListeners extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, ListenerInEntity.class, AddListenerEntity.class
 //                , "openjpa.Compatibility", "SingletonLifecycleEventManager=true"
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Vertex.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Vertex.java
index 48dd9cb09..3934dd885 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Vertex.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/Vertex.java
@@ -55,8 +55,8 @@ public class Vertex {
     private VertexType type;
 
     protected Vertex() {
-        this.incoming = new ArrayList<Edge>();
-        this.outgoing = new ArrayList<Edge>();
+        this.incoming = new ArrayList<>();
+        this.outgoing = new ArrayList<>();
     }
 
     public Vertex( VertexType type ) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/VertexType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/VertexType.java
index 35f9360ce..a4b675a86 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/VertexType.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/VertexType.java
@@ -48,7 +48,7 @@ public class VertexType {
     private String name;
 
     protected VertexType() {
-        this.instances = new ArrayList<Vertex>();
+        this.instances = new ArrayList<>();
     }
 
     public VertexType( String name ) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/EmbeddableWithRelationships.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/EmbeddableWithRelationships.java
index 49b16e06c..220bcf4bb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/EmbeddableWithRelationships.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/EmbeddableWithRelationships.java
@@ -42,8 +42,8 @@ public class EmbeddableWithRelationships {
     private PUDEntityB o2o;
 
     public EmbeddableWithRelationships() {
-        colM2M = new ArrayList<PUDEntityB>();
-        colO2M = new ArrayList<PUDEntityB>();
+        colM2M = new ArrayList<>();
+        colO2M = new ArrayList<>();
     }
 
     public Collection<PUDEntityB> getColM2M() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA01.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA01.java
index f041d0e55..bbec1b771 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA01.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityA01.java
@@ -53,8 +53,8 @@ public class PUDEntityA01 {
     private PUDEntityB o2o;
 
     public PUDEntityA01() {
-        colM2M = new ArrayList<PUDEntityB>();
-        colO2M = new ArrayList<PUDEntityB>();
+        colM2M = new ArrayList<>();
+        colO2M = new ArrayList<>();
     }
 
     public int getId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityAE01.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityAE01.java
index f444f0e0e..4984b22ba 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityAE01.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/PUDEntityAE01.java
@@ -57,8 +57,8 @@ public class PUDEntityAE01 {
     private AnEmbeddable ane;
 
     public PUDEntityAE01() {
-        colM2M = new ArrayList<PUDEntityB>();
-        colO2M = new ArrayList<PUDEntityB>();
+        colM2M = new ArrayList<>();
+        colO2M = new ArrayList<>();
     }
 
     public int getId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestNoPUDefaultCascadePersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestNoPUDefaultCascadePersist.java
index 859892254..3efdb734f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestNoPUDefaultCascadePersist.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestNoPUDefaultCascadePersist.java
@@ -23,6 +23,7 @@ import javax.persistence.EntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestNoPUDefaultCascadePersist extends SingleEMFTestCase {
+    @Override
     public void setUp() throws Exception {
         super.setUp(PUDEntityA01.class, PUDEntityA02.class, PUDEntityAE01.class, PUDEntityB.class,
             AnEmbeddable.class, EmbeddableWithRelationships.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
index b8d4fd962..20512c26a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
@@ -23,17 +23,20 @@ import javax.persistence.EntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestPUDefaultCascadePersist extends SingleEMFTestCase {
+    @Override
     public void setUp() throws Exception {
         super.setUp(PUDEntityA01.class, PUDEntityA02.class, PUDEntityAE01.class, PUDEntityB.class,
             AnEmbeddable.class, EmbeddableWithRelationships.class,
             CLEAR_TABLES);
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "TestPUDefaultCascadePersist";
     }
 
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Address.java
index c4b86b20a..fe6c88902 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Address.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
 
 @Entity
 public class Address
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ComplexEmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ComplexEmbeddedPC.java
index 304594b7d..f6ad02ace 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ComplexEmbeddedPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/ComplexEmbeddedPC.java
@@ -19,9 +19,13 @@
 package org.apache.openjpa.persistence.common.apps;
 
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Course.java
index ed662ec85..30c36e90b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Course.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Course.java
@@ -21,7 +21,13 @@ package org.apache.openjpa.persistence.common.apps;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToMany;
+import javax.persistence.Transient;
 
 @Entity
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Department.java
index a01e2a86b..085f450d0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Department.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.common.apps;
 
-import javax.persistence.*;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Transient;
 
 
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedOwnerPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedOwnerPC.java
index a74e10b18..5effec125 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedOwnerPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedOwnerPC.java
@@ -113,7 +113,9 @@ public class EmbeddedOwnerPC
 
 	public static class EmbKey implements Serializable
 	{
-		public int					id1;
+		
+        private static final long serialVersionUID = 1L;
+        public int					id1;
 		public int					id2;
 
 		public EmbKey()
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedPC.java
index 8942f1184..8737a1f28 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/EmbeddedPC.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java
index 944c66b2f..871258aa2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity1.java
@@ -111,7 +111,8 @@ public class Entity1 implements Serializable
 		return entity2Field;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return("PK: " + pk + " StringField: " + stringField
                 + " IntField: " + intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity2.java
index 007376edb..b65cdacad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Entity2.java
@@ -35,9 +35,7 @@ import javax.persistence.Id;
 @Entity
 public class Entity2 implements Serializable
 {
-	/**
-	 *
-	 */
+	
 	private static final long serialVersionUID = 4723739219953167343L;
 
 	@Id
@@ -90,7 +88,8 @@ public class Entity2 implements Serializable
 		return intField;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return("PK: " + pk + " StringField: " + stringField
                 + " IntField: " + intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/MaleUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/MaleUser.java
index c8729fc63..137ecf8de 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/MaleUser.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/MaleUser.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
 
 @Entity
 @DiscriminatorValue(value="M")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java
index c02754e0a..ed0b88a1a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -30,6 +31,9 @@ import javax.persistence.Table;
 @Table(name="MPTZZS")
 public class Part implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Column(name="NA_PT", length=20)
     private String partName;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java
index 15b40750d..c2d3b0dcc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/PartPK.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
@@ -26,6 +27,9 @@ import javax.persistence.Embeddable;
 public class PartPK implements Serializable {
     /*Textile Id*/
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Column(name="ID_TXE")
     private Integer textileId;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest1.java
index 32ba2dfd8..f787f6ba1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest1.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.common.apps;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -126,7 +128,8 @@ public class RuntimeTest1 implements Serializable
 		this.selfOneMany = selfOneMany;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
 		return "IntField: "+intField+", StringField: "+stringField+" .";
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest2.java
index 039ddabbe..b01f084e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/RuntimeTest2.java
@@ -54,7 +54,8 @@ public class RuntimeTest2 extends RuntimeTest1
 		this.intField2 = intField2;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return "IntField: " + intField2
             + ", StringField: " + super.getStringField() + " .";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Shirt.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Shirt.java
index 02eb7e1b9..5af7ca5b8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Shirt.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Shirt.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.common.apps;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -37,6 +38,8 @@ import javax.persistence.Table;
 @Table(name="MPTZZV")
 public class Shirt extends Textile implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     @Column(name="ID_SZE", length=1)
     private String szeId;
 
@@ -49,7 +52,7 @@ public class Shirt extends Textile implements Serializable {
     }
 
     @OneToMany(cascade=CascadeType.ALL, mappedBy="shirt", fetch=FetchType.EAGER, orphanRemoval=true)
-    Collection<Part> parts = new ArrayList<Part>();
+    Collection<Part> parts = new ArrayList<>();
 
 
     public Collection<Part> getParts() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Student.java
index 207b7eda7..dc64589e2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Student.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Student.java
@@ -21,7 +21,14 @@ package org.apache.openjpa.persistence.common.apps;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.Transient;
 
 @Entity
 public class Student implements Serializable {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Textile.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Textile.java
index a7efcade4..885a6ca29 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Textile.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Textile.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.persistence.common.apps;
 
+import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -27,13 +29,14 @@ import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
-import java.io.Serializable;
-
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
 @Table(name="MPTZZT")
 public class Textile implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="ID_TXE", length=4)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/TextilePK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/TextilePK.java
index b43425689..2674e0996 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/TextilePK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/TextilePK.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.GeneratedValue;
@@ -27,6 +28,8 @@ import javax.persistence.GenerationType;
 @Embeddable
 public class TextilePK implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     @GeneratedValue(strategy=GenerationType.IDENTITY)
     @Column(name="ID_TXE", length=4)
     private Integer textileId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Trousers.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Trousers.java
index fff65ef4b..9a1e82329 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Trousers.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Trousers.java
@@ -18,16 +18,18 @@
  */
 package org.apache.openjpa.persistence.common.apps;
 
+import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import java.io.Serializable;
-
 @Entity
 @Table(name="MPTZZU")
 public class Trousers extends Textile implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     @Column(name="NU_LNH", length=4)
     private Integer lnhNumber;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java
index 316779198..c62d60339 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java
@@ -65,9 +65,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
-import java.util.Map.Entry;
 
 import javax.management.IntrospectionException;
 import javax.persistence.EntityManager;
@@ -98,7 +98,7 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
 
     private String persistenceXmlResource;
     private Map<Map,OpenJPAEntityManagerFactory> emfs =
-        new HashMap<Map,OpenJPAEntityManagerFactory>();
+        new HashMap<>();
     private OpenJPAEntityManager currentEntityManager;
     private Object[] props;
 
@@ -143,6 +143,7 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
      * Closes any EMFs created by getEmf()
      *
      */
+    @Override
     public void tearDown() throws Exception {
         try {
             super.tearDown();
@@ -776,6 +777,7 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
 
             mttest("reflection invocation: (" + method + ")",
                 serialCount, threads, iterations, new VolatileRunnable() {
+                @Override
                 public void run() throws Exception {
                     meth.invoke(thiz, args);
                 }
@@ -823,6 +825,7 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
 
             runners[i - 1] =
                 new Thread(title + " [" + i + " of " + threads + "]") {
+                    @Override
                     public void run() {
                         // do our best to have all threads start at the exact
                         // same time. This is imperfect, but the closer we
@@ -896,9 +899,9 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
     /**
      * A Runnable that can throw an Exception: used to test cases.
      */
-    public static interface VolatileRunnable {
+    public interface VolatileRunnable {
 
-        public void run() throws Exception;
+        void run() throws Exception;
     }
 
     /**
@@ -906,6 +909,8 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
      */
     public class ThreadingException extends RuntimeException {
 
+        
+        private static final long serialVersionUID = 1L;
         private final Throwable[] _nested;
 
         public ThreadingException(String msg, Throwable nested) {
@@ -924,14 +929,17 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
                 _nested = nested;
         }
 
+        @Override
         public void printStackTrace() {
             printStackTrace(System.out);
         }
 
+        @Override
         public void printStackTrace(PrintStream out) {
             printStackTrace(new PrintWriter(out));
         }
 
+        @Override
         public void printStackTrace(PrintWriter out) {
             super.printStackTrace(out);
             for (int i = 0; i < _nested.length; i++) {
@@ -999,7 +1007,8 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
      */
     public void sleepRandom(int max) {
         try {
-            Thread.currentThread().sleep((long) (Math.random() * max));
+            Thread.currentThread();
+            Thread.sleep((long) (Math.random() * max));
         } catch (InterruptedException ex) {
         }
     }
@@ -1050,6 +1059,7 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
             // spawn thread
             TimeOutThread tot = new TimeOutThread("TimeOutThread ["
                 + methodName + "] (" + millis + "ms)") {
+                @Override
                 public void run() {
                     try {
                         method.invoke(thz, (Object[]) null);
@@ -1074,14 +1084,16 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
                     tot.interrupt();
                 } catch (Throwable e) {
                 }
-                Thread.currentThread().sleep(500);
+                Thread.currentThread();
+                Thread.sleep(500);
 
                 // try to kill the thread
                 try {
                     tot.stop();
                 } catch (Throwable e) {
                 }
-                Thread.currentThread().sleep(500);
+                Thread.currentThread();
+                Thread.sleep(500);
 
                 throw new OperationTimedOutException("Execution of \""
                     + methodName + "\" timed out after "
@@ -1115,6 +1127,8 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
      */
     public static class OperationTimedOutException extends RuntimeException {
 
+        
+        private static final long serialVersionUID = 1L;
         private final Throwable _err;
 
         public OperationTimedOutException(String msg, Throwable throwable) {
@@ -1122,14 +1136,17 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
             _err = throwable;
         }
 
+        @Override
         public void printStackTrace() {
             printStackTrace(System.out);
         }
 
+        @Override
         public void printStackTrace(PrintStream out) {
             printStackTrace(new PrintWriter(out));
         }
 
+        @Override
         public void printStackTrace(PrintWriter out) {
             super.printStackTrace(out);
             if (_err != null) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/BufferedLogFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/BufferedLogFactory.java
index f94199309..fe0d5fad8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/BufferedLogFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/BufferedLogFactory.java
@@ -18,9 +18,13 @@
  */
 package org.apache.openjpa.persistence.common.utils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
-import org.apache.openjpa.lib.log.*;
+import org.apache.openjpa.lib.log.LogFactoryImpl;
 
 /**
  * Simple default log implementation to test whether certain messages
@@ -32,9 +36,10 @@ public class BufferedLogFactory
     extends LogFactoryImpl {
 
     private int bufferSize = 10000;
-    private List<String> buffer = new ArrayList<String>();
-    private List<String> disallowedMessages = new LinkedList<String>();
+    private List<String> buffer = new ArrayList<>();
+    private List<String> disallowedMessages = new LinkedList<>();
 
+    @Override
     protected LogImpl newLogImpl() {
         return new BufferedLog();
     }
@@ -82,6 +87,7 @@ public class BufferedLogFactory
     public class BufferedLog
         extends LogFactoryImpl.LogImpl {
 
+        @Override
         protected void log(short level, String message, Throwable t) {
             super.log(level, message, t);
             buffer.add(message);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/Bug.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/Bug.java
index a71b52c07..809a57722 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/Bug.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/Bug.java
@@ -18,9 +18,10 @@
  */
 package org.apache.openjpa.persistence.common.utils;
 
-import java.io.*;
+import java.io.PrintStream;
+import java.io.PrintWriter;
 
-import junit.framework.*;
+import junit.framework.AssertionFailedError;
 
 /**
  * Extension of an assertion error that indicates to the outside
@@ -32,6 +33,8 @@ import junit.framework.*;
 public class Bug
     extends AssertionFailedError {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String BUG_TOKEN = "SOLARBUG";
     public static final String BUG_DELIMITER = "|";
 
@@ -52,6 +55,7 @@ public class Bug
         return new Bug(trackingId, t, message);
     }
 
+    @Override
     public void printStackTrace(PrintWriter pw) {
         super.printStackTrace(pw);
         if (error != null) {
@@ -60,6 +64,7 @@ public class Bug
         }
     }
 
+    @Override
     public void printStackTrace(PrintStream ps) {
         super.printStackTrace(ps);
         if (error != null) {
@@ -68,6 +73,7 @@ public class Bug
         }
     }
 
+    @Override
     public String getMessage() {
         return super.getMessage() + " [reported bug #" + trackingId + "]";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1To1_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1To1_JT.java
index d93a2a97c..ee63a07e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1To1_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1To1_JT.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToOne;
 
 @Entity
 public class Bi_1To1_JT {
@@ -60,10 +65,12 @@ public class Bi_1To1_JT {
         this.entityC = entityC;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Bi_1To1_JT)) return false;
         Bi_1To1_JT b = (Bi_1To1_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_FK.java
index 6d2abb79d..54803755e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_FK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_FK.java
@@ -20,7 +20,11 @@ package org.apache.openjpa.persistence.compat;
 
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 /**
  * This is the default bi-directional one-to-many mapping.
@@ -62,10 +66,12 @@ public class Bi_1ToM_FK {
         this.entityCs = entityCs;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Bi_1ToM_FK)) return false;
         Bi_1ToM_FK b = (Bi_1ToM_FK)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_JT.java
index 2292ab87d..6f58531fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_JT.java
@@ -20,7 +20,11 @@ package org.apache.openjpa.persistence.compat;
 
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 
 
@@ -56,10 +60,12 @@ public class Bi_1ToM_JT {
         this.entityCs = entityCs;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Bi_1ToM_JT)) return false;
         Bi_1ToM_JT b = (Bi_1ToM_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_JT.java
index 82f2bbb59..ca78a6f9c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_JT.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.compat;
 import java.util.Collection;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 
 
@@ -57,10 +61,12 @@ public class Bi_1ToM_Map_JT {
         this.entityCs = entityCs;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Bi_1ToM_Map_JT)) return false;
         Bi_1ToM_Map_JT b = (Bi_1ToM_Map_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_RelKey_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_RelKey_JT.java
index deab705d6..3737d0613 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_RelKey_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Bi_1ToM_Map_RelKey_JT.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.compat;
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 
 
@@ -57,10 +61,12 @@ public class Bi_1ToM_Map_RelKey_JT {
         this.entityCs = entityCs;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Bi_1ToM_Map_RelKey_JT)) return false;
         Bi_1ToM_Map_RelKey_JT b = (Bi_1ToM_Map_RelKey_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Department.java
index 0bb982d6f..58e1d5a0b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Department.java
@@ -57,7 +57,7 @@ public class Department {
 
     public void addEmployee(FullTimeEmployee e) {
         if (fullTimeEmployees == null)
-            fullTimeEmployees = new ArrayList<FullTimeEmployee>();
+            fullTimeEmployees = new ArrayList<>();
         this.fullTimeEmployees.add(e);
         e.setDept(this);
     }
@@ -68,7 +68,7 @@ public class Department {
 
     public void addEmployee(PartTimeEmployee e) {
         if (partTimeEmployees == null)
-            partTimeEmployees = new ArrayList<PartTimeEmployee>();
+            partTimeEmployees = new ArrayList<>();
         this.partTimeEmployees.add(e);
         e.setDept(this);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/DepartmentId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/DepartmentId.java
index ae5732b25..08fe1d1c5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/DepartmentId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/DepartmentId.java
@@ -21,6 +21,8 @@ package org.apache.openjpa.persistence.compat;
 import java.io.Serializable;
 
 public class DepartmentId implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     private String name;
 
     public DepartmentId() {
@@ -31,10 +33,12 @@ public class DepartmentId implements Serializable {
         this.name = name;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuper.java
index 4683abbdf..18a7642ae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuper.java
@@ -19,7 +19,13 @@
 package org.apache.openjpa.persistence.compat;
 
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 @MappedSuperclass
 public class EmbeddableSuper {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuperSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuperSub.java
index 68bb9f1cf..72a566e14 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuperSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmbeddableSuperSub.java
@@ -19,7 +19,12 @@
 package org.apache.openjpa.persistence.compat;
 
 
-import javax.persistence.*;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
 
 @Entity
 @DiscriminatorColumn(name = "DISC")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmployeeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmployeeId.java
index d2b94d47e..465312c30 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmployeeId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EmployeeId.java
@@ -22,6 +22,8 @@ import java.io.Serializable;
 
 public class EmployeeId implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private String ssn;
 
     public EmployeeId(){
@@ -29,6 +31,7 @@ public class EmployeeId implements Serializable {
     public EmployeeId(String ssn){
         this.ssn = ssn;
     }
+    @Override
     public boolean equals (Object other)
     {
         if (other == this)
@@ -49,6 +52,7 @@ public class EmployeeId implements Serializable {
     }
 
 
+    @Override
     public int hashCode ()
     {
         return (ssn.hashCode());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC.java
index 58823e5d3..24336f5f3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC.java
@@ -45,10 +45,12 @@ public class EntityC {
         this.name = name;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EntityC)) return false;
         EntityC c = (EntityC)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B11JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B11JT.java
index 5f19558bf..7d136d547 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B11JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B11JT.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
 
 @Entity
 public class EntityC_B11JT {
@@ -52,10 +55,12 @@ public class EntityC_B11JT {
         return bi11jt;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EntityC_B11JT)) return false;
         EntityC_B11JT c = (EntityC_B11JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MFK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MFK.java
index d5a720157..7e32dacdd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MFK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MFK.java
@@ -19,7 +19,11 @@
 package org.apache.openjpa.persistence.compat;
 
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="C_B1MFK")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MJT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MJT.java
index 8eb9eca68..e4667cded 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MJT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1MJT.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class EntityC_B1MJT {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_JT.java
index d3bff1c96..6716fed00 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_JT.java
@@ -19,7 +19,13 @@
 package org.apache.openjpa.persistence.compat;
 
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="C_B1M_Map_JT")
@@ -61,10 +67,12 @@ public class EntityC_B1M_Map_JT {
         return bi1mjt;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EntityC_B1M_Map_JT)) return false;
         EntityC_B1M_Map_JT c = (EntityC_B1M_Map_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_RelKey_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_RelKey_JT.java
index b243ba905..3a9ea06d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_RelKey_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_B1M_Map_RelKey_JT.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="C_B1M_Map_RelKey_JT")
@@ -60,10 +66,12 @@ public class EntityC_B1M_Map_RelKey_JT {
         return bi1mjt;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EntityC_B1M_Map_RelKey_JT)) return false;
         EntityC_B1M_Map_RelKey_JT c = (EntityC_B1M_Map_RelKey_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U11JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U11JT.java
index aaaba1e63..1d326ab19 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U11JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U11JT.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 
 @Entity
@@ -42,10 +44,12 @@ public class EntityC_U11JT {
         this.name = name;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EntityC_U11JT)) return false;
         EntityC_U11JT c = (EntityC_U11JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1MFK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1MFK.java
index 244eb6a6d..b386e36fd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1MFK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1MFK.java
@@ -19,7 +19,10 @@
 package org.apache.openjpa.persistence.compat;
 
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="C_U1MFK")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_FK.java
index 98cf5238b..d1e18bfd5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_FK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_FK.java
@@ -19,7 +19,10 @@
 package org.apache.openjpa.persistence.compat;
 
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="C_U1M_Map_FK")
@@ -43,10 +46,12 @@ public class EntityC_U1M_Map_FK {
         this.name = name;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EntityC_U1M_Map_FK)) return false;
         EntityC_U1M_Map_FK c = (EntityC_U1M_Map_FK)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java
index eeb67ec33..47001d285 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/EntityC_U1M_Map_RelKey_FK.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="C_U1M_Map_RelKey_FK")
@@ -42,10 +45,12 @@ public class EntityC_U1M_Map_RelKey_FK {
         this.name = name;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EntityC_U1M_Map_RelKey_FK)) return false;
         EntityC_U1M_Map_RelKey_FK c = (EntityC_U1M_Map_RelKey_FK)o;
@@ -54,6 +59,7 @@ public class EntityC_U1M_Map_RelKey_FK {
         return true;
     }
 
+    @Override
     public String toString() {
         return id + name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Invoice.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Invoice.java
index aa61db967..471a31c6c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Invoice.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Invoice.java
@@ -19,7 +19,11 @@ package org.apache.openjpa.persistence.compat;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.OneToMany;
 
 @Entity
 @IdClass(InvoiceKey.class)
@@ -33,7 +37,7 @@ public class Invoice {
     private double price;
 
     @OneToMany(cascade={CascadeType.ALL})
-    private List<LineItem> lineItems = new ArrayList<LineItem>();
+    private List<LineItem> lineItems = new ArrayList<>();
 
     public Invoice() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/LineItem.java
index ddea047a8..df92677fb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/LineItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/LineItem.java
@@ -16,7 +16,9 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class LineItem {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity.java
index ab87042e7..930bbbd2f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/SimpleEntity.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.compat;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -56,6 +57,8 @@ import javax.persistence.Table;
 @Table(name = "SIMPLE_ENTITY")
 public class SimpleEntity implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     public static final String NAMED_QUERY_WITH_POSITIONAL_PARAMS = "SelectWithPositionalParameter";
     public static final String NAMED_QUERY_WITH_NAMED_PARAMS = "SelectWithNamedParameter";
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestContainerSpecCompatibilityOptions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestContainerSpecCompatibilityOptions.java
index e0307e9ab..83d033a1e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestContainerSpecCompatibilityOptions.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestContainerSpecCompatibilityOptions.java
@@ -42,7 +42,7 @@ import org.apache.openjpa.persistence.test.ContainerEMFTest;
 public class TestContainerSpecCompatibilityOptions
     extends ContainerEMFTest {
 
-    protected List<String> sql = new ArrayList<String>();
+    protected List<String> sql = new ArrayList<>();
     protected int sqlCount;
 
     @Override
@@ -108,7 +108,7 @@ public class TestContainerSpecCompatibilityOptions
      * a mapped superclass.
      */
     public void testMappedSuperClass() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityA.class);
         types.add(EntityB.class);
         types.add(MappedSuper.class);
@@ -173,7 +173,7 @@ public class TestContainerSpecCompatibilityOptions
      *
      */
     public void testOneToManyRelation() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityC.class);
         types.add(EntityC_B1MFK.class);
         types.add(EntityC_B1MJT.class);
@@ -212,7 +212,7 @@ public class TestContainerSpecCompatibilityOptions
         //create
         Uni_1ToM_FK u = new Uni_1ToM_FK();
         u.setName("u");
-        List<EntityC_U1MFK> cs = new ArrayList<EntityC_U1MFK>();
+        List<EntityC_U1MFK> cs = new ArrayList<>();
         EntityC_U1MFK c = new EntityC_U1MFK();
         c.setName("c");
         cs.add(c);
@@ -238,7 +238,7 @@ public class TestContainerSpecCompatibilityOptions
 
         Uni_1ToM_FK u2 = new Uni_1ToM_FK();
         u2.setName("u2");
-        List<EntityC_U1MFK> cs2 = new ArrayList<EntityC_U1MFK>();
+        List<EntityC_U1MFK> cs2 = new ArrayList<>();
         cs2.add(c2);
         u2.setEntityCs(cs2);
         em.persist(u2);
@@ -267,7 +267,7 @@ public class TestContainerSpecCompatibilityOptions
     public void crudUni1MJT(EntityManager em) {
         Uni_1ToM_JT u = new Uni_1ToM_JT();
         u.setName("u");
-        List<EntityC> cs = new ArrayList<EntityC>();
+        List<EntityC> cs = new ArrayList<>();
         EntityC c = new EntityC();
         c.setName("c");
         cs.add(c);
@@ -310,7 +310,7 @@ public class TestContainerSpecCompatibilityOptions
     public void crudBi1MFK(EntityManager em) {
         Bi_1ToM_FK b = new Bi_1ToM_FK();
         b.setName("b");
-        List<EntityC_B1MFK> cs = new ArrayList<EntityC_B1MFK>();
+        List<EntityC_B1MFK> cs = new ArrayList<>();
         EntityC_B1MFK c = new EntityC_B1MFK();
         c.setName("c");
         c.setBi1mfk(b);
@@ -354,7 +354,7 @@ public class TestContainerSpecCompatibilityOptions
     public void crudBi1MJT(EntityManager em) {
         Bi_1ToM_JT b = new Bi_1ToM_JT();
         b.setName("b");
-        List<EntityC_B1MJT> cs = new ArrayList<EntityC_B1MJT>();
+        List<EntityC_B1MJT> cs = new ArrayList<>();
         EntityC_B1MJT c = new EntityC_B1MJT();
         c.setName("c");
         c.setBi1mjt(b);
@@ -402,7 +402,7 @@ public class TestContainerSpecCompatibilityOptions
     }
 
     public void testOneToManyMapRelation() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityC_U1M_Map_FK.class);
         types.add(Uni_1ToM_Map_FK.class);
         types.add(EntityC_B1M_Map_JT.class);
@@ -440,7 +440,7 @@ public class TestContainerSpecCompatibilityOptions
         //create
         Uni_1ToM_Map_FK u = new Uni_1ToM_Map_FK();
         u.setName("u");
-        Map<String, EntityC_U1M_Map_FK> cs = new HashMap<String, EntityC_U1M_Map_FK>();
+        Map<String, EntityC_U1M_Map_FK> cs = new HashMap<>();
         EntityC_U1M_Map_FK c1 = new EntityC_U1M_Map_FK();
         c1.setName("c1");
         cs.put(c1.getName(), c1);
@@ -472,7 +472,7 @@ public class TestContainerSpecCompatibilityOptions
 
         Uni_1ToM_Map_FK u2 = new Uni_1ToM_Map_FK();
         u2.setName("u2");
-        Map<String, EntityC_U1M_Map_FK> cs2 = new HashMap<String, EntityC_U1M_Map_FK>();
+        Map<String, EntityC_U1M_Map_FK> cs2 = new HashMap<>();
         cs2.put(c4.getName(), c4);
         u2.setEntityCs(cs2);
         em.persist(u2);
@@ -499,7 +499,7 @@ public class TestContainerSpecCompatibilityOptions
     public void crudBi1MMapJT(EntityManager em) {
         Bi_1ToM_Map_JT b = new Bi_1ToM_Map_JT();
         b.setName("b");
-        Map<String, EntityC_B1M_Map_JT> cs = new HashMap<String, EntityC_B1M_Map_JT>();
+        Map<String, EntityC_B1M_Map_JT> cs = new HashMap<>();
         EntityC_B1M_Map_JT c = new EntityC_B1M_Map_JT();
         c.setName("c");
         c.setBi1mjt(b);
@@ -549,7 +549,7 @@ public class TestContainerSpecCompatibilityOptions
         //create
         Uni_1ToM_Map_RelKey_FK u = new Uni_1ToM_Map_RelKey_FK();
         u.setName("u");
-        Map<EntityC, EntityC_U1M_Map_RelKey_FK> cs = new HashMap<EntityC, EntityC_U1M_Map_RelKey_FK>();
+        Map<EntityC, EntityC_U1M_Map_RelKey_FK> cs = new HashMap<>();
         EntityC_U1M_Map_RelKey_FK c1 = new EntityC_U1M_Map_RelKey_FK();
         c1.setName("c1");
         EntityC cKey1 = new EntityC();
@@ -589,7 +589,7 @@ public class TestContainerSpecCompatibilityOptions
 
         Uni_1ToM_Map_RelKey_FK u2 = new Uni_1ToM_Map_RelKey_FK();
         u2.setName("u2");
-        Map<EntityC, EntityC_U1M_Map_RelKey_FK> cs2 = new HashMap<EntityC, EntityC_U1M_Map_RelKey_FK>();
+        Map<EntityC, EntityC_U1M_Map_RelKey_FK> cs2 = new HashMap<>();
         cs2.put(cKey1, c4);
         u2.setEntityCs(cs2);
         em.persist(u2);
@@ -616,7 +616,7 @@ public class TestContainerSpecCompatibilityOptions
     public void crudBi1MMapRelKeyJT(EntityManager em) {
         Bi_1ToM_Map_RelKey_JT b = new Bi_1ToM_Map_RelKey_JT();
         b.setName("b");
-        Map<EntityC, EntityC_B1M_Map_RelKey_JT> cs = new HashMap<EntityC, EntityC_B1M_Map_RelKey_JT>();
+        Map<EntityC, EntityC_B1M_Map_RelKey_JT> cs = new HashMap<>();
         EntityC_B1M_Map_RelKey_JT c = new EntityC_B1M_Map_RelKey_JT();
         c.setName("c");
         c.setBi1mjt(b);
@@ -669,7 +669,7 @@ public class TestContainerSpecCompatibilityOptions
     }
 
     public void testUniManyToOneUsingJoinTable() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityC.class);
         types.add(Uni_MTo1_JT.class);
         OpenJPAEntityManagerFactorySPI emf = createEMF2_0(types);
@@ -741,7 +741,7 @@ public class TestContainerSpecCompatibilityOptions
     }
 
     public void testOneToOneUsingJoinTable() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityC_B11JT.class);
         types.add(EntityC_U11JT.class);
         types.add(Bi_1To1_JT.class);
@@ -864,7 +864,7 @@ public class TestContainerSpecCompatibilityOptions
     }
 
     private OpenJPAEntityManagerFactorySPI createEMF2_0(List<Class<?>> types) {
-        Map<String,Object> map = new HashMap<String,Object>();
+        Map<String,Object> map = new HashMap<>();
         map.put("openjpa.jdbc.JDBCListeners",
                 new JDBCListener[] {
                     this.new Listener()
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestDupNamedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestDupNamedQuery.java
index fe6759ad8..0cfcb2381 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestDupNamedQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestDupNamedQuery.java
@@ -20,13 +20,15 @@ package org.apache.openjpa.persistence.compat;
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.conf.OpenJPAVersion;
 import org.apache.openjpa.persistence.ArgumentException;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * <b>Compatible testcases</b> are used to test various backwards compatibility scenarios between JPA 2.0 and JPA 1.2
  *
@@ -42,6 +44,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestDupNamedQuery extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SimpleEntity.class, SimpleEntity2.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java
index 3ed801013..6d46fc74a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java
@@ -45,6 +45,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestEmbeddableSuperclass
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(EmbeddableSuper.class, EmbeddableSuperSub.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMessageListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMessageListener.java
index e3f449e42..52a5ab33e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMessageListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMessageListener.java
@@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.compat;
 
 import javax.persistence.Query;
 
+import org.apache.openjpa.conf.OpenJPAVersion;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.callbacks.Message;
 import org.apache.openjpa.persistence.callbacks.MessageListenerImpl;
-import org.apache.openjpa.conf.OpenJPAVersion;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 /**
  * <b>TestCompatibile</b> is used to test various backwards compatibility scenarios between JPA 2.0 and JPA 1.2
@@ -42,6 +42,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManager;
  */
 public class TestMessageListener extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Message.class,
               "openjpa.Compatibility", "default",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMethodQLQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMethodQLQuery.java
index a45eb591e..a05b0c435 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMethodQLQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestMethodQLQuery.java
@@ -18,15 +18,15 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import java.util.Map;
 import java.util.ArrayList;
+import java.util.Map;
 
 import org.apache.openjpa.conf.OpenJPAVersion;
+import org.apache.openjpa.kernel.FetchConfiguration;
 import org.apache.openjpa.kernel.QueryLanguages;
 import org.apache.openjpa.kernel.StoreContext;
-import org.apache.openjpa.kernel.FetchConfiguration;
-import org.apache.openjpa.lib.rop.ResultObjectProvider;
 import org.apache.openjpa.lib.rop.ListResultObjectProvider;
+import org.apache.openjpa.lib.rop.ResultObjectProvider;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.persistence.ArgumentException;
 import org.apache.openjpa.persistence.OpenJPAQuery;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java
index 802d4ac94..f214d19c0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java
@@ -48,6 +48,7 @@ public class TestNonPrimaryKeyQueryParameters extends SQLListenerTestCase {
     private static final int LINEITEM_PER_INVOICE = 1;
     private static final String DEPT_NAME = "ENGINEERING";
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Department.class, Employee.class,
                 FullTimeEmployee.class, PartTimeEmployee.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestQuerySQLCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestQuerySQLCache.java
index 3222ebfd5..1effcd30d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestQuerySQLCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestQuerySQLCache.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.compat;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
@@ -35,6 +36,8 @@ import org.apache.openjpa.persistence.simple.Person;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.framework.TestCase;
+
 /**
  * <b>TestQuerySQLCache</b> is used to verify multiple permutations of openjpa.jdbc.QuerySQLCache settings that were
  * valid in JPA 1.2 but may not be valid in JPA 2.0
@@ -203,7 +206,7 @@ public class TestQuerySQLCache extends SingleEMFTestCase {
                     newThreads[i].join();
                 }
                 catch (InterruptedException e) {
-                    this.fail("Caught Interrupted Exception: " + e);
+                    TestCase.fail("Caught Interrupted Exception: " + e);
                 }
             }
 
@@ -256,6 +259,7 @@ public class TestQuerySQLCache extends SingleEMFTestCase {
             return failures;
         }
 
+        @Override
         public void run() {
             try {
                 EntityManager em = emf.createEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestSpecCompatibilityOptions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestSpecCompatibilityOptions.java
index 4685d8d3b..40f0982e9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestSpecCompatibilityOptions.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestSpecCompatibilityOptions.java
@@ -40,7 +40,7 @@ import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
 public class TestSpecCompatibilityOptions
 extends AbstractCachedEMFTestCase {
 
-    protected List<String> sql = new ArrayList<String>();
+    protected List<String> sql = new ArrayList<>();
     protected int sqlCount;
 
     /*
@@ -103,7 +103,7 @@ extends AbstractCachedEMFTestCase {
      * a mapped superclass.
      */
     public void testMappedSuperClass() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityA.class);
         types.add(EntityB.class);
         types.add(MappedSuper.class);
@@ -168,7 +168,7 @@ extends AbstractCachedEMFTestCase {
      *
      */
     public void testOneToManyRelation() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityC.class);
         types.add(EntityC_B1MFK.class);
         types.add(EntityC_B1MJT.class);
@@ -207,7 +207,7 @@ extends AbstractCachedEMFTestCase {
         //create
         Uni_1ToM_FK u = new Uni_1ToM_FK();
         u.setName("u");
-        List<EntityC_U1MFK> cs = new ArrayList<EntityC_U1MFK>();
+        List<EntityC_U1MFK> cs = new ArrayList<>();
         EntityC_U1MFK c = new EntityC_U1MFK();
         c.setName("c");
         cs.add(c);
@@ -233,7 +233,7 @@ extends AbstractCachedEMFTestCase {
 
         Uni_1ToM_FK u2 = new Uni_1ToM_FK();
         u2.setName("u2");
-        List<EntityC_U1MFK> cs2 = new ArrayList<EntityC_U1MFK>();
+        List<EntityC_U1MFK> cs2 = new ArrayList<>();
         cs2.add(c2);
         u2.setEntityCs(cs2);
         em.persist(u2);
@@ -262,7 +262,7 @@ extends AbstractCachedEMFTestCase {
     public void crudUni1MJT(EntityManager em) {
         Uni_1ToM_JT u = new Uni_1ToM_JT();
         u.setName("u");
-        List<EntityC> cs = new ArrayList<EntityC>();
+        List<EntityC> cs = new ArrayList<>();
         EntityC c = new EntityC();
         c.setName("c");
         cs.add(c);
@@ -305,7 +305,7 @@ extends AbstractCachedEMFTestCase {
     public void crudBi1MFK(EntityManager em) {
         Bi_1ToM_FK b = new Bi_1ToM_FK();
         b.setName("b");
-        List<EntityC_B1MFK> cs = new ArrayList<EntityC_B1MFK>();
+        List<EntityC_B1MFK> cs = new ArrayList<>();
         EntityC_B1MFK c = new EntityC_B1MFK();
         c.setName("c");
         c.setBi1mfk(b);
@@ -349,7 +349,7 @@ extends AbstractCachedEMFTestCase {
     public void crudBi1MJT(EntityManager em) {
         Bi_1ToM_JT b = new Bi_1ToM_JT();
         b.setName("b");
-        List<EntityC_B1MJT> cs = new ArrayList<EntityC_B1MJT>();
+        List<EntityC_B1MJT> cs = new ArrayList<>();
         EntityC_B1MJT c = new EntityC_B1MJT();
         c.setName("c");
         c.setBi1mjt(b);
@@ -397,7 +397,7 @@ extends AbstractCachedEMFTestCase {
     }
 
     public void testOneToManyMapRelation() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityC_U1M_Map_FK.class);
         types.add(Uni_1ToM_Map_FK.class);
         types.add(EntityC_B1M_Map_JT.class);
@@ -435,7 +435,7 @@ extends AbstractCachedEMFTestCase {
         //create
         Uni_1ToM_Map_FK u = new Uni_1ToM_Map_FK();
         u.setName("u");
-        Map<String, EntityC_U1M_Map_FK> cs = new HashMap<String, EntityC_U1M_Map_FK>();
+        Map<String, EntityC_U1M_Map_FK> cs = new HashMap<>();
         EntityC_U1M_Map_FK c1 = new EntityC_U1M_Map_FK();
         c1.setName("c1");
         cs.put(c1.getName(), c1);
@@ -467,7 +467,7 @@ extends AbstractCachedEMFTestCase {
 
         Uni_1ToM_Map_FK u2 = new Uni_1ToM_Map_FK();
         u2.setName("u2");
-        Map<String, EntityC_U1M_Map_FK> cs2 = new HashMap<String, EntityC_U1M_Map_FK>();
+        Map<String, EntityC_U1M_Map_FK> cs2 = new HashMap<>();
         cs2.put(c4.getName(), c4);
         u2.setEntityCs(cs2);
         em.persist(u2);
@@ -494,7 +494,7 @@ extends AbstractCachedEMFTestCase {
     public void crudBi1MMapJT(EntityManager em) {
         Bi_1ToM_Map_JT b = new Bi_1ToM_Map_JT();
         b.setName("b");
-        Map<String, EntityC_B1M_Map_JT> cs = new HashMap<String, EntityC_B1M_Map_JT>();
+        Map<String, EntityC_B1M_Map_JT> cs = new HashMap<>();
         EntityC_B1M_Map_JT c = new EntityC_B1M_Map_JT();
         c.setName("c");
         c.setBi1mjt(b);
@@ -544,7 +544,7 @@ extends AbstractCachedEMFTestCase {
         //create
         Uni_1ToM_Map_RelKey_FK u = new Uni_1ToM_Map_RelKey_FK();
         u.setName("u");
-        Map<EntityC, EntityC_U1M_Map_RelKey_FK> cs = new HashMap<EntityC, EntityC_U1M_Map_RelKey_FK>();
+        Map<EntityC, EntityC_U1M_Map_RelKey_FK> cs = new HashMap<>();
         EntityC_U1M_Map_RelKey_FK c1 = new EntityC_U1M_Map_RelKey_FK();
         c1.setName("c1");
         EntityC cKey1 = new EntityC();
@@ -584,7 +584,7 @@ extends AbstractCachedEMFTestCase {
 
         Uni_1ToM_Map_RelKey_FK u2 = new Uni_1ToM_Map_RelKey_FK();
         u2.setName("u2");
-        Map<EntityC, EntityC_U1M_Map_RelKey_FK> cs2 = new HashMap<EntityC, EntityC_U1M_Map_RelKey_FK>();
+        Map<EntityC, EntityC_U1M_Map_RelKey_FK> cs2 = new HashMap<>();
         cs2.put(cKey1, c4);
         u2.setEntityCs(cs2);
         em.persist(u2);
@@ -611,7 +611,7 @@ extends AbstractCachedEMFTestCase {
     public void crudBi1MMapRelKeyJT(EntityManager em) {
         Bi_1ToM_Map_RelKey_JT b = new Bi_1ToM_Map_RelKey_JT();
         b.setName("b");
-        Map<EntityC, EntityC_B1M_Map_RelKey_JT> cs = new HashMap<EntityC, EntityC_B1M_Map_RelKey_JT>();
+        Map<EntityC, EntityC_B1M_Map_RelKey_JT> cs = new HashMap<>();
         EntityC_B1M_Map_RelKey_JT c = new EntityC_B1M_Map_RelKey_JT();
         c.setName("c");
         c.setBi1mjt(b);
@@ -664,7 +664,7 @@ extends AbstractCachedEMFTestCase {
     }
 
     public void testUniManyToOneUsingJoinTable() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityC.class);
         types.add(Uni_MTo1_JT.class);
         OpenJPAEntityManagerFactorySPI emf = createEMF2_0(types);
@@ -736,7 +736,7 @@ extends AbstractCachedEMFTestCase {
     }
 
     public void testOneToOneUsingJoinTable() {
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         types.add(EntityC_B11JT.class);
         types.add(EntityC_U11JT.class);
         types.add(Bi_1To1_JT.class);
@@ -859,7 +859,7 @@ extends AbstractCachedEMFTestCase {
     }
 
     private OpenJPAEntityManagerFactorySPI createEMF2_0(List<Class<?>> types) {
-        Map<Object,Object> map = new HashMap<Object,Object>();
+        Map<Object,Object> map = new HashMap<>();
         map.put("openjpa.jdbc.JDBCListeners",
                 new JDBCListener[] {
                     this.new Listener()
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1To1_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1To1_JT.java
index c53994df2..e92182bf8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1To1_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1To1_JT.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToOne;
 
 @Entity
 public class Uni_1To1_JT {
@@ -59,10 +64,12 @@ public class Uni_1To1_JT {
         this.entityC = entityC;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Uni_1To1_JT)) return false;
         Uni_1To1_JT u = (Uni_1To1_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_FK.java
index 3f4997ee2..53347d8d0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_FK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_FK.java
@@ -20,7 +20,12 @@ package org.apache.openjpa.persistence.compat;
 
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
 
 /**
  * This is the non-default uni-directional one-to-many mapping.
@@ -63,10 +68,12 @@ public class Uni_1ToM_FK {
         this.entityCs = entityCs;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Uni_1ToM_FK)) return false;
         Uni_1ToM_FK b = (Uni_1ToM_FK)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_JT.java
index 384cdb124..e48b8393b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_JT.java
@@ -20,7 +20,13 @@ package org.apache.openjpa.persistence.compat;
 
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
 
 /**
  * This is the default uni-directional one-to-many mapping.
@@ -68,10 +74,12 @@ public class Uni_1ToM_JT {
         this.entityCs = entityAs;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Uni_1ToM_JT)) return false;
         Uni_1ToM_JT b = (Uni_1ToM_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_FK.java
index 5b1cb4a62..f8802d79d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_FK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_FK.java
@@ -21,7 +21,13 @@ package org.apache.openjpa.persistence.compat;
 import java.util.Collection;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
 
 //non-default mapping
 //Sec 11.1.36, Example 3:
@@ -64,10 +70,12 @@ public class Uni_1ToM_Map_FK {
         this.entityCs = entityCs;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Uni_1ToM_Map_FK)) return false;
         Uni_1ToM_Map_FK b = (Uni_1ToM_Map_FK)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java
index 8ae805301..37c6271c7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_1ToM_Map_RelKey_FK.java
@@ -21,7 +21,13 @@ package org.apache.openjpa.persistence.compat;
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
 
 //non-default mapping
 //Sec 11.1.36, Example 3:
@@ -64,10 +70,12 @@ public class Uni_1ToM_Map_RelKey_FK {
         this.entityCs = entityCs;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Uni_1ToM_Map_RelKey_FK)) return false;
         Uni_1ToM_Map_RelKey_FK b = (Uni_1ToM_Map_RelKey_FK)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_MTo1_JT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_MTo1_JT.java
index b2143d4a2..f1fd13945 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_MTo1_JT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/Uni_MTo1_JT.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.compat;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class Uni_MTo1_JT {
@@ -59,10 +64,12 @@ public class Uni_MTo1_JT {
         this.entityC = entityC;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + (int)id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Uni_MTo1_JT)) return false;
         Uni_MTo1_JT c = (Uni_MTo1_JT)o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java
index 56bf493b8..d09ebbbaa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOpenJPAConfiguration.java
@@ -26,15 +26,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import org.apache.openjpa.persistence.common.utils.BufferedLogFactory;
-import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.lib.conf.PluginValue;
 import org.apache.openjpa.lib.conf.Value;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.common.utils.BufferedLogFactory;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 /**
  * <p>Tests the JDO configuration classes.</p>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java
index 5d0a9b834..72159dfe9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java
@@ -47,6 +47,7 @@ public class TestOverrideNonJtaDataSource extends SingleEMFTestCase {
         closeEMF(emf1);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(Person.class, CLEAR_TABLES);
         OpenJPAEntityManager em = emf.createEntityManager();
@@ -87,11 +88,12 @@ public class TestOverrideNonJtaDataSource extends SingleEMFTestCase {
     }
 
     protected EntityManager getEm(EntityManagerFactory emf, String name, String value) {
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put(name, value);
         return emf.createEntityManager(props);
     }
 
+    @Override
     public String getPersistenceUnitName() {
         return "TestCfSwitching";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java
index a6f57ded9..570478601 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java
@@ -84,11 +84,12 @@ public class TestSwitchConnection extends SingleEMFTestCase {
     }
 
     protected EntityManager getEm(EntityManagerFactory emf1, String name, String value) {
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put(name, value);
         return emf1.createEntityManager(props);
     }
 
+    @Override
     public String getPersistenceUnitName() {
         return "TestCfSwitching";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
index cf231b81f..fa2a4d08b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/AbstractCriteriaTestCase.java
@@ -31,8 +31,6 @@ import javax.persistence.Persistence;
 import javax.persistence.Query;
 import javax.persistence.criteria.CriteriaQuery;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.DerbyDictionary;
@@ -46,6 +44,8 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 
+import junit.framework.TestCase;
+
 /**
  * Extends junit.framework.TestCase
  *
@@ -80,7 +80,7 @@ public abstract class AbstractCriteriaTestCase extends TestCase {
      *            key,value,key,value...
      */
     protected OpenJPAEntityManagerFactorySPI createNamedEMF(Class<?>... types) {
-        Map<Object, Object> map = new HashMap<Object, Object>();
+        Map<Object, Object> map = new HashMap<>();
         map.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true," + "SchemaAction='add')");
         map.put("openjpa.jdbc.QuerySQLCache", "false");
         map.put("openjpa.DynamicEnhancementAgent", "false");
@@ -97,7 +97,7 @@ public abstract class AbstractCriteriaTestCase extends TestCase {
 
         map.put("openjpa.MetaDataFactory", "jpa(Types=" + buf.toString() + ")");
 
-        Map<Object, Object> config = new HashMap<Object, Object>(System.getProperties());
+        Map<Object, Object> config = new HashMap<>(System.getProperties());
         config.putAll(map);
         return (OpenJPAEntityManagerFactorySPI) Persistence.createEntityManagerFactory("test", config);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser.java
index 2797e4277..bac5ab913 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser.java
@@ -18,8 +18,21 @@
  */
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.PersistentCollection;
 
 @Entity
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java
index 1b8520c7c..e87ca4321 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CompUser_.java
@@ -25,6 +25,7 @@ package org.apache.openjpa.persistence.criteria;
 
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
+
 import org.apache.openjpa.persistence.criteria.CompUser.CreditRating;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
index 620169825..307a3504d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/CriteriaTest.java
@@ -79,6 +79,7 @@ public abstract class CriteriaTest extends AbstractCriteriaTestCase {
         super.tearDown();
     }
 
+    @Override
     protected OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
         return emf;
     }
@@ -87,6 +88,7 @@ public abstract class CriteriaTest extends AbstractCriteriaTestCase {
         CriteriaTest.emf = emf;
     }
 
+    @Override
     protected SQLAuditor getAuditor() {
         return auditor;
     }
@@ -103,6 +105,7 @@ public abstract class CriteriaTest extends AbstractCriteriaTestCase {
         this.cb = cb;
     }
 
+    @Override
     protected EntityManager getEntityManager() {
         return em;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java
index 110106ac2..30f86c39c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer.java
@@ -44,7 +44,7 @@ public class Customer {
 	private String name;
 
 	@OneToMany(mappedBy="customer")
-	private Set<Order> orders = new HashSet<Order>();
+	private Set<Order> orders = new HashSet<>();
 
 	private int status;
 	private int balanceOwed;
@@ -57,7 +57,7 @@ public class Customer {
     private long accountNum;
 
 	@OneToMany
-	private List<Account> accounts = new ArrayList<Account>();
+	private List<Account> accounts = new ArrayList<>();
 
     @Enumerated
     @Basic
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
index 7306bc78d..f92a6c59e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Customer_.java
@@ -26,6 +26,7 @@ package org.apache.openjpa.persistence.criteria;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
+
 import org.apache.openjpa.persistence.criteria.Customer.CreditRating;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java
index 28956315d..30df60114 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/DependentId_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.util.Date;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java
index 66ef13f2e..650b77d9a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Dependent_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.util.Date;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java
index 04c3147eb..96afb673c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java
@@ -109,6 +109,7 @@ public abstract class EmbeddableDomainTestCase extends AbstractCriteriaTestCase
         }
     }
 
+    @Override
     protected OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
         return emf;
     }
@@ -117,6 +118,7 @@ public abstract class EmbeddableDomainTestCase extends AbstractCriteriaTestCase
         EmbeddableDomainTestCase.emf = emf;
     }
 
+    @Override
     protected SQLAuditor getAuditor() {
         return auditor;
     }
@@ -133,6 +135,7 @@ public abstract class EmbeddableDomainTestCase extends AbstractCriteriaTestCase
         this.cb = cb;
     }
 
+    @Override
     protected EntityManager getEntityManager() {
         return em;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
index 45af01359..9e9579895 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Exempt_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.util.Date;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
index 1c4f58d34..4d373b413 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
@@ -65,6 +65,7 @@ public abstract class JoinDomainTestCase extends AbstractCriteriaTestCase {
         super.tearDown();
     }
 
+    @Override
     protected OpenJPAEntityManagerFactorySPI getEntityManagerFactory() {
         return emf;
     }
@@ -73,6 +74,7 @@ public abstract class JoinDomainTestCase extends AbstractCriteriaTestCase {
         JoinDomainTestCase.emf = emf;
     }
 
+    @Override
     protected SQLAuditor getAuditor() {
         return auditor;
     }
@@ -89,6 +91,7 @@ public abstract class JoinDomainTestCase extends AbstractCriteriaTestCase {
         this.cb = cb;
     }
 
+    @Override
     protected EntityManager getEntityManager() {
         return em;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine.java
index c7ad3d075..9a37216f8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine.java
@@ -19,18 +19,18 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.io.Serializable;
+import java.sql.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.FetchType;
 import javax.persistence.Table;
 
-import java.sql.Date;
-
 @Entity
 @Table(name="CR_MG")
 public class Magazine implements Serializable {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java
index 351047e54..063a1c3a2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Magazine_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.sql.Date;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser.java
index 83eb6434d..39af3823a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/MaleUser.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.*;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
 
 @Entity
 @DiscriminatorValue(value="M")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
index d03436344..e4401cf73 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Manager_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.math.BigDecimal;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java
index dcfeaa817..c17b4320e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Movie.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.criteria;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="CR_MV")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
index 9a1d5b00d..a29422d8f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Order_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.sql.Timestamp;
+
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java
index 79e7a6dc5..19b895499 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Phone.java
@@ -35,7 +35,7 @@ public class Phone {
     private int id;
 
     @ManyToMany
-    private Collection<Employee> employees = new ArrayList<Employee>();
+    private Collection<Employee> employees = new ArrayList<>();
 
 	private String vendor;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java
index 2aa584112..59cbd9fa5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Product.java
@@ -17,7 +17,12 @@
  * under the License.
  */
 package org.apache.openjpa.persistence.criteria;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 @Entity
 @Table(name="CR_PRD")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher.java
index 9f0188b5e..d924cf902 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Publisher.java
@@ -19,17 +19,17 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.io.Serializable;
+import java.util.Set;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import java.util.Set;
-
 @Entity
 @Table(name="CR_PSH")
 public class Publisher implements Serializable {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java
index 92d02480b..75e2f9526 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Request.java
@@ -20,7 +20,10 @@ package org.apache.openjpa.persistence.criteria;
 
 import java.sql.Date;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class Request {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/StringComparison.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/StringComparison.java
index a25046ee0..5c30ec696 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/StringComparison.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/StringComparison.java
@@ -60,7 +60,7 @@ public class StringComparison {
 	}
 
 	public List<String> tokenize(String s) throws IOException {
-		List<String> list = new ArrayList<String>();
+		List<String> list = new ArrayList<>();
 		StreamTokenizer tok = new StreamTokenizer(new StringReader(s));
 		tok.resetSyntax();
 		tok.wordChars('a', 'z');
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java
index 1a445eefc..8bcf4e932 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/Student.java
@@ -46,7 +46,7 @@ public class Student {
         inverseJoinColumns=@JoinColumn(name="SEMESTER"))
     @MapKeyJoinColumn(name="COURSE")
     private Map<Course, Semester> enrollment =
-        new HashMap<Course, Semester>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestByteArray.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestByteArray.java
index 783128fb6..7fcfb6b46 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestByteArray.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestByteArray.java
@@ -33,6 +33,7 @@ public class TestByteArray extends SingleEMFTestCase {
     protected CriteriaBuilder cb;
     String pic = "IamNotAPicture";
     Character[] chars = new Character[] { new Character('a'), new Character('b') };
+    @Override
     public void setUp() {
         super.setUp(BlogUser.class
             // Using the following property will require corresponding
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java
index 4b1e0df60..18e116d93 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestCriteria.java
@@ -59,6 +59,7 @@ public class TestCriteria extends SingleEMFTestCase {
     protected OpenJPAQueryBuilder qb;
     protected StringComparison comparator = new StringComparison();
 
+    @Override
     public void setUp() {
             super.setUp(CLEAR_TABLES,
                     "openjpa.DynamicEnhancementAgent", "false",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java
index 499ae14cb..64c4d02d0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDateStringConversion.java
@@ -114,6 +114,7 @@ public class TestDateStringConversion extends CriteriaTest {
         c.orderBy(cb.asc(d.get(Dependent_.endDate)));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("dateString", dateString);
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java
index 4e5fd0b76..545eac59e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestDistinctCriteria.java
@@ -40,6 +40,7 @@ public class TestDistinctCriteria extends CriteriaTest {
         }
     }
 
+    @Override
     public void tearDown() throws Exception {
         try {
             deleteDataForTestDistinct();
@@ -62,7 +63,7 @@ public class TestDistinctCriteria extends CriteriaTest {
         Order o2 = new Order(); o2.setCustomer(c1);
         Order o3 = new Order(); o3.setCustomer(c2);
 
-        Set<Order> orders = new HashSet<Order>();
+        Set<Order> orders = new HashSet<>();
         orders.add(o1); orders.add(o2);
         c1.setOrders(orders);
         orders.clear();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java
index a191e8698..79fdd3fb7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEdit.java
@@ -198,6 +198,7 @@ public class TestEdit extends CriteriaTest {
         c.where(cb.equal(p.get(Person_.name), cb.parameter(String.class, "p1")));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("p1", "XYZ");
             }
@@ -207,6 +208,7 @@ public class TestEdit extends CriteriaTest {
         c.where(cb.and(where, cb.equal(p.get(Person_.name), cb.parameter(String.class, "p2"))));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("p1", "MNO");
                 q.setParameter("p2", "ABC");
@@ -224,6 +226,7 @@ public class TestEdit extends CriteriaTest {
                        cb.equal(p.get(Person_.name), cb.parameter(String.class, "p2"))));
         assertEquals(2,c.getParameters().size());
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("p1", "XYZ");
                 q.setParameter("p2", "ABC");
@@ -233,6 +236,7 @@ public class TestEdit extends CriteriaTest {
         c.where(cb.equal(p.get(Person_.name), cb.parameter(String.class, "p3")));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("p3", "MNO");
             }
@@ -249,6 +253,7 @@ public class TestEdit extends CriteriaTest {
                        cb.equal(p.get(Person_.name), cb.parameter(String.class, "p2"))));
         assertEquals(2,c.getParameters().size());
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("p1", "XYZ");
                 q.setParameter("p2", "ABC");
@@ -258,6 +263,7 @@ public class TestEdit extends CriteriaTest {
         c.where(cb.equal(p.get(Person_.name), cb.parameter(String.class, "p1")));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("p1", "MNO");
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
index 906db7198..4c2c7898e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestEmbeddableCriteria.java
@@ -1176,6 +1176,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         ParameterExpression<Embed_Embed> param1 = cb.parameter(Embed_Embed.class, "embed2");
         q.where(cb.isMember(param1, a.get(EntityA_Coll_Embed_Embed_.embeds)));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("embed2", new Embed_Embed());
             }
@@ -1195,6 +1196,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.isMember(param1, a.get(EntityA_Coll_Embed_Embed_.embeds)));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("embed2", new Embed_Embed());
             }
@@ -1213,6 +1215,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         Parameter<Embed_Embed> param1 = cb.parameter(Embed_Embed.class);
         //q.where(cb.equal(param1, e));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("embed2", new Embed_Embed());
             }
@@ -1520,6 +1523,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.equal(param1, cb.any(sq)));
         q.orderBy(cb.asc(i));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("image", "my photo");
             }
@@ -1540,6 +1544,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.equal(param1, cb.any(sq)));
         q.orderBy(cb.asc(i));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("image", "my photo");
             }
@@ -1561,6 +1566,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.exists(sq));
         q.orderBy(cb.asc(i));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("image", "my photo");
             }
@@ -1581,6 +1587,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.equal(param1, cb.any(sq)));
         q.orderBy(cb.asc(i));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("image", "my photo");
             }
@@ -1602,6 +1609,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.exists(sq));
         q.orderBy(cb.asc(i));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("image", "my photo");
             }
@@ -1622,6 +1630,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.equal(param1, cb.any(sq)));
         q.orderBy(cb.asc(i));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("image", "my photo");
             }
@@ -1643,6 +1652,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.exists(sq));
         q.orderBy(cb.asc(i));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("image", "my photo");
             }
@@ -1680,6 +1690,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.equal(param1, sq));
         q.orderBy(cb.asc(c));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("division", new Division());
             }
@@ -1701,6 +1712,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.exists(sq));
         q.orderBy(cb.asc(c));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("division", new Division());
             }
@@ -1722,6 +1734,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.exists(sq));
         q.orderBy(cb.asc(c));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("division", new Division());
             }
@@ -1743,6 +1756,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.equal(param1, sq));
         q.orderBy(cb.asc(c));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("division", new Division());
             }
@@ -1764,6 +1778,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.exists(sq));
         q.orderBy(cb.asc(c));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("k", new Division());
             }
@@ -1785,6 +1800,7 @@ public class TestEmbeddableCriteria extends EmbeddableDomainTestCase {
         q.where(cb.exists(sq));
         q.orderBy(cb.asc(c));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("k", new Division());
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
index 096de911a..d55f179ee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestJPQLSubquery.java
@@ -1514,6 +1514,7 @@ public class TestJPQLSubquery extends CriteriaTest {
 
         q.where(cb.and(cb.and(cb.and(p1, p2), p3), p4));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("empid",   101L);
                 q.setParameter("minDate", new Date(100));
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
index 185d2231a..1dfcaf658 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestMetaModelTypesafeCriteria.java
@@ -381,6 +381,7 @@ public class TestMetaModelTypesafeCriteria extends CriteriaTest {
             c.get(customer_.getSingularAttribute("status", Integer.class)), param));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("stat", 1);
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java
index aec64d071..6574f3925 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestQueryByExample.java
@@ -187,6 +187,7 @@ public class TestQueryByExample extends CriteriaTest {
                 + "AND t0.name = ? AND t0.rating = ? AND t0.salary = ?)");
     }
 
+    @Override
     void executeAndCompareSQL(CriteriaQuery<?> q, String expected) {
         auditor.clear();
         em.createQuery(q).getResultList();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java
index 251301149..f0dc2bf47 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestStringCriteria.java
@@ -35,7 +35,6 @@ import javax.persistence.criteria.Root;
 import javax.persistence.criteria.SetJoin;
 import javax.persistence.criteria.Subquery;
 
-import org.apache.openjpa.persistence.criteria.AbstractCriteriaTestCase.QueryDecorator;
 import org.apache.openjpa.persistence.test.AllowFailure;
 
 public class TestStringCriteria extends CriteriaTest {
@@ -218,6 +217,7 @@ public class TestStringCriteria extends CriteriaTest {
         q.select(c).where(cb.equal(c.get("status"), param));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("stat", 1);
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java
index 8a9fa7c4d..920aa1138 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypeSafeCondExpression.java
@@ -45,8 +45,6 @@ import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
 
-import org.apache.openjpa.persistence.criteria.AbstractCriteriaTestCase.QueryDecorator;
-
 /**
  * Tests type-strict version of Criteria API. The test scenarios are adapted
  * from TestEJBQLCondExpression in
@@ -165,6 +163,7 @@ public class TestTypeSafeCondExpression extends CriteriaTest {
         cq.select(c.get(CompUser_.name));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("name", "%|_%");
             }
@@ -507,6 +506,7 @@ public class TestTypeSafeCondExpression extends CriteriaTest {
         cq.orderBy(cb.asc(e.get(CompUser_.name)));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("a", MaleUser.class);
                 q.setParameter("b", FemaleUser.class);
@@ -526,6 +526,7 @@ public class TestTypeSafeCondExpression extends CriteriaTest {
         q.where(cb.equal(e.type(), param1).not());
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("t", MaleUser.class);
             }
@@ -539,7 +540,7 @@ public class TestTypeSafeCondExpression extends CriteriaTest {
         Root<Address> a = q.from(Address.class);
         Root<FemaleUser> e = q.from(FemaleUser.class);
         q.multiselect(e, cb.literal(FemaleUser.class), a);
-        q.where(e.get(FemaleUser_.address).isNotNull());
+        q.where(e.get(CompUser_.address).isNotNull());
 
         assertEquivalence(q, query);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
index 45c0feadd..d850c1695 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestTypesafeCriteria.java
@@ -544,6 +544,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         q.select(c).where(cb.equal(c.get(Customer_.status), param));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("stat", 1);
             }
@@ -561,6 +562,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
                 cb.equal(c.get(Customer_.name), param2)));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("stat", 1);
                 q.setParameter("name", "test");
@@ -577,6 +579,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         q.select(c).where(cb.equal(c.get(Customer_.status), param));
 
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("stat", 1);
             }
@@ -593,6 +596,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         q.select(c).where(cb.and(cb.equal(c.get(Customer_.status), param1),
                 cb.equal(c.get(Customer_.name), param2)));
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("stat", 1);
                 q.setParameter("name", "test");
@@ -612,6 +616,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         vals.add(1);
         vals.add(2);
         assertEquivalence(new QueryDecorator() {
+            @Override
             public void decorate(Query q) {
                 q.setParameter("coll", vals);
             }
@@ -949,7 +954,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -969,7 +974,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -988,7 +993,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1007,7 +1012,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1028,7 +1033,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1048,7 +1053,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1067,7 +1072,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1085,7 +1090,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1106,7 +1111,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1125,7 +1130,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1144,7 +1149,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1163,7 +1168,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1186,7 +1191,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1205,7 +1210,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1224,7 +1229,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1243,7 +1248,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
         Root<Item> item = q.from(Item.class);
         MapJoin<Item, String, Photo> photo = item.join(Item_.photos);
         q.multiselect(item.get(Item_.name), photo);
-        Map<String, Photo> photo1 = new HashMap<String, Photo>();
+        Map<String, Photo> photo1 = new HashMap<>();
         for (int i = 0; i < 5; i++) {
             Photo p1 = new Photo();
             p1.setLabel("label" + i);
@@ -1386,6 +1391,7 @@ public class TestTypesafeCriteria extends CriteriaTest {
          .having(cb.gt(cb.count(country), 3));
 
         assertEquivalence(new QueryDecorator(){
+            @Override
             public void decorate(Query q) {
                 q.setMaxResults(20);
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java
index 58d663212..474b50bca 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TransactionHistory_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.criteria;
 
 import java.sql.Timestamp;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java
index b9812b2e0..3cfdac29c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/VideoStore.java
@@ -50,7 +50,7 @@ public class VideoStore {
         joinColumns=@JoinColumn(name="STORE"))
     @Column(name="COPIES_IN_STOCK")
     @MapKeyJoinColumn(name="MOVIE", referencedColumnName="ID")
-    private Map<Movie, Integer> videoInventory = new HashMap<Movie, Integer>();
+    private Map<Movie, Integer> videoInventory = new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/MyUserEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/MyUserEntity.java
index 99afa8d77..f05a239a6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/MyUserEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/init/MyUserEntity.java
@@ -41,7 +41,7 @@ public class MyUserEntity {
     private String username;
 
     @OneToMany(mappedBy = "user", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-    private List<AddressEntity> addresses = new ArrayList<AddressEntity>();
+    private List<AddressEntity> addresses = new ArrayList<>();
 
     public MyUserEntity() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay_.java
index cd439dd95..9d2906e9b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/DimDay_.java
@@ -18,10 +18,8 @@
  */
 package org.apache.openjpa.persistence.criteria.multiselect;
 
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.String;
 import java.util.Date;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment_.java
index 5d7850292..4029f9ff1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/FactWorkAssignment_.java
@@ -18,12 +18,8 @@
  */
 package org.apache.openjpa.persistence.criteria.multiselect;
 
-import java.lang.Boolean;
-import java.lang.Double;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.String;
 import java.util.Date;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/TestCriteriaMultiselectAliasing.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/TestCriteriaMultiselectAliasing.java
index 7f7d80a66..bfb4c1104 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/TestCriteriaMultiselectAliasing.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/multiselect/TestCriteriaMultiselectAliasing.java
@@ -119,7 +119,7 @@ public class TestCriteriaMultiselectAliasing extends SQLListenerTestCase {
     public CriteriaQuery<Tuple> createCriteriaBuilder(){
             EntityManager em = emf.createEntityManager();
 
-            List<Predicate> predicates = new ArrayList<Predicate>();
+            List<Predicate> predicates = new ArrayList<>();
             CriteriaBuilder cb = em.getCriteriaBuilder();
             CriteriaQuery<Tuple> cq = cb.createTupleQuery();
             Root<DimDay> day = cq.from(DimDay.class);
@@ -134,7 +134,7 @@ public class TestCriteriaMultiselectAliasing extends SQLListenerTestCase {
             Root<FactWorkAssignment> wa1 = subQuery.from(FactWorkAssignment.class);
 
             subQuery.select(wa1.get(FactWorkAssignment_.personObjId));
-            List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+            List<Predicate> subQueryPredicates = new ArrayList<>();
             subQueryPredicates.add(cb.equal(wa1.get(FactWorkAssignment_.orgOID), "dummy1"));
 
             //Removing this seem to "fix" the issue....I think the fact that we use 'day' from
@@ -154,7 +154,7 @@ public class TestCriteriaMultiselectAliasing extends SQLListenerTestCase {
 
             predicates.add(predicate);
 
-            List<Selection<?>> selections = new ArrayList<Selection<?>>();
+            List<Selection<?>> selections = new ArrayList<>();
 
             Expression<Integer> expHC = wa.get(FactWorkAssignment_.employeeCount);
             selections.add(expHC);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item.java
index 8516ead7b..2eaa487ae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Item.java
@@ -19,7 +19,13 @@
 
 package org.apache.openjpa.persistence.criteria.results;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="CRIT_RES_ITEM")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/OrderProducer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/OrderProducer.java
index a3d2a738b..fd7c3a854 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/OrderProducer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/OrderProducer.java
@@ -29,6 +29,7 @@ public class OrderProducer {
         producer = p;
     }
 
+    @Override
     public String toString() {
         return order.toPrettyString() + "   " + producer.toString();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer.java
index ef79d4474..1f28617ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer.java
@@ -20,9 +20,9 @@
 package org.apache.openjpa.persistence.criteria.results;
 
 import javax.persistence.Entity;
-import javax.persistence.OneToOne;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.OneToOne;
 
 @Entity
 public class Producer {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer_.java
index 1c55d815b..af94d1bf7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Producer_.java
@@ -19,8 +19,8 @@
 
 package org.apache.openjpa.persistence.criteria.results;
 
-import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
 
 @StaticMetamodel(value=Producer.class)
 public class Producer_ {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/ShipRate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/ShipRate.java
index 276017f13..744172afb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/ShipRate.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/ShipRate.java
@@ -21,7 +21,12 @@ package org.apache.openjpa.persistence.criteria.results;
 
 import java.math.BigDecimal;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.Id;
+import javax.persistence.NamedNativeQuery;
+import javax.persistence.SqlResultSetMapping;
 
 @Entity
 @SqlResultSetMapping(name="selectShipRateMapping",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop.java
index 698e925d6..678e4906b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/Shop.java
@@ -19,14 +19,14 @@
 
 package org.apache.openjpa.persistence.criteria.results;
 
+import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import java.util.Set;
-
 @Entity
 @Table(name="CRIT_RES_SHOP")
 public class Shop {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java
index 0619acb26..e99bc40ac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java
@@ -30,9 +30,9 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.Tuple;
 import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Join;
-import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Root;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
@@ -51,6 +51,7 @@ public class TestTypedResults extends SingleEMFTestCase {
 
     DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.US);
 
+    @Override
     public void setUp() throws Exception {
         setUp(CLEAR_TABLES, Order.class, Item.class, Shop.class, Producer.class,
              "openjpa.DynamicEnhancementAgent", "false");
@@ -92,6 +93,7 @@ public class TestTypedResults extends SingleEMFTestCase {
         em.close();
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java
index d22df10c3..5c1b24e92 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java
@@ -23,17 +23,17 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.datacache.common.apps.AttachA;
 import org.apache.openjpa.persistence.datacache.common.apps.AttachB;
 import org.apache.openjpa.persistence.datacache.common.apps.AttachC;
 import org.apache.openjpa.persistence.datacache.common.apps.AttachD;
 import org.apache.openjpa.persistence.datacache.common.apps.AttachE;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 /**
  * Tests load on the cache. To run:
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
index 37b6906d9..4371cb330 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTest.java
@@ -29,9 +29,30 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+
 import javax.persistence.EntityManager;
 
-
+import org.apache.openjpa.datacache.ConcurrentDataCache;
+import org.apache.openjpa.datacache.DataCache;
+import org.apache.openjpa.datacache.DataCacheManager;
+import org.apache.openjpa.datacache.DelegatingDataCache;
+import org.apache.openjpa.datacache.QueryCache;
+import org.apache.openjpa.datacache.TypesChangedEvent;
+import org.apache.openjpa.kernel.Broker;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.kernel.PCData;
+import org.apache.openjpa.kernel.jpql.JPQLParser;
+import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.meta.MetaDataRepository;
+import org.apache.openjpa.persistence.Extent;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.datacache.common.apps.AppIdCacheObject;
 import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
 import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
@@ -48,34 +69,14 @@ import org.apache.openjpa.persistence.datacache.common.apps.
         CacheObjectInterface;
 import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectJ;
 import org.apache.openjpa.persistence.datacache.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import junit.framework.AssertionFailedError;
-import org.apache.openjpa.datacache.ConcurrentDataCache;
-import org.apache.openjpa.datacache.DataCache;
-import org.apache.openjpa.datacache.DelegatingDataCache;
-import org.apache.openjpa.datacache.QueryCache;
-import org.apache.openjpa.datacache.TypesChangedEvent;
-import org.apache.openjpa.datacache.DataCacheManager;
-import org.apache.openjpa.kernel.Broker;
-import org.apache.openjpa.kernel.OpenJPAStateManager;
-import org.apache.openjpa.kernel.PCData;
-import org.apache.openjpa.kernel.jpql.JPQLParser;
-import org.apache.openjpa.meta.ClassMetaData;
-import org.apache.openjpa.meta.FieldMetaData;
-import org.apache.openjpa.meta.MetaDataRepository;
-import org.apache.openjpa.persistence.Extent;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.util.CacheMap;
 import org.apache.openjpa.util.Id;
 import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.ProxyDate;
 
+import junit.framework.AssertionFailedError;
+
 /**
  * ### should add 1..1 relation test ### app id compound key test
  */
@@ -164,6 +165,7 @@ public abstract class CacheTest extends AbstractTestCase {
         return false;
     }
 
+    @Override
     public void setUp() throws Exception {
 
         /*
@@ -291,6 +293,7 @@ public abstract class CacheTest extends AbstractTestCase {
         }
     }
 
+    @Override
     public void tearDown() throws Exception {
         endEm(em);
         em = null;
@@ -1061,7 +1064,8 @@ public abstract class CacheTest extends AbstractTestCase {
                 getLog().warn("CacheTest.timeoutsHelper() skipping sleep for checkCache(h=500) because sleep="+sleep);
             } else if (sleep > 10) {
                 getLog().info("CacheTest.timeoutsHelper() testing h to be dropped by waiting sleep="+sleep);
-                Thread.currentThread().sleep(700);
+                Thread.currentThread();
+                Thread.sleep(700);
                 Thread.yield();
             } else {
                 sleep = 0;
@@ -1098,7 +1102,8 @@ public abstract class CacheTest extends AbstractTestCase {
                 getLog().warn("CacheTest.timeoutsHelper() skipping sleep for checkCache(f=000) because sleep="+sleep);
             } else if (sleep > 10) {
                 getLog().info("CacheTest.timeoutsHelper() testing f to be dropped by waiting sleep="+sleep);
-                Thread.currentThread().sleep(sleep);
+                Thread.currentThread();
+                Thread.sleep(sleep);
                 Thread.yield();
             } else {
                 sleep = 0;
@@ -1130,7 +1135,8 @@ public abstract class CacheTest extends AbstractTestCase {
             sleep = 6000 - diff;
             if (sleep > 0) {
                 getLog().info("CacheTest.timeoutsHelper() testing g to be dropped by waiting sleep="+sleep);
-                Thread.currentThread().sleep(sleep);
+                Thread.currentThread();
+                Thread.sleep(sleep);
                 Thread.yield();
             }
             // all of them should be dropped now, since diff > 5000
@@ -1192,7 +1198,8 @@ public abstract class CacheTest extends AbstractTestCase {
             long sleep = 2000 - diff;
             if (sleep > 0) {
                 getLog().trace("CacheTest.queryTimeoutsHelper() testing f to be dropped by waiting sleep="+sleep);
-                Thread.currentThread().sleep(sleep);
+                Thread.currentThread();
+                Thread.sleep(sleep);
                 Thread.yield();
             }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTestBroker.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTestBroker.java
index 086148458..96debe99b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTestBroker.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTestBroker.java
@@ -39,12 +39,19 @@ import org.apache.openjpa.lib.rop.ResultObjectProvider;
  */
 public class CacheTestBroker extends BrokerImpl {
 
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     protected QueryImpl newQueryImpl(String language, StoreQuery sq) {
         return new CacheTestQuery(this, language, sq);
     }
 
     public static class CachedQueryResult extends ListResultList {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public CachedQueryResult(List list) {
             super(list);
         }
@@ -52,11 +59,15 @@ public class CacheTestBroker extends BrokerImpl {
 
     private static class CacheTestQuery extends QueryImpl {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public CacheTestQuery(Broker broker, String language,
             StoreQuery query) {
             super(broker, language, query);
         }
 
+        @Override
         protected Object toResult(StoreQuery q, StoreQuery.Executor ex,
             ResultObjectProvider rop, StoreQuery.Range range)
             throws Exception {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTestHelper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTestHelper.java
index f631d27ab..d2055a8bc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTestHelper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheTestHelper.java
@@ -23,25 +23,27 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import org.apache.openjpa.datacache.DataCache;
+import org.apache.openjpa.datacache.DataCacheManager;
 import org.apache.openjpa.datacache.QueryCache;
 import org.apache.openjpa.datacache.QueryKey;
-import org.apache.openjpa.datacache.DataCacheManager;
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
+import junit.framework.TestCase;
+
 class CacheTestHelper {
 
     static void checkCache(AbstractTestCase tc, DataCache cache, Object[] ids,
         boolean[] stati) {
         for (int i = 0; i < ids.length; i++) {
             if (stati[i])
-                tc.assertTrue("id " + i + " (" + ids[i]
+                TestCase.assertTrue("id " + i + " (" + ids[i]
                     + ") was not in cache; should have been",
                     cache.contains(ids[i]));
             else
-                tc.assertFalse("id " + i + " (" + ids[i]
+                TestCase.assertFalse("id " + i + " (" + ids[i]
                     + ") was in cache; should not have been",
                     cache.contains(ids[i]));
         }
@@ -68,17 +70,17 @@ class CacheTestHelper {
 
         QueryCache qc = cacheManager(factory).getSystemQueryCache();
         if (inCache == Boolean.FALSE && qc.get(qk) != null) {
-            tc.fail("query should not be in cache; was.");
+            TestCase.fail("query should not be in cache; was.");
         } else if (inCache == Boolean.TRUE || (inCache == null
             && qc.get(qk) != null)) {
             Object res = (args == null) ? query.execute()
                 : query.execute(args);
             if (inCache == Boolean.TRUE &&
                 !isCachedResult(res, inCache, query.getBroker()))
-                tc.fail("query should be in cache; was not.");
+                TestCase.fail("query should be in cache; was not.");
             else if (inCache == null &&
                 isCachedResult(res, inCache, query.getBroker()))
-                tc.fail("query should not be returned to user; was.");
+                TestCase.fail("query should not be returned to user; was.");
             query.closeAll();
         }
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
index 6a31dd3ea..631ef61f8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CachedEntityStatistics.java
@@ -41,10 +41,10 @@ public class CachedEntityStatistics {
     protected int version;
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    Set<CachedEntityStatistics> eagerList = new HashSet<CachedEntityStatistics>();
+    Set<CachedEntityStatistics> eagerList = new HashSet<>();
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    Set<CachedEntityStatistics> lazyList = new HashSet<CachedEntityStatistics>();
+    Set<CachedEntityStatistics> lazyList = new HashSet<>();
 
     String firstName, lastName;
 
@@ -103,6 +103,7 @@ public class CachedEntityStatistics {
         lazyList.add(p);
     }
 
+    @Override
     public int hashCode() {
         int res = id * 31;
         for (CachedEntityStatistics m : eagerList) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/DistributedCacheTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/DistributedCacheTest.java
index 38734121e..8acde8ec5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/DistributedCacheTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/DistributedCacheTest.java
@@ -50,10 +50,12 @@ public class DistributedCacheTest
         super(test);
     }
 
+    @Override
     protected String[] getConfs() {
         return getConfs(true);
     }
 
+    @Override
     protected String[] getConfs2() {
         return getConfs(false);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OptimisticLockInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OptimisticLockInstance.java
index b51df018d..87c7d76a3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OptimisticLockInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OptimisticLockInstance.java
@@ -19,11 +19,10 @@
 package org.apache.openjpa.persistence.datacache;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Version;
 import javax.persistence.GeneratedValue;
-
+import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Version;
 
 @Entity
 @Table(name="OPTIMISTIC_LOCK_INSTANCE")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyChild.java
index 2ebb7d415..333617ea6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyChild.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyChild.java
@@ -18,9 +18,9 @@
  */
 package org.apache.openjpa.persistence.datacache;
 
+import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.Entity;
 
 @Entity
 public class OrderedOneManyChild {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyParent.java
index fe9bce0f8..91f5ab0a4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/OrderedOneManyParent.java
@@ -38,7 +38,7 @@ public class OrderedOneManyParent {
     @OneToMany(mappedBy="parent")
     @OrderBy("name ASC")
     private List<OrderedOneManyChild> children =
-        new ArrayList<OrderedOneManyChild>();
+        new ArrayList<>();
 
     public long getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestArrayFieldsInDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestArrayFieldsInDataCache.java
index 16ee94c84..418ac2e64 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestArrayFieldsInDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestArrayFieldsInDataCache.java
@@ -19,14 +19,15 @@
 package org.apache.openjpa.persistence.datacache;
 
 import java.util.Arrays;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.datacache.DataCache;
 import org.apache.openjpa.kernel.PCData;
 import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.StoreCacheImpl;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.simple.AllFieldTypes;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -39,6 +40,7 @@ public class TestArrayFieldsInDataCache
     private Object jpaOid;
     private Object internalOid;
 
+    @Override
     public void setUp() {
         setUp("openjpa.DataCache", "true",
             "openjpa.RemoteCommitProvider", "sjvm",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkJPQLAndDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkJPQLAndDataCache.java
index cd97a3f94..09255b5bf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkJPQLAndDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkJPQLAndDataCache.java
@@ -32,6 +32,7 @@ public class TestBulkJPQLAndDataCache
 
     private Object oid;
 
+    @Override
     public void setUp() throws Exception {
         setUp("openjpa.DataCache", "true",
             "openjpa.QueryCache", "true",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesAndVersionColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesAndVersionColumn.java
index 94c905aee..84fa3288b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesAndVersionColumn.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesAndVersionColumn.java
@@ -23,15 +23,16 @@ import javax.persistence.LockModeType;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.RollbackException;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestBulkUpdatesAndVersionColumn
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() throws Exception {
         setUp("openjpa.DataCache", "true",
             "openjpa.RemoteCommitProvider", "sjvm",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java
index 92d720a61..92311a63b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestBulkUpdatesDataCacheEviction.java
@@ -30,6 +30,7 @@ public class TestBulkUpdatesDataCacheEviction extends SingleEMFTestCase {
     Object[] noEvictProps = new Object[] { CLEAR_TABLES, CachedEntityStatistics.class
         , "openjpa.DataCache", "true(EvictOnBulkUpdate=false)" };
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(props);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java
index c303fe3c1..e8f7a310d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestCacheExclusions.java
@@ -72,6 +72,7 @@ public class TestCacheExclusions extends AbstractCachedEMFTestCase {
         em.close();
     }
 
+    @Override
     public void tearDown() throws Exception {
         if (emf != null) {
             EntityManager em = emf.createEntityManager();
@@ -205,7 +206,7 @@ public class TestCacheExclusions extends AbstractCachedEMFTestCase {
             dataCacheSettings.append(excludes);
             dataCacheSettings.append(")");
         }
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.DataCache", dataCacheSettings.toString());
         props.put("openjpa.RemoteCommitProvider", "sjvm");
         props.put("openjpa.MetaDataFactory", "jpa(Types="
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestClearableScheduler.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestClearableScheduler.java
index e908a89fe..dbbd2ced3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestClearableScheduler.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestClearableScheduler.java
@@ -38,6 +38,7 @@ public class TestClearableScheduler extends SingleEMFTestCase {
         return buf.toString();
     }
 
+    @Override
     public void setUp() {
         setUp(
             "openjpa.DataCache", "true(EvictionSchedule=+1)"
@@ -73,15 +74,18 @@ public class TestClearableScheduler extends SingleEMFTestCase {
         // Schedule eviction to happen every mintue on cache 1
         scheduler.scheduleEviction(cache1, ("+1"));
 
-        Thread.currentThread().sleep(61000);
+        Thread.currentThread();
+        Thread.sleep(61000);
         assertEquals(1,cache1.getClearCount());
         assertEquals(1,cache2.getClearCount());
 
-        Thread.currentThread().sleep(60000);
+        Thread.currentThread();
+        Thread.sleep(60000);
         assertEquals(2,cache1.getClearCount());
         assertEquals(2,cache2.getClearCount());
 
-        Thread.currentThread().sleep(60000);
+        Thread.currentThread();
+        Thread.sleep(60000);
         assertEquals(3,cache1.getClearCount());
         assertEquals(2,cache2.getClearCount());
     }
@@ -145,11 +149,14 @@ public class TestClearableScheduler extends SingleEMFTestCase {
     // }
     private class DummyCache extends ConcurrentDataCache {
 
+        
+        private static final long serialVersionUID = 1L;
         int clearCount = 0;
 
         public synchronized int getClearCount(){
             return clearCount;
         }
+        @Override
         public synchronized void clear() {
             clearCount++;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java
index 4e4b41ec2..e35f36e46 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestConcurrentDataCache.java
@@ -32,6 +32,7 @@ public class TestConcurrentDataCache
         super(test);
     }
 
+    @Override
     protected String[] getConfs() {
         return new String[]{
             // the second cache is there solely to differentiate between
@@ -44,6 +45,7 @@ public class TestConcurrentDataCache
         };
     }
 
+    @Override
     protected String[] getConfs2() {
         return new String[]{
             // the second cache is there solely to differentiate between
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
index d5941f339..e2915cbf9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
@@ -27,10 +27,10 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.StoreCache;
 import org.apache.openjpa.persistence.StoreCacheImpl;
-import org.apache.openjpa.persistence.querycache.common.apps.BidirectionalOne2OneOwned;
-import org.apache.openjpa.persistence.querycache.common.apps.BidirectionalOne2OneOwner;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.datacache.common.apps.PObject;
+import org.apache.openjpa.persistence.querycache.common.apps.BidirectionalOne2OneOwned;
+import org.apache.openjpa.persistence.querycache.common.apps.BidirectionalOne2OneOwner;
 
 /**
  * Tests various application behavior with or without DataCache.
@@ -69,6 +69,7 @@ public class TestDataCacheBehavesIdentical extends AbstractTestCase {
     /**
      * Sets up two EntityManagerFactory: one with DataCache another without.
      */
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         if (emfWithDataCache == null) {
@@ -102,6 +103,7 @@ public class TestDataCacheBehavesIdentical extends AbstractTestCase {
         TEST_COUNT++;
     }
 
+    @Override
     public void tearDown() throws Exception {
         // HACK - need to manually close EMFs after all tests have run
         if (TEST_COUNT >= 21) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheOptimisticLockRecovery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheOptimisticLockRecovery.java
index 1b0db2078..b5242531f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheOptimisticLockRecovery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheOptimisticLockRecovery.java
@@ -21,17 +21,18 @@ package org.apache.openjpa.persistence.datacache;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+
 import javax.persistence.EntityManager;
-import javax.persistence.RollbackException;
 import javax.persistence.LockModeType;
+import javax.persistence.RollbackException;
 import javax.sql.DataSource;
 
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.event.RemoteCommitListener;
 import org.apache.openjpa.event.RemoteCommitEvent;
+import org.apache.openjpa.event.RemoteCommitListener;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestDataCacheOptimisticLockRecovery
     extends SingleEMFTestCase {
@@ -40,6 +41,7 @@ public class TestDataCacheOptimisticLockRecovery
     private int remoteCommitEventStaleCount = 0;
     private Object staleOid;
 
+    @Override
     public void setUp() {
         setUp("openjpa.DataCache", "true",
             "openjpa.RemoteCommitProvider", "sjvm",
@@ -47,6 +49,7 @@ public class TestDataCacheOptimisticLockRecovery
 
         emf.getConfiguration().getRemoteCommitEventManager().addListener(
             new RemoteCommitListener() {
+                @Override
                 public void afterCommit(RemoteCommitEvent e) {
                     if (e.getPayloadType() ==
                         RemoteCommitEvent.PAYLOAD_LOCAL_STALE_DETECTION) {
@@ -55,6 +58,7 @@ public class TestDataCacheOptimisticLockRecovery
                     }
                 }
 
+                @Override
                 public void close() {
                 }
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCachePCDataGenerator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCachePCDataGenerator.java
index 1f56e8e8c..c4f7dacc8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCachePCDataGenerator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCachePCDataGenerator.java
@@ -28,10 +28,12 @@ public class TestDataCachePCDataGenerator
         super(test);
     }
 
+    @Override
     protected String[] getConfs() {
         return addGenerator(super.getConfs());
     }
 
+    @Override
     protected String[] getConfs2() {
         return addGenerator(super.getConfs2());
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreLazyFk.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreLazyFk.java
index 5afa07855..10e7af7e9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreLazyFk.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreLazyFk.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 public class TestDataCacheStoreLazyFk extends SQLListenerTestCase {
     Object[] p = new Object[] { CLEAR_TABLES, CachedEntityStatistics.class, "openjpa.DataCache", "true" };
 
+    @Override
     public void setUp() {
         super.setUp(p);
     }
@@ -42,7 +43,7 @@ public class TestDataCacheStoreLazyFk extends SQLListenerTestCase {
             em.getTransaction().begin();
             CachedEntityStatistics e = new CachedEntityStatistics();
             CachedEntityStatistics lazy = new CachedEntityStatistics();
-            Set<CachedEntityStatistics> lazyList = new HashSet<CachedEntityStatistics>();
+            Set<CachedEntityStatistics> lazyList = new HashSet<>();
             lazyList.add(lazy);
             e.setLazyList(lazyList);
             em.persist(e);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreManager.java
index 7d5cea7c3..b50f31d28 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheStoreManager.java
@@ -46,6 +46,7 @@ public class TestDataCacheStoreManager extends SingleEMFTestCase {
     private DataCacheManager dcm;
     private OpenJPAStateManager sm;
 
+    @Override
     public void setUp() {
         super.setUp(p);
 
@@ -65,6 +66,7 @@ public class TestDataCacheStoreManager extends SingleEMFTestCase {
         sm = (OpenJPAStateManager) ((PersistenceCapable) p).pcGetStateManager();
     }
 
+    @Override
     public void tearDown() throws Exception {
         dcm.startCaching(CachedEntityStatistics.class.getName());
         em.close();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java
index 2dd6a7c3f..5eb88a617 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDistributedKodoDataCache.java
@@ -23,17 +23,16 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-
-import org.apache.openjpa.persistence.datacache.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.datacache.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.datacache.DataCache;
 import org.apache.openjpa.event.TCPRemoteCommitProvider;
 import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.datacache.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.util.Id;
 
 @AllowFailure(message="surefire excluded")
@@ -52,6 +51,7 @@ public class TestDistributedKodoDataCache extends AbstractTestCase {
         super(test, "datacachecactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
         deleteAll(RuntimeTest2.class);
@@ -59,18 +59,20 @@ public class TestDistributedKodoDataCache extends AbstractTestCase {
 
     private interface ChangeOperation {
 
-        public String getName();
+        String getName();
 
-        public void operation(OpenJPAEntityManagerFactory kpmf,
+        void operation(OpenJPAEntityManagerFactory kpmf,
             boolean asLarge);
     }
 
     private class performAsModify implements ChangeOperation {
 
+        @Override
         public String getName() {
             return "Modify SpecialRuntimeTest1";
         }
 
+        @Override
         public void operation(OpenJPAEntityManagerFactory kpmf,
             boolean asLarge) {
             OpenJPAEntityManager pm;
@@ -90,10 +92,12 @@ public class TestDistributedKodoDataCache extends AbstractTestCase {
 
     private class performAsDelete implements ChangeOperation {
 
+        @Override
         public String getName() {
             return "Delete SpecialRuntimeTest1";
         }
 
+        @Override
         public void operation(OpenJPAEntityManagerFactory kpmf,
             boolean asLarge) {
             OpenJPAEntityManager pm;
@@ -335,8 +339,10 @@ public class TestDistributedKodoDataCache extends AbstractTestCase {
 
     private void pause(double seconds) {
         try {
-            Thread.currentThread().yield();
-            Thread.currentThread().sleep((int) seconds * 1000);
+            Thread.currentThread();
+            Thread.yield();
+            Thread.currentThread();
+            Thread.sleep((int) seconds * 1000);
         }
         catch (Exception e) {
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java
index 08e662bd6..a6c13271a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java
@@ -81,7 +81,7 @@ public class TestEntitiesAsKeys extends AbstractPersistenceTestCase {
     }
 
     private Map<MapEmbeddable, MapEmbeddable> getEmbeddableMap(Integer... integers) {
-        Map<MapEmbeddable, MapEmbeddable> rval = new HashMap<MapEmbeddable, MapEmbeddable>();
+        Map<MapEmbeddable, MapEmbeddable> rval = new HashMap<>();
         assertEquals(0, integers.length % 2);
 
         for (int i = 0; i < integers.length; i += 2) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
index 4bb5669d2..c1798738b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestFlushDataCache.java
@@ -21,14 +21,14 @@ package org.apache.openjpa.persistence.datacache;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.datacache.common.apps.
         FlushDataCacheObject;
 import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 @AllowFailure(message="surefire excluded")
 public class TestFlushDataCache
@@ -38,6 +38,7 @@ public class TestFlushDataCache
         super(str, "datacachecactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(FlushDataCacheObject.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPACache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPACache.java
index 33b76ee0e..049bd237c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPACache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPACache.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.util.UserException;
 
 public class TestJPACache extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(CachedPerson.class, CachedManager.class, CachedEmployee.class, "openjpa.DataCache", "true",
             "openjpa.RemoteCommitProvider", "sjvm");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java
index 73ec28eb9..2b89d79ea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPAEmbeddableDataCache.java
@@ -30,6 +30,7 @@ public class TestJPAEmbeddableDataCache extends SingleEMFTestCase {
     Object[] params = new Object[] { Person.class, ContactInfo.class, Phone.class, "openjpa.DataCache", "true",
         CLEAR_TABLES };
 
+    @Override
     protected void setUp(Object... props) {
         super.setUp(params);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java
index 2e7cf6856..40febd4e9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java
@@ -21,18 +21,18 @@ package org.apache.openjpa.persistence.datacache;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import javax.persistence.EntityManagerFactory;
 
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import javax.persistence.EntityManagerFactory;
 
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="surefire excluded")
 public class TestJPQL2Queries
@@ -44,6 +44,7 @@ public class TestJPQL2Queries
 
     private BrokerFactory _factory;
 
+    @Override
     public void setUp() {
         deleteAll(CacheObjectA.class);
 
@@ -64,6 +65,7 @@ public class TestJPQL2Queries
         CacheTestHelper.cacheManager(_factory).getSystemQueryCache().clear();
     }
 
+    @Override
     public void tearDown()
         throws Exception {
         try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java
index be735f135..fb8bb57c6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java
@@ -23,22 +23,21 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.EntityManagerFactory;
 
-
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectB;
-import org.apache.openjpa.persistence.datacache.common.apps.
-        CacheObjectWithExternalizedFields;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectB;
+import org.apache.openjpa.persistence.datacache.common.apps.
+        CacheObjectWithExternalizedFields;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="surefire excluded")
 public class TestJPQL2ResultsAndResultClasses
@@ -50,6 +49,7 @@ public class TestJPQL2ResultsAndResultClasses
 
     private BrokerFactory _factory;
 
+    @Override
     public void setUp() {
         deleteAll(CacheObjectA.class);
         deleteAll(CacheObjectWithExternalizedFields.class);
@@ -103,6 +103,7 @@ public class TestJPQL2ResultsAndResultClasses
         CacheTestHelper.cacheManager(_factory).getSystemQueryCache().clear();
     }
 
+    @Override
     public void tearDown()
         throws Exception {
         _factory.close();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java
index be681ea7c..06eeb4ae2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java
@@ -22,22 +22,21 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.EntityManagerFactory;
 
-
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectE;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectJ;
-import org.apache.openjpa.persistence.datacache.common.apps.
-        SelfReferencingCacheTestObject;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectE;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectJ;
+import org.apache.openjpa.persistence.datacache.common.apps.
+        SelfReferencingCacheTestObject;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.util.UserException;
 
 @AllowFailure(message="surefire excluded")
@@ -50,6 +49,7 @@ public class TestJPQLRelationProjections
 
     private BrokerFactory _factory;
 
+    @Override
     public void setUp() {
         deleteAll(CacheObjectJ.class);
         deleteAll(CacheObjectE.class);
@@ -92,6 +92,7 @@ public class TestJPQLRelationProjections
         CacheTestHelper.cacheManager(_factory).getSystemQueryCache().clear();
     }
 
+    @Override
     public void tearDown()
         throws Exception {
         _factory.close();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java
index 761964df4..54875de88 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLRUCache.java
@@ -67,7 +67,7 @@ public class TestLRUCache extends SingleEMFTestCase {
 
         Set<?> keys = cache.getCacheMap().keySet();
         assertEquals(cacheSize, keys.size());
-        List<String> strKeys = new ArrayList<String>();
+        List<String> strKeys = new ArrayList<>();
         for (Object key : keys) {
             strKeys.add(key.toString());
         }
@@ -87,7 +87,7 @@ public class TestLRUCache extends SingleEMFTestCase {
         OpenJPAEntityManagerSPI em = emf.createEntityManager();
         StoreCacheImpl storeCache = (StoreCacheImpl) emf.getCache();
         DataCache cache = (DataCache) storeCache.getDelegate();
-        LinkedList<CachedPerson> people = new LinkedList<CachedPerson>();
+        LinkedList<CachedPerson> people = new LinkedList<>();
 
         // Persist cacheSize + 1 Entites.
         for (int i = 0; i < cacheSize + 1; i++) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java
index a90e0b3bd..9d02a919e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestLocalCache.java
@@ -31,6 +31,7 @@ public class TestLocalCache
         super(test);
     }
 
+    @Override
     protected String[] getConfs() {
         return new String[]{
             "openjpa.DataCache", "true",
@@ -40,6 +41,7 @@ public class TestLocalCache
         };
     }
 
+    @Override
     protected String[] getConfs2() {
         return new String[]{
             "openjpa.DataCache", "true",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java
index bdfe0f0ff..0e49b17fe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.datacache.common.apps.M2MEntityF;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestM2MInDataCache extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp("openjpa.DataCache", "true", "openjpa.RemoteCommitProvider", "sjvm", M2MEntityE.class, M2MEntityF.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
index 5e946250c..28cb5de18 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
@@ -22,19 +22,18 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManagerFactory;
 
-
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="surefire excluded")
 public class TestMutableParameters
@@ -47,6 +46,7 @@ public class TestMutableParameters
     private BrokerFactory _factory;
     private Date _startDate;
 
+    @Override
     public void setUp()
         throws Exception {
         deleteAll(CacheObjectA.class);
@@ -76,6 +76,7 @@ public class TestMutableParameters
         CacheTestHelper.cacheManager(_factory).getSystemQueryCache().clear();
     }
 
+    @Override
     public void tearDown()
         throws Exception {
         try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestOrderbyInDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestOrderbyInDataCache.java
index 57264c369..77ceaf62a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestOrderbyInDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestOrderbyInDataCache.java
@@ -31,6 +31,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestOrderbyInDataCache extends SingleEMFTestCase {
 	private long pid;
+    @Override
     public void setUp() {
         setUp("openjpa.DataCache", "true",
             "openjpa.RemoteCommitProvider", "sjvm",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java
index 3ea9a08cc..68d9270c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPCParametersInQueries.java
@@ -21,20 +21,19 @@ package org.apache.openjpa.persistence.datacache;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManagerFactory;
 
-
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectE;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectJ;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectE;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectJ;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 /**
  * New test case.
@@ -49,6 +48,7 @@ public class TestPCParametersInQueries extends AbstractTestCase {
     private BrokerFactory _factory;
     private Object _eId;
 
+    @Override
     public void setUp() {
         deleteAll(CacheObjectA.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartitionedDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartitionedDataCache.java
index fa1a6aeef..844e8e6e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartitionedDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestPartitionedDataCache.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.util.UserException;
 
 public class TestPartitionedDataCache extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         super.setUp("openjpa.DataCache", "partitioned(PartitionType=concurrent,partitions="+
                 "'(name=a,cacheSize=100),(name=b,cacheSize=200)')",
@@ -106,16 +107,20 @@ public class TestPartitionedDataCache extends SingleEMFTestCase {
 
     public static class TestPolicy implements CacheDistributionPolicy {
 
+        @Override
         public String selectCache(OpenJPAStateManager sm, Object context) {
             return "a";
         }
 
+        @Override
         public void endConfiguration() {
         }
 
+        @Override
         public void setConfiguration(Configuration conf) {
         }
 
+        @Override
         public void startConfiguration() {
         }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultSize.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultSize.java
index f661cf911..7846e6492 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultSize.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultSize.java
@@ -41,6 +41,7 @@ public class TestQueryResultSize
     private EntityManagerFactory _pmf;
     private OpenJPAEntityManager pm;
 
+    @Override
     public void setUp() {
         System.out.println("****Deleted Records "
             + deleteAll(CacheObjectE.class));
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java
index 5185f939f..b05329117 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestQueryResultTypes.java
@@ -19,15 +19,14 @@
 package org.apache.openjpa.persistence.datacache;
 
 
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectB;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectB;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 /**
  * Test some assumptions about query result metadata that the query
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java
index 2319af20d..bfe6de576 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java
@@ -24,17 +24,17 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.EntityManagerFactory;
 
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import javax.persistence.EntityManagerFactory;
 
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectAChild1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 /**
  * Test that we marshall and unmarshall result types appropriately.
@@ -48,6 +48,7 @@ public class TestResultShapes extends AbstractTestCase {
 
     private Broker _broker;
 
+    @Override
     public void setUp() {
         deleteAll(CacheObjectAChild1.class);
 
@@ -67,6 +68,7 @@ public class TestResultShapes extends AbstractTestCase {
         _broker = factory.newBroker();
     }
 
+    @Override
     public void tearDown() throws Exception {
         _broker.close();
         _broker = null;
@@ -104,10 +106,10 @@ public class TestResultShapes extends AbstractTestCase {
 
     public void testCollectionOfSingleValuedProjection() {
 
-        Collection<String> ac = new ArrayList<String>();
+        Collection<String> ac = new ArrayList<>();
         ac.add("age");
 
-        Collection<Class> bd = new ArrayList<Class>();
+        Collection<Class> bd = new ArrayList<>();
         bd.add(Long.class);
 
         arrayHelper(false, bd, ac, true);
@@ -116,10 +118,10 @@ public class TestResultShapes extends AbstractTestCase {
     }
 
     public void testUniqueSingleValuedProjection() {
-        Collection<String> ac = new ArrayList<String>();
+        Collection<String> ac = new ArrayList<>();
         ac.add("age");
 
-        Collection<Class> bd = new ArrayList<Class>();
+        Collection<Class> bd = new ArrayList<>();
         bd.add(Long.class);
 
         arrayHelper(true, bd, ac, true);
@@ -128,11 +130,11 @@ public class TestResultShapes extends AbstractTestCase {
     }
 
     public void testCollectionOfMultiValuedProjection() {
-        Collection<String> ac = new ArrayList<String>();
+        Collection<String> ac = new ArrayList<>();
         ac.add("age");
         ac.add("name");
 
-        Collection<Class> bd = new ArrayList<Class>();
+        Collection<Class> bd = new ArrayList<>();
         bd.add(Long.class);
         bd.add(String.class);
 
@@ -148,11 +150,11 @@ public class TestResultShapes extends AbstractTestCase {
     }
 
     public void testUniqueMultiValuedProjection() {
-        Collection<String> ac = new ArrayList<String>();
+        Collection<String> ac = new ArrayList<>();
         ac.add("age");
         ac.add("name");
 
-        Collection<Class> bd = new ArrayList<Class>();
+        Collection<Class> bd = new ArrayList<>();
         bd.add(Long.class);
         bd.add(String.class);
 
@@ -169,11 +171,11 @@ public class TestResultShapes extends AbstractTestCase {
     }
 
     public void testUncachedQueryHasCorrectShape() {
-        Collection<String> ac = new ArrayList<String>();
+        Collection<String> ac = new ArrayList<>();
         ac.add("age");
         ac.add("name");
 
-        Collection<Class> bd = new ArrayList<Class>();
+        Collection<Class> bd = new ArrayList<>();
         bd.add(Long.class);
         bd.add(String.class);
 
@@ -267,7 +269,7 @@ public class TestResultShapes extends AbstractTestCase {
 
     private void rawHelper(boolean unique, Class recordClass, String result,
         boolean inCache) {
-        ArrayList<String> l = new ArrayList<String>();
+        ArrayList<String> l = new ArrayList<>();
         l.add(result);
         Collection res = (result == null) ? null : l;
         Query q = setUpQuery(unique, res);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestSJVMCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestSJVMCache.java
index e91995dd5..aec2678c1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestSJVMCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestSJVMCache.java
@@ -29,6 +29,7 @@ public class TestSJVMCache
         super(test);
     }
 
+    @Override
     protected String[] getConfs() {
         return new String[]{
             // the second cache is there solely to differentiate between
@@ -41,6 +42,7 @@ public class TestSJVMCache
         };
     }
 
+    @Override
     protected String[] getConfs2() {
         return new String[]{
             // the second cache is there solely to differentiate between
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
index 55077df2b..e12a3c2ee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
@@ -20,14 +20,14 @@ package org.apache.openjpa.persistence.datacache;
 
 import javax.persistence.EntityManager;
 
-import junit.framework.AssertionFailedError;
-
 import org.apache.openjpa.datacache.CacheStatistics;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.StoreCache;
 import org.apache.openjpa.persistence.StoreCacheImpl;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.framework.AssertionFailedError;
+
 /**
  * Tests statistics of data cache operation.
  *
@@ -47,6 +47,7 @@ public class TestStatistics extends SingleEMFTestCase {
     private StoreCache cache;
     CacheStatistics stats;
 
+    @Override
     public void setUp() {
         super.setUp(p);
         cache = emf.getStoreCache();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java
index 7430fa3a5..b1d752c95 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestUniteratedQueryResult.java
@@ -22,15 +22,14 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.EntityManagerFactory;
 
-
-import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.datacache.common.apps.CacheObjectA;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="surefire excluded")
 public class TestUniteratedQueryResult
@@ -42,6 +41,7 @@ public class TestUniteratedQueryResult
 
     private EntityManagerFactory _pmf;
 
+    @Override
     public void setUp() {
         System.out.println("****Deleted Records "
             + deleteAll(CacheObjectA.class));
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java
index 9de96e5d4..6ea7f8b7e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachA.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -30,6 +31,8 @@ import javax.persistence.Table;
 public class AttachA
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private String astr;
     private int aint;
     private double adbl;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachB.java
index 4ade3ba35..7edfdb4ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachB.java
@@ -22,12 +22,15 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import javax.persistence.Entity;
 
 @Entity
 public class AttachB
     extends AttachA {
 
+    
+    private static final long serialVersionUID = 1L;
     private String bstr;
     private int bint;
     private double bdbl;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachC.java
index ab71d885c..3465342f9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachC.java
@@ -20,12 +20,15 @@ package org.apache.openjpa.persistence.datacache.common.apps;
 
 import java.util.LinkedList;
 import java.util.List;
+
 import javax.persistence.Entity;
 
 @Entity
 public class AttachC
     extends AttachB {
 
+    
+    private static final long serialVersionUID = 1L;
     private String cstr;
     private int cint;
     private double cdbl;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachD.java
index 1589beaaf..d93a62f01 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachD.java
@@ -24,12 +24,16 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import javax.persistence.Entity;
 
 @Entity
 public class AttachD
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private Object version;
 
     private String dstr;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java
index 9cd8cd493..04e061a9d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachE.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.datacache.common.apps;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -28,6 +29,9 @@ import javax.persistence.Table;
 public class AttachE
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private Object version;
 
     private String estr;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachF.java
index 8c0e9ef3c..a5b6393b6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/AttachF.java
@@ -22,12 +22,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
+
 import javax.persistence.Entity;
 
 @Entity
 public class AttachF
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private int id1;
     private String id2;
 
@@ -93,14 +96,17 @@ public class AttachF
             id2 = tok.nextToken();
         }
 
+        @Override
         public int hashCode() {
             return id1 + (id2 == null ? 0 : id2.hashCode());
         }
 
+        @Override
         public String toString() {
             return id1 + ":" + id2;
         }
 
+        @Override
         public boolean equals(Object other) {
             return other instanceof ID
                 && ((ID) other).id1 == id1
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectA.java
index a5f36e9aa..954406e29 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectA.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.Locale;
+
 import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorColumn;
 import javax.persistence.DiscriminatorValue;
@@ -250,6 +251,7 @@ public class CacheObjectA {
         return relatedInterface;
     }
 
+    @Override
     public String toString() {
         try {
             return "CacheObjectA: " + super.toString() + "; name: " + name
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectC.java
index 1ebac7ad0..94d3b604f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectC.java
@@ -44,10 +44,12 @@ public class CacheObjectC
         this.str = s;
     }
 
+    @Override
     public String getStr() {
         return str;
     }
 
+    @Override
     public void setStr(String s) {
         this.str = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectInterface.java
index 35a915e99..dcb989dde 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/CacheObjectInterface.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.datacache.common.apps;
 
 public interface CacheObjectInterface {
 
-    public void setStr(String val);
+    void setStr(String val);
 
-    public String getStr();
+    String getStr();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddingOwnerEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddingOwnerEntity.java
index f242da494..abc5a90ab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddingOwnerEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/EmbeddingOwnerEntity.java
@@ -54,7 +54,7 @@ public class EmbeddingOwnerEntity {
 
 	public void addMember(EmbeddedEntity member) {
 		if (members == null)
-			members = new ArrayList<EmbeddedEntity>();
+			members = new ArrayList<>();
 		this.members.add(member);
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java
index ddc0b7777..2919de813 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java
@@ -17,8 +17,13 @@
  * under the License.
  */
 package org.apache.openjpa.persistence.datacache.common.apps;
-import javax.persistence.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.MapKey;
 
 @Entity
 public class M2MEntityE  {
@@ -30,7 +35,7 @@ public class M2MEntityE  {
 	private Map<Integer,M2MEntityF> entityf;
 
 	public M2MEntityE() {
-		entityf = new HashMap<Integer,M2MEntityF>();
+		entityf = new HashMap<>();
 		name="entitye";
 	}
 
@@ -43,7 +48,8 @@ public class M2MEntityE  {
 	public void setId(int id) {
 		this.id = id;
 	}
-	public String toString(){
+	@Override
+    public String toString(){
 		return "EntityE:"+id;
 	}
 	public void print(){
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java
index 44113282a..f93bbda68 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.datacache.common.apps;
 
-import javax.persistence.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.MapKey;
 
 @Entity
 public class M2MEntityF  {
@@ -30,7 +35,7 @@ public class M2MEntityF  {
 	private Map<String, M2MEntityE> entitye;
 
 	public M2MEntityF() {
-		entitye = new HashMap<String,M2MEntityE>();
+		entitye = new HashMap<>();
 	}
 	public Map<String, M2MEntityE> getEntityE() {
 		return entitye;
@@ -41,7 +46,8 @@ public class M2MEntityF  {
 	public void setId(int id) {
 		this.id = id;
 	}
-	public String toString(){
+	@Override
+    public String toString(){
 		return "EntityF:"+id;
 	}
 	public void print(){
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest1.java
index 0fff3702f..064674f70 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest1.java
@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
@@ -44,6 +45,9 @@ import javax.persistence.TemporalType;
 public class RuntimeTest1
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String someStaticField = "someField";
 
     private byte byteField;
@@ -82,7 +86,7 @@ public class RuntimeTest1
 
     @OneToMany(mappedBy = "selfOneOne",
         cascade = { CascadeType.PERSIST, CascadeType.REMOVE })
-    private Set<RuntimeTest1> selfOneMany = new HashSet<RuntimeTest1>();
+    private Set<RuntimeTest1> selfOneMany = new HashSet<>();
 
     public RuntimeTest1() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest2.java
index 793564e91..256242691 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/RuntimeTest2.java
@@ -31,6 +31,8 @@ import javax.persistence.Entity;
 public class RuntimeTest2
     extends RuntimeTest1 {
 
+    
+    private static final long serialVersionUID = 1L;
     private int intField2;
 
     public RuntimeTest2() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
index 98701fda3..676d9dea6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/stats/TestStatistics.java
@@ -34,7 +34,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestStatistics extends SingleEMFTestCase {
 	private CacheStatistics stats;
 
-	public void setUp() {
+	@Override
+    public void setUp() {
 		super.setUp(CLEAR_TABLES, Customer.class, Order.class,
                 "openjpa.DataCache", "true", "openjpa.RemoteCommitProvider",
 				"sjvm");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityA.java
index 955b99ab6..5c15eb2b5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityA.java
@@ -58,22 +58,22 @@ public class EntityA {
     @ElementCollection
     // CollectionTable with default name generation
     @CollectionTable
-    private Set<String> collectionSet = new HashSet<String>();
+    private Set<String> collectionSet = new HashSet<>();
 
     @ElementCollection
     @OrderColumn(name="order col")
     @CollectionTable(name="delim set", schema="delim id2")
-    private Set<String> collectionDelimSet = new HashSet<String>();
+    private Set<String> collectionDelimSet = new HashSet<>();
 
     @ElementCollection
     // MapKeyColumn with default name generation
     @MapKeyColumn
-    private Map<String, String> collectionMap = new HashMap<String, String>();
+    private Map<String, String> collectionMap = new HashMap<>();
 
     @ElementCollection
     @MapKeyColumn(name="map key", columnDefinition="varchar(20)", table="m ktbl")
     private Map<String, String> delimCollectionMap =
-        new HashMap<String, String>();
+        new HashMap<>();
 
     public EntityA(){
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityC.java
index b110558fb..e97c84899 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityC.java
@@ -51,7 +51,7 @@ public class EntityC {
 
     @ManyToMany
     @JoinTable(name="\"c d\"", schema="\"delim id\"")
-    private Collection<EntityD> entityDs = new HashSet<EntityD>();
+    private Collection<EntityD> entityDs = new HashSet<>();
 
     @OneToOne
     @JoinColumn(name="\"entd2 id\"", referencedColumnName="\"entityD2 id\"")
@@ -60,13 +60,13 @@ public class EntityC {
     @ManyToMany
     @JoinTable(name="\"m jtbl\"", schema="\"delim id\"")
     @MapKeyJoinColumn(name="map_ed3", referencedColumnName="\"entityD3 id\"")
-    Map<EntityD3,EntityD4> map = new HashMap<EntityD3,EntityD4>();
+    Map<EntityD3,EntityD4> map = new HashMap<>();
 
     @ManyToMany
     @JoinTable(name="\"m2 jtbl\"", schema="\"delim id\"")
     @MapKeyJoinColumn(name="\"map ed4\"",
         referencedColumnName="\"entityD4 id\"")
-    Map<EntityD4,EntityD3> map2 = new HashMap<EntityD4,EntityD3>();
+    Map<EntityD4,EntityD3> map2 = new HashMap<>();
 
     public EntityC() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD.java
index 0f0cb6e6c..3d5871ed5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityD.java
@@ -33,7 +33,7 @@ public class EntityD {
     private int id;
     private String name;
     @ManyToMany(mappedBy="entityDs")
-    private Collection<EntityC> entityCs = new HashSet<EntityC>();
+    private Collection<EntityC> entityCs = new HashSet<>();
 
     public EntityD() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityF.java
index c0b09d2ab..929e4a276 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityF.java
@@ -63,16 +63,16 @@ public class EntityF {
     @ElementCollection
     // CollectionTable with default name generation
     @CollectionTable
-    private Set<String> cSet = new HashSet<String>();
+    private Set<String> cSet = new HashSet<>();
 
     @ElementCollection
     @CollectionTable(name="\"collectionDelimSet\"", schema="\"delim id\"")
-    private Set<String> collectionDelimSet = new HashSet<String>();
+    private Set<String> collectionDelimSet = new HashSet<>();
 
     @ElementCollection
     // MapKeyColumn with default name generation
     @MapKeyColumn
-    private Map<String, String> cMap = new HashMap<String, String>();
+    private Map<String, String> cMap = new HashMap<>();
 
     @ElementCollection
     // Note: Delimited column definition is not supported on some DBs, so
@@ -80,7 +80,7 @@ public class EntityF {
     // TODO: create a separate entity and conditionally run the test on a supported DB
     @MapKeyColumn(name="\"mapKey\"", columnDefinition="varchar(20)", table="\"d colmap\"")
     private Map<String, String> dcMap =
-        new HashMap<String, String>();
+        new HashMap<>();
 
     public EntityF(String name) {
         this.name = name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java
index 9aac7e211..07abf4108 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityH.java
@@ -51,7 +51,7 @@ public class EntityH {
 
     @ManyToMany
     @JoinTable(name="ha i", schema="delim id2")
-    private Collection<EntityI> entityIs = new HashSet<EntityI>();
+    private Collection<EntityI> entityIs = new HashSet<>();
 
     @OneToOne
     @JoinColumn(name="enti2 id", referencedColumnName="entityI2 id", table="join column")
@@ -60,13 +60,13 @@ public class EntityH {
     @ManyToMany
     @JoinTable(name="map3a join table", schema="delim id2")
     @MapKeyJoinColumn(name="map_ei3", referencedColumnName="entityI3 id")
-    Map<EntityI3,EntityI4> map = new HashMap<EntityI3,EntityI4>();
+    Map<EntityI3,EntityI4> map = new HashMap<>();
 
     @ManyToMany
     @JoinTable(name="map4 join table", schema="delim id2")
     @MapKeyJoinColumn(name="map ei4",
         referencedColumnName="entityI4 id", table="mk j col")
-    Map<EntityI4,EntityI3> map2 = new HashMap<EntityI4,EntityI3>();
+    Map<EntityI4,EntityI3> map2 = new HashMap<>();
 
     public EntityH() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI.java
index 2b2fc842e..266f6074b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/EntityI.java
@@ -33,7 +33,7 @@ public class EntityI {
     private int id;
     private String name;
     @ManyToMany(mappedBy="entityIs")
-    private Collection<EntityH> entityHs = new HashSet<EntityH>();
+    private Collection<EntityH> entityHs = new HashSet<>();
 
     public EntityI() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java
index e6f6c9d4d..b4d3b9cdb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/TestDelimitedIdentifiers.java
@@ -28,6 +28,7 @@ public class TestDelimitedIdentifiers extends SQLListenerTestCase {
 
     EntityA entityA;
 
+    @Override
     public void setUp() throws Exception {
         setSupportedDatabases(
             org.apache.openjpa.jdbc.sql.DerbyDictionary.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityC.java
index d65252451..b6b374701 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityC.java
@@ -51,7 +51,7 @@ public class EntityC {
 
     @ManyToMany
     @JoinTable(name="\"nsc d\"")
-    private Collection<EntityD> entityDs = new HashSet<EntityD>();
+    private Collection<EntityD> entityDs = new HashSet<>();
 
     @OneToOne
     @JoinColumn(name="\"nsentd2 id\"", referencedColumnName="\"nsentityD2 id\"")
@@ -60,13 +60,13 @@ public class EntityC {
     @ManyToMany
     @JoinTable(name="\"nsm ndjtab\"")
     @MapKeyJoinColumn(name="nsmap_ed3", referencedColumnName="\"nsentityD3 id\"")
-    Map<EntityD3,EntityD4> map = new HashMap<EntityD3,EntityD4>();
+    Map<EntityD3,EntityD4> map = new HashMap<>();
 
     @ManyToMany
     @JoinTable(name="\"nsm2 ndjtbl\"")
     @MapKeyJoinColumn(name="\"nsmap ed4\"",
         referencedColumnName="\"nsentityD4 id\"")
-    Map<EntityD4,EntityD3> map2 = new HashMap<EntityD4,EntityD3>();
+    Map<EntityD4,EntityD3> map2 = new HashMap<>();
 
     public EntityC() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD.java
index 1d25fe527..c5b22fa23 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityD.java
@@ -33,7 +33,7 @@ public class EntityD {
     private int id;
     private String name;
     @ManyToMany(mappedBy="entityDs")
-    private Collection<EntityC> entityCs = new HashSet<EntityC>();
+    private Collection<EntityC> entityCs = new HashSet<>();
 
     public EntityD() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java
index f445244c4..ad90d7bc4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/noschema/EntityF.java
@@ -62,16 +62,16 @@ public class EntityF {
     @ElementCollection
     // CollectionTable with default name generation
     @CollectionTable
-    private Set<String> nscs = new HashSet<String>();
+    private Set<String> nscs = new HashSet<>();
 
     @ElementCollection
     @CollectionTable(name="\"nsc DelSet\"")
-    private Set<String> nscds = new HashSet<String>();
+    private Set<String> nscds = new HashSet<>();
 
     @ElementCollection
     // MapKeyColumn with default name generation
     @MapKeyColumn
-    private Map<String, String> nscollMap = new HashMap<String, String>();
+    private Map<String, String> nscollMap = new HashMap<>();
 
     @ElementCollection
     // Note: Delimited column definition is not supported on some DBs, so
@@ -79,7 +79,7 @@ public class EntityF {
     // TODO: create a separate entity and conditionally run the test on a supported DB
     @MapKeyColumn(name="\"nsmap Key\"", columnDefinition="varchar(20)", table="\"nsd c map\"")
     private Map<String, String> delimCollectionMap =
-        new HashMap<String, String>();
+        new HashMap<>();
 
     public EntityF(String name) {
         this.name = name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityA.java
index 714a520b3..5a6c48ec5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityA.java
@@ -29,9 +29,9 @@ public class EntityA {
 
     private String secName;
 
-    private Set<String> delimSet = new HashSet<String>();
+    private Set<String> delimSet = new HashSet<>();
     private Map<String, String> delimMap =
-        new HashMap<String, String>();
+        new HashMap<>();
 
     public EntityA(){
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityH.java
index 4a3b1fa73..4f5530e4f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityH.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityH.java
@@ -29,13 +29,13 @@ public class EntityH {
 
     private String secName;
 
-    private Collection<EntityI> eIs = new HashSet<EntityI>();
+    private Collection<EntityI> eIs = new HashSet<>();
 
     private EntityI2 eI2;
 
-    Map<EntityI3,EntityI4> map = new HashMap<EntityI3,EntityI4>();
+    Map<EntityI3,EntityI4> map = new HashMap<>();
 
-    Map<EntityI4,EntityI3> map2 = new HashMap<EntityI4,EntityI3>();
+    Map<EntityI4,EntityI3> map2 = new HashMap<>();
 
     public EntityH() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityI.java
index 0d7c8bcbe..49c03b036 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityI.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/EntityI.java
@@ -24,7 +24,7 @@ import java.util.HashSet;
 public class EntityI {
     private int id;
     private String name;
-    private Collection<EntityH> eHs = new HashSet<EntityH>();
+    private Collection<EntityH> eHs = new HashSet<>();
 
     public EntityI() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimitedIdentifiers.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimitedIdentifiers.java
index 47a7dcb3e..1bf0b1ac2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimitedIdentifiers.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/delimited/identifiers/xml/TestXmlDelimitedIdentifiers.java
@@ -29,6 +29,7 @@ public class TestXmlDelimitedIdentifiers extends SQLListenerTestCase {
 
     EntityA entityA;
 
+    @Override
     public void setUp() throws Exception {
         setSupportedDatabases(DB2Dictionary.class, DerbyDictionary.class);
         if (isTestsDisabled())
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/TestDerivedIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/TestDerivedIdentity.java
index 415536926..5969bbaef 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/TestDerivedIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/derivedid/TestDerivedIdentity.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestDerivedIdentity  extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(EBigDecimalID.class, EDBigDecimalID.class,
             EBigIntegerID.class, EDBigIntegerID.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity10.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity10.java
index 5ade4bf94..baf2cd5ac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity10.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/Entity10.java
@@ -52,11 +52,11 @@ public class Entity10 {
     }
 
     private void initialize() {
-        intCollection = new ArrayList<Integer>();
+        intCollection = new ArrayList<>();
         intCollection.add(new Integer(1));
         intCollection.add(new Integer(99));
 
-        stringCollection = new HashSet<String>();
+        stringCollection = new HashSet<>();
         stringCollection.add(new String("xxx"));
         stringCollection.add(new String("yyy"));
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntVersionEntity.java
index 8c7197bdb..9996c32ab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntVersionEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/IntVersionEntity.java
@@ -30,6 +30,8 @@ import javax.persistence.Version;
 @Entity
 public class IntVersionEntity implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     @Id
     private int id;
     private String name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java
index 8fd7059b9..2ffea366d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachCascade.java
@@ -50,8 +50,9 @@ public class TestDetachCascade extends SingleEMFTestCase {
     Entity13 e13;   // references a Map<String, Entity11> - cascade ALL
     Entity14 e14;
 
-    Collection<Object> allEntities = new HashSet<Object>();
+    Collection<Object> allEntities = new HashSet<>();
 
+    @Override
     public void setUp() throws Exception {
         setUp(Entity1.class,
             Entity3.class,
@@ -113,12 +114,12 @@ public class TestDetachCascade extends SingleEMFTestCase {
         e6.setE7(e7);
         e8.setE9(e9);
 
-        Collection<Entity8> collection = new HashSet<Entity8>();
+        Collection<Entity8> collection = new HashSet<>();
         collection.add(e8);
         collection.add(e8a); // e8a contains a null value for Entity9
         e10.setCollection(collection);
 
-        Map<String, Entity11> map = new HashMap<String, Entity11>();
+        Map<String, Entity11> map = new HashMap<>();
         map.put(e11.getName(), e11);
         e13.setMap(map);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java
index c1c26a94a..2aa6f1e1a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoCascade.java
@@ -36,8 +36,9 @@ public class TestDetachNoCascade extends SingleEMFTestCase {
     Entity1 e1;
     Entity7 e7;
     Entity14 e14;
-    Collection<Object> allEntities = new HashSet<Object>();
+    Collection<Object> allEntities = new HashSet<>();
 
+    @Override
     public void setUp() throws Exception {
         setUp(Entity1.class,    // references Entity14
             Entity7.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
index 02f9b9194..5c08618c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
@@ -38,6 +38,7 @@ public class TestDetachNoProxy extends SingleEMFTestCase {
     private static final String PROXY = new String("$proxy");
     private Log _log;
 
+    @Override
     public void setUp() {
         setUp(DROP_TABLES, Entity20.class);
         _log = emf.getConfiguration().getLog("test");
@@ -180,7 +181,7 @@ public class TestDetachNoProxy extends SingleEMFTestCase {
         OpenJPAEntityManager em = emf2.createEntityManager();
         em.clear();
 
-        ArrayList<Entity20> e20List = new ArrayList<Entity20>(numEntities);
+        ArrayList<Entity20> e20List = new ArrayList<>(numEntities);
         for (int i=0; i<numEntities; i++) {
             Entity20 e20 = em.find(Entity20.class, new Integer(i));
             e20List.add(e20);
@@ -235,7 +236,7 @@ public class TestDetachNoProxy extends SingleEMFTestCase {
         OpenJPAEntityManager em = emf1.createEntityManager();
         em.clear();
 
-        ArrayList<Entity20> e20List = new ArrayList<Entity20>(numEntities);
+        ArrayList<Entity20> e20List = new ArrayList<>(numEntities);
         for (int i=0; i<numEntities; i++) {
             Entity20 e20 = em.find(Entity20.class, new Integer(i));
             e20List.add(e20);
@@ -289,7 +290,7 @@ public class TestDetachNoProxy extends SingleEMFTestCase {
         OpenJPAEntityManager em = emf2.createEntityManager();
         em.clear();
 
-        ArrayList<Entity20> e20List = new ArrayList<Entity20>(numEntities);
+        ArrayList<Entity20> e20List = new ArrayList<>(numEntities);
         for (int i=0; i<numEntities; i++) {
             Entity20 e20 = em.find(Entity20.class, new Integer(i));
             e20List.add(e20);
@@ -343,7 +344,7 @@ public class TestDetachNoProxy extends SingleEMFTestCase {
         OpenJPAEntityManager em = emf2.createEntityManager();
         em.clear();
 
-        ArrayList<Entity20> e20List = new ArrayList<Entity20>(numEntities);
+        ArrayList<Entity20> e20List = new ArrayList<>(numEntities);
         for (int i=0; i<numEntities; i++) {
             Entity20 e20 = em.find(Entity20.class, new Integer(i));
             e20List.add(e20);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java
index 52471a673..bf51551ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java
@@ -29,6 +29,7 @@ public class TestDetachReloadProp extends SQLListenerTestCase {
     int id;
     Compatibility compat;
 
+    @Override
     public void setUp() {
         setUp(org.apache.openjpa.persistence.detach.IntVersionEntity.class,
             org.apache.openjpa.persistence.detach.TimestampVersionEntity.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java
index a45b837e4..d2122df6d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachStateCascade.java
@@ -47,10 +47,11 @@ public class TestDetachStateCascade extends SingleEMFTestCase {
     EntityD entityD;
     EntityE entityE;
 
-    List<EntityC> list = new ArrayList<EntityC>();
+    List<EntityC> list = new ArrayList<>();
 
-    Collection<Object> allEntities = new HashSet<Object>();
+    Collection<Object> allEntities = new HashSet<>();
 
+    @Override
     public void setUp() throws Exception {
         setUp(org.apache.openjpa.persistence.detach.EntityA.class,
             org.apache.openjpa.persistence.detach.EntityB.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/SerializableDetachedStateManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/SerializableDetachedStateManager.java
index aeab5eb34..3bf618117 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/SerializableDetachedStateManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/SerializableDetachedStateManager.java
@@ -31,9 +31,7 @@ import javax.persistence.Version;
 
 @Entity
 public class SerializableDetachedStateManager implements Serializable {
-    /**
-     *
-     */
+    
     private static final long serialVersionUID = 80701492251635740L;
 
     @Id
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/TestSerializableDetachedStateManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/TestSerializableDetachedStateManager.java
index 75aa2ea86..98f8b2ab2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/TestSerializableDetachedStateManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/serializable/TestSerializableDetachedStateManager.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestSerializableDetachedStateManager extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, SerializableDetachedStateManager.class, DROP_TABLES, "openjpa.DetachState",
             "fgs(DetachedStateField=true)");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/TestDetachXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/TestDetachXML.java
index d2ffda928..233c356d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/TestDetachXML.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/xml/TestDetachXML.java
@@ -119,7 +119,7 @@ public class TestDetachXML extends AbstractPersistenceTestCase {
     }
 
     private List<Object> createData(EntityManager em) {
-        List<Object> data = new ArrayList<Object>();
+        List<Object> data = new ArrayList<>();
         Automobile auto = new Automobile();
         auto.setMake("Ford");
         auto.setModel("Pinto");
@@ -130,7 +130,7 @@ public class TestDetachXML extends AbstractPersistenceTestCase {
         auto2.setModel("Sightseer");
         data.add(auto2);
 
-        List<Automobile> autos = new ArrayList<Automobile>();
+        List<Automobile> autos = new ArrayList<>();
         autos.add(auto);
         autos.add(auto2);
 
@@ -144,7 +144,7 @@ public class TestDetachXML extends AbstractPersistenceTestCase {
         p2.setAutos(autos);
         data.add(p2);
 
-        List<Passenger> passengers = new ArrayList<Passenger>();
+        List<Passenger> passengers = new ArrayList<>();
         passengers.add(p1);
         passengers.add(p2);
         auto.setPassengers(passengers);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyParent.java
index 83cc2d2a5..453ce7ca0 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/DetachmentOneManyParent.java
@@ -20,7 +20,15 @@ package org.apache.openjpa.persistence.detachment;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.*;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Version;
 
 @Entity
 public class DetachmentOneManyParent {
@@ -35,7 +43,7 @@ public class DetachmentOneManyParent {
         fetch=FetchType.EAGER)
     @OrderBy("name ASC")
     private List<DetachmentOneManyChild> children =
-        new ArrayList<DetachmentOneManyChild>();
+        new ArrayList<>();
 
     @Version
     private Integer optLock;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachConstructedCopy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachConstructedCopy.java
index 163ad1819..f867fcac1 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachConstructedCopy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachConstructedCopy.java
@@ -20,9 +20,10 @@ package org.apache.openjpa.persistence.detachment;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that manually constructing instances with existing primary key values
  * and attaching them works.
@@ -32,6 +33,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestAttachConstructedCopy
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Record.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachWithNoChanges.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachWithNoChanges.java
index c73a8dcde..1602d0c6c 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachWithNoChanges.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestAttachWithNoChanges.java
@@ -21,9 +21,10 @@ package org.apache.openjpa.persistence.detachment;
 import javax.persistence.EntityManager;
 import javax.persistence.OptimisticLockException;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that attaching an instance without having changed it still overwrites
  * any changes to the managed copy.
@@ -33,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestAttachWithNoChanges
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(DetachmentOneManyParent.class, DetachmentOneManyChild.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java
index b68167792..2e9a58f1e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestCascadeMerge.java
@@ -32,6 +32,7 @@ public class TestCascadeMerge extends SingleEMFTestCase {
     private EntityG enG1;
     private EntityG enG2;
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES,EntityF.class, EntityG.class);
 
@@ -62,7 +63,7 @@ public class TestCascadeMerge extends SingleEMFTestCase {
             EntityF enF1 = em.find(EntityF.class, 1);
             enG1.setEntityF(enF1);
             enG2.setEntityF(enF1);
-            List<EntityG> l = new ArrayList<EntityG>();
+            List<EntityG> l = new ArrayList<>();
             l.add(enG1);
             l.add(enG2);
             enF1.setListG(l);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java
index e5bf1f65d..ef73932b3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetach.java
@@ -54,6 +54,7 @@ public class TestDetach extends SingleEMFTestCase {
     OpenJPAEntityManager em;
     DMCustomer root;
 
+    @Override
     public void setUp() {
         super.setUp(DMCustomer.class, DMCustomerInventory.class, DMItem.class,
             CLEAR_TABLES);
@@ -149,7 +150,7 @@ public class TestDetach extends SingleEMFTestCase {
         }
 
         List<DMCustomerInventory> newInventories =
-            new ArrayList<DMCustomerInventory>();
+            new ArrayList<>();
         newInventories.addAll(inventories);
         DMCustomerInventory newInventory = new DMCustomerInventory();
         newInventory.setCustomer(detached);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachLite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachLite.java
index 0a5b81f8e..733075f9b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachLite.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachLite.java
@@ -35,6 +35,7 @@ public class TestDetachLite extends TestDetach {
         new Object[] { "openjpa.DetachState", "loaded(LiteAutoDetach=true)", DMCustomer.class,
             DMCustomerInventory.class, DMItem.class, CLEAR_TABLES };
 
+    @Override
     public void setUp() {
         super.setUp(props);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachedEntityCascadePersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachedEntityCascadePersist.java
index 4c8b2c05a..6f42d4b73 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachedEntityCascadePersist.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachedEntityCascadePersist.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestDetachedEntityCascadePersist extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(
             CLEAR_TABLES,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachment.java
index 22a31378f..2920d1ffb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachment.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachment.java
@@ -26,6 +26,7 @@ public class TestDetachment extends SingleEMFTestCase {
 
     private int id;
 
+    @Override
     public void setUp() {
         super.setUp(Record.class);
         id = prepare();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachmentOneMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachmentOneMany.java
index 99f2755f7..321eb846f 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachmentOneMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestDetachmentOneMany.java
@@ -20,11 +20,12 @@ package org.apache.openjpa.persistence.detachment;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.AutoDetachType;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Tests detachment for bidirectional one-many relationship
  *
@@ -33,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestDetachmentOneMany
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(DetachmentOneManyParent.class, DetachmentOneManyChild.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java
index e53265bb9..dc280d20f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestGetReferenceAndImplicitDetachment
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp("openjpa.DetachState", "fetch-groups",
             DetachmentOneManyParent.class, DetachmentOneManyChild.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToManyMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToManyMerge.java
index f51bc9792..fa7b59213 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToManyMerge.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToManyMerge.java
@@ -18,11 +18,14 @@
  */
 package org.apache.openjpa.persistence.detachment;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.persistence.detachment.model.*;
-
 import javax.persistence.EntityManager;
 
+import org.apache.openjpa.persistence.detachment.model.SimpleA;
+import org.apache.openjpa.persistence.detachment.model.SimpleB;
+import org.apache.openjpa.persistence.detachment.model.SimpleC;
+import org.apache.openjpa.persistence.detachment.model.SimpleRef;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
 import junit.textui.TestRunner;
 
 /**
@@ -33,6 +36,7 @@ import junit.textui.TestRunner;
 public class TestNoCascadeOneToManyMerge extends SingleEMFTestCase {
     private int a_id;
 
+    @Override
     public void setUp() {
         setUp(SimpleA.class, SimpleRef.class, SimpleB.class, SimpleC.class,
                 CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToOneMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToOneMerge.java
index 0d39d171c..4660f8b36 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToOneMerge.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestNoCascadeOneToOneMerge.java
@@ -19,11 +19,14 @@
 
 package org.apache.openjpa.persistence.detachment;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.persistence.detachment.model.*;
-
 import javax.persistence.EntityManager;
 
+import org.apache.openjpa.persistence.detachment.model.SimpleA;
+import org.apache.openjpa.persistence.detachment.model.SimpleB;
+import org.apache.openjpa.persistence.detachment.model.SimpleC;
+import org.apache.openjpa.persistence.detachment.model.SimpleRef;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
 import junit.textui.TestRunner;
 
 /**
@@ -39,6 +42,7 @@ public class TestNoCascadeOneToOneMerge
     private int b1_id;
     private int b2_id;
 
+    @Override
     public void setUp() {
         setUp(SimpleA.class, SimpleRef.class, SimpleB.class, SimpleC.class,
             "openjpa.Compatibility", "FlushBeforeDetach=true," +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomer.java
index cf2961c26..33df64ea1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomer.java
@@ -45,7 +45,7 @@ public class DMCustomer {
             fetch=FetchType.EAGER,
             cascade=CascadeType.ALL)
             private List<DMCustomerInventory> customerInventories =
-                new ArrayList<DMCustomerInventory>();
+                new ArrayList<>();
 
     @Temporal(TemporalType.TIMESTAMP)
     Calendar cal;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomerInventory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomerInventory.java
index 6eb512ea7..0e16cb33c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomerInventory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/DMCustomerInventory.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.detachment.model;
 
-import static javax.persistence.CascadeType.*;
+import static javax.persistence.CascadeType.MERGE;
+import static javax.persistence.CascadeType.PERSIST;
+import static javax.persistence.CascadeType.REFRESH;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleA.java
index 381971285..48417dc3e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleA.java
@@ -19,9 +19,16 @@
 
 package org.apache.openjpa.persistence.detachment.model;
 
-import javax.persistence.*;
-import java.util.Set;
 import java.util.LinkedHashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 
 @Entity
 public class SimpleA {
@@ -37,7 +44,7 @@ public class SimpleA {
     protected SimpleRef ref;
 
     @OneToMany(cascade=CascadeType.ALL, mappedBy="parent")
-    protected Set<SimpleB> b_set = new LinkedHashSet<SimpleB>();
+    protected Set<SimpleB> b_set = new LinkedHashSet<>();
 
     public int getId() {
         return a_id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleB.java
index 1bf6d1970..e8ca4d4b7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleB.java
@@ -19,9 +19,17 @@
 
 package org.apache.openjpa.persistence.detachment.model;
 
-import javax.persistence.*;
-import java.util.Set;
 import java.util.LinkedHashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 
 @Entity
 public class SimpleB {
@@ -39,7 +47,7 @@ public class SimpleB {
     protected SimpleA parent;
 
     @OneToMany(cascade=CascadeType.ALL, mappedBy="parent")
-    protected Set<SimpleC> c_set  = new LinkedHashSet<SimpleC>();
+    protected Set<SimpleC> c_set  = new LinkedHashSet<>();
 
     public int getId() {
         return b_id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleC.java
index f2b13bec5..d2c028d92 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleC.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.detachment.model;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class SimpleC {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleRef.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleRef.java
index 0e01f1fd1..43bac5302 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleRef.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/model/SimpleRef.java
@@ -19,7 +19,10 @@
 
 package org.apache.openjpa.persistence.detachment.model;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 public class SimpleRef {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/TestDiscriminatorTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/TestDiscriminatorTypes.java
index 929138daa..91de8e339 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/TestDiscriminatorTypes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/discriminator/TestDiscriminatorTypes.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.discriminator;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
@@ -28,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestDiscriminatorTypes extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(CharAbstractEntity.class, CharLeafEntity.class,
                 CharRootEntity.class, IntegerAbstractEntity.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Course.java
index dbc981ede..8d8ad1704 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Course.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Course.java
@@ -18,6 +18,10 @@
  */
 package org.apache.openjpa.persistence.distinctjoin;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.CascadeType;
@@ -32,9 +36,6 @@ import javax.persistence.OneToMany;
 import javax.persistence.OrderColumn;
 import javax.persistence.Table;
 import javax.persistence.Version;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * This is a test entity to demonstrate OPENJPA-2179
@@ -44,6 +45,9 @@ import java.util.List;
 public class Course implements Serializable
 {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private Long id;
@@ -136,7 +140,7 @@ public class Course implements Serializable
      */
     void addLecturer(Lecturer lecturer) {
         if (lecturers == null) {
-            lecturers = new ArrayList<Lecturer>();
+            lecturers = new ArrayList<>();
         }
         lecturers.add(lecturer);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Lecturer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Lecturer.java
index 4b0a4af56..d73737c4f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Lecturer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/Lecturer.java
@@ -18,14 +18,14 @@
  */
 package org.apache.openjpa.persistence.distinctjoin;
 
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Version;
 
-import java.io.Serializable;
-
 import org.apache.openjpa.persistence.jdbc.Index;
 
 /**
@@ -35,6 +35,9 @@ import org.apache.openjpa.persistence.jdbc.Index;
 public class Lecturer implements Serializable
 {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private Long id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/TestDistinctJoin.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/TestDistinctJoin.java
index 56d1b5ecc..d50d0f8d0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/TestDistinctJoin.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/distinctjoin/TestDistinctJoin.java
@@ -18,13 +18,14 @@
  */
 package org.apache.openjpa.persistence.distinctjoin;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Query;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import javax.persistence.Query;
+
 import org.apache.openjpa.lib.jdbc.JDBCListener;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
@@ -42,7 +43,7 @@ import org.apache.openjpa.persistence.test.FilteringJDBCListener;
  */
 public class TestDistinctJoin extends AbstractPersistenceTestCase {
 
-    protected List<String> sql = new ArrayList<String>();
+    protected List<String> sql = new ArrayList<>();
 
     private Log log;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityReservedWords.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityReservedWords.java
index 2eb6b786c..9f7afcd0f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityReservedWords.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityReservedWords.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.persistence.dynamicschema;
 
 import java.io.Serializable;
-import java.math.BigInteger;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -40,6 +40,8 @@ import javax.persistence.Id;
 @Entity
 public class EntityReservedWords implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     @Id
     private int id;
     private Integer add;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityVeryLongNames.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityVeryLongNames.java
index 9c5ab9539..49a245aab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityVeryLongNames.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/EntityVeryLongNames.java
@@ -39,6 +39,9 @@ import javax.persistence.Table;
             "Name______________________________________________" )
 public class EntityVeryLongNames implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @Column(name="ID________________________________________________" +
                  "Very______________________________________________" +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java
index dffb5403c..3bb7100fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java
@@ -53,6 +53,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestDynamicSchemas extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
     }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestResWordEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestResWordEntity.java
index a26880eb7..a14c9e8a0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestResWordEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestResWordEntity.java
@@ -19,7 +19,9 @@
 package org.apache.openjpa.persistence.dynamicschema;
 
 import java.util.Random;
+
 import javax.persistence.EntityManager;
+
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -32,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestResWordEntity extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
     }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/A.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/A.java
index fc4c6bb78..a24c30a61 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/A.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/A.java
@@ -23,12 +23,25 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OrderColumn;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 
 @Entity
 @Table(name = "A_EMBED")
 public class A implements java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     protected String id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Address.java
index d5a5ac59b..077cb782d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Address.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 
 /**
  * An entity that extends a MappedSuperClass and embeds an entity.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/BaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/BaseEntity.java
index 217b0eb74..ff25162ff 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/BaseEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/BaseEntity.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
 
 /**
  * Mapped Super Class using auto-generated identity.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Book.java
index 2a8804e33..c8b74cb6e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Book.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Book.java
@@ -21,7 +21,13 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.CollectionTable;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="BK_EMD")
@@ -34,7 +40,7 @@ public class Book {
 
     @ElementCollection
     @CollectionTable(name="listing")
-    protected Set<Listing> listings = new HashSet<Listing>();
+    protected Set<Listing> listings = new HashSet<>();
 
     public Book(){}
 
@@ -71,6 +77,7 @@ public class Book {
 	}
 
 
+    @Override
     public String toString(){
     	String res ="Book isbn: " + isbn + "\nListings: ";
     	for(Listing l : listings){
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1.java
index 838fbfe6c..5a2f71a38 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company1.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKeyClass;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="Comp1_EMB")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2.java
index 0cb3375a1..102329804 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Company2.java
@@ -21,7 +21,10 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="Comp2_EMB")
@@ -31,7 +34,7 @@ public class Company2 {
 
     @OneToMany
     Map<Division, VicePresident> organization =
-        new HashMap<Division, VicePresident>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/CompanyXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/CompanyXml.java
index f7d7cf034..8ed151384 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/CompanyXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/CompanyXml.java
@@ -26,7 +26,7 @@ public class CompanyXml {
     int id;
 
     Map<DivisionXml, VicePresidentXml> organization =
-        new HashMap<DivisionXml, VicePresidentXml>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ContactInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ContactInfo.java
index 354267d22..7f3dc24b4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ContactInfo.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ContactInfo.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Embeddable;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
 
 @Embeddable
 public class ContactInfo {
@@ -31,7 +36,7 @@ public class ContactInfo {
 
     )
     // Bidirectional
-    List<PhoneNumber> phoneNumbers = new ArrayList<PhoneNumber>();
+    List<PhoneNumber> phoneNumbers = new ArrayList<>();
 
     public List<PhoneNumber> getPhoneNumbers() {
         return phoneNumbers;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/CustomerXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/CustomerXml.java
index f5f167d4c..e33fbdce3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/CustomerXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/CustomerXml.java
@@ -26,7 +26,7 @@ public class CustomerXml {
 
     protected String name;
 
-    protected Set<OrderXml> orders = new HashSet<OrderXml>();
+    protected Set<OrderXml> orders = new HashSet<>();
 
     public int getId() {
         return id;
@@ -56,6 +56,7 @@ public class CustomerXml {
         orders.add(order);
     }
 
+    @Override
     public boolean equals(Object obj) {
         CustomerXml c0 = (CustomerXml) obj;
         if (c0 == null) return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1.java
index e958a1f30..aaa2b38be 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department1.java
@@ -21,14 +21,18 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
 
 @Entity
 public class Department1 {
 
     int deptId;
 
-    Map<Integer, Employee1> empMap = new HashMap<Integer, Employee1>();
+    Map<Integer, Employee1> empMap = new HashMap<>();
 
     @Id
     public int getDeptId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java
index b9df43c24..eed5040ae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department2.java
@@ -21,13 +21,16 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
 
 @Entity
 public class Department2 {
 
     int deptId;
-    Map<EmployeePK2, Employee2> empMap = new HashMap<EmployeePK2, Employee2>();
+    Map<EmployeePK2, Employee2> empMap = new HashMap<>();
 
     @Id
     public int getDeptId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3.java
index 677974f4e..cca9d5a90 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Department3.java
@@ -36,7 +36,7 @@ public class Department3 {
     @OneToMany(mappedBy="department", fetch=FetchType.EAGER)
     @MapKey(name="name")
     Map<EmployeeName3, Employee3> emps =
-        new HashMap<EmployeeName3, Employee3>();
+        new HashMap<>();
 
     public int getDeptId() {
         return deptId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/DepartmentXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/DepartmentXml.java
index bd38f7153..d3f9dccba 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/DepartmentXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/DepartmentXml.java
@@ -24,7 +24,7 @@ import java.util.Map;
 public class DepartmentXml {
     int deptId;
 
-    Map<Integer, EmployeeXml> empMap = new HashMap<Integer, EmployeeXml>();
+    Map<Integer, EmployeeXml> empMap = new HashMap<>();
 
     public int getDeptId() {
         return deptId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed.java
index 3aba1005e..51d568fe4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Embed.java
@@ -18,15 +18,14 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
-import javax.persistence.Embeddable;
-
 import javax.persistence.ElementCollection;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class Embed_Coll_Embed {
@@ -41,7 +40,7 @@ public class Embed_Coll_Embed {
         @AttributeOverride(name="intVal2", column=@Column(name="A2")),
         @AttributeOverride(name="intVal3", column=@Column(name="A3"))
     })
-    protected List<Embed> embeds = new ArrayList<Embed>();
+    protected List<Embed> embeds = new ArrayList<>();
 
     public int getIntVal1() {
         return intVal1;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer.java
index 71b1c9379..e5f5e67b3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Integer.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence.embed;
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.Embeddable;
+
 import javax.persistence.ElementCollection;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class Embed_Coll_Integer {
@@ -31,7 +32,7 @@ public class Embed_Coll_Integer {
 
     @ElementCollection // use default table name
     //@CollectionTable
-    protected Set<Integer> otherIntVals = new HashSet<Integer>();
+    protected Set<Integer> otherIntVals = new HashSet<>();
 
     public int getIntVal1() {
         return intVal1;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Map.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Map.java
index 42e8f28d0..fd949fb10 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Map.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_Coll_Map.java
@@ -31,7 +31,7 @@ public class Embed_Coll_Map {
     protected String name3;
 
     @ElementCollection
-    public Map<Integer, Integer> mapKeyInteger = new HashMap<Integer, Integer>();
+    public Map<Integer, Integer> mapKeyInteger = new HashMap<>();
 
     public String getName1() {
         return name1;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany.java
index 362158327..3d05f20ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Embed_ToMany.java
@@ -32,7 +32,7 @@ public class Embed_ToMany {
     protected String name3;
 
     @OneToMany(fetch=FetchType.EAGER)
-    public List<EntityB1> bs = new ArrayList<EntityB1>();
+    public List<EntityB1> bs = new ArrayList<>();
 
     public String getName1() {
         return name1;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee.java
index edf145f40..e92e7ce76 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee.java
@@ -21,7 +21,12 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="EmpEmbedTest")
@@ -40,7 +45,7 @@ public class Employee {
 
     @ElementCollection // use default table (PERSON_NICKNAMES)
     @Column(name="name", length=50)
-    protected Set<String> nickNames = new HashSet<String>();
+    protected Set<String> nickNames = new HashSet<>();
 
     public int getEmpId() {
         return empId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1.java
index 9622aac8a..453726fa5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee1.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class Employee1 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2.java
index 605b96987..a3502e68d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee2.java
@@ -20,7 +20,10 @@ package org.apache.openjpa.persistence.embed;
 
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class Employee2 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3.java
index 6e6afdf2f..d5f86ec25 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Employee3.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class Employee3 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3.java
index d9c0d7561..32770feea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeeName3.java
@@ -49,6 +49,7 @@ public class EmployeeName3 {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EmployeeName3)) return false;
         EmployeeName3 other = (EmployeeName3) o;
@@ -58,6 +59,7 @@ public class EmployeeName3 {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2.java
index 565d8a3f6..b00e42765 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2.java
@@ -21,10 +21,12 @@ package org.apache.openjpa.persistence.embed;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class EmployeePK2 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     String name;
     Date bDay;
 
@@ -34,6 +36,7 @@ public class EmployeePK2 implements Serializable {
         this.bDay = bDay;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof EmployeePK2)) return false;
@@ -43,6 +46,7 @@ public class EmployeePK2 implements Serializable {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int code = 0;
         code = code * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2_.java
index 53dbaeb58..ed307a4f1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EmployeePK2_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.embed;
 
 import java.util.Date;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed.java
index 7000f9cb7..6c0c20957 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_Embed.java
@@ -24,16 +24,18 @@ import java.util.List;
 
 import javax.persistence.Basic;
 import javax.persistence.Column;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import javax.persistence.ElementCollection;
-
 @Entity
 @Table(name="TBL1A")
 public class EntityA_Coll_Embed_Embed implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
@@ -44,7 +46,7 @@ public class EntityA_Coll_Embed_Embed implements Serializable {
     int age;
 
     @ElementCollection
-    protected List<Embed_Embed> embeds = new ArrayList<Embed_Embed>();
+    protected List<Embed_Embed> embeds = new ArrayList<>();
 
     public int getAge() {
         return age;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_EmbedXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_EmbedXml.java
index 001305b3d..afc8661d5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_EmbedXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_EmbedXml.java
@@ -34,13 +34,16 @@ import java.util.List;
 
 
 public class EntityA_Coll_Embed_EmbedXml implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     Integer id;
 
     String name;
 
     int age;
 
-    protected List<Embed_EmbedXml> embeds = new ArrayList<Embed_EmbedXml>();
+    protected List<Embed_EmbedXml> embeds = new ArrayList<>();
 
     public int getAge() {
         return age;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne.java
index a234f1239..5bd4a8312 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_Embed_ToOne.java
@@ -25,18 +25,20 @@ import java.util.Set;
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Basic;
+import javax.persistence.CollectionTable;
 import javax.persistence.Column;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.CollectionTable;
-
 @Entity
 @Table(name="TBL2A")
 public class EntityA_Coll_Embed_ToOne implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     // contains a collection of Embed1ToOne
     // Embed1ToOne does not have an element collection or to-Many relationships
     @Id
@@ -59,7 +61,7 @@ public class EntityA_Coll_Embed_ToOne implements Serializable {
         @AttributeOverride(name="name3", column=@Column(name="EMB_NAME3"))
     })
 
-    protected Set<Embed_ToOne> embed1s = new HashSet<Embed_ToOne>();
+    protected Set<Embed_ToOne> embed1s = new HashSet<>();
 
     public int getAge() {
         return age;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String.java
index 31046fcf1..4208c303f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_String.java
@@ -26,23 +26,25 @@ import java.util.List;
 import java.util.Set;
 
 import javax.persistence.Basic;
+import javax.persistence.CollectionTable;
 import javax.persistence.Column;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.Lob;
+import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.CollectionTable;
-import javax.persistence.Table;
-
 @Entity
 @Table(name="TBL3A")
 public class EntityA_Coll_String implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
@@ -55,19 +57,19 @@ public class EntityA_Coll_String implements Serializable {
     @ElementCollection(fetch=FetchType.EAGER)
     @CollectionTable(name="NickNames_Tbl")
     @Column(name="nicknames1", length=20)
-    protected Set<String> nickNames = new HashSet<String>();
+    protected Set<String> nickNames = new HashSet<>();
 
     @ElementCollection
     @Enumerated(EnumType.ORDINAL)
-    protected List<CreditRating> cr = new ArrayList<CreditRating>();
+    protected List<CreditRating> cr = new ArrayList<>();
 
     @ElementCollection
     @Temporal(TemporalType.DATE)
-    protected List<Timestamp> ts = new ArrayList<Timestamp>();
+    protected List<Timestamp> ts = new ArrayList<>();
 
     @ElementCollection
     @Lob
-    protected List<String> lobs = new ArrayList<String>();
+    protected List<String> lobs = new ArrayList<>();
 
     public int getAge() {
         return age;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_StringXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_StringXml.java
index a2dd43fed..15af6b422 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_StringXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Coll_StringXml.java
@@ -41,13 +41,16 @@ import java.util.Set;
 public class EntityA_Coll_StringXml implements Serializable {
     // contains a collection of basic types
 
+    
+    private static final long serialVersionUID = 1L;
+
     Integer id;
 
     String name;
 
     int age;
 
-    protected Set<String> nickNames = new HashSet<String>();
+    protected Set<String> nickNames = new HashSet<>();
 
     public int getAge() {
         return age;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java
index a6a5c01e2..8169aa045 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed.java
@@ -30,6 +30,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TBL7B")
 public class EntityA_Embed implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed.java
index 046bea249..d65733b2b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Embed.java
@@ -32,6 +32,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TBL4A")
 public class EntityA_Embed_Coll_Embed implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer.java
index 888738cd4..90f2a5feb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Integer.java
@@ -30,6 +30,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TBL5A")
 public class EntityA_Embed_Coll_Integer implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Map.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Map.java
index 6b4601e01..6d6930ffd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Map.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Coll_Map.java
@@ -31,6 +31,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="EETMM")
 public class EntityA_Embed_Coll_Map implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Complex.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Complex.java
index 95ba476a4..514d21b97 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Complex.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Complex.java
@@ -28,24 +28,26 @@ import java.util.Set;
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Basic;
+import javax.persistence.CollectionTable;
 import javax.persistence.Column;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.Lob;
+import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.CollectionTable;
-import javax.persistence.Table;
-
 @Entity
 @Table(name="TBL3C")
 public class EntityA_Embed_Complex implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
@@ -58,24 +60,24 @@ public class EntityA_Embed_Complex implements Serializable {
     @ElementCollection(fetch=FetchType.EAGER)
     @CollectionTable(name="NickNames_Tbl")
     @Column(name="nicknames1", length=20)
-    protected Set<String> nickNames = new HashSet<String>();
+    protected Set<String> nickNames = new HashSet<>();
 
     @ElementCollection
     @Enumerated(EnumType.ORDINAL)
-    protected List<CreditRating> cr = new ArrayList<CreditRating>();
+    protected List<CreditRating> cr = new ArrayList<>();
 
     @ElementCollection
     @Temporal(TemporalType.DATE)
-    protected List<Timestamp> ts = new ArrayList<Timestamp>();
+    protected List<Timestamp> ts = new ArrayList<>();
 
     @ElementCollection
     @Lob
-    protected List<String> lobs = new ArrayList<String>();
+    protected List<String> lobs = new ArrayList<>();
 
     protected Embed_Embed embed;
 
     @ElementCollection
-    protected List<Embed_Embed> embeds = new ArrayList<Embed_Embed>();
+    protected List<Embed_Embed> embeds = new ArrayList<>();
 
     @ElementCollection(fetch=FetchType.EAGER)
     @CollectionTable(name="EMBED1ToOneS2") // use default join column name
@@ -84,7 +86,7 @@ public class EntityA_Embed_Complex implements Serializable {
         @AttributeOverride(name="name2", column=@Column(name="EMB_NAME2")),
         @AttributeOverride(name="name3", column=@Column(name="EMB_NAME3"))
     })
-    protected Set<Embed_ToOne> embed1s = new HashSet<Embed_ToOne>();
+    protected Set<Embed_ToOne> embed1s = new HashSet<>();
 
     private transient Integer transientJavaValue;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed.java
index 785dd0977..32c7962c3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed.java
@@ -30,6 +30,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TBL7A")
 public class EntityA_Embed_Embed implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany.java
index afe2b03c1..d51be560b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Embed_ToMany.java
@@ -31,6 +31,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TBL6A")
 public class EntityA_Embed_Embed_ToMany implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne.java
index e99802e05..4666e79d0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOne.java
@@ -30,6 +30,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TBL8A")
 public class EntityA_Embed_MappedToOne implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOneCascadeDelete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOneCascadeDelete.java
index 0f479bf4a..ad343d530 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOneCascadeDelete.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_MappedToOneCascadeDelete.java
@@ -30,6 +30,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TB11A")
 public class EntityA_Embed_MappedToOneCascadeDelete implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Single_Coll.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Single_Coll.java
index bd0a2d9c7..dc620ee91 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Single_Coll.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_Single_Coll.java
@@ -27,6 +27,9 @@ import javax.persistence.Entity;
 @Entity
 public class EntityA_Embed_Single_Coll implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @EmbeddedId
     protected Embed_Single_Coll embed;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany.java
index 4f797186c..3ba2b2498 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToMany.java
@@ -31,6 +31,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TBL9A")
 public class EntityA_Embed_ToMany implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne.java
index a55f88cc6..f38638f6c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityA_Embed_ToOne.java
@@ -30,6 +30,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name="TB10A")
 public class EntityA_Embed_ToOne implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     Integer id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1.java
index ef3a44d3f..f861f933d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB1.java
@@ -27,6 +27,9 @@ import javax.persistence.OneToOne;
 @Entity
 public class EntityB1 implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     int id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB2.java
index 9dfe6e7a5..7adf8249c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/EntityB2.java
@@ -29,6 +29,9 @@ import javax.persistence.OneToOne;
 @Entity
 public class EntityB2 implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     int id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FeatureIdXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FeatureIdXml.java
index fb4727845..9401a7597 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FeatureIdXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FeatureIdXml.java
@@ -21,7 +21,9 @@ package org.apache.openjpa.persistence.embed;
 import java.io.Serializable;
 
 public class FeatureIdXml implements Serializable {
-	private String oid;
+	
+    private static final long serialVersionUID = 1L;
+    private String oid;
 
 	public String getOid() {
 		return oid;
@@ -41,7 +43,8 @@ public class FeatureIdXml implements Serializable {
 		this.index = feanum;
 	}
 
-	public boolean equals(Object other) {
+	@Override
+    public boolean equals(Object other) {
 		if (this == other)
 			return true;
 		if (other instanceof FeatureIdXml) {
@@ -52,11 +55,13 @@ public class FeatureIdXml implements Serializable {
 		return false;
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		return getIndex() + getOid().hashCode();
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return getOid() + "#" + getIndex();
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FileName4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FileName4.java
index 92c1fffae..ce2bcc457 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FileName4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/FileName4.java
@@ -49,6 +49,7 @@ public class FileName4 {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof FileName4)) return false;
         FileName4 other = (FileName4) o;
@@ -58,6 +59,7 @@ public class FileName4 {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Geocode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Geocode.java
index e1a13c8b1..a416baafa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Geocode.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Geocode.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 /**
  * An embedded entity.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1.java
index 6c9dd1ac5..2c5f5edb2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item1.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKeyClass;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="CR_EMBED_ITEM")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2.java
index f95551874..4a693eab9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item2.java
@@ -21,7 +21,10 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKeyColumn;
 
 @Entity
 public class Item2 {
@@ -30,7 +33,7 @@ public class Item2 {
 
     @ElementCollection
     @MapKeyColumn(name="IMAGE_NAME", table="ITEM2_XXX")
-    Map<String, String> images = new HashMap<String, String>();
+    Map<String, String> images = new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3.java
index a7d29bc03..3636c222a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item3.java
@@ -21,7 +21,12 @@ package org.apache.openjpa.persistence.embed;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKeyColumn;
 
 @Entity
 public class Item3 {
@@ -32,7 +37,7 @@ public class Item3 {
     @MapKeyColumn(name="IMAGE_NAME")
     @Column(name="IMAGE_FILENAME")
     @CollectionTable(name="IMAGE_MAPPING")
-    Map<String, String> images = new HashMap<String, String>();
+    Map<String, String> images = new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item4.java
index 9a6a3c993..7e8f7adb0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item4.java
@@ -34,7 +34,7 @@ public class Item4 {
 
     @ElementCollection
     @MapKeyEnumerated(EnumType.STRING)
-    Map<Catagory, FileName4> images = new HashMap<Catagory, FileName4>();
+    Map<Catagory, FileName4> images = new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item5.java
index 075b74cb8..e481c8cfc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Item5.java
@@ -35,7 +35,7 @@ public class Item5 {
 
     @ElementCollection
     @MapKeyTemporal(TemporalType.TIME)
-    Map<Timestamp, FileName4> images = new HashMap<Timestamp, FileName4>();
+    Map<Timestamp, FileName4> images = new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/JobInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/JobInfo.java
index eb4b252f9..01100157d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/JobInfo.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/JobInfo.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
+import javax.persistence.ManyToOne;
 
 @Embeddable
 public class JobInfo {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/LocationDetails.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/LocationDetails.java
index 21c7031ec..dd2504877 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/LocationDetails.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/LocationDetails.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
+import javax.persistence.OneToOne;
 
 @Embeddable
 public class LocationDetails {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/OrderXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/OrderXml.java
index e77b3f43f..d40f14403 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/OrderXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/OrderXml.java
@@ -50,6 +50,7 @@ public class OrderXml {
         this.description = desc;
     }
 
+    @Override
     public boolean equals(Object obj) {
         OrderXml o0 = (OrderXml) obj;
         if (o0 == null) return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ParkingSpot.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ParkingSpot.java
index 2c71b5d48..91b77245a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ParkingSpot.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ParkingSpot.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="ParkingEmbedTest")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/PhoneNumber.java
index ba8e85680..7b79f0825 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/PhoneNumber.java
@@ -18,9 +18,13 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.Collection;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PhoneEmbedTest")
@@ -30,7 +34,7 @@ public class PhoneNumber {
     int number;
 
     @ManyToMany(mappedBy="contactInfo.phoneNumbers")
-    Collection<Employee> employees = new ArrayList<Employee>();
+    Collection<Employee> employees = new ArrayList<>();
 
     public int getNumber() {
         return number;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ProgramManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ProgramManager.java
index 62b60ed9f..4fcd89340 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ProgramManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/ProgramManager.java
@@ -18,9 +18,13 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.Collection;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PMEmbedTest")
@@ -30,7 +34,7 @@ public class ProgramManager {
     int id;
 
     @OneToMany(mappedBy="jobInfo.pm")
-    Collection<Employee> manages = new ArrayList<Employee>();
+    Collection<Employee> manages = new ArrayList<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Seller.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Seller.java
index bce6c0ccc..24c964b8f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Seller.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/Seller.java
@@ -62,7 +62,8 @@ public class Seller {
 	    this.name = name;
 	}
 
-	public String toString(){
+	@Override
+    public String toString(){
 		return "Seller id: " + id + " name: " + name;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
index 5459751fd..99a4e6672 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddable.java
@@ -79,9 +79,10 @@ public class TestEmbeddable extends SQLListenerTestCase {
     public int phoneId = 1;
     public int pmId = 1;
     public int parkingSpotId = 1;
-    public Map<Integer, PhoneNumber> phones = new HashMap<Integer, PhoneNumber>();
-    public Map<Integer, Employee> employees = new HashMap<Integer, Employee>();
+    public Map<Integer, PhoneNumber> phones = new HashMap<>();
+    public Map<Integer, Employee> employees = new HashMap<>();
 
+    @Override
     public void setUp() {
         setUp(Embed.class, Embed_Coll_Embed.class, Embed_Coll_Integer.class,
             Embed_Embed.class, Embed_Embed_ToMany.class, Embed_ToMany.class,
@@ -3111,7 +3112,7 @@ public class TestEmbeddable extends SQLListenerTestCase {
         Set embeds = new HashSet();
         embeds.add(embed);
         a.setEmbeds(embeds);
-        Collection<Date> dates = new ArrayList<Date>();
+        Collection<Date> dates = new ArrayList<>();
         dates.add(new Date());
         a.setCollectionDate(dates);
         em.persist(a);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java
index 9673834cf..f66b8123e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddableXml.java
@@ -62,6 +62,7 @@ public class TestEmbeddableXml extends SingleEMFTestCase {
     public int numCustomers = 1;
     public int numOrdersPerCustomer = 2;
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES);
     }
@@ -96,7 +97,7 @@ public class TestEmbeddableXml extends SingleEMFTestCase {
         AttributeXml a = new AttributeXml();
         a.setName("name1");
         a.setValue("value1");
-        List<AttributeXml> aList = new ArrayList<AttributeXml>();
+        List<AttributeXml> aList = new ArrayList<>();
         aList.add(a);
         f.setAttributes(aList);
         em.persist(f);
@@ -109,7 +110,7 @@ public class TestEmbeddableXml extends SingleEMFTestCase {
         AttributeXml a1 = new AttributeXml();
         a1.setName("name1");
         a1.setValue("value1");
-        List<AttributeXml> aList1 = new ArrayList<AttributeXml>();
+        List<AttributeXml> aList1 = new ArrayList<>();
         aList1.add(a1);
         f1.setAttributes(aList1);
         em.persist(f1);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java
index 8d6be0386..cbaca1efb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbedded.java
@@ -26,6 +26,7 @@ import javax.persistence.EntityTransaction;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestEmbedded extends SQLListenerTestCase {
+    @Override
     public void setUp() {
         super.setUp(BaseEntity.class, Address.class, Geocode.class,
                 CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java
index 25a755a84..0b67f4ade 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java
@@ -28,6 +28,7 @@ import javax.persistence.Query;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestEmbeddedWithQuery extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(EParent.class, EChild.class, EGeneric.class,
             "openjpa.MaxFetchDepth", "1",
@@ -50,7 +51,7 @@ public class TestEmbeddedWithQuery extends SingleEMFTestCase {
             List resultList = q1.getResultList();
             assertNotNull(resultList);
 
-            List <EParent> pList = new ArrayList<EParent>();
+            List <EParent> pList = new ArrayList<>();
             pList.addAll(resultList);
             em.clear();
             assertNotEquals(0, pList.size());
@@ -80,7 +81,7 @@ public class TestEmbeddedWithQuery extends SingleEMFTestCase {
             List resultList = q1.getResultList();
             assertNotNull(resultList);
 
-            List <EParent> pList = new ArrayList<EParent>();
+            List <EParent> pList = new ArrayList<>();
             pList.addAll(resultList);
             em.clear();
             assertNotEquals(0, pList.size());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestUpdateEmbeddedQueryResult.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestUpdateEmbeddedQueryResult.java
index 947e4204b..fbf4d5baa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestUpdateEmbeddedQueryResult.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestUpdateEmbeddedQueryResult.java
@@ -31,6 +31,7 @@ public class TestUpdateEmbeddedQueryResult extends SingleEMFTestCase {
 
     public int ID = 1;
 
+    @Override
     public void setUp() {
         setUp(Embed.class,
             Embed_Embed.class,
@@ -58,7 +59,7 @@ public class TestUpdateEmbeddedQueryResult extends SingleEMFTestCase {
         em.getTransaction().begin();
         String query = "select address from Address address" +
             " where address.streetAddress = '555 Bailey Ave'";
-        List<Address> list = (List<Address>) em.createQuery(query).getResultList();
+        List<Address> list = em.createQuery(query).getResultList();
         Address a1 = list.get(0);
 
         assertEquals(a1.getGeocode().getLatitude(),1.0f);
@@ -149,9 +150,6 @@ public class TestUpdateEmbeddedQueryResult extends SingleEMFTestCase {
         return embed;
     }
 
-    /*
-     *
-     */
     public void testBulkUpdateEmbeddedField() {
         EntityManager em = emf.createEntityManager();
         String update = "UPDATE EntityA_Embed_Embed a set a.embed.embed.intVal1 = ?1," +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident.java
index afbeedff2..72d2c00f1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/VicePresident.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.embed;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="VP_EMB")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AbstractEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AbstractEmployee.java
index f871a9ba9..bed9a2695 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AbstractEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AbstractEmployee.java
@@ -21,7 +21,6 @@ package org.apache.openjpa.persistence.embed.attrOverrides;
 import java.util.ArrayList;
 import java.util.Collection;
 
-
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
@@ -37,7 +36,7 @@ public abstract class AbstractEmployee {
     @ManyToOne protected Address address;
 
     @ManyToMany protected Collection<Project> projects =
-    	new ArrayList<Project>();
+    	new ArrayList<>();
 
     public Integer getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java
index 0e3707c26..64783ef65 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.embed.attrOverrides;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="ADR_AO")
@@ -72,7 +76,8 @@ public class Address {
     	this.zipcode = zipcode;
     }
 
-	public boolean equals(Object o) {
+	@Override
+    public boolean equals(Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Address)) return false;
 		Address a = (Address) o;
@@ -83,7 +88,8 @@ public class Address {
 		return true;
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		int ret = 0;
 		ret = ret + 31 * city.hashCode();
 		ret = ret + 31 * state.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ContactInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ContactInfo.java
index a025609ac..369695524 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ContactInfo.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ContactInfo.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.embed.attrOverrides;
 
-import javax.persistence.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
 
 @Embeddable
 public class ContactInfo {
@@ -28,7 +33,7 @@ public class ContactInfo {
 
 	// Bidirectional
 	@ManyToMany
-    List<PhoneNumber> phoneNumbers = new ArrayList<PhoneNumber>();
+    List<PhoneNumber> phoneNumbers = new ArrayList<>();
 
     @Embedded
     EmergencyContactInfo ecInfo;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Customer.java
index 8e61acab2..c4cdb1cfc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Customer.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.embed.attrOverrides;
 
-import javax.persistence.*;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="CUS_ATTROVER")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/EmergencyContactInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/EmergencyContactInfo.java
index f4968d157..dac4cbf13 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/EmergencyContactInfo.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/EmergencyContactInfo.java
@@ -21,7 +21,10 @@ package org.apache.openjpa.persistence.embed.attrOverrides;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import javax.persistence.*;
+import javax.persistence.ElementCollection;
+import javax.persistence.Embeddable;
+import javax.persistence.OneToOne;
+import javax.persistence.OrderBy;
 
 
 @Embeddable
@@ -36,7 +39,7 @@ public class EmergencyContactInfo {
 
 	@ElementCollection
 	@OrderBy
-	Collection<String> nickNames = new ArrayList<String>();
+	Collection<String> nickNames = new ArrayList<>();
 
     public PhoneNumber getPhoneNumber() {
         return phoneNumber;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Employee.java
index 83273dc63..1ac426d83 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Employee.java
@@ -21,7 +21,20 @@ package org.apache.openjpa.persistence.embed.attrOverrides;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.AssociationOverride;
+import javax.persistence.AssociationOverrides;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="EMP_ATTROVER")
@@ -71,7 +84,7 @@ public class Employee {
    		column=@Column(name="JOB_DESC")
    	)
    	@MapKeyColumn(name="JOB_KEY", length=20)
-    Map<String, JobInfo> jobInfos = new HashMap<String, JobInfo>();
+    Map<String, JobInfo> jobInfos = new HashMap<>();
 
     public int getEmpId() {
         return empId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/JobInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/JobInfo.java
index 8122804dc..a7d6f9108 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/JobInfo.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/JobInfo.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.embed.attrOverrides;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
+import javax.persistence.ManyToOne;
 
 @Embeddable
 public class JobInfo {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Person.java
index a873071c4..9d0f37a28 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Person.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.embed.attrOverrides;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.CollectionTable;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
@@ -36,12 +37,12 @@ public class Person {
 
     @ElementCollection
     @OrderBy("zipcode.zip, zipcode.plusFour")
-    protected List<Address> residences = new ArrayList<Address>();
+    protected List<Address> residences = new ArrayList<>();
 
     @ElementCollection
     @CollectionTable(name="PSN_nickNames")
     @OrderBy("DESC")
-    private List<String> nickNames = new ArrayList<String>();
+    private List<String> nickNames = new ArrayList<>();
 
     public List<String> getNickNames() {
         return nickNames;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java
index 14eefb386..494001aea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PhoneNumber.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.embed.attrOverrides;
 
-import javax.persistence.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PHONE_ATTROVER")
@@ -29,7 +34,7 @@ public class PhoneNumber {
 
 
     @ManyToMany(mappedBy="contactInfo.phoneNumbers")
-    Collection<Employee> employees = new ArrayList<Employee>();
+    Collection<Employee> employees = new ArrayList<>();
 
     public int getPhNumber() {
         return phNumber;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ProgramManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ProgramManager.java
index c0efdc10f..1e18f29e3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ProgramManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/ProgramManager.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.embed.attrOverrides;
 
-import javax.persistence.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PGM_ATTROVER")
@@ -28,7 +33,7 @@ public class ProgramManager {
     int id;
 
     @OneToMany
-    Collection<Employee> manages = new ArrayList<Employee>();
+    Collection<Employee> manages = new ArrayList<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyInfo.java
index bae229c12..31902b1af 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyInfo.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyInfo.java
@@ -19,7 +19,8 @@
 package org.apache.openjpa.persistence.embed.attrOverrides;
 
 import java.math.BigDecimal;
-import javax.persistence.*;
+
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class PropertyInfo {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyOwner.java
index 8877f0a89..2aaf19577 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyOwner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyOwner.java
@@ -17,7 +17,9 @@
  * under the License.
  */
 package org.apache.openjpa.persistence.embed.attrOverrides;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
 
 @Embeddable
 public class PropertyOwner {
@@ -42,7 +44,8 @@ public class PropertyOwner {
 		this.ssn = ssn;
 	}
 
-	public boolean equals(Object o) {
+	@Override
+    public boolean equals(Object o) {
 		if (o == this) return true;
 		if (!(o instanceof PropertyOwner)) return false;
 		PropertyOwner p = (PropertyOwner) o;
@@ -51,7 +54,8 @@ public class PropertyOwner {
 		return true;
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		int ret = 0;
 		ret = ret + 31 * ssn.hashCode();
 		ret = ret + 31 * addr.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyRecord.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyRecord.java
index 0e407939d..891acfba2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyRecord.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/PropertyRecord.java
@@ -21,7 +21,14 @@ package org.apache.openjpa.persistence.embed.attrOverrides;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PROPREC_ATTROVER")
@@ -37,7 +44,7 @@ public class PropertyRecord {
     })
     @ElementCollection
     @CollectionTable(name="PROPREC_ATTROVER_parcels")
-    Map<Address, PropertyInfo> parcels = new HashMap<Address, PropertyInfo>();
+    Map<Address, PropertyInfo> parcels = new HashMap<>();
 
     @Column(length = 10)
     String description;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java
index 818d7a507..d717dd2b0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java
@@ -25,10 +25,10 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestAssocOverrides  extends SQLListenerTestCase {
     public int numEmployees = 2;
     public int numPhoneNumbers = numEmployees + 1;
@@ -42,6 +42,7 @@ public class TestAssocOverrides  extends SQLListenerTestCase {
     public int peId = 1;
     public int pId = 1;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(DROP_TABLES, Address.class, ContactInfo.class,
             EmergencyContactInfo.class, Employee.class, JobInfo.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverridesXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverridesXML.java
index 0fe94c0b7..439500621 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverridesXML.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverridesXML.java
@@ -35,7 +35,7 @@ import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
 
 public class TestAssocOverridesXML  extends AbstractPersistenceTestCase{
 
-    protected List<String> _sql = new ArrayList<String>();
+    protected List<String> _sql = new ArrayList<>();
 
     /**
      * Test association overrides defined within an embedded of an element
@@ -44,7 +44,7 @@ public class TestAssocOverridesXML  extends AbstractPersistenceTestCase{
     public void testElementCollectionAssocOverrides() {
 
         _sql.clear();
-        HashMap<String, Object> props = new HashMap<String, Object>();
+        HashMap<String, Object> props = new HashMap<>();
         props.put("openjpa.jdbc.JDBCListeners",
             new JDBCListener[] { new SQLListener() });
         OpenJPAEntityManagerFactorySPI emf1 =
@@ -61,16 +61,16 @@ public class TestAssocOverridesXML  extends AbstractPersistenceTestCase{
         XMLAssocOverEmbed emb = new XMLAssocOverEmbed();
         eb.setName("XMLAssocOverEntityB");
         meb.setName("XMLAssocOverEntityBM21");
-        List<XMLAssocOverEntityA> eaList1 = new ArrayList<XMLAssocOverEntityA>();
+        List<XMLAssocOverEntityA> eaList1 = new ArrayList<>();
         eaList1.add(ea);
-        List<XMLAssocOverEntityA> eaList2 = new ArrayList<XMLAssocOverEntityA>();
+        List<XMLAssocOverEntityA> eaList2 = new ArrayList<>();
         eaList2.add(ea);
         eb.setEaList(eaList1);
         meb.setEaList(eaList2);
         emb.setName("XMLAssocOverEmbed");
         emb.setEb(eb);
         emb.setMeb(meb);
-        List<XMLAssocOverEmbed> embList = new ArrayList<XMLAssocOverEmbed>();
+        List<XMLAssocOverEmbed> embList = new ArrayList<>();
         embList.add(emb);
         ea.setEmbA(embList);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
index bba8e9af6..941571336 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
@@ -33,6 +33,7 @@ public class TestAttrOverrides  extends SQLListenerTestCase {
     public int eId = 1;
     public int pId = 1;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(DROP_TABLES, Address.class, Customer.class,
             PropertyInfo.class, PropertyOwner.class, PropertyRecord.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
index 2c97a0c81..fc0c9107b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
@@ -28,20 +28,21 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestAttrOverridesXml extends SQLListenerTestCase {
 
     public int numPersons = 4;
-    public List<String> namedQueries = new ArrayList<String>();
+    public List<String> namedQueries = new ArrayList<>();
     public int eId = 1;
 
+    @Override
     public void setUp() {
         setUp(
         org.apache.openjpa.persistence.embed.attrOverrides.AnnoOverEmbed.class,
@@ -73,7 +74,7 @@ public class TestAttrOverridesXml extends SQLListenerTestCase {
 
         BasicEmbedXML bem = new BasicEmbedXML();
         bem.setNotIntegerValue(new Random().nextInt());
-        ArrayList<BasicEmbedXML> al = new ArrayList<BasicEmbedXML>();
+        ArrayList<BasicEmbedXML> al = new ArrayList<>();
         al.add(bem);
         be.setListIntAttrOverEmbed(al);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Zipcode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Zipcode.java
index c0976eebf..e0048ed60 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Zipcode.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Zipcode.java
@@ -19,7 +19,8 @@
 package org.apache.openjpa.persistence.embed.attrOverrides;
 
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class Zipcode {
@@ -44,7 +45,8 @@ public class Zipcode {
 		this.plusFour = plusFour;
 	}
 
-	public boolean equals(Object o) {
+	@Override
+    public boolean equals(Object o) {
 		if (o == this) return true;
 		if (!(o instanceof Zipcode)) return false;
 		Zipcode z = (Zipcode) o;
@@ -53,7 +55,8 @@ public class Zipcode {
 		return true;
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		int ret = 0;
 		ret = ret + 31 * zip.hashCode();
 		ret = ret + 31 * plusFour.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectIdClass.java
index a12989bbe..8cb062297 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectIdClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/SubjectIdClass.java
@@ -22,6 +22,9 @@ import java.io.Serializable;
 
 public class SubjectIdClass implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private Integer subjectNummer;
 
     private String subjectTypeCode;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java
index 2ab82020b..8af131911 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java
@@ -32,10 +32,10 @@ import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.framework.Assert;
+
 public class TestCompositePrimaryKeys extends SingleEMFTestCase {
 
     // NOTE: There are 3 aspects to the fix to OPENJPA-2631, each being tested in some manner in the test
@@ -50,6 +50,7 @@ public class TestCompositePrimaryKeys extends SingleEMFTestCase {
     protected EntityManager em;
     private EntityTransaction tx;
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES, Subject.class, SubjectKey.class, SubjectWithIdClass.class, Topic.class);
 
@@ -375,7 +376,7 @@ public class TestCompositePrimaryKeys extends SingleEMFTestCase {
         Subject s2 = new Subject();
         s2.setKey(key);
 
-        List<Subject> subjectList = new ArrayList<Subject>();
+        List<Subject> subjectList = new ArrayList<>();
         subjectList.add(s);
         subjectList.add(s2);
 
@@ -413,7 +414,7 @@ public class TestCompositePrimaryKeys extends SingleEMFTestCase {
         Subject s2 = new Subject();
         s2.setKey(key);
 
-        List<Subject> subjectList = new ArrayList<Subject>();
+        List<Subject> subjectList = new ArrayList<>();
         subjectList.add(s);
         subjectList.add(s2);
 
@@ -543,6 +544,7 @@ public class TestCompositePrimaryKeys extends SingleEMFTestCase {
         Assert.assertEquals(expected.getKey().getSubjectTypeCode(), actual.getKey().getSubjectTypeCode());
     }
 
+    @Override
     public void tearDown() {
         if (tx != null && tx.isActive()) {
             tx.rollback();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/TestLazyEmbeddable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/TestLazyEmbeddable.java
index e0a1bacb2..82b8fc713 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/TestLazyEmbeddable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/lazy/TestLazyEmbeddable.java
@@ -34,7 +34,7 @@ import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
 
 public class TestLazyEmbeddable extends AbstractPersistenceTestCase {
 
-    protected List<String> _sql = new ArrayList<String>();
+    protected List<String> _sql = new ArrayList<>();
 
     /*
      * Verifies an entity with annotated (@Persistent) lazy embeddable and xml-tagged
@@ -43,7 +43,7 @@ public class TestLazyEmbeddable extends AbstractPersistenceTestCase {
      */
     public void testLazyEmbeddableFields() throws Exception {
         _sql.clear();
-        HashMap<String, Object> props = new HashMap<String, Object>();
+        HashMap<String, Object> props = new HashMap<>();
         props.put("openjpa.jdbc.JDBCListeners",
             new JDBCListener[] { new SQLListener() });
         OpenJPAEntityManagerFactorySPI emf1 =
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java
index a6aed3f0a..fbea15d04 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java
@@ -20,10 +20,6 @@ package org.apache.openjpa.persistence.enhance;
 
 import javax.persistence.Persistence;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.apache.openjpa.persistence.annotations.TestAnnotationBasics;
 import org.apache.openjpa.persistence.annotations.TestEmbeddedId;
 import org.apache.openjpa.persistence.annotations.TestEnumerated;
@@ -113,6 +109,10 @@ import org.apache.openjpa.persistence.spring.TestLibService;
 import org.apache.openjpa.persistence.xml.TestSimpleXmlEntity;
 import org.apache.openjpa.persistence.xml.TestXmlOverrideEntity;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 /**
  * TODO: this should be refactored to a @RunWith or similar...
  */
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestClone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestClone.java
index 8a90859d5..a0e299619 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestClone.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestClone.java
@@ -19,11 +19,11 @@
 package org.apache.openjpa.persistence.enhance;
 
 
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.enhance.common.apps.NoClone;
 import org.apache.openjpa.persistence.enhance.common.apps.PCClone;
 import org.apache.openjpa.persistence.enhance.common.apps.SubclassClone;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 public class TestClone
     extends AbstractTestCase {
@@ -32,6 +32,7 @@ public class TestClone
         super(name, "enhancecactusapp");
     }
 
+    @Override
     public void setUp() {
 
         deleteAll(NoClone.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestDynamicStorageGenerator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestDynamicStorageGenerator.java
index 1398ed958..a07a5cdb0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestDynamicStorageGenerator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestDynamicStorageGenerator.java
@@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.enhance;
 
 import java.util.Date;
 
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.enhance.DynamicStorage;
 import org.apache.openjpa.enhance.DynamicStorageGenerator;
 import org.apache.openjpa.meta.JavaTypes;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestDynamicStorageGenerator
     extends AbstractTestCase {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddableEntityWithIDAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddableEntityWithIDAnnotation.java
index 853ada4a8..79e63e104 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddableEntityWithIDAnnotation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddableEntityWithIDAnnotation.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestEmbeddableEntityWithIDAnnotation extends SQLListenerTestCase{
 
+    @Override
     public void setUp() {
         setUp(EmbeddableEntityWithIDAnnotation.class, IDOwningClassTestEntity.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddedEnumSqlGeneration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddedEnumSqlGeneration.java
index 83ec28559..9b72dace9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddedEnumSqlGeneration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestEmbeddedEnumSqlGeneration.java
@@ -18,6 +18,10 @@
  */
 package org.apache.openjpa.persistence.enhance;
 
+import java.io.IOException;
+
+import javax.persistence.EntityManager;
+
 import org.apache.openjpa.enhance.PCEnhancer;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.MappingTool;
@@ -26,9 +30,6 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
-import javax.persistence.EntityManager;
-import java.io.IOException;
-
 public class TestEmbeddedEnumSqlGeneration
     extends AbstractTestCase {
 
@@ -38,6 +39,7 @@ public class TestEmbeddedEnumSqlGeneration
         super(s, "org.apache.openjpa.persistence.enhance.EntityWithEnum");
     }
 
+    @Override
     public void setUp() {
     }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestNoNoArgs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestNoNoArgs.java
index 84b706d64..93f2ad1d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestNoNoArgs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestNoNoArgs.java
@@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.enhance;
 
 import java.io.IOException;
 
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.enhance.PCEnhancer;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.util.OpenJPAException;
 
 public class TestNoNoArgs
@@ -40,6 +40,7 @@ public class TestNoNoArgs
         super(s, "enhancecactusapp");
     }
 
+    @Override
     public void setUp() {
         OpenJPAEntityManager em =
             (OpenJPAEntityManager) currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestSubclassedBehavior.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestSubclassedBehavior.java
index 89ff7ef50..3c44045f0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestSubclassedBehavior.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/TestSubclassedBehavior.java
@@ -22,10 +22,19 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-
+import org.apache.openjpa.kernel.Broker;
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.meta.AccessCode;
+import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.enhance.common.apps.
         BackingFieldNameMismatchInstance;
 import org.apache.openjpa.persistence.enhance.common.apps.BaseEntity;
@@ -37,19 +46,11 @@ import org.apache.openjpa.persistence.enhance.common.apps.
 import org.apache.openjpa.persistence.enhance.common.apps.
         ManagedInverseTestInstance2;
 import org.apache.openjpa.persistence.enhance.common.apps.SubclassTestInstance;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import junit.framework.AssertionFailedError;
-import org.apache.openjpa.kernel.Broker;
-import org.apache.openjpa.kernel.OpenJPAStateManager;
-import org.apache.openjpa.meta.AccessCode;
-import org.apache.openjpa.meta.ClassMetaData;
-import org.apache.openjpa.meta.FieldMetaData;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.util.ExceptionInfo;
 import org.apache.openjpa.util.ImplHelper;
 
+import junit.framework.AssertionFailedError;
+
 public class TestSubclassedBehavior extends AbstractTestCase {
 
     public TestSubclassedBehavior(String name) {
@@ -57,6 +58,7 @@ public class TestSubclassedBehavior extends AbstractTestCase {
     }
 
 
+    @Override
     public void setUp() {
         deleteAll(BasicSubclassInstance.class);
         deleteAll(BackingFieldNameMismatchInstance.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BackingFieldNameMismatchInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BackingFieldNameMismatchInstance.java
index 7e809de77..e762dc8b2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BackingFieldNameMismatchInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BackingFieldNameMismatchInstance.java
@@ -58,10 +58,12 @@ public class BackingFieldNameMismatchInstance
         _version = v;
     }
 
+    @Override
     public String getStringField() {
         return _s;
     }
 
+    @Override
     public void setStringField(String s) {
         _s = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BaseEntity.java
index 713cef4ce..8c046b195 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BaseEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BaseEntity.java
@@ -57,10 +57,12 @@ public class BaseEntity
         _version = version;
     }
 
+    @Override
     public void setStringField(String s) {
         _s = s;
     }
 
+    @Override
     public String getStringField() {
         return _s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BasicSubclassInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BasicSubclassInstance.java
index 4a2fa2532..200785a14 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BasicSubclassInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/BasicSubclassInstance.java
@@ -53,10 +53,12 @@ public class BasicSubclassInstance
         version = v;
     }
 
+    @Override
     public String getStringField() {
         return stringField;
     }
 
+    @Override
     public void setStringField(String str) {
         stringField = str;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachablePC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachablePC.java
index 1e4d7a661..98d17d8c8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachablePC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachablePC.java
@@ -19,12 +19,15 @@
 package org.apache.openjpa.persistence.enhance.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 
 @Entity
 public class DetachablePC
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private long id;
     private String val;
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachableVersionedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachableVersionedPC.java
index e0ea6bc17..466f78cc2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachableVersionedPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/DetachableVersionedPC.java
@@ -19,12 +19,15 @@
 package org.apache.openjpa.persistence.enhance.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 
 @Entity
 public class DetachableVersionedPC
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private long id;
     private String val;
     private int version;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/EmbeddableEntityWithIDAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/EmbeddableEntityWithIDAnnotation.java
index 31571daea..5e0190ea4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/EmbeddableEntityWithIDAnnotation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/EmbeddableEntityWithIDAnnotation.java
@@ -23,10 +23,7 @@ package org.apache.openjpa.persistence.enhance.common.apps;
 
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 
 /**
  * BillingNoteId entity. @author MyEclipse Persistence Tools
@@ -75,6 +72,7 @@ public class EmbeddableEntityWithIDAnnotation implements java.io.Serializable
         this.seqNo = seqNo;
     }
 
+    @Override
     public boolean equals( Object other )
     {
         if ( ( this == other ) )
@@ -93,6 +91,7 @@ public class EmbeddableEntityWithIDAnnotation implements java.io.Serializable
                 		&& this.getSeqNo( ).equals( castOther.getSeqNo( ) ) ) );
     }
 
+    @Override
     public int hashCode()
     {
         int result = 17;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java
index c6af6cbbf..e2284bbb1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity1.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.enhance.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -94,6 +95,7 @@ public class Entity1 implements Serializable {
         return entity2Field;
     }
 
+    @Override
     public String toString() {
         return ("PK: " + pk + " StringField: " + stringField + " IntField: " +
             intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity2.java
index 68969cf37..9f4d0106b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/Entity2.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.enhance.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -35,9 +36,7 @@ import javax.persistence.Id;
 @Entity
 public class Entity2 implements Serializable {
 
-    /**
-     *
-     */
+    
     private static final long serialVersionUID = 4723739219953167343L;
 
     @Id
@@ -79,6 +78,7 @@ public class Entity2 implements Serializable {
         return intField;
     }
 
+    @Override
     public String toString() {
         return ("PK: " + pk + " StringField: " + stringField + " IntField: " +
             intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/PCClone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/PCClone.java
index 1009aa30d..6fe0e1daf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/PCClone.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/PCClone.java
@@ -33,6 +33,7 @@ public class PCClone implements Cloneable {
         return string;
     }
 
+    @Override
     public Object clone() {
         try {
             return (PCClone) super.clone();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/SubclassTestInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/SubclassTestInstance.java
index 337788488..324c95ed8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/SubclassTestInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/common/apps/SubclassTestInstance.java
@@ -24,7 +24,7 @@ package org.apache.openjpa.persistence.enhance.common.apps;
  */
 public interface SubclassTestInstance {
 
-    public void setStringField(String s);
+    void setStringField(String s);
 
-    public String getStringField();
+    String getStringField();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContactId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContactId.java
index 0a1b66219..a2aa82844 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContactId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BeneContactId.java
@@ -32,7 +32,8 @@ public class BeneContactId implements Serializable {
 
     String beneficiaryPK;
 
-	public boolean equals(Object obj) {
+	@Override
+    public boolean equals(Object obj) {
 		if(this == obj) return true;
 		if((obj != null) && (obj instanceof BeneContactId)) {
 			BeneContactId other = (BeneContactId) obj;
@@ -42,12 +43,14 @@ public class BeneContactId implements Serializable {
 		return false;
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		String hash = beneficiaryPK + Integer.toString(type.ordinal());
 		return hash.hashCode();
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return type.toString() + "-" + beneficiaryPK;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book.java
index 5c4be3218..9a518fa04 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.enhance.identity;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -46,12 +47,15 @@ import org.apache.openjpa.persistence.jdbc.VersionColumn;
 @IdClass(BookId.class)
 @VersionColumn
 public class Book implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @Column(name="BOOK_NAME", nullable = false)
     private String name;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "book")
-    private Set<Page> pages = new HashSet<Page>();
+    private Set<Page> pages = new HashSet<>();
 
     @Id
     @Column(nullable = false)
@@ -98,6 +102,7 @@ public class Book implements Serializable {
 		this.author = author;
 	}
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Book)) {
             return false;
@@ -112,6 +117,7 @@ public class Book implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return getName().hashCode();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java
index 6c72c3e8f..2c82c2e25 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Book1.java
@@ -51,6 +51,9 @@ import org.apache.openjpa.persistence.jdbc.VersionColumn;
 @Table(name="DI_BOOK1")
 @VersionColumn
 public class Book1 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @EmbeddedId
     @AttributeOverrides({
         @AttributeOverride(name="name", column=@Column(name="BOOK_NAME")),
@@ -59,7 +62,7 @@ public class Book1 implements Serializable {
     private BookId1 bid;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "book")
-    private Set<Page1> pages = new HashSet<Page1>();
+    private Set<Page1> pages = new HashSet<>();
 
     @MapsId("library")
     @ManyToOne
@@ -106,6 +109,7 @@ public class Book1 implements Serializable {
 		this.author = author;
 	}
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Book1)) {
             return false;
@@ -120,6 +124,7 @@ public class Book1 implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return getBid().hashCode();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId.java
index 762397dc5..b312ad8f7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId.java
@@ -32,10 +32,13 @@ import java.io.Serializable;
  *
  */
 public final class BookId implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     private String name;
     private String library;
 
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof BookId)) {
             return false;
@@ -54,6 +57,7 @@ public final class BookId implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return safeHash(getName()) * safeHash(getLibrary());
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId1.java
index 6e29ffc0d..b162f420a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/BookId1.java
@@ -36,6 +36,8 @@ import javax.persistence.Embeddable;
  */
 @Embeddable
 public final class BookId1 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     private String name;
     private String library;
 
@@ -47,6 +49,7 @@ public final class BookId1 implements Serializable {
     }
 
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof BookId1)) {
             return false;
@@ -65,6 +68,7 @@ public final class BookId1 implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return safeHash(getName()) * safeHash(getLibrary());
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1.java
index 37d45878b..e59790bbd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.MapsId;
+import javax.persistence.Table;
 
 
 @Entity
@@ -46,6 +50,7 @@ public class Dependent1 {
         this.id = id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Dependent1)) return false;
@@ -58,6 +63,7 @@ public class Dependent1 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + id.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1Xml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1Xml.java
index 19b194f46..035985089 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1Xml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent1Xml.java
@@ -40,6 +40,7 @@ public class Dependent1Xml {
         this.id = id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Dependent1Xml)) return false;
@@ -52,6 +53,7 @@ public class Dependent1Xml {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + id.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent2.java
index 054b36b3e..09899c196 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent2.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.MapsId;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="DEP2_MBI")
@@ -45,6 +49,7 @@ public class Dependent2 {
         this.id = id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Dependent2)) return false;
@@ -58,6 +63,7 @@ public class Dependent2 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + id.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java
index 31137b9d6..fd42dacd7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent3.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="DEP3_MBI")
@@ -56,6 +61,7 @@ public class Dependent3 {
         this.id = id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Dependent3)) return false;
@@ -71,6 +77,7 @@ public class Dependent3 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + id.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent4.java
index f637b54bc..f1b29952b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent4.java
@@ -19,13 +19,21 @@
 package org.apache.openjpa.persistence.enhance.identity;
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 @Entity
 @IdClass(DependentId4.class)
 public class Dependent4 implements Serializable {
 
-	@Id
+	
+    private static final long serialVersionUID = 1L;
+
+    @Id
 	@Column(name = "id", unique = false, nullable = false)
 	private long id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5.java
index 06e09cd73..eae443057 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5.java
@@ -19,7 +19,12 @@
 package org.apache.openjpa.persistence.enhance.identity;
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
 
 @Entity
 @IdClass(DependentId5.class)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5a.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5a.java
index 617848c2c..ff1fa27ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5a.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Dependent5a.java
@@ -19,7 +19,12 @@
 package org.apache.openjpa.persistence.enhance.identity;
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
 
 @Entity
 @IdClass(DependentId5.class)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1.java
index f7dac476c..3a61bd088 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class DependentId1 {
@@ -48,6 +48,7 @@ public class DependentId1 {
         return empPK;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof DependentId1)) return false;
@@ -58,6 +59,7 @@ public class DependentId1 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = (int) (ret * 31 + empPK);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1Xml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1Xml.java
index 6f05782f2..45a58ceda 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1Xml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId1Xml.java
@@ -45,6 +45,7 @@ public class DependentId1Xml {
         return empPK;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof DependentId1Xml)) return false;
@@ -55,6 +56,7 @@ public class DependentId1Xml {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = (int) (ret * 31 + empPK);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId2.java
index 3b4d83b53..647ab69d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId2.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class DependentId2 {
@@ -48,6 +48,7 @@ public class DependentId2 {
         return empPK;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof DependentId2)) return false;
@@ -58,6 +59,7 @@ public class DependentId2 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         if (empPK != null)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId3.java
index fdc84de7b..72581c8f6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId3.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class DependentId3 {
@@ -59,6 +59,7 @@ public class DependentId3 {
         return parentPK;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof DependentId3)) return false;
@@ -70,6 +71,7 @@ public class DependentId3 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = (int) (ret * 31 + empPK);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId4.java
index de91f94db..e9fd23a4c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId4.java
@@ -22,6 +22,7 @@ public class DependentId4 {
     public long id;
     public long parent;
 
+    @Override
     public boolean equals(Object o) {
     	if (!(o instanceof DependentId4)) return false;
     	if (id != ((DependentId4)o).id) return false;
@@ -29,6 +30,7 @@ public class DependentId4 {
        	return true;
     }
 
+    @Override
     public int hashCode() {
     	return (int) (id + 31 * parent);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId5.java
index 1c14dedff..84c401021 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/DependentId5.java
@@ -46,10 +46,12 @@ public class DependentId5 {
         this.emp = emp;
     }
 
+    @Override
     public int hashCode() {
         return name.hashCode() + emp.hashCode();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof DependentId5)) return false;
         DependentId5 d = (DependentId5) o;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmpId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmpId.java
index ed1d8d744..9db7c28e1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmpId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmpId.java
@@ -43,6 +43,7 @@ public class EmpId {
         this.empType = empType;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EmpId)) return false;
         if (((EmpId)o).empId == empId &&
@@ -50,6 +51,7 @@ public class EmpId {
         return false;
     }
 
+    @Override
     public int hashCode() {
         return empId *31 + empType.hashCode();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java
index d084cc4e7..ebb661c1f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 
 @Entity
@@ -59,6 +64,7 @@ public class Employee {
         this.empType = empType;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         PhoneNumber p = e.getPhoneNumber();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1.java
index 84842e62d..c5b080c55 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="EMP1_MBI")
@@ -30,7 +35,7 @@ public class Employee1 {
     String name;
 
     @OneToMany(mappedBy="emp")
-    List<Dependent1> dependents = new ArrayList<Dependent1>();
+    List<Dependent1> dependents = new ArrayList<>();
 
     public int getEmpId() {
         return empId;
@@ -60,6 +65,7 @@ public class Employee1 {
         dependents.add(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Employee1)) return false;
@@ -78,6 +84,7 @@ public class Employee1 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + empId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1Xml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1Xml.java
index 3be13076c..75f83f70f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1Xml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee1Xml.java
@@ -26,7 +26,7 @@ public class Employee1Xml {
 
     String name;
 
-    List<Dependent1Xml> dependents = new ArrayList<Dependent1Xml>();
+    List<Dependent1Xml> dependents = new ArrayList<>();
 
     public int getEmpId() {
         return empId;
@@ -56,6 +56,7 @@ public class Employee1Xml {
         dependents.add(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Employee1Xml)) return false;
@@ -74,6 +75,7 @@ public class Employee1Xml {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + empId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee2.java
index de2d84649..b71e87309 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee2.java
@@ -18,9 +18,13 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import java.util.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="EMP2_MBI")
@@ -29,7 +33,7 @@ public class Employee2 {
     EmployeeId2 empId;
 
     @OneToMany(mappedBy="emp")
-    List<Dependent2> dependents = new ArrayList<Dependent2>();
+    List<Dependent2> dependents = new ArrayList<>();
 
     public EmployeeId2 getEmpId() {
         return empId;
@@ -51,6 +55,7 @@ public class Employee2 {
         dependents.add(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Employee2)) return false;
@@ -68,6 +73,7 @@ public class Employee2 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + empId.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee3.java
index f4252d0a5..5b835ecea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee3.java
@@ -18,9 +18,15 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="EMP3_MBI")
@@ -32,7 +38,7 @@ public class Employee3 {
     String name;
 
     @OneToMany(mappedBy="emp")
-    List<Dependent3> dependents = new ArrayList<Dependent3>();
+    List<Dependent3> dependents = new ArrayList<>();
 
     public int getEmpId() {
         return empId;
@@ -58,6 +64,7 @@ public class Employee3 {
         dependents.add(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Employee3)) return false;
@@ -76,6 +83,7 @@ public class Employee3 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + empId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee4.java
index 674b30db7..09215a595 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee4.java
@@ -18,9 +18,16 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import java.util.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 @Entity
 public class Employee4 {
@@ -31,7 +38,7 @@ public class Employee4 {
 	private long id;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "parent")
-	private List<Dependent4> children = new ArrayList<Dependent4>();
+	private List<Dependent4> children = new ArrayList<>();
 
     private int age;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee5.java
index fcd5e3039..927ac7ea4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Employee5.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
-import java.io.*;
+import java.io.Serializable;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
 
 @Entity
 public class Employee5 implements Serializable {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId2.java
index de83c275a..325354360 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId2.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class EmployeeId2 {
@@ -48,6 +48,7 @@ public class EmployeeId2 {
         return lastName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof EmployeeId2)) return false;
@@ -61,6 +62,7 @@ public class EmployeeId2 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + firstName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId5.java
index 4e97b6736..8374b1471 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/EmployeeId5.java
@@ -23,6 +23,8 @@ import javax.persistence.Embeddable;
 @Embeddable
 public class EmployeeId5 implements java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     String firstName;
     String lastName;
 
@@ -50,6 +52,7 @@ public class EmployeeId5 implements java.io.Serializable {
         return lastName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EmployeeId5))
             return false;
@@ -60,6 +63,7 @@ public class EmployeeId5 implements java.io.Serializable {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += firstName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library.java
index d2de2b03b..e875e4e00 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.enhance.identity;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -43,12 +44,15 @@ import org.apache.openjpa.persistence.jdbc.VersionColumn;
 @Entity
 @VersionColumn
 public class Library implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @Column(name="LIBRARY_NAME", nullable = false)
     private String name;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "library")
-    private Set<Book> books = new HashSet<Book>();
+    private Set<Book> books = new HashSet<>();
 
     private String location;
 
@@ -87,6 +91,7 @@ public class Library implements Serializable {
 		this.location = location;
 	}
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Library)) {
             return false;
@@ -101,6 +106,7 @@ public class Library implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return getName().hashCode();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library1.java
index e1e092ed1..79c3ef4bc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Library1.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.enhance.identity;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -47,13 +48,16 @@ import org.apache.openjpa.persistence.jdbc.VersionColumn;
 @Table(name="DI_LIBRARY1")
 @VersionColumn
 public class Library1 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @Column(name="LIBRARY_NAME", nullable = false)
     private String name;
 
     @OneToMany(fetch=FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "library")
     @OrderBy(value = "bid.library ASC, bid.name ASC")
-    private Set<Book1> books = new HashSet<Book1>();
+    private Set<Book1> books = new HashSet<>();
 
     private String location;
 
@@ -92,6 +96,7 @@ public class Library1 implements Serializable {
 		this.location = location;
 	}
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Library1)) {
             return false;
@@ -106,6 +111,7 @@ public class Library1 implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return getName().hashCode();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Line1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Line1.java
index 11ce39d9d..8a9540dff 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Line1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Line1.java
@@ -47,6 +47,9 @@ import org.apache.openjpa.persistence.jdbc.VersionColumn;
 @Table(name="DI_LINE1")
 @VersionColumn
 public class Line1 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @EmbeddedId
     @AttributeOverride(name="lineNum", column=@Column(name="LINE_NUM"))
     private LineId1 lid;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/LineId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/LineId1.java
index c43365c9a..4af465fd7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/LineId1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/LineId1.java
@@ -40,6 +40,9 @@ import javax.persistence.Embedded;
 
 @Embeddable
 public final class LineId1 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Column(name="LINE_NUM")
     private int lineNum;
 
@@ -62,6 +65,7 @@ public final class LineId1 implements Serializable {
         this.lineNum = lineNum;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof LineId1)) {
             return false;
@@ -80,6 +84,7 @@ public final class LineId1 implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return lineNum * (page != null ? getPage().hashCode() : 31);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory1.java
index 71632901d..b435d56e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory1.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MED1_MBI")
@@ -55,6 +59,7 @@ public class MedicalHistory1 {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof MedicalHistory1)) return false;
@@ -68,6 +73,7 @@ public class MedicalHistory1 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory2.java
index 3a8cb3e24..c8243d3fb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory2.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapsId;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MED2_MBI")
@@ -55,6 +59,7 @@ public class MedicalHistory2 {
         this.id = id;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof MedicalHistory2)) return false;
@@ -72,6 +77,7 @@ public class MedicalHistory2 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory3.java
index 351175ef2..a989fadcf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory3.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MED3_MBI")
@@ -45,6 +49,7 @@ public class MedicalHistory3 {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof MedicalHistory3)) return false;
@@ -58,6 +63,7 @@ public class MedicalHistory3 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory4.java
index 2e8bc6367..8853c98f2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/MedicalHistory4.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MED4_MBI")
@@ -45,6 +49,7 @@ public class MedicalHistory4 {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof MedicalHistory4)) return false;
@@ -58,6 +63,7 @@ public class MedicalHistory4 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page.java
index 542f37cef..606d8a583 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page.java
@@ -45,6 +45,9 @@ import org.apache.openjpa.persistence.jdbc.VersionColumn;
 @IdClass(PageId.class)
 @VersionColumn
 public class Page implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @Column(name="PAGE_NUMBER",nullable = false)
     private int number;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page1.java
index 13d0b281c..47fffa8b9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Page1.java
@@ -51,6 +51,9 @@ import org.apache.openjpa.persistence.jdbc.VersionColumn;
 @Table(name="DI_PAGE1")
 @VersionColumn
 public class Page1 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @EmbeddedId
     @AttributeOverride(name="number", column=@Column(name="PAGE_NUM"))
     private PageId1 pid;
@@ -64,7 +67,7 @@ public class Page1 implements Serializable {
     private Book1 book;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "page")
-    private Set<Line1> lines = new HashSet<Line1>();
+    private Set<Line1> lines = new HashSet<>();
 
     public PageId1 getPid() {
         return pid;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId.java
index 5294b35f6..65a558c60 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId.java
@@ -32,6 +32,8 @@ import java.io.Serializable;
  *
  */
 public final class PageId implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     private int number;
     private BookId book;
 
@@ -43,6 +45,7 @@ public final class PageId implements Serializable {
         this.number = number;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof PageId)) {
             return false;
@@ -61,6 +64,7 @@ public final class PageId implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return number * (book != null ? getBook().hashCode() : 31);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId1.java
index 4fe33c109..532912e8a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PageId1.java
@@ -41,6 +41,9 @@ import javax.persistence.Embedded;
 
 @Embeddable
 public final class PageId1 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     private int number;
 
     @Embedded
@@ -66,6 +69,7 @@ public final class PageId1 implements Serializable {
         this.number = number;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof PageId1)) {
             return false;
@@ -84,6 +88,7 @@ public final class PageId1 implements Serializable {
         return true;
     }
 
+    @Override
     public int hashCode() {
         return number * (book != null ? getBook().hashCode() : 31);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Parent3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Parent3.java
index 97b75fac3..bc3727bfc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Parent3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Parent3.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 
 @Entity
@@ -53,6 +58,7 @@ public class Parent3 {
         this.dependent = dependent;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Parent3)) return false;
@@ -65,6 +71,7 @@ public class Parent3 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + pid;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person1.java
index 8f09f7b1e..17f9baadc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person1.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PER1_MBI")
@@ -45,6 +48,7 @@ public class Person1 {
         this.medical = medical;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Person1)) return false;
@@ -59,6 +63,7 @@ public class Person1 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + id.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person2.java
index a68670b06..8a399763f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person2.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PER2_MBI")
@@ -56,6 +61,7 @@ public class Person2 {
         this.medical = medical;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Person2)) return false;
@@ -72,6 +78,7 @@ public class Person2 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + (int) ssn;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person3.java
index aa3801c5a..ddf510d0b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person3.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PER3_MBI")
@@ -57,6 +61,7 @@ public class Person3 {
         this.medical = medical;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Person3)) return false;
@@ -73,6 +78,7 @@ public class Person3 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + firstName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person4.java
index a8b0cf010..bbd63bb5f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/Person4.java
@@ -48,6 +48,7 @@ public class Person4 {
         this.medical = medical;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Person4)) return false;
@@ -62,6 +63,7 @@ public class Person4 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + id.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId1.java
index 5e1d2b75f..fe2f68ad1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId1.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 package org.apache.openjpa.persistence.enhance.identity;
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class PersonId1 {
@@ -47,6 +47,7 @@ public class PersonId1 {
         return lastName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof PersonId1)) return false;
@@ -60,6 +61,7 @@ public class PersonId1 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + firstName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId3.java
index 489acdb5b..876d019be 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId3.java
@@ -45,6 +45,7 @@ public class PersonId3 {
         return lastName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof PersonId3)) return false;
@@ -58,6 +59,7 @@ public class PersonId3 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         if (firstName != null)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId4.java
index 07866ca3d..92396e169 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PersonId4.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class PersonId4 {
@@ -48,6 +48,7 @@ public class PersonId4 {
         return lastName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof PersonId4)) return false;
@@ -61,6 +62,7 @@ public class PersonId4 {
         return true;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         if (firstName != null)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java
index 99bf3d532..3db4c3a8c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/PhoneNumber.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.enhance.identity;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="PH_MBI")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestDerivedIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestDerivedIdentity.java
index 1aed62cce..29f8fb283 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestDerivedIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestDerivedIdentity.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.PersistenceException;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestDerivedIdentity extends SingleEMFTestCase {
+    @Override
     public void setUp() throws Exception {
         super.setUp(DROP_TABLES, Dependent5a.class, Employee5.class, EmployeeId5.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java
index fbcf0f802..970110b3c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMappedById.java
@@ -38,28 +38,27 @@ public class TestMappedById extends SingleEMFTestCase {
     public int numDependentsPerEmployee = 2;
     public int numPersons = 4;
 
-    public Map<Integer, Employee1> emps1 = new HashMap<Integer, Employee1>();
-    public Map<String, Dependent1> deps1 = new HashMap<String, Dependent1>();
-    public Map<Integer, Employee2> emps2 = new HashMap<Integer, Employee2>();
-    public Map<String, Dependent2> deps2 = new HashMap<String, Dependent2>();
-    public Map<String, Person1> persons1 = new HashMap<String, Person1>();
+    public Map<Integer, Employee1> emps1 = new HashMap<>();
+    public Map<String, Dependent1> deps1 = new HashMap<>();
+    public Map<Integer, Employee2> emps2 = new HashMap<>();
+    public Map<String, Dependent2> deps2 = new HashMap<>();
+    public Map<String, Person1> persons1 = new HashMap<>();
     public Map<String, MedicalHistory1> medicals1 =
-        new HashMap<String, MedicalHistory1>();
-    public Map<String, Person2> persons2 = new HashMap<String, Person2>();
+        new HashMap<>();
+    public Map<String, Person2> persons2 = new HashMap<>();
     public Map<String, MedicalHistory2> medicals2 =
-        new HashMap<String, MedicalHistory2>();
-    public Map<String, Person3> persons3 = new HashMap<String, Person3>();
-    public Map<String, MedicalHistory3> medicals3 = new HashMap<String,
-        MedicalHistory3>();
-    public Map<String, Person4> persons4 = new HashMap<String, Person4>();
+        new HashMap<>();
+    public Map<String, Person3> persons3 = new HashMap<>();
+    public Map<String, MedicalHistory3> medicals3 = new HashMap<>();
+    public Map<String, Person4> persons4 = new HashMap<>();
     public Map<String, MedicalHistory4> medicals4 =
-        new HashMap<String, MedicalHistory4>();
+        new HashMap<>();
 
-    public Map<Integer, Employee3> emps3 = new HashMap<Integer, Employee3>();
+    public Map<Integer, Employee3> emps3 = new HashMap<>();
     public Map<Object, Dependent3> depMap3 =
-    	new HashMap<Object, Dependent3>();
+    	new HashMap<>();
     public List dids3 = new ArrayList();
-    public List<Dependent3> deps3 = new ArrayList<Dependent3>();
+    public List<Dependent3> deps3 = new ArrayList<>();
 
     public int eId1 = 1;
     public int dId1 = 1;
@@ -78,6 +77,7 @@ public class TestMappedById extends SingleEMFTestCase {
     public int pId4 = 1;
     public int mId4 = 1;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(DROP_TABLES, Dependent1.class, Employee.class, Employee1.class,
             DependentId1.class, Dependent2.class, Employee2.class,
@@ -862,7 +862,7 @@ public class TestMappedById extends SingleEMFTestCase {
         EntityManager em = emf.createEntityManager();
         Beneficiary b = new Beneficiary();
         b.setId("b8");
-        List<BeneContact> contacts = new ArrayList<BeneContact>();
+        List<BeneContact> contacts = new ArrayList<>();
         BeneContact c = new BeneContact();
         c.setEmail("email8");
         BeneContactId id = new BeneContactId();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMapsIdXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMapsIdXml.java
index 88bca44b2..e950dbeeb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMapsIdXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMapsIdXml.java
@@ -33,11 +33,12 @@ public class TestMapsIdXml extends SingleEMFTestCase {
     public int numDependentsPerEmployee = 2;
     public int numPersons = 4;
 
-    public Map<Integer, Employee1Xml> emps1xml = new HashMap<Integer, Employee1Xml>();
-    public Map<String, Dependent1Xml> deps1xml = new HashMap<String, Dependent1Xml>();
+    public Map<Integer, Employee1Xml> emps1xml = new HashMap<>();
+    public Map<String, Dependent1Xml> deps1xml = new HashMap<>();
     public int eId1 = 1;
     public int dId1 = 1;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity.java
index c6e257167..f470ce8c8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity.java
@@ -44,7 +44,8 @@ public class TestMultipleLevelDerivedIdentity extends SingleEMFTestCase {
 	private static String BOOK_NAME    = "foo";
 	private static int    NUM_PAGES    = 3;
 
-	public void setUp() throws Exception {
+	@Override
+    public void setUp() throws Exception {
         super.setUp(CLEAR_TABLES, Library.class, Book.class, Page.class,
                 "openjpa.RuntimeUnenhancedClasses", "unsupported");
 		create();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java
index 2d9327c0a..19e1227dd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/enhance/identity/TestMultipleLevelDerivedIdentity1.java
@@ -40,6 +40,7 @@ public class TestMultipleLevelDerivedIdentity1 extends SQLListenerTestCase {
 	private static int    NUM_PAGES    = 3;
 	private static int    NUM_LINES    = 20;
 
+    @Override
     public void setUp() throws Exception {
         setSupportedDatabases(org.apache.openjpa.jdbc.sql.DerbyDictionary.class,
             org.apache.openjpa.jdbc.sql.DB2Dictionary.class,
@@ -280,6 +281,7 @@ public class TestMultipleLevelDerivedIdentity1 extends SQLListenerTestCase {
                 + toString(Arrays.asList(keys)));
     }
 
+    @Override
     public String toString(List<String> list) {
         StringBuffer buf = new StringBuffer();
         for (String s : list)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java
index d1ec63738..961f60581 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java
@@ -43,7 +43,7 @@ public class EntityA implements Serializable {
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "center", orphanRemoval = true, cascade = CascadeType.ALL)
     @OrderColumn
-    private Set<EntityB> services = new LinkedHashSet<EntityB>();
+    private Set<EntityB> services = new LinkedHashSet<>();
 
     public EntityA() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java
index 379012a39..3909d0f54 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java
@@ -76,7 +76,7 @@ public class EntityB {
 
     public Set<EntityC> getCs() {
         if (linacs == null)
-            linacs = new HashSet<EntityC>();
+            linacs = new HashSet<>();
         return linacs;
     }
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
index 053780f5d..7fb3089dc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entitymanager/TestEntityManagerConfiguration.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.datacache.common.apps.PObject;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestEntityManagerConfiguration extends SingleEMFTestCase {
+    @Override
     public void setUp() throws Exception {
         super.setUp(PObject.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/TestCascades.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/TestCascades.java
index 6da458048..5fa40b578 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/TestCascades.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/TestCascades.java
@@ -19,10 +19,10 @@
 package org.apache.openjpa.persistence.entityoperation;
 
 
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.entityoperation.common.apps.
         CascadesEntity;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 /**
  * <p>Test EJB persistence cascade options.</p>
@@ -35,6 +35,7 @@ public class TestCascades extends AbstractTestCase {
         super(name, "entityopcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(CascadesEntity.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/common/apps/CascadesEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/common/apps/CascadesEntity.java
index 66d2e2719..0e9e0e39a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/common/apps/CascadesEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entityoperation/common/apps/CascadesEntity.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.entityoperation.common.apps;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/AnEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/AnEntity.java
index 5eca89720..ac438c2e5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/AnEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/AnEntity.java
@@ -56,7 +56,8 @@ public class AnEntity {
 		return name;
 	}
 
-	public String toString(){
+	@Override
+    public String toString(){
 		return "id = " + id + ", name = " + name;
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/JMSRemoteEventsTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/JMSRemoteEventsTest.java
index 50439fdd9..1d5a5f6ee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/JMSRemoteEventsTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/JMSRemoteEventsTest.java
@@ -31,10 +31,8 @@ import javax.jms.TopicSubscriber;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
-
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-
 import org.apache.openjpa.event.JMSRemoteCommitProvider;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
 
 /**
  * So named to prevent the autobuild from running this -- we don't
@@ -47,6 +45,7 @@ public class JMSRemoteEventsTest
         super(s);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
@@ -83,6 +82,7 @@ public class JMSRemoteEventsTest
     private static class DebugMessageListener
         implements MessageListener {
 
+        @Override
         public void onMessage(Message m) {
             try {
                 if (m instanceof ObjectMessage) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
index 98e70ebec..7742e75ac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
@@ -23,10 +23,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.event.RemoteCommitEvent;
 import org.apache.openjpa.event.RemoteCommitListener;
 import org.apache.openjpa.lib.conf.Configurations;
@@ -36,6 +32,8 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.StoreCache;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
 import org.apache.openjpa.util.Id;
 
 public class RemoteEventBase extends AbstractTestCase {
@@ -110,7 +108,8 @@ public class RemoteEventBase extends AbstractTestCase {
         endTx(pm);
 
         try {
-            Thread.currentThread().sleep(250);
+            Thread.currentThread();
+            Thread.sleep(250);
         }
         catch (InterruptedException ie) {
         }
@@ -144,7 +143,8 @@ public class RemoteEventBase extends AbstractTestCase {
         endTx(pm);
 
         try {
-            Thread.currentThread().sleep(250);
+            Thread.currentThread();
+            Thread.sleep(250);
         }
         catch (InterruptedException ie) {
         }
@@ -176,7 +176,8 @@ public class RemoteEventBase extends AbstractTestCase {
         endTx(pm);
 
         try {
-            Thread.currentThread().sleep(250);
+            Thread.currentThread();
+            Thread.sleep(250);
         }
         catch (InterruptedException ie) {
         }
@@ -212,12 +213,14 @@ public class RemoteEventBase extends AbstractTestCase {
 
         transient Collection deleted;
 
+        @Override
         public void afterCommit(RemoteCommitEvent event) {
             this.added = event.getPersistedObjectIds();
             this.updated = event.getUpdatedObjectIds();
             this.deleted = event.getDeletedObjectIds();
         }
 
+        @Override
         public void close() {
         }
     }
@@ -227,10 +230,12 @@ public class RemoteEventBase extends AbstractTestCase {
 
         boolean commitNotificationReceived = false;
 
+        @Override
         public void afterCommit(RemoteCommitEvent event) {
             commitNotificationReceived = true;
         }
 
+        @Override
         public void close() {
         }
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java
index 4dfb48f4d..bae02ac43 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java
@@ -22,13 +22,13 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.event.TransactionEvent;
 import org.apache.openjpa.event.TransactionListener;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.OracleDictionary;
 import org.apache.openjpa.jdbc.sql.SybaseDictionary;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
@@ -142,6 +142,7 @@ public class TestBeforeCommit extends AbstractPersistenceTestCase implements Tra
         em.close();
     }
 
+    @Override
     public void beforeCommit(TransactionEvent event) {
         if(StringUtil.isBlank(ae.getName())) {
             ae.setName("Ava");
@@ -157,27 +158,35 @@ public class TestBeforeCommit extends AbstractPersistenceTestCase implements Tra
     }
 
     // Unused Interface methods
+    @Override
     public void afterBegin(TransactionEvent event) {
     }
 
+    @Override
     public void afterFlush(TransactionEvent event) {
     }
 
+    @Override
     public void beforeFlush(TransactionEvent event) {
     }
 
+    @Override
     public void afterCommit(TransactionEvent event) {
     }
 
+    @Override
     public void afterCommitComplete(TransactionEvent event) {
     }
 
+    @Override
     public void afterRollback(TransactionEvent event) {
     }
 
+    @Override
     public void afterRollbackComplete(TransactionEvent event) {
     }
 
+    @Override
     public void afterStateTransitions(TransactionEvent event) {
     }
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestEvents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestEvents.java
index c7162426a..83fc42ad8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestEvents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestEvents.java
@@ -21,17 +21,16 @@ package org.apache.openjpa.persistence.event;
 import java.util.Collection;
 import java.util.Collections;
 
-
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import junit.framework.AssertionFailedError;
-
 import org.apache.openjpa.event.TransactionEvent;
 import org.apache.openjpa.event.TransactionListener;
 import org.apache.openjpa.persistence.CallbackMode;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
+
+import junit.framework.AssertionFailedError;
 
 @AllowFailure(message="surefire excluded")
 public class TestEvents
@@ -43,6 +42,7 @@ public class TestEvents
         super(s, "eventcactusapp");
     }
 
+    @Override
     public void setUp() {
         transactionListener = new TransactionEventListenerTestImpl();
         deleteAll(RuntimeTest1.class);
@@ -128,7 +128,7 @@ public class TestEvents
         //FIXME need to find an alternative
         ((OpenJPAEntityManagerSPI) pm)
             .setTransactionListenerCallbackMode(CallbackMode.IGNORE);
-        transactionListener.exception = transactionListener.EXCEPTION;
+        transactionListener.exception = TransactionEventListenerTestImpl.EXCEPTION;
 
         RuntimeTest1 t1 = new RuntimeTest1("foo", 5);
         startTx(pm);
@@ -149,7 +149,7 @@ public class TestEvents
             (OpenJPAEntityManager) currentEntityManager();
         ((OpenJPAEntityManagerSPI) pm)
             .addTransactionListener(transactionListener);
-        transactionListener.exception = transactionListener.EXCEPTION;
+        transactionListener.exception = TransactionEventListenerTestImpl.EXCEPTION;
 
         RuntimeTest1 t1 = new RuntimeTest1("foo", 5);
         startTx(pm);
@@ -180,7 +180,7 @@ public class TestEvents
             (OpenJPAEntityManager) currentEntityManager();
         ((OpenJPAEntityManagerSPI) pm)
             .addTransactionListener(transactionListener);
-        transactionListener.exception = transactionListener.EXCEPTION_AFTER;
+        transactionListener.exception = TransactionEventListenerTestImpl.EXCEPTION_AFTER;
 
         RuntimeTest1 t1 = new RuntimeTest1("foo", 5);
         startTx(pm);
@@ -219,16 +219,20 @@ public class TestEvents
         int status;
         Collection trans = Collections.EMPTY_LIST;
 
+        @Override
         public void afterBegin(TransactionEvent event) {
             status |= STARTED;
         }
 
+        @Override
         public void beforeFlush(TransactionEvent event) {
         }
 
+        @Override
         public void afterFlush(TransactionEvent event) {
         }
 
+        @Override
         public void beforeCommit(TransactionEvent event) {
             status |= COMMIT_BEGUN;
             trans = event.getTransactionalObjects();
@@ -236,22 +240,27 @@ public class TestEvents
                 throw new RuntimeException("xxx");
         }
 
+        @Override
         public void afterCommit(TransactionEvent event) {
             status |= COMMITTED;
             if (exception == EXCEPTION_AFTER)
                 throw new RuntimeException("xxx");
         }
 
+        @Override
         public void afterRollback(TransactionEvent event) {
             status |= ROLLEDBACK;
         }
 
+        @Override
         public void afterStateTransitions(TransactionEvent event) {
         }
 
+        @Override
         public void afterCommitComplete(TransactionEvent event) {
         }
 
+        @Override
         public void afterRollbackComplete(TransactionEvent event) {
         }
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestFakeRemoteEvents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestFakeRemoteEvents.java
index aa97febd3..1c79d65e8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestFakeRemoteEvents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestFakeRemoteEvents.java
@@ -25,17 +25,15 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.event.AbstractRemoteCommitProvider;
 import org.apache.openjpa.event.RemoteCommitEvent;
 import org.apache.openjpa.event.RemoteCommitListener;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.util.Id;
 
 @AllowFailure(message="surefire excluded")
@@ -53,6 +51,7 @@ public class TestFakeRemoteEvents extends AbstractTestCase {
         super(s, "eventcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
@@ -189,12 +188,14 @@ public class TestFakeRemoteEvents extends AbstractTestCase {
 
         transient Collection deleted;
 
+        @Override
         public void afterCommit(RemoteCommitEvent event) {
             this.added = event.getPersistedObjectIds();
             this.updated = event.getUpdatedObjectIds();
             this.deleted = event.getDeletedObjectIds();
         }
 
+        @Override
         public void close() {
         }
     }
@@ -216,12 +217,14 @@ public class TestFakeRemoteEvents extends AbstractTestCase {
 
         // ---------- RemoteCommitProvider implementation ----------
 
+        @Override
         public void broadcast(RemoteCommitEvent event) {
             this.added = event.getPersistedObjectIds();
             this.updated = event.getUpdatedObjectIds();
             this.deleted = event.getDeletedObjectIds();
         }
 
+        @Override
         public void close() {
         }
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLifecycleEventManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLifecycleEventManager.java
index 2e5e3d3a2..df4dceb29 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLifecycleEventManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLifecycleEventManager.java
@@ -19,11 +19,6 @@
 package org.apache.openjpa.persistence.event;
 
 
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest4;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.event.LifecycleEvent;
 import org.apache.openjpa.event.LifecycleEventManager;
 import org.apache.openjpa.event.LoadListener;
@@ -32,6 +27,11 @@ import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest4;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 /**
  * <p>Test the {@link LifecycleEventManager}.</p>
@@ -204,19 +204,23 @@ public class TestLifecycleEventManager
         public int preStore = 0;
         public int store = 0;
 
+        @Override
         public void afterLoad(LifecycleEvent ev) {
             load++;
         }
 
+        @Override
         public void afterRefresh(LifecycleEvent ev) {
             // TODO
         }
 
+        @Override
         public void beforeStore(LifecycleEvent ev) {
             preStore++;
             store++;
         }
 
+        @Override
         public void afterStore(LifecycleEvent ev) {
             store++;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLocalRemoteEvents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLocalRemoteEvents.java
index 8a9e98721..d6912318a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLocalRemoteEvents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLocalRemoteEvents.java
@@ -19,11 +19,10 @@
 package org.apache.openjpa.persistence.event;
 
 
+import org.apache.openjpa.event.SingleJVMRemoteCommitProvider;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.test.AllowFailure;
 
-import org.apache.openjpa.event.SingleJVMRemoteCommitProvider;
-
 @AllowFailure(message="surefire excluded")
 public class TestLocalRemoteEvents
     extends RemoteEventBase {
@@ -32,6 +31,7 @@ public class TestLocalRemoteEvents
         super(s);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestOrphanedKeyAction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestOrphanedKeyAction.java
index 42e4fd6ab..44959841a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestOrphanedKeyAction.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestOrphanedKeyAction.java
@@ -21,17 +21,15 @@ package org.apache.openjpa.persistence.event;
 import java.util.HashMap;
 import java.util.Map;
 
-
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import org.apache.openjpa.persistence.common.utils.BufferedLogFactory;
-
 import org.apache.openjpa.event.OrphanedKeyAction;
 import org.apache.openjpa.persistence.EntityNotFoundException;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.common.utils.BufferedLogFactory;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.util.OpenJPAException;
 
 /**
@@ -49,6 +47,7 @@ public class TestOrphanedKeyAction
         super(s, "eventcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java
index 7d7af1759..b0cd049ab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java
@@ -21,14 +21,9 @@ package org.apache.openjpa.persistence.event;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.event.common.apps.Duration;
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.event.RemoteCommitEvent;
 import org.apache.openjpa.event.RemoteCommitListener;
 import org.apache.openjpa.event.TCPRemoteCommitProvider;
@@ -36,6 +31,10 @@ import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.event.common.apps.Duration;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="surefire excluded")
 public class TestTCPRemoteClassChanges
@@ -45,6 +44,7 @@ public class TestTCPRemoteClassChanges
         super(s, "eventcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
@@ -58,8 +58,10 @@ public class TestTCPRemoteClassChanges
 
     private void pause(double seconds) {
         try {
-            Thread.currentThread().yield();
-            Thread.currentThread().sleep((int) seconds * 1000);
+            Thread.currentThread();
+            Thread.yield();
+            Thread.currentThread();
+            Thread.sleep((int) seconds * 1000);
         } catch (Exception e) {
         }
     }
@@ -235,6 +237,7 @@ public class TestTCPRemoteClassChanges
 
         int receivedExtentEvCount = 0;
 
+        @Override
         public synchronized void afterCommit(RemoteCommitEvent event) {
             totalAddedClasses += event.getPersistedTypeNames().size();
             if (event.getPayloadType() == RemoteCommitEvent.PAYLOAD_EXTENTS) {
@@ -261,9 +264,11 @@ public class TestTCPRemoteClassChanges
             totalOidDeleted = 0;
         }
 
+        @Override
         public void close() {
         }
 
+        @Override
         public String toString() {
             String returnString = "Clsses add=" + totalAddedClasses + " dels=" +
                 totalDeletedClasses + " ups=" + totalUpdatedClasses;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEvents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEvents.java
index d8bbc9ade..60789d071 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEvents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEvents.java
@@ -19,11 +19,10 @@
 package org.apache.openjpa.persistence.event;
 
 
+import org.apache.openjpa.event.TCPRemoteCommitProvider;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.test.AllowFailure;
 
-import org.apache.openjpa.event.TCPRemoteCommitProvider;
-
 @AllowFailure(message="surefire excluded")
 public class TestTCPRemoteEvents
     extends RemoteEventBase {
@@ -32,6 +31,7 @@ public class TestTCPRemoteEvents
         super(s);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java
index d057447be..5980f1a57 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java
@@ -21,20 +21,19 @@ package org.apache.openjpa.persistence.event;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.event.common.apps.Duration;
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.event.RemoteCommitEvent;
 import org.apache.openjpa.event.RemoteCommitListener;
 import org.apache.openjpa.event.TCPRemoteCommitProvider;
 import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.event.common.apps.Duration;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="surefire excluded")
 public class TestTCPRemoteEventsDuration
@@ -44,6 +43,7 @@ public class TestTCPRemoteEventsDuration
         super(s, "eventcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
@@ -139,9 +139,11 @@ public class TestTCPRemoteEventsDuration
                 "(s).\n Clustered pmfs (" + NUM_CONCURRENT
                 + " threads - " + benchmarkCluster + "(s).\n");
 
-        Thread.currentThread().yield();
+        Thread.currentThread();
+        Thread.yield();
         try {
-            Thread.currentThread().sleep((int) 500);
+            Thread.currentThread();
+            Thread.sleep((int) 500);
         } catch (InterruptedException e) {
             fail("unexecpted exception during pause");
         }
@@ -174,6 +176,7 @@ public class TestTCPRemoteEventsDuration
             _pm = pm;
         }
 
+        @Override
         public void run() {
             doTransactions(_pm, NUM_OBJECTS);
             endEm(_pm);
@@ -264,6 +267,7 @@ public class TestTCPRemoteEventsDuration
         int totalUpdated;
         int totalDeleted;
 
+        @Override
         public synchronized void afterCommit(RemoteCommitEvent event) {
             this.addClasses = event.getPersistedTypeNames();
             this.updated = event.getUpdatedObjectIds();
@@ -274,6 +278,7 @@ public class TestTCPRemoteEventsDuration
             totalDeleted += deleted.size();
         }
 
+        @Override
         public void close() {
         }
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java
index 6087d24b5..414c11979 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java
@@ -21,20 +21,19 @@ package org.apache.openjpa.persistence.event;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.event.common.apps.Duration;
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.event.RemoteCommitEvent;
 import org.apache.openjpa.event.RemoteCommitListener;
 import org.apache.openjpa.event.TCPRemoteCommitProvider;
 import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.event.common.apps.Duration;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="surefire excluded")
 public class TestTCPRemoteRecovery
@@ -44,6 +43,7 @@ public class TestTCPRemoteRecovery
         super(s, "eventcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
@@ -57,8 +57,10 @@ public class TestTCPRemoteRecovery
 
     private void pause(double seconds) {
         try {
-            Thread.currentThread().yield();
-            Thread.currentThread().sleep((int) seconds * 1000);
+            Thread.currentThread();
+            Thread.yield();
+            Thread.currentThread();
+            Thread.sleep((int) seconds * 1000);
         } catch (Exception e) {
         }
     }
@@ -307,6 +309,7 @@ public class TestTCPRemoteRecovery
         int totalUpdated;
         int totalDeleted;
 
+        @Override
         public synchronized void afterCommit(RemoteCommitEvent event) {
             this.updated = event.getUpdatedObjectIds();
             this.deleted = event.getDeletedObjectIds();
@@ -317,9 +320,11 @@ public class TestTCPRemoteRecovery
             System.out.println("Aftercommit " + this);
         }
 
+        @Override
         public void close() {
         }
 
+        @Override
         public String toString() {
             String returnString = "Added clsses " + totalAddedClasses +
                 " Dels " + totalDeleted + " Ups " + totalUpdated;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java
index a34143c0e..44cfa3c69 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java
@@ -21,20 +21,19 @@ package org.apache.openjpa.persistence.event;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.event.common.apps.Duration;
-import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.test.AllowFailure;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
 import org.apache.openjpa.event.RemoteCommitEvent;
 import org.apache.openjpa.event.RemoteCommitListener;
 import org.apache.openjpa.event.TCPRemoteCommitProvider;
 import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.event.common.apps.Duration;
+import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 @AllowFailure(message="surefire excluded")
 public class TestTCPRemoteRecoveryTransmitAdds
@@ -44,6 +43,7 @@ public class TestTCPRemoteRecoveryTransmitAdds
         super(s, "eventcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
@@ -57,8 +57,10 @@ public class TestTCPRemoteRecoveryTransmitAdds
 
     private void pause(double seconds) {
         try {
-            Thread.currentThread().yield();
-            Thread.currentThread().sleep((int) seconds * 1000);
+            Thread.currentThread();
+            Thread.yield();
+            Thread.currentThread();
+            Thread.sleep((int) seconds * 1000);
         } catch (Exception e) {
         }
     }
@@ -314,6 +316,7 @@ public class TestTCPRemoteRecoveryTransmitAdds
         int totalUpdated;
         int totalDeleted;
 
+        @Override
         public synchronized void afterCommit(RemoteCommitEvent event) {
 
             this.added = event.getPersistedObjectIds();
@@ -325,9 +328,11 @@ public class TestTCPRemoteRecoveryTransmitAdds
             totalDeleted += deleted.size();
         }
 
+        @Override
         public void close() {
         }
 
+        @Override
         public String toString() {
             String returnString = "Adds " + totalAdded + " Dels " +
                 totalDeleted + " Ups " + totalUpdated;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/Duration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/Duration.java
index 7a2240b26..c477abe3d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/Duration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/Duration.java
@@ -93,6 +93,7 @@ public class Duration
         _running = false;
     }
 
+    @Override
     protected Object clone()
 
         throws CloneNotSupportedException {
@@ -176,6 +177,7 @@ public class Duration
         return _started;
     }
 
+    @Override
     public String toString() {
 
         double time = 0.0;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest1.java
index 6fa0b0d5e..3aa977966 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest1.java
@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -39,6 +40,9 @@ import org.apache.openjpa.persistence.PersistentCollection;
 public class RuntimeTest1
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String someStaticField = "someField";
 
     private byte byteField;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest2.java
index 4d3e79171..d75309e17 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest2.java
@@ -29,6 +29,8 @@ import javax.persistence.Entity;
 public class RuntimeTest2
     extends RuntimeTest1 {
 
+    
+    private static final long serialVersionUID = 1L;
     private int intField2;
 
     public RuntimeTest2() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest4.java
index 69ec5dbfa..1344b6b33 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/common/apps/RuntimeTest4.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.event.common.apps;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
 import javax.persistence.Entity;
 
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java
index 567cfbcb2..527ac4cdd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java
@@ -44,7 +44,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestException extends SingleEMFTestCase {
 	private static long ID_COUNTER = System.currentTimeMillis();
 
-	public void setUp() {
+	@Override
+    public void setUp() {
         super.setUp(PObject.class, CLEAR_TABLES);
     }
 
@@ -204,7 +205,8 @@ public class TestException extends SingleEMFTestCase {
      * Otherwise fails assertion and prints the given throwable and its nested
 	 * exception on the console.
 	 */
-	public void assertException(Throwable t, Class expectedType) {
+	@Override
+    public void assertException(Throwable t, Class expectedType) {
 		if (!isExpectedException(t, expectedType)) {
 		    getLog().error("TestException.assertException() - unexpected exception type", t);
 			//t.printStackTrace();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestParameterLogging.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestParameterLogging.java
index fb1e3ad88..c9b0fa0fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestParameterLogging.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestParameterLogging.java
@@ -35,6 +35,7 @@ import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
 public class TestParameterLogging extends AbstractPersistenceTestCase implements LogFactory {
     String _regex = ".*params=.*1,.*]";
     private static final String ID = Integer.toString(Integer.MIN_VALUE);
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         messages.clear();
@@ -151,10 +152,12 @@ public class TestParameterLogging extends AbstractPersistenceTestCase implements
 
     // Start LogFactory implementation
     // This is static so both the test and the logger share
-    private static List<String> messages = new ArrayList<String>();
+    private static List<String> messages = new ArrayList<>();
+    @Override
     public Log getLog(String channel) {
         return new AbstractLog() {
 
+            @Override
             protected boolean isEnabled(short logLevel) {
                 return true;
             }
@@ -164,6 +167,7 @@ public class TestParameterLogging extends AbstractPersistenceTestCase implements
                 messages.add(message.toString());
             }
 
+            @Override
             protected void log(short type, String message, Throwable t) {
                 messages.add(message);
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java
index dbd289c0a..67bda943e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/external/TestExternalValues.java
@@ -24,13 +24,14 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.persistence.RollbackException;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.framework.Assert;
+
 public class TestExternalValues extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES, EntityA.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGAddress.java
index 4713b9d0c..ec6873d35 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGAddress.java
@@ -92,6 +92,7 @@ public class FGAddress {
         this.zip = zip;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("FGAddress(id=").append(this.id).append(")");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGDepartment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGDepartment.java
index a2c13dea4..b28cc95b3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGDepartment.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGDepartment.java
@@ -53,6 +53,7 @@ public class FGDepartment {
         this.name = name;
     }
 
+    @Override
     public String toString() {
         return new String("FGDepartment(id=" + this.id + ")");
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java
index e34ccf8ce..c17588ebb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGEmployee.java
@@ -179,6 +179,7 @@ public class FGEmployee {
         this.rating = rating;
     }
 
+    @Override
     public String toString() {
         return new String(this.getClass().getSimpleName() + "(id=" + this.id
                 + ")");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGManager.java
index e5f3ca7b7..b1975e9b7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/FGManager.java
@@ -47,14 +47,14 @@ public class FGManager extends FGEmployee {
 
     public FGManager() {
         super();
-        employees = new ArrayList<FGEmployee>();
+        employees = new ArrayList<>();
     }
 
     public FGManager(int id, String firstName, String lastName, String desc,
             FGDepartment dept, FGAddress address, FGManager manager,
             String rating, Collection<FGEmployee> employees, String mData) {
         super(id, firstName, lastName, desc, dept, address, manager, rating);
-        this.employees = new ArrayList<FGEmployee>();
+        this.employees = new ArrayList<>();
         this.employees.addAll(employees);
         this.mData = mData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroupStacks.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroupStacks.java
index 6b3a9f71b..16f03743d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroupStacks.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroupStacks.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestFetchGroupStacks extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(FGManager.class, FGDepartment.class, FGEmployee.class,
             FGAddress.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroupStacksXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroupStacksXML.java
index 7b170f05d..5c5aa172b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroupStacksXML.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroupStacksXML.java
@@ -19,10 +19,12 @@
 package org.apache.openjpa.persistence.fetchgroups;
 
 public class TestFetchGroupStacksXML extends TestFetchGroupStacks {
+    @Override
     public void setUp() {
         super.setUp();
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "fetch-groups-xml";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroups.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroups.java
index 982bd0b7d..689d14748 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroups.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fetchgroups/TestFetchGroups.java
@@ -33,12 +33,13 @@ public class TestFetchGroups extends SingleEMTestCase {
     private static final int mgrCount = 3;
     private static final int empCount = mgrCount * empPerMgr;
 
-    private HashSet<FGEmployee> employeeSet = new HashSet<FGEmployee>();
-    private HashSet<FGManager> managerSet = new HashSet<FGManager>();
+    private HashSet<FGEmployee> employeeSet = new HashSet<>();
+    private HashSet<FGManager> managerSet = new HashSet<>();
 
     private static final String empDescriptionFieldStr =
         "org.apache.openjpa.persistence.fetchgroups.FGEmployee.description";
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, FGManager.class, FGDepartment.class, FGEmployee.class, FGAddress.class);
         createEmployeeData();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/ByteArrayHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/ByteArrayHolder.java
index 070df428c..f2a40bda9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/ByteArrayHolder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/ByteArrayHolder.java
@@ -18,13 +18,14 @@
  */
 package org.apache.openjpa.persistence.fields;
 
+import static javax.persistence.GenerationType.IDENTITY;
+
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
-
-import static javax.persistence.GenerationType.IDENTITY;
+import javax.persistence.Id;
 
 @Entity
 public class ByteArrayHolder implements Serializable {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumFieldType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumFieldType.java
index 514b3d084..3c888aedf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumFieldType.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumFieldType.java
@@ -18,11 +18,12 @@
  */
 package org.apache.openjpa.persistence.fields;
 
-import java.util.List;
 import java.util.ArrayList;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
+import java.util.List;
+
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 import org.apache.openjpa.persistence.PersistentCollection;
 
@@ -36,7 +37,7 @@ public class EnumFieldType {
     private SampleEnum enumField;
 
     @PersistentCollection
-    private List<SampleEnum> enumList = new ArrayList<SampleEnum>();
+    private List<SampleEnum> enumList = new ArrayList<>();
 
     // for OpenJPA
     protected EnumFieldType() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumSetOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumSetOwner.java
index 8b1bc084a..7f25bf817 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumSetOwner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/EnumSetOwner.java
@@ -18,15 +18,16 @@
  */
 package org.apache.openjpa.persistence.fields;
 
-import java.util.EnumSet;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.Set;
+
+import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
-import javax.persistence.Entity;
 
-import org.apache.openjpa.persistence.Persistent;
 import org.apache.openjpa.persistence.Externalizer;
+import org.apache.openjpa.persistence.Persistent;
 
 @Entity
 public class EnumSetOwner {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestByteArray.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestByteArray.java
index f2f1ba986..d5ac1d6ef 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestByteArray.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestByteArray.java
@@ -35,6 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestByteArray extends SingleEMTestCase {
     boolean runTest=false;
 
+    @Override
     public void setUp()  {
         super.setUp();
         OpenJPAEntityManagerFactorySPI ojpaEmf = (OpenJPAEntityManagerFactorySPI) emf;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumQueryConstructor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumQueryConstructor.java
index 38bb3ed1a..12ff5c164 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumQueryConstructor.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumQueryConstructor.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestEnumQueryConstructor
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(EnumFieldType.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumSets.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumSets.java
index 14adf1386..7a98af163 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumSets.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumSets.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestEnumSets
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(EnumSetOwner.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumsInJPQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumsInJPQL.java
index 8cc6c9037..f7faf1b0f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumsInJPQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/fields/TestEnumsInJPQL.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestEnumsInJPQL
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(EnumFieldType.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/TestCascadingFlush.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/TestCascadingFlush.java
index 5d9b1892c..8c6ce4f42 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/TestCascadingFlush.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/flush/TestCascadingFlush.java
@@ -36,6 +36,7 @@ public class TestCascadingFlush extends SingleEMFTestCase {
 
     boolean supportsNativeSequence = false;
 
+    @Override
     public void setUp() {
         setUp(Assignment.class, ClassPeriod.class, Course.class, SubTopic.class, Topic.class, CLEAR_TABLES);
 
@@ -183,13 +184,13 @@ public class TestCascadingFlush extends SingleEMFTestCase {
         Assignment assignment1 = new Assignment();
         assignment1.setAssignmentText("Lab: Nuclear Fusion");
 
-        Set<Assignment> assignments = new HashSet<Assignment>();
+        Set<Assignment> assignments = new HashSet<>();
         assignments.add(assignment1);
 
         SubTopic subtopic1 = new SubTopic();
         subtopic1.setSubtopicText("Nuclear Fusion");
 
-        Set<SubTopic> subtopics = new HashSet<SubTopic>();
+        Set<SubTopic> subtopics = new HashSet<>();
         subtopics.add(subtopic1);
 
         Topic topic1 = new Topic();
@@ -200,7 +201,7 @@ public class TestCascadingFlush extends SingleEMFTestCase {
         assignment1.setTopic(topic1);
         subtopic1.setTopic(topic1);
 
-        Set<Topic> topics = new HashSet<Topic>();
+        Set<Topic> topics = new HashSet<>();
         topics.add(topic1);
 
         ClassPeriod cp1 = new ClassPeriod();
@@ -210,7 +211,7 @@ public class TestCascadingFlush extends SingleEMFTestCase {
 
         topic1.setClassPeriod(cp1);
 
-        Set<ClassPeriod> cps = new HashSet<ClassPeriod>();
+        Set<ClassPeriod> cps = new HashSet<>();
         cps.add(cp1);
 
         course.setClassPeriods(cps);
@@ -224,13 +225,13 @@ public class TestCascadingFlush extends SingleEMFTestCase {
         Assignment assignment = new Assignment();
         assignment.setAssignmentText("Read pages 442-645");
 
-        Set<Assignment> assignments = new HashSet<Assignment>();
+        Set<Assignment> assignments = new HashSet<>();
         assignments.add(assignment);
 
         SubTopic subTopic = new SubTopic();
         subTopic.setSubtopicText("Newton");
 
-        Set<SubTopic> subTopics = new HashSet<SubTopic>();
+        Set<SubTopic> subTopics = new HashSet<>();
         subTopics.add(subTopic);
 
         Topic topic = new Topic();
@@ -241,20 +242,20 @@ public class TestCascadingFlush extends SingleEMFTestCase {
         assignment.setTopic(topic);
         subTopic.setTopic(topic);
 
-        Set<Topic> topics = new HashSet<Topic>();
+        Set<Topic> topics = new HashSet<>();
         topics.add(topic);
 
         // Add another topic
         Assignment assignment2 = new Assignment();
         assignment2.setAssignmentText("Read pages 645-785");
 
-        Set<Assignment> assignments2 = new HashSet<Assignment>();
+        Set<Assignment> assignments2 = new HashSet<>();
         assignments2.add(assignment2);
 
         SubTopic subTopic2 = new SubTopic();
         subTopic2.setSubtopicText("Forces");
 
-        Set<SubTopic> subTopics2 = new HashSet<SubTopic>();
+        Set<SubTopic> subTopics2 = new HashSet<>();
         subTopics2.add(subTopic2);
 
         Topic topic2 = new Topic();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TestMultForeignKeys.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TestMultForeignKeys.java
index e1ce8d96d..1bf968ce1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TestMultForeignKeys.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/foreign/keys/TestMultForeignKeys.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  * the type.
  */
 public class TestMultForeignKeys extends SQLListenerTestCase {
+    @Override
     public void setUp() {
         setUp(SimpleEntity.class,
             ContainsMultSimpleEntity.class,
@@ -96,7 +97,7 @@ public class TestMultForeignKeys extends SQLListenerTestCase {
         contMultSE.setSimpleEntity1(se1);
         contMultSE.setSimpleEntity2(se2);
 
-        Collection<ContainsMultSimpleEntity> contMultSEColl = new ArrayList<ContainsMultSimpleEntity>();
+        Collection<ContainsMultSimpleEntity> contMultSEColl = new ArrayList<>();
         contMultSEColl.add(contMultSE);
 
         TopLevel tl = new TopLevel();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/CustomSeq.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/CustomSeq.java
index ca20eae83..85ef9a327 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/CustomSeq.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/CustomSeq.java
@@ -26,22 +26,27 @@ public class CustomSeq implements Seq {
 
     private int i = 1;
 
+    @Override
     public void setType(int type) {
         if (type == Seq.TYPE_TRANSACTIONAL)
             throw new UnsupportedOperationException();
     }
 
+    @Override
     public Object next(StoreContext ctx, ClassMetaData cls) {
         return i++;
     }
 
+    @Override
     public Object current(StoreContext ctx, ClassMetaData cls) {
         return i;
     }
 
+    @Override
     public void allocate(int additional, StoreContext ctx, ClassMetaData cls) {
     }
 
+    @Override
     public void close() {
     }
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog1.java
index 6bf3a734c..e3ae64b59 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog1.java
@@ -18,14 +18,22 @@
  */
 package org.apache.openjpa.persistence.generationtype;
 
-import javax.persistence.*;
-import java.io.*;
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity(name = "Dog1")
 @Table(name = "DOGAUTO", schema = "SCHEMA1")
 public class Dog1 implements Serializable
 
 {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id2;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog2.java
index 2fd255507..9289d28ab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/Dog2.java
@@ -18,14 +18,22 @@
  */
 package org.apache.openjpa.persistence.generationtype;
 
-import javax.persistence.*;
-import java.io.*;
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity(name = "Dog2")
 @Table(name = "DOGAUTO", schema = "SCHEMA2")
 public class Dog2 implements Serializable
 
 {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id2;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable.java
index 2eee1da25..38572bba0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable.java
@@ -19,14 +19,23 @@
 package org.apache.openjpa.persistence.generationtype;
 
 
-import javax.persistence.*;
-import java.io.*;
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
 
 @Entity(name = "DogTable")
 @Table(name = "DOGTABLES", schema = "SCHEMA1")
 public class DogTable implements Serializable
 
 {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @TableGenerator(name = "Dog_Gen1", table = "ID_Gen1",
             pkColumnName = "GEN_NAME", valueColumnName = "GEN_VAL",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable2.java
index 5f0882eb9..b49e92f62 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable2.java
@@ -18,14 +18,23 @@
  */
 package org.apache.openjpa.persistence.generationtype;
 
-import java.io.*;
-import javax.persistence.*;
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
 
 @Entity(name = "DogTable2")
 @Table(name = "DOGTABLES", schema = "SCHEMA2")
 public class DogTable2 implements Serializable
 
 {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @TableGenerator(name = "Dog_Gen2", table = "ID_Gen2",
             pkColumnName = "GEN_NAME", valueColumnName = "GEN_VAL",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable3.java
index 33df77404..a4d85cc1e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable3.java
@@ -18,14 +18,23 @@
  */
 package org.apache.openjpa.persistence.generationtype;
 
-import java.io.*;
-import javax.persistence.*;
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
 
 @Entity(name = "DogTable3")
 @Table(name = "DOGTABLES", schema = "SCHEMA3")
 public class DogTable3 implements Serializable
 
 {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @TableGenerator(name = "Dog_Gen3", table = "ID_Gen3", schema="SCHEMA3G",
             pkColumnName = "GEN_NAME", valueColumnName = "GEN_VAL",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable4.java
index dbb90c842..a30fa590a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/DogTable4.java
@@ -18,14 +18,23 @@
  */
 package org.apache.openjpa.persistence.generationtype;
 
-import java.io.*;
-import javax.persistence.*;
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
 
 @Entity(name = "DogTable4")
 @Table(name = "DOGTABLES4")
 public class DogTable4 implements Serializable
 
 {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @TableGenerator(name = "Dog_Gen4", table = "ID_Gen4", schema="SCHEMA4G",
             pkColumnName = "GEN_NAME", valueColumnName = "GEN_VAL",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityWithGeneratedValueAndPostPersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityWithGeneratedValueAndPostPersist.java
index 5bab09df9..96ee70e89 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityWithGeneratedValueAndPostPersist.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/EntityWithGeneratedValueAndPostPersist.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.generationtype;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.PostPersist;
+import javax.persistence.Transient;
 
 @Entity
 public class EntityWithGeneratedValueAndPostPersist {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestEntityWithGeneratedValueAndPostPersist.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestEntityWithGeneratedValueAndPostPersist.java
index 386669b87..55c29ddf3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestEntityWithGeneratedValueAndPostPersist.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestEntityWithGeneratedValueAndPostPersist.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.generationtype;
 
-import javax.persistence.*;
+import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -33,12 +33,14 @@ public class TestEntityWithGeneratedValueAndPostPersist
 
     private int cache;
 
+    @Override
     public void setUp() {
         setUp(EntityWithGeneratedValueAndPostPersist.class, CLEAR_TABLES);
         cache = 0;
     }
 
     // satisfy the ValueCache interface
+    @Override
     public void setValue(int val) {
         cache = val;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestGeneratedValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestGeneratedValues.java
index 06fe1e081..6f806e36d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestGeneratedValues.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestGeneratedValues.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestGeneratedValues extends SingleEMFTestCase {
     DBDictionary _dict;
 
+    @Override
     public void setUp() {
         setUp(GeneratedValues.class, CLEAR_TABLES);
         _dict = ((JDBCConfiguration)emf.getConfiguration()).getDBDictionaryInstance();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java
index 1885a2bea..97c363d20 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java
@@ -43,6 +43,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestMultipleSchemaNames extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         // Need to skip tests on some databases.
         // See createSchemas() comment at the bottom
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGenerator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGenerator.java
index 88e58e7f3..10b3d947c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGenerator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGenerator.java
@@ -24,6 +24,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestTableGenerator extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Dog.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreaded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreaded.java
index fa7146823..675a8a59e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreaded.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreaded.java
@@ -36,6 +36,7 @@ public class TestTableGeneratorMultithreaded extends SingleEMFTestCase {
     public final int LOOPS = 100000;
     public final int THREADS = 5;
 
+    @Override
     public void setUp() {
         setUp(Dog.class, CLEAR_TABLES
         // , "openjpa.Log", "SQL=trace", "openjpa.ConnectionFactoryProperties","PrintParameters=true"
@@ -48,12 +49,13 @@ public class TestTableGeneratorMultithreaded extends SingleEMFTestCase {
 
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
 
     public void testAllIdsAreUsed() throws Exception {
-        List<WorkerThread> threads = new ArrayList<WorkerThread>();
+        List<WorkerThread> threads = new ArrayList<>();
         for (int i = 0; i < THREADS; i++) {
             threads.add(new WorkerThread(emf));
         }
@@ -81,6 +83,7 @@ public class TestTableGeneratorMultithreaded extends SingleEMFTestCase {
             _repo = emf.getConfiguration().getMetaDataRepositoryInstance();
         }
 
+        @Override
         public void run() {
             ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
             SequenceMetaData meta = _repo.getSequenceMetaData("Dog_Gen", contextLoader, true);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreadedInitialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreadedInitialization.java
index 87c0a0909..536c8c479 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreadedInitialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorMultithreadedInitialization.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
 public class TestTableGeneratorMultithreadedInitialization extends AbstractPersistenceTestCase {
     Object[] props = new Object[] { Dog.class, CLEAR_TABLES };
 
+    @Override
     public void setUp() throws Exception {
     }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
index c9841c796..ad3ba5b4e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestTableGeneratorUseSchemaNameProp.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  */
 public class TestTableGeneratorUseSchemaNameProp extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(Dog.class, "openjpa.jdbc.SchemaFactory",
             "native(ForeignKeys=true)", "openjpa.jdbc.DBDictionary",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/ValueCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/ValueCache.java
index 77ca65c2d..35d139a27 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/ValueCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/ValueCache.java
@@ -19,5 +19,5 @@
 package org.apache.openjpa.persistence.generationtype;
 
 public interface ValueCache {
-    public void setValue(int val);
+    void setValue(int val);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/City.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/City.java
index 3ec4982b0..90394a273 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/City.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/City.java
@@ -29,9 +29,9 @@ import javax.persistence.Id;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class City implements Serializable {
+    private static final long serialVersionUID = 1L;
     @Id
     private String name;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/Graph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/Graph.java
index 208022b93..6fbde8791 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/Graph.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/Graph.java
@@ -48,7 +48,7 @@ public interface Graph<E> extends Set<E> {
      *
      * @return a relation
      */
-    public <V1 extends E, V2 extends E> Relation<V1, V2> link(V1 source, V2 target);
+    <V1 extends E, V2 extends E> Relation<V1, V2> link(V1 source, V2 target);
 
     /**
      * Breaks the relation between the given pair of nodes.
@@ -61,7 +61,7 @@ public interface Graph<E> extends Set<E> {
      *
      * @return the existing relation, if any, that had been broken. null otherwise.
      */
-    public <V1 extends E, V2 extends E> Relation<V1, V2> delink(V1 source, V2 target);
+    <V1 extends E, V2 extends E> Relation<V1, V2> delink(V1 source, V2 target);
 
     /**
      * Gets the directed relation between the given pair of nodes, if exists.
@@ -74,14 +74,14 @@ public interface Graph<E> extends Set<E> {
      *
      * @return a relation between the nodes, if exists. null otherwise.
      */
-    public <V1 extends E, V2 extends E> Relation<V1, V2> getRelation(V1 source, V2 target);
+    <V1 extends E, V2 extends E> Relation<V1, V2> getRelation(V1 source, V2 target);
 
     /**
      * Gets the nodes that are directly reachable from the given source node.
      *
      * @return set of target nodes. Empty set if the given source node is not connected to any other nodes.
      */
-    public Set<E> getTargets(E source);
+    Set<E> getTargets(E source);
 
 
     /**
@@ -89,19 +89,19 @@ public interface Graph<E> extends Set<E> {
      *
      * @return set of source nodes. Empty set if the given target node is not connected from any node.
      */
-    public Set<E> getSources(E target);
+    Set<E> getSources(E target);
 
     /**
      * Gets all the relations originating from the given source.
      * @param <V>
      * @param source
      */
-    public <V extends E> Set<Relation<V,E>> getRelationsFrom(V source);
+    <V extends E> Set<Relation<V,E>> getRelationsFrom(V source);
 
     /**
      * Gets all the relations terminating on the given target.
      * @param <V>
      * @param target
      */
-    public <V extends E> Set<Relation<E,V>> getRelationsTo(V target);
+    <V extends E> Set<Relation<E,V>> getRelationsTo(V target);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/People.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/People.java
index 01a5d08d7..79bf9ad07 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/People.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/People.java
@@ -29,9 +29,9 @@ import javax.persistence.Id;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class People implements Serializable {
+    private static final long serialVersionUID = 1L;
     @Id
     private long ssn;
     private String name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentGraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentGraph.java
index da2902525..636894e83 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentGraph.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentGraph.java
@@ -39,10 +39,9 @@ import javax.persistence.MappedSuperclass;
  *
  * @param <E> type of element.
  */
-@SuppressWarnings("serial")
 @MappedSuperclass
 public abstract class PersistentGraph<E> extends AbstractGraph<E> implements Serializable {
-
+    private static final long serialVersionUID = 1L;
     @Id
     @GeneratedValue
     private long id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentRelation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentRelation.java
index 8696c82d6..2b530299f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentRelation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/PersistentRelation.java
@@ -50,9 +50,10 @@ import javax.persistence.OneToOne;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class PersistentRelation<V1,V2> implements Relation<V1,V2>, Serializable {
+    private static final long serialVersionUID = 1L;
+
     /**
      * Relation is a first class object with its own identifier.
      */
@@ -134,6 +135,7 @@ public class PersistentRelation<V1,V2> implements Relation<V1,V2>, Serializable
     /**
      * Gets the immutable source vertex.
      */
+    @Override
     public V1 getSource() {
         return source;
     }
@@ -141,6 +143,7 @@ public class PersistentRelation<V1,V2> implements Relation<V1,V2>, Serializable
     /**
      * Gets the immutable target vertex.
      */
+    @Override
     public V2 getTarget() {
         return target;
     }
@@ -148,6 +151,7 @@ public class PersistentRelation<V1,V2> implements Relation<V1,V2>, Serializable
     /**
      * Affirms if the given attribute is associated with this relation.
      */
+    @Override
     public boolean hasAttribute(String attr) {
         return attrs.containsKey(attr);
     }
@@ -158,10 +162,12 @@ public class PersistentRelation<V1,V2> implements Relation<V1,V2>, Serializable
      * @return value of the given attribute. A null value does not distinguish whether
      * the attribute was set to a null value or the attribute was absent.
      */
+    @Override
     public Object getAttribute(String attr) {
         return attrs.get(attr);
     }
 
+    @Override
     public Properties getAttributes() {
         return attrs;
     }
@@ -171,6 +177,7 @@ public class PersistentRelation<V1,V2> implements Relation<V1,V2>, Serializable
      *
      * @return the same relation for fluent method-chaining
      */
+    @Override
     public Relation<V1,V2> addAttribute(String attr, Object v) {
         attrs.put(attr, v);
         return this;
@@ -182,11 +189,13 @@ public class PersistentRelation<V1,V2> implements Relation<V1,V2>, Serializable
      * @return value of the given attribute that just has been removed. A null value does not
      * distinguish whether the attribute was set to a null value or the attribute was absent.
      */
+    @Override
     public Relation<V1,V2> removeAttribute(String attr) {
         attrs.remove(attr);
         return this;
     }
 
+    @Override
     public String toString() {
         return source + "->" + target;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/Relation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/Relation.java
index e40eda76d..eb17772ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/Relation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/Relation.java
@@ -45,7 +45,7 @@ public interface Relation<V1,V2> {
      *
      * @return a non-null source vertex.
      */
-    public V1 getSource();
+    V1 getSource();
 
     /**
      * Gets the immutable target vertex.
@@ -53,7 +53,7 @@ public interface Relation<V1,V2> {
      *
      * @return a target vertex. May be null.
      */
-    public V2 getTarget();
+    V2 getTarget();
 
 
     /**
@@ -61,13 +61,13 @@ public interface Relation<V1,V2> {
      *
      * @return the same relation for <em>fluent</em> method-chaining
      */
-    public Relation<V1,V2> addAttribute(String key, Object value);
+    Relation<V1,V2> addAttribute(String key, Object value);
 
     /**
      * Affirms if an attribute value has been associated with the given key.
      *
      */
-    public boolean hasAttribute(String key);
+    boolean hasAttribute(String key);
 
     /**
      * Gets the value of the given attribute.
@@ -77,17 +77,17 @@ public interface Relation<V1,V2> {
      *
      * @see #hasAttribute(String)
      */
-    public Object getAttribute(String key);
+    Object getAttribute(String key);
 
     /**
      * Removes the given attribute.
      *
      * @return the modified relation for <em>fluent</em> method chaining.
      */
-    public Relation<V1,V2> removeAttribute(String key);
+    Relation<V1,V2> removeAttribute(String key);
 
     /**
      * Gets the key-value pairs associated with this relation.
      */
-    public Properties getAttributes();
+    Properties getAttributes();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/RelationGraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/RelationGraph.java
index 0bbcc8261..83cce3b08 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/RelationGraph.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/RelationGraph.java
@@ -34,11 +34,11 @@ import javax.persistence.OneToMany;
  *
  */
 
-@SuppressWarnings("serial")
 @Entity
 public class RelationGraph<E> extends PersistentGraph<E>  {
+    private static final long serialVersionUID = 1L;
     @OneToMany(cascade={CascadeType.PERSIST,CascadeType.MERGE, CascadeType.DETACH, CascadeType.REFRESH})
-    private Set<PersistentRelation<E,E>> relations = new HashSet<PersistentRelation<E,E>>();
+    private Set<PersistentRelation<E,E>> relations = new HashSet<>();
 
     /*
      * Links the given vertices, unless they are already connected.
@@ -48,6 +48,7 @@ public class RelationGraph<E> extends PersistentGraph<E>  {
      *
      * @see org.apache.openjpa.persistence.graph.Graph#link(V1, V2)
      */
+    @Override
     public <V1 extends E,V2 extends E> Relation<V1,V2> link(V1 source, V2 target) {
         if (source == null)
             throw new NullPointerException("Can not link from a null source vertex");
@@ -56,7 +57,7 @@ public class RelationGraph<E> extends PersistentGraph<E>  {
 
         Relation<V1,V2> r = getRelation(source, target);
         if (r == null) {
-            r = new PersistentRelation<V1, V2>(source, target);
+            r = new PersistentRelation<>(source, target);
             relations.add((PersistentRelation<E, E>) r);
         }
         return r;
@@ -69,6 +70,7 @@ public class RelationGraph<E> extends PersistentGraph<E>  {
      *
      * @see org.apache.openjpa.persistence.graph.Graph#delink(V1, V2)
      */
+    @Override
     public <V1 extends E,V2 extends E> Relation<V1,V2> delink(V1 source, V2 target) {
         Relation<V1,V2> r = getRelation(source, target);
         if (r != null) {
@@ -83,6 +85,7 @@ public class RelationGraph<E> extends PersistentGraph<E>  {
      *
      * @see org.apache.openjpa.persistence.graph2.Graph#getRelation(V1, V2)
      */
+    @Override
     public <V1 extends E,V2 extends E> Relation<V1,V2> getRelation(V1 source, V2 target) {
         for (Relation<?,?> r : relations) {
             if (r.getSource().equals(source) && r.getTarget() != null && r.getTarget().equals(target)) {
@@ -95,16 +98,19 @@ public class RelationGraph<E> extends PersistentGraph<E>  {
     /**
      * Iterator over the nodes of this graph.
      */
+    @Override
     public Iterator<E> iterator() {
         return getNodes().iterator();
     }
 
+    @Override
     public int size() {
         return 0;
     }
 
+    @Override
     public <V extends E> Set<Relation<V, E>> getRelationsFrom(V source) {
-        Set<Relation<V,E>> rs = new HashSet<Relation<V,E>>();
+        Set<Relation<V,E>> rs = new HashSet<>();
         for (Relation<E,E> r : relations) {
             if (r.getSource().equals(source) && r.getTarget() != null)
                 rs.add((Relation<V,E>)r);
@@ -112,8 +118,9 @@ public class RelationGraph<E> extends PersistentGraph<E>  {
         return rs;
     }
 
+    @Override
     public <V extends E> Set<Relation<E, V>> getRelationsTo(V target) {
-        Set<Relation<E, V>> rs = new HashSet<Relation<E, V>>();
+        Set<Relation<E, V>> rs = new HashSet<>();
         for (Relation<?,?> r : relations) {
             if (r.getTarget() != null && r.getTarget().equals(target))
                 rs.add((Relation<E, V>)r);
@@ -121,8 +128,9 @@ public class RelationGraph<E> extends PersistentGraph<E>  {
         return rs;
     }
 
+    @Override
     public Set<E> getSources(Object target) {
-        Set<E> sources = new HashSet<E>();
+        Set<E> sources = new HashSet<>();
         for (Relation<E,E> r : relations) {
             if (r.getTarget() != null && r.getTarget().equals(target))
                 sources.add(r.getSource());
@@ -130,8 +138,9 @@ public class RelationGraph<E> extends PersistentGraph<E>  {
         return sources;
     }
 
+    @Override
     public Set<E> getTargets(Object source) {
-        Set<E> targets = new HashSet<E>();
+        Set<E> targets = new HashSet<>();
         for (Relation<E,E> r : relations) {
             if (r.getSource().equals(source) && r.getTarget() != null)
                 targets.add(r.getTarget());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/TestPersistentGraph.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/TestPersistentGraph.java
index 5ba059e02..2258f00d3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/TestPersistentGraph.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/graph/TestPersistentGraph.java
@@ -80,6 +80,7 @@ public class TestPersistentGraph extends SingleEMFTestCase {
     private EntityManager em;
     private PersistentGraph<Object> graph;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(CLEAR_TABLES, PersistentGraph.class, RelationGraph.class,
                 PersistentRelation.class, People.class, City.class);
@@ -343,7 +344,7 @@ public class TestPersistentGraph extends SingleEMFTestCase {
      * the actual values and relations set in in this method.
      */
     PersistentGraph<Object> createData() {
-        PersistentGraph<Object> graph = new RelationGraph<Object>();
+        PersistentGraph<Object> graph = new RelationGraph<>();
 
         em.getTransaction().begin();
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/TestHungarianNotationRemoval.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/TestHungarianNotationRemoval.java
index c409f6afb..82e9e0933 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/TestHungarianNotationRemoval.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/hugariannotation/TestHungarianNotationRemoval.java
@@ -31,6 +31,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestHungarianNotationRemoval extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(HungarianNotationFieldDuplicates.class,
             HungarianNotationFields.class, OtherClass.class, CLEAR_TABLES,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigIntegerIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigIntegerIdEntity.java
index 3d103fe43..ec95f3706 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigIntegerIdEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLBigIntegerIdEntity.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.identity;
 
 import java.math.BigInteger;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLDateIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLDateIdEntity.java
index 304c88902..167e78ecd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLDateIdEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/SQLDateIdEntity.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.identity;
 
 import java.sql.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestCompundIdWithNull.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestCompundIdWithNull.java
index 269ac6f43..8eac2b759 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestCompundIdWithNull.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestCompundIdWithNull.java
@@ -47,6 +47,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestCompundIdWithNull extends SingleEMFTestCase {
     private static boolean tablesCreated = false;
 
+    @Override
     public void setUp() throws Exception {
         // Only run on Derby because we use DDL specific to Derby
         setSupportedDatabases(
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestFloatingPointIds.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestFloatingPointIds.java
index e2101ba1f..ef80c1ff4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestFloatingPointIds.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestFloatingPointIds.java
@@ -20,9 +20,10 @@ package org.apache.openjpa.persistence.identity;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that entities can use floating point ids.
  *
@@ -31,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestFloatingPointIds
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(FloatIdEntity.class, DoubleObjIdEntity.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java
index 293d9607e..5262cbdd4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java
@@ -24,12 +24,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
-
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Simple test case to test the GenerationType for
  * {@link javax.persistence.Id}.
@@ -42,6 +42,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestGenerationType
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         if (getName().endsWith("WithoutGetGeneratedKeys")) {
             setUp(IdentityGenerationType.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java
index 416448658..93c73c633 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java
@@ -22,17 +22,18 @@ import java.math.BigDecimal;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
-
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * @author <a href="mailto:mnachev@gmail.com">Miroslav Nachev</a>
  */
 public class TestSQLBigDecimalId
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SQLBigDecimalIdEntity.class, DROP_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigIntegerId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigIntegerId.java
index 4e89dd693..9f7e40ac4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigIntegerId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigIntegerId.java
@@ -20,17 +20,20 @@ package org.apache.openjpa.persistence.identity;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * @author <a href="mailto:mnachev@gmail.com">Miroslav Nachev</a>
  */
 public class TestSQLBigIntegerId
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SQLBigIntegerIdEntity.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLDateId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLDateId.java
index 633e993e5..ab021927e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLDateId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLDateId.java
@@ -19,11 +19,13 @@
 package org.apache.openjpa.persistence.identity;
 
 import java.sql.Date;
+
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that entities can use SQL dates as identity values.
  *
@@ -32,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestSQLDateId
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SQLDateIdEntity.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountGroup.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountGroup.java
index 22bd47ec2..07891c4bf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountGroup.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountGroup.java
@@ -37,7 +37,7 @@ public class AccountGroup {
     private Set<Account> accountSet;
 
     public AccountGroup() {
-        accountSet = new java.util.HashSet<Account>();
+        accountSet = new java.util.HashSet<>();
     }
 
     public Integer getId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountId.java
index a5baa9e97..b8ca20906 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/AccountId.java
@@ -56,6 +56,7 @@ public class AccountId implements java.io.Serializable {
         this.accountHolder = accountHolder;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == this) {
             return true;
@@ -73,6 +74,7 @@ public class AccountId implements java.io.Serializable {
         return false;
     }
 
+    @Override
     public int hashCode() {
         if (hashcode == null) {
             String hashStr = this.groupId + ":" + this.accountHolder + ":" + this.accountId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/TestEntityAsIdentityFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/TestEntityAsIdentityFields.java
index 724d0f051..deb0ef506 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/TestEntityAsIdentityFields.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity/TestEntityAsIdentityFields.java
@@ -27,6 +27,7 @@ import javax.persistence.Query;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestEntityAsIdentityFields extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp( CLEAR_TABLES,
                 Account.class, AccountGroup.class, Person.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Attendance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Attendance.java
index b1d64cb11..4c9ac7636 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Attendance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/Attendance.java
@@ -41,14 +41,17 @@ public class Attendance {
             this.course = courseId;
         }
 
+        @Override
         public String toString() {
             return student + ":" + course;
         }
 
+        @Override
         public int hashCode() {
             return (17 + student) * 37 + course;
         }
 
+        @Override
         public boolean equals(Object other) {
             return this == other
                 || other instanceof AttendanceId
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/TestEntityAsIdentityFields2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/TestEntityAsIdentityFields2.java
index fcc1d6828..591eef8ef 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/TestEntityAsIdentityFields2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/entityasidentity2/TestEntityAsIdentityFields2.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestEntityAsIdentityFields2 extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Attendance.class, Course.class, Person.class, Student.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java
index 01a08670b..e1c2cac37 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestDefaultInheritanceStrategy.java
@@ -35,6 +35,7 @@ import org.apache.openjpa.persistence.inheritance.entity.BaseClass3;
 import org.apache.openjpa.persistence.inheritance.entity.BaseClass4;
 import org.apache.openjpa.persistence.inheritance.entity.BaseClass5;
 import org.apache.openjpa.persistence.inheritance.entity.BaseClass6;
+import org.apache.openjpa.persistence.inheritance.entity.ImplClassA;
 import org.apache.openjpa.persistence.inheritance.entity.ManagedIface;
 import org.apache.openjpa.persistence.inheritance.entity.ManagedIface2;
 import org.apache.openjpa.persistence.inheritance.entity.MappedSuper;
@@ -46,7 +47,6 @@ import org.apache.openjpa.persistence.inheritance.entity.SubclassB;
 import org.apache.openjpa.persistence.inheritance.entity.SubclassC;
 import org.apache.openjpa.persistence.inheritance.entity.SubclassD;
 import org.apache.openjpa.persistence.inheritance.entity.SubclassE;
-import org.apache.openjpa.persistence.inheritance.entity.ImplClassA;
 import org.apache.openjpa.persistence.inheritance.entity.SubclassF;
 import org.apache.openjpa.persistence.inheritance.entity.SubclassG;
 import org.apache.openjpa.persistence.inheritance.entity.SubclassH;
@@ -68,6 +68,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestDefaultInheritanceStrategy
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(BaseClass.class, SubclassA.class, SubclassB.class,
             SubclassC.class, MappedSuper.class, SubclassD.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java
index 86f4b0960..88066e30a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestFindAbstractClass.java
@@ -22,9 +22,10 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that you can find a concrete subclass record when passing in its
  * abstract base class to EntityManager.find().
@@ -34,6 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestFindAbstractClass
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AbstractBase.class, ConcreteSubclass.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestIdentityWithSingleTableStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestIdentityWithSingleTableStrategy.java
index 6b128e621..cb7578b77 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestIdentityWithSingleTableStrategy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestIdentityWithSingleTableStrategy.java
@@ -42,7 +42,8 @@ public class TestIdentityWithSingleTableStrategy extends SingleEMFTestCase {
 	private Admin admin;
 	private RegularUser user;
 
-	public void setUp() {
+	@Override
+    public void setUp() {
 		super.setUp(CLEAR_TABLES, Admin.class, RegularUser.class,
 				ComputerUser.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestInheritanceWithMSCID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestInheritanceWithMSCID.java
index 86e48325a..1fba4bc9a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestInheritanceWithMSCID.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestInheritanceWithMSCID.java
@@ -31,6 +31,7 @@ import org.apache.openjpa.persistence.inheritance.entities.testinterfaces.
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestInheritanceWithMSCID extends SingleEMFTestCase {
+    @Override
     @SuppressWarnings("unchecked")
     public void setUp() {
         /*
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java
index 70dc764d3..238503d48 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java
@@ -23,8 +23,8 @@ import javax.persistence.EntityManager;
 import org.apache.openjpa.persistence.inheritance.entity.Department;
 import org.apache.openjpa.persistence.inheritance.entity.Employee;
 import org.apache.openjpa.persistence.inheritance.entity.FTEmployee;
-import org.apache.openjpa.persistence.inheritance.entity.PTEmployee;
 import org.apache.openjpa.persistence.inheritance.entity.Manager;
+import org.apache.openjpa.persistence.inheritance.entity.PTEmployee;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 /**
@@ -39,7 +39,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestJoinTableStrategy extends SingleEMFTestCase {
 
-	public void setUp() {
+	@Override
+    public void setUp() {
 		super.setUp(CLEAR_TABLES, Department.class, Employee.class,
 				PTEmployee.class, FTEmployee.class, Manager.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java
index 524e85d5c..fd3cc7669 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMappedSuperclass.java
@@ -34,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  *
  */
 public class TestMappedSuperclass extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(BaseClass.class, SubclassC.class, MappedSuper.class,
                 SubclassD.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java
index f37f14108..f9dfc2bed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestMultipleMappedSuperclassHierarchy.java
@@ -20,9 +20,10 @@ package org.apache.openjpa.persistence.inheritance;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Perform basic operations on an inheritance hierarchy involving multiple
  * @MappedSuperclasses.
@@ -32,6 +33,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestMultipleMappedSuperclassHierarchy
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(MappedSuperclassBase.class, MappedSuperclassL2.class,
             EntityL3.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedMappedSuperclassIdValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedMappedSuperclassIdValue.java
index 7fb5c017d..0672d20eb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedMappedSuperclassIdValue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedMappedSuperclassIdValue.java
@@ -20,9 +20,10 @@ package org.apache.openjpa.persistence.inheritance;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that sibling classes with a shared id value declared in their
  * mapped superclass are distinguished correctly.
@@ -32,6 +33,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestSharedMappedSuperclassIdValue
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, NoGenMappedSuperclassBase.class,
                 NoGenMappedSuperclassL2.class, NoGenEntityL3.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedUnqualifiedClassNames.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedUnqualifiedClassNames.java
index 0e2a5522c..1b196acdf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedUnqualifiedClassNames.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestSharedUnqualifiedClassNames.java
@@ -37,6 +37,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestSharedUnqualifiedClassNames
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(org.apache.openjpa.persistence.inheritance.mappedsuperclass
                 .SharedName1.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/RelationOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/RelationOwner.java
index b168ac32e..f15ddb42e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/RelationOwner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/RelationOwner.java
@@ -18,8 +18,16 @@
  */
 package org.apache.openjpa.persistence.inheritance.abstractjoinedappid;
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
 
@@ -28,7 +36,7 @@ import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
 public class RelationOwner {
 
 	private Integer id;
-	private Collection<Superclass> supers = new ArrayList<Superclass>();
+	private Collection<Superclass> supers = new ArrayList<>();
 
 	@Id
 	@Column(name="ID")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/SubID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/SubID.java
index 13437094f..4ac779e42 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/SubID.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/SubID.java
@@ -20,4 +20,7 @@ package org.apache.openjpa.persistence.inheritance.abstractjoinedappid;
 
 public class SubID extends SuperID {
 
+    
+    private static final long serialVersionUID = 1L;
+
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Subclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Subclass.java
index fb18c828d..63d9005ac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Subclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Subclass.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.inheritance.abstractjoinedappid;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.IdClass;
+import javax.persistence.Table;
 
 @Entity
 @IdClass(SubID.class)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/SuperID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/SuperID.java
index e6a251deb..94091e888 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/SuperID.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/SuperID.java
@@ -22,16 +22,20 @@ import java.io.Serializable;
 
 public abstract class SuperID implements Serializable {
 
-	private Integer id;
+	
+    private static final long serialVersionUID = 1L;
+    private Integer id;
 
 	public Integer getId() { return id; }
 	public void setId(Integer id) {	this.id = id; }
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		return id;
 	}
 
-	public boolean equals(Object obj) {
+	@Override
+    public boolean equals(Object obj) {
 		if (obj == this) return true;
 		if (!(obj instanceof SuperID)) return false;
 		SuperID pk = (SuperID) obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Superclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Superclass.java
index 689730627..0e3dca4ab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Superclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/Superclass.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.inheritance.abstractjoinedappid;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
 
 @Entity
 @IdClass(SuperID.class)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
index 6c00a5384..0bfa25f52 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
@@ -24,9 +24,10 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that you traverse an inverse key-baesd relation to an abstract
  * class using joined inheritance.
@@ -34,6 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestAbstractJoinedAppId
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Superclass.class, Subclass.class, RelationOwner.class,
             DROP_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
index 807db4f9c..ab66a57ee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/EntityMapping.java
@@ -98,46 +98,55 @@ public class EntityMapping {
         // Primitive Identity defined on a Mapped Superclass,
         // Joined Table Entity Inheritance, Integer Discriminator
         PIdJTIDMSCRootEntity {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCRootEntity.class;
             }
         },
         PIdJTIDMSCLeafA {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCLeafA.class;
             }
         },
         PIdJTIDMSCEntityB {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCEntityB.class;
             }
         },
         PIdJTIDMSCLeafB1 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCLeafB1.class;
             }
         },
         PIdJTIDMSCLeafB2 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCLeafB2.class;
             }
         },
         PIdJTIDMSCLeafC {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCLeafC.class;
             }
         },
         PIdJTIDMSCEntityD {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCEntityD.class;
             }
         },
         PIdJTIDMSCLeafD1 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCLeafD1.class;
             }
         },
         PIdJTIDMSCLeafD2 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCLeafD2.class;
             }
@@ -146,46 +155,55 @@ public class EntityMapping {
         // Primitive Identity defined on a Mapped Superclass,
         // Joined Table Entity Inheritance, Char Discriminator
         PIdJTCDMSCRootEntity {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCRootEntity.class;
             }
         },
         PIdJTCDMSCLeafA {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCLeafA.class;
             }
         },
         PIdJTCDMSCEntityB {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCEntityB.class;
             }
         },
         PIdJTCDMSCLeafB1 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCLeafB1.class;
             }
         },
         PIdJTCDMSCLeafB2 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCLeafB2.class;
             }
         },
         PIdJTCDMSCLeafC {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCLeafC.class;
             }
         },
         PIdJTCDMSCEntityD {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCEntityD.class;
             }
         },
         PIdJTCDMSCLeafD1 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCLeafD1.class;
             }
         },
         PIdJTCDMSCLeafD2 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCLeafD2.class;
             }
@@ -194,46 +212,55 @@ public class EntityMapping {
         // Primitive Identity defined on a Mapped Superclass,
         // Joined Table Entity Inheritance, String Discriminator
         PIdJTSDMSCRootEntity {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCRootEntity.class;
             }
         },
         PIdJTSDMSCLeafA {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCLeafA.class;
             }
         },
         PIdJTSDMSCEntityB {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCEntityB.class;
             }
         },
         PIdJTSDMSCLeafB1 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCLeafB1.class;
             }
         },
         PIdJTSDMSCLeafB2 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCLeafB2.class;
             }
         },
         PIdJTSDMSCLeafC {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCLeafC.class;
             }
         },
         PIdJTSDMSCEntityD {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCEntityD.class;
             }
         },
         PIdJTSDMSCLeafD1 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCLeafD1.class;
             }
         },
         PIdJTSDMSCLeafD2 {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCLeafD2.class;
             }
@@ -247,46 +274,55 @@ public class EntityMapping {
         // Primitive Identity defined on a Mapped Superclass,
         // Single Table Entity Inheritance, Integer Discriminator
         PIdSTIDMSCRootEntity {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCRootEntity.class;
             }
         },
         PIdSTIDMSCLeafA {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCLeafA.class;
             }
         },
         PIdSTIDMSCEntityB {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCEntityB.class;
             }
         },
         PIdSTIDMSCLeafB1 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCLeafB1.class;
             }
         },
         PIdSTIDMSCLeafB2 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCLeafB2.class;
             }
         },
         PIdSTIDMSCLeafC {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCLeafC.class;
             }
         },
         PIdSTIDMSCEntityD {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCEntityD.class;
             }
         },
         PIdSTIDMSCLeafD1 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCLeafD1.class;
             }
         },
         PIdSTIDMSCLeafD2 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCLeafD2.class;
             }
@@ -295,46 +331,55 @@ public class EntityMapping {
         // Primitive Identity defined on a Mapped Superclass,
         // Single Table Entity Inheritance, Char Discriminator
         PIdSTCDMSCRootEntity {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCRootEntity.class;
             }
         },
         PIdSTCDMSCLeafA {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCLeafA.class;
             }
         },
         PIdSTCDMSCEntityB {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCEntityB.class;
             }
         },
         PIdSTCDMSCLeafB1 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCLeafB1.class;
             }
         },
         PIdSTCDMSCLeafB2 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCLeafB2.class;
             }
         },
         PIdSTCDMSCLeafC {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCLeafC.class;
             }
         },
         PIdSTCDMSCEntityD {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCEntityD.class;
             }
         },
         PIdSTCDMSCLeafD1 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCLeafD1.class;
             }
         },
         PIdSTCDMSCLeafD2 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCLeafD2.class;
             }
@@ -343,46 +388,55 @@ public class EntityMapping {
         // Primitive Identity defined on a Mapped Superclass,
         // Single Table Entity Inheritance, String Discriminator
         PIdSTSDMSCRootEntity {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCRootEntity.class;
             }
         },
         PIdSTSDMSCLeafA {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCLeafA.class;
             }
         },
         PIdSTSDMSCEntityB {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCEntityB.class;
             }
         },
         PIdSTSDMSCLeafB1 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCLeafB1.class;
             }
         },
         PIdSTSDMSCLeafB2 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCLeafB2.class;
             }
         },
         PIdSTSDMSCLeafC {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCLeafC.class;
             }
         },
         PIdSTSDMSCEntityD {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCEntityD.class;
             }
         },
         PIdSTSDMSCLeafD1 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCLeafD1.class;
             }
         },
         PIdSTSDMSCLeafD2 {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCLeafD2.class;
             }
@@ -393,36 +447,43 @@ public class EntityMapping {
          * Non Entity PC-Aware Types
          */
         PrimitiveIDMappedSuperclass {
+            @Override
             public Class getEntityClass() {
                 return PrimitiveIDMappedSuperclass.class;
             }
         },
         PIdJTIDMSCMappedSuperclass {
+            @Override
             public Class getEntityClass() {
                 return PIdJTIDMSCMappedSuperclass.class;
             }
         },
         PIdJTICMSCMappedSuperclass {
+            @Override
             public Class getEntityClass() {
                 return PIdJTCDMSCMappedSuperclass.class;
             }
         },
         PIdJTISMSCMappedSuperclass {
+            @Override
             public Class getEntityClass() {
                 return PIdJTSDMSCMappedSuperclass.class;
             }
         },
         PIdSTIDMSCMappedSuperclass {
+            @Override
             public Class getEntityClass() {
                 return PIdSTIDMSCMappedSuperclass.class;
             }
         },
         PIdSTICMSCMappedSuperclass {
+            @Override
             public Class getEntityClass() {
                 return PIdSTCDMSCMappedSuperclass.class;
             }
         },
         PIdSTISMSCMappedSuperclass {
+            @Override
             public Class getEntityClass() {
                 return PIdSTSDMSCMappedSuperclass.class;
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java
index b85a50786..15cdb12a0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityB.java
@@ -31,9 +31,11 @@ public class PIdJTCDMSCEntityB
 extends PIdJTCDMSCRootEntity implements EntityB {
     private String entityBData;
 
+    @Override
     public String getEntityBData() {
         return entityBData;
     }
+    @Override
     public void setEntityBData(String entityBData) {
         this.entityBData = entityBData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java
index 800474cdd..9a77e8ec9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCEntityD.java
@@ -30,9 +30,11 @@ public class PIdJTCDMSCEntityD
 extends PIdJTCDMSCMappedSuperclass implements EntityD {
 private String entityDData;
 
+    @Override
     public String getEntityDData() {
         return entityDData;
     }
+    @Override
     public void setEntityDData(String entityDData) {
         this.entityDData = entityDData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java
index 91f19a5c7..4615cda7a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafA.java
@@ -30,11 +30,13 @@ public class PIdJTCDMSCLeafA
 extends PIdJTCDMSCRootEntity implements LeafA {
     private String leafAData;
 
+    @Override
     public String getLeafAData()
     {
         return leafAData;
     }
 
+    @Override
     public void setLeafAData(String leafAData) {
         this.leafAData = leafAData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java
index 36ec43071..6271cddd7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB1.java
@@ -31,9 +31,11 @@ public class PIdJTCDMSCLeafB1
 extends PIdJTCDMSCEntityB implements LeafB1 {
     private String leafB1Data;
 
+    @Override
     public String getLeafB1Data() {
         return leafB1Data;
     }
+    @Override
     public void setLeafB1Data(String leafB1Data) {
         this.leafB1Data = leafB1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java
index 47da8b071..5fad69ddb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafB2.java
@@ -31,9 +31,11 @@ public class PIdJTCDMSCLeafB2
 extends PIdJTCDMSCEntityB implements LeafB2 {
 private String leafB2Data;
 
+    @Override
     public String getLeafB2Data() {
         return leafB2Data;
     }
+    @Override
     public void setLeafB2Data(String leafB2Data) {
         this.leafB2Data = leafB2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java
index 1c295e94e..f23ffb6ec 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafC.java
@@ -30,11 +30,13 @@ public class PIdJTCDMSCLeafC
 extends PIdJTCDMSCMappedSuperclass implements LeafC {
     private String leafCData;
 
+    @Override
     public String getLeafCData()
     {
         return leafCData;
     }
 
+    @Override
     public void setLeafCData(String leafCData) {
         this.leafCData = leafCData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java
index 9d3e6ee8b..9b97efd13 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD1.java
@@ -31,9 +31,11 @@ public class PIdJTCDMSCLeafD1
 extends PIdJTCDMSCEntityD implements LeafD1 {
     private String leafD1Data;
 
+    @Override
     public String getLeafD1Data() {
         return leafD1Data;
     }
+    @Override
     public void setLeafD1Data(String leafD1Data) {
         this.leafD1Data = leafD1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java
index 7fb7fb17b..bd023574c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCLeafD2.java
@@ -31,9 +31,11 @@ public class PIdJTCDMSCLeafD2
 extends PIdJTCDMSCEntityD implements LeafD2 {
     private String leafD2Data;
 
+    @Override
     public String getLeafD2Data() {
         return leafD2Data;
     }
+    @Override
     public void setLeafD2Data(String leafD2Data) {
         this.leafD2Data = leafD2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java
index 1b0a529e5..980689942 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCMappedSuperclass.java
@@ -28,10 +28,12 @@ public class PIdJTCDMSCMappedSuperclass
 extends PIdJTCDMSCRootEntity implements MSC {
     private String mappedSuperclassData;
 
+    @Override
     public String getMappedSuperclassData() {
         return mappedSuperclassData;
     }
 
+    @Override
     public void setMappedSuperclassData(String mappedSuperclassData) {
         this.mappedSuperclassData = mappedSuperclassData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java
index 978ce75e9..c79a4bf88 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/chardiscriminator/PIdJTCDMSCRootEntity.java
@@ -38,9 +38,11 @@ public class PIdJTCDMSCRootEntity
     extends PrimitiveIDMappedSuperclass implements RootEntity {
     private String rootEntityData;
 
+    @Override
     public String getRootEntityData() {
         return rootEntityData;
     }
+    @Override
     public void setRootEntityData(String rootEntityData) {
         this.rootEntityData = rootEntityData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java
index 22bdd52a5..45e45ac17 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityB.java
@@ -31,9 +31,11 @@ public class PIdJTIDMSCEntityB
 extends PIdJTIDMSCRootEntity implements EntityB {
     private String entityBData;
 
+    @Override
     public String getEntityBData() {
         return entityBData;
     }
+    @Override
     public void setEntityBData(String entityBData) {
         this.entityBData = entityBData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java
index 76cf25a00..92a3ee3cd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCEntityD.java
@@ -30,9 +30,11 @@ public class PIdJTIDMSCEntityD
 extends PIdJTIDMSCMappedSuperclass implements EntityD {
 private String entityDData;
 
+    @Override
     public String getEntityDData() {
         return entityDData;
     }
+    @Override
     public void setEntityDData(String entityDData) {
         this.entityDData = entityDData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java
index 1a3bfc71d..3965bf0ac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafA.java
@@ -30,11 +30,13 @@ public class PIdJTIDMSCLeafA
 extends PIdJTIDMSCRootEntity implements LeafA {
     private String leafAData;
 
+    @Override
     public String getLeafAData()
     {
         return leafAData;
     }
 
+    @Override
     public void setLeafAData(String leafAData) {
         this.leafAData = leafAData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java
index 9e8c3136d..2e84b47b0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB1.java
@@ -31,9 +31,11 @@ public class PIdJTIDMSCLeafB1
 extends PIdJTIDMSCEntityB implements LeafB1 {
     private String leafB1Data;
 
+    @Override
     public String getLeafB1Data() {
         return leafB1Data;
     }
+    @Override
     public void setLeafB1Data(String leafB1Data) {
         this.leafB1Data = leafB1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java
index b5faf36c9..2c6eaa2e5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafB2.java
@@ -31,9 +31,11 @@ public class PIdJTIDMSCLeafB2
 extends PIdJTIDMSCEntityB implements LeafB2 {
 private String leafB2Data;
 
+    @Override
     public String getLeafB2Data() {
         return leafB2Data;
     }
+    @Override
     public void setLeafB2Data(String leafB2Data) {
         this.leafB2Data = leafB2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java
index 5ab95d2e6..7649ccc83 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafC.java
@@ -30,11 +30,13 @@ public class PIdJTIDMSCLeafC
 extends PIdJTIDMSCMappedSuperclass implements LeafC {
     private String leafCData;
 
+    @Override
     public String getLeafCData()
     {
         return leafCData;
     }
 
+    @Override
     public void setLeafCData(String leafCData) {
         this.leafCData = leafCData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java
index bd9ed7768..38d969245 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD1.java
@@ -31,9 +31,11 @@ public class PIdJTIDMSCLeafD1
 extends PIdJTIDMSCEntityD implements LeafD1 {
     private String leafD1Data;
 
+    @Override
     public String getLeafD1Data() {
         return leafD1Data;
     }
+    @Override
     public void setLeafD1Data(String leafD1Data) {
         this.leafD1Data = leafD1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java
index f673b6004..1f9db74c1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCLeafD2.java
@@ -31,9 +31,11 @@ public class PIdJTIDMSCLeafD2
 extends PIdJTIDMSCEntityD implements LeafD2 {
     private String leafD2Data;
 
+    @Override
     public String getLeafD2Data() {
         return leafD2Data;
     }
+    @Override
     public void setLeafD2Data(String leafD2Data) {
         this.leafD2Data = leafD2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java
index e92638c2d..35fc1fe5c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCMappedSuperclass.java
@@ -28,10 +28,12 @@ public class PIdJTIDMSCMappedSuperclass
 extends PIdJTIDMSCRootEntity implements MSC {
     private String mappedSuperclassData;
 
+    @Override
     public String getMappedSuperclassData() {
         return mappedSuperclassData;
     }
 
+    @Override
     public void setMappedSuperclassData(String mappedSuperclassData) {
         this.mappedSuperclassData = mappedSuperclassData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java
index d6c473d72..42cffeaa1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/intdiscriminator/PIdJTIDMSCRootEntity.java
@@ -38,9 +38,11 @@ public class PIdJTIDMSCRootEntity
     extends PrimitiveIDMappedSuperclass implements RootEntity {
     private String rootEntityData;
 
+    @Override
     public String getRootEntityData() {
         return rootEntityData;
     }
+    @Override
     public void setRootEntityData(String rootEntityData) {
         this.rootEntityData = rootEntityData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java
index 3275e50db..24d7d0e5b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityB.java
@@ -31,9 +31,11 @@ public class PIdJTSDMSCEntityB
 extends PIdJTSDMSCRootEntity implements EntityB {
     private String entityBData;
 
+    @Override
     public String getEntityBData() {
         return entityBData;
     }
+    @Override
     public void setEntityBData(String entityBData) {
         this.entityBData = entityBData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java
index aa9fc8a2c..24519a018 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCEntityD.java
@@ -30,9 +30,11 @@ public class PIdJTSDMSCEntityD
 extends PIdJTSDMSCMappedSuperclass implements EntityD {
 private String entityDData;
 
+    @Override
     public String getEntityDData() {
         return entityDData;
     }
+    @Override
     public void setEntityDData(String entityDData) {
         this.entityDData = entityDData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java
index 4e76e89a5..ff659a9b0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafA.java
@@ -30,11 +30,13 @@ public class PIdJTSDMSCLeafA
 extends PIdJTSDMSCRootEntity implements LeafA {
     private String leafAData;
 
+    @Override
     public String getLeafAData()
     {
         return leafAData;
     }
 
+    @Override
     public void setLeafAData(String leafAData) {
         this.leafAData = leafAData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java
index adfd90195..5e0075122 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB1.java
@@ -31,9 +31,11 @@ public class PIdJTSDMSCLeafB1
 extends PIdJTSDMSCEntityB implements LeafB1 {
     private String leafB1Data;
 
+    @Override
     public String getLeafB1Data() {
         return leafB1Data;
     }
+    @Override
     public void setLeafB1Data(String leafB1Data) {
         this.leafB1Data = leafB1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java
index cd0681563..0c4c5958f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafB2.java
@@ -31,9 +31,11 @@ public class PIdJTSDMSCLeafB2
 extends PIdJTSDMSCEntityB implements LeafB2 {
 private String leafB2Data;
 
+    @Override
     public String getLeafB2Data() {
         return leafB2Data;
     }
+    @Override
     public void setLeafB2Data(String leafB2Data) {
         this.leafB2Data = leafB2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java
index d5edd3d95..2439d659f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafC.java
@@ -30,11 +30,13 @@ public class PIdJTSDMSCLeafC
 extends PIdJTSDMSCMappedSuperclass implements LeafC {
     private String leafCData;
 
+    @Override
     public String getLeafCData()
     {
         return leafCData;
     }
 
+    @Override
     public void setLeafCData(String leafCData) {
         this.leafCData = leafCData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java
index 03ab36e8e..b78435ed7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD1.java
@@ -31,9 +31,11 @@ public class PIdJTSDMSCLeafD1
 extends PIdJTSDMSCEntityD implements LeafD1 {
     private String leafD1Data;
 
+    @Override
     public String getLeafD1Data() {
         return leafD1Data;
     }
+    @Override
     public void setLeafD1Data(String leafD1Data) {
         this.leafD1Data = leafD1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java
index 5afc79885..c7963320e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCLeafD2.java
@@ -31,9 +31,11 @@ public class PIdJTSDMSCLeafD2
 extends PIdJTSDMSCEntityD implements LeafD2 {
     private String leafD2Data;
 
+    @Override
     public String getLeafD2Data() {
         return leafD2Data;
     }
+    @Override
     public void setLeafD2Data(String leafD2Data) {
         this.leafD2Data = leafD2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java
index 3458a99eb..653796944 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCMappedSuperclass.java
@@ -28,10 +28,12 @@ public class PIdJTSDMSCMappedSuperclass
 extends PIdJTSDMSCRootEntity implements MSC {
     private String mappedSuperclassData;
 
+    @Override
     public String getMappedSuperclassData() {
         return mappedSuperclassData;
     }
 
+    @Override
     public void setMappedSuperclassData(String mappedSuperclassData) {
         this.mappedSuperclassData = mappedSuperclassData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java
index 37a6135dd..6e63af4df 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/jointable/stringdiscriminator/PIdJTSDMSCRootEntity.java
@@ -38,9 +38,11 @@ public class PIdJTSDMSCRootEntity
     extends PrimitiveIDMappedSuperclass implements RootEntity {
     private String rootEntityData;
 
+    @Override
     public String getRootEntityData() {
         return rootEntityData;
     }
+    @Override
     public void setRootEntityData(String rootEntityData) {
         this.rootEntityData = rootEntityData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java
index f26af3783..36adc7163 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityB.java
@@ -31,9 +31,11 @@ public class PIdSTCDMSCEntityB
 extends PIdSTCDMSCRootEntity implements EntityB {
     private String entityBData;
 
+    @Override
     public String getEntityBData() {
         return entityBData;
     }
+    @Override
     public void setEntityBData(String entityBData) {
         this.entityBData = entityBData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java
index 86062ec22..c57e48019 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCEntityD.java
@@ -30,9 +30,11 @@ public class PIdSTCDMSCEntityD
 extends PIdSTCDMSCMappedSuperclass implements EntityD {
 private String entityDData;
 
+    @Override
     public String getEntityDData() {
         return entityDData;
     }
+    @Override
     public void setEntityDData(String entityDData) {
         this.entityDData = entityDData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java
index 48824ec88..802a2cf09 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafA.java
@@ -30,11 +30,13 @@ public class PIdSTCDMSCLeafA
 extends PIdSTCDMSCRootEntity implements LeafA {
     private String leafAData;
 
+    @Override
     public String getLeafAData()
     {
         return leafAData;
     }
 
+    @Override
     public void setLeafAData(String leafAData) {
         this.leafAData = leafAData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java
index 71dc9b145..82d5bd8f8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB1.java
@@ -31,9 +31,11 @@ public class PIdSTCDMSCLeafB1
 extends PIdSTCDMSCEntityB implements LeafB1 {
     private String leafB1Data;
 
+    @Override
     public String getLeafB1Data() {
         return leafB1Data;
     }
+    @Override
     public void setLeafB1Data(String leafB1Data) {
         this.leafB1Data = leafB1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java
index 4dcd1575e..4e04227cd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafB2.java
@@ -31,9 +31,11 @@ public class PIdSTCDMSCLeafB2
 extends PIdSTCDMSCEntityB implements LeafB2 {
 private String leafB2Data;
 
+    @Override
     public String getLeafB2Data() {
         return leafB2Data;
     }
+    @Override
     public void setLeafB2Data(String leafB2Data) {
         this.leafB2Data = leafB2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java
index d498da2da..cc886810d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafC.java
@@ -30,11 +30,13 @@ public class PIdSTCDMSCLeafC
 extends PIdSTCDMSCMappedSuperclass implements LeafC {
     private String leafCData;
 
+    @Override
     public String getLeafCData()
     {
         return leafCData;
     }
 
+    @Override
     public void setLeafCData(String leafCData) {
         this.leafCData = leafCData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java
index a0774e4d2..d5e86d487 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD1.java
@@ -31,9 +31,11 @@ public class PIdSTCDMSCLeafD1
 extends PIdSTCDMSCEntityD implements LeafD1 {
     private String leafD1Data;
 
+    @Override
     public String getLeafD1Data() {
         return leafD1Data;
     }
+    @Override
     public void setLeafD1Data(String leafD1Data) {
         this.leafD1Data = leafD1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java
index d97cefd02..3ad902211 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCLeafD2.java
@@ -31,9 +31,11 @@ public class PIdSTCDMSCLeafD2
 extends PIdSTCDMSCEntityD implements LeafD2 {
     private String leafD2Data;
 
+    @Override
     public String getLeafD2Data() {
         return leafD2Data;
     }
+    @Override
     public void setLeafD2Data(String leafD2Data) {
         this.leafD2Data = leafD2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java
index f061149b4..bfd3aeb30 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCMappedSuperclass.java
@@ -28,10 +28,12 @@ public class PIdSTCDMSCMappedSuperclass
 extends PIdSTCDMSCRootEntity implements MSC {
     private String mappedSuperclassData;
 
+    @Override
     public String getMappedSuperclassData() {
         return mappedSuperclassData;
     }
 
+    @Override
     public void setMappedSuperclassData(String mappedSuperclassData) {
         this.mappedSuperclassData = mappedSuperclassData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java
index 41ae70b9d..37e053ef7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/chardiscriminator/PIdSTCDMSCRootEntity.java
@@ -38,9 +38,11 @@ public class PIdSTCDMSCRootEntity
     extends PrimitiveIDMappedSuperclass implements RootEntity {
     private String rootEntityData;
 
+    @Override
     public String getRootEntityData() {
         return rootEntityData;
     }
+    @Override
     public void setRootEntityData(String rootEntityData) {
         this.rootEntityData = rootEntityData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java
index 427a64d4f..fc2ce731a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityB.java
@@ -31,9 +31,11 @@ public class PIdSTIDMSCEntityB
 extends PIdSTIDMSCRootEntity implements EntityB {
     private String entityBData;
 
+    @Override
     public String getEntityBData() {
         return entityBData;
     }
+    @Override
     public void setEntityBData(String entityBData) {
         this.entityBData = entityBData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java
index 0f3359cd5..e927d7c7a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCEntityD.java
@@ -30,9 +30,11 @@ public class PIdSTIDMSCEntityD
 extends PIdSTIDMSCMappedSuperclass implements EntityD {
 private String entityDData;
 
+    @Override
     public String getEntityDData() {
         return entityDData;
     }
+    @Override
     public void setEntityDData(String entityDData) {
         this.entityDData = entityDData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java
index 545e1a756..7cf240f71 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafA.java
@@ -30,11 +30,13 @@ public class PIdSTIDMSCLeafA
 extends PIdSTIDMSCRootEntity implements LeafA {
     private String leafAData;
 
+    @Override
     public String getLeafAData()
     {
         return leafAData;
     }
 
+    @Override
     public void setLeafAData(String leafAData) {
         this.leafAData = leafAData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java
index 878be9270..948b8e79e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB1.java
@@ -31,9 +31,11 @@ public class PIdSTIDMSCLeafB1
 extends PIdSTIDMSCEntityB implements LeafB1 {
     private String leafB1Data;
 
+    @Override
     public String getLeafB1Data() {
         return leafB1Data;
     }
+    @Override
     public void setLeafB1Data(String leafB1Data) {
         this.leafB1Data = leafB1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java
index 68a5d09c5..6ae45a381 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafB2.java
@@ -31,9 +31,11 @@ public class PIdSTIDMSCLeafB2
 extends PIdSTIDMSCEntityB implements LeafB2 {
 private String leafB2Data;
 
+    @Override
     public String getLeafB2Data() {
         return leafB2Data;
     }
+    @Override
     public void setLeafB2Data(String leafB2Data) {
         this.leafB2Data = leafB2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java
index 08c092810..d2f3a3e83 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafC.java
@@ -30,11 +30,13 @@ public class PIdSTIDMSCLeafC
 extends PIdSTIDMSCMappedSuperclass implements LeafC {
     private String leafCData;
 
+    @Override
     public String getLeafCData()
     {
         return leafCData;
     }
 
+    @Override
     public void setLeafCData(String leafCData) {
         this.leafCData = leafCData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java
index 10af46159..0a21e6e47 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD1.java
@@ -31,9 +31,11 @@ public class PIdSTIDMSCLeafD1
 extends PIdSTIDMSCEntityD implements LeafD1 {
     private String leafD1Data;
 
+    @Override
     public String getLeafD1Data() {
         return leafD1Data;
     }
+    @Override
     public void setLeafD1Data(String leafD1Data) {
         this.leafD1Data = leafD1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java
index 38f618782..dfc2cd546 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCLeafD2.java
@@ -31,9 +31,11 @@ public class PIdSTIDMSCLeafD2
 extends PIdSTIDMSCEntityD implements LeafD2 {
     private String leafD2Data;
 
+    @Override
     public String getLeafD2Data() {
         return leafD2Data;
     }
+    @Override
     public void setLeafD2Data(String leafD2Data) {
         this.leafD2Data = leafD2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java
index 16ba2c858..b3a584083 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCMappedSuperclass.java
@@ -28,10 +28,12 @@ public class PIdSTIDMSCMappedSuperclass
 extends PIdSTIDMSCRootEntity implements MSC {
     private String mappedSuperclassData;
 
+    @Override
     public String getMappedSuperclassData() {
         return mappedSuperclassData;
     }
 
+    @Override
     public void setMappedSuperclassData(String mappedSuperclassData) {
         this.mappedSuperclassData = mappedSuperclassData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java
index 7b3cb86ed..446cefe81 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/intdiscriminator/PIdSTIDMSCRootEntity.java
@@ -38,9 +38,11 @@ public class PIdSTIDMSCRootEntity
     extends PrimitiveIDMappedSuperclass implements RootEntity {
     private String rootEntityData;
 
+    @Override
     public String getRootEntityData() {
         return rootEntityData;
     }
+    @Override
     public void setRootEntityData(String rootEntityData) {
         this.rootEntityData = rootEntityData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java
index 223c0c98c..a37b00466 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityB.java
@@ -31,9 +31,11 @@ public class PIdSTSDMSCEntityB
 extends PIdSTSDMSCRootEntity implements EntityB {
     private String entityBData;
 
+    @Override
     public String getEntityBData() {
         return entityBData;
     }
+    @Override
     public void setEntityBData(String entityBData) {
         this.entityBData = entityBData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java
index 8dbdc35c8..e4b7271dc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCEntityD.java
@@ -30,9 +30,11 @@ public class PIdSTSDMSCEntityD
 extends PIdSTSDMSCMappedSuperclass implements EntityD {
 private String entityDData;
 
+    @Override
     public String getEntityDData() {
         return entityDData;
     }
+    @Override
     public void setEntityDData(String entityDData) {
         this.entityDData = entityDData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java
index b6b6fea08..47193195b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafA.java
@@ -30,11 +30,13 @@ public class PIdSTSDMSCLeafA
 extends PIdSTSDMSCRootEntity implements LeafA {
     private String leafAData;
 
+    @Override
     public String getLeafAData()
     {
         return leafAData;
     }
 
+    @Override
     public void setLeafAData(String leafAData) {
         this.leafAData = leafAData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java
index 3daa96fa5..a48fb1af0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB1.java
@@ -31,9 +31,11 @@ public class PIdSTSDMSCLeafB1
 extends PIdSTSDMSCEntityB implements LeafB1 {
     private String leafB1Data;
 
+    @Override
     public String getLeafB1Data() {
         return leafB1Data;
     }
+    @Override
     public void setLeafB1Data(String leafB1Data) {
         this.leafB1Data = leafB1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java
index db416e5e4..3464de881 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafB2.java
@@ -31,9 +31,11 @@ public class PIdSTSDMSCLeafB2
 extends PIdSTSDMSCEntityB implements LeafB2 {
 private String leafB2Data;
 
+    @Override
     public String getLeafB2Data() {
         return leafB2Data;
     }
+    @Override
     public void setLeafB2Data(String leafB2Data) {
         this.leafB2Data = leafB2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java
index d5260d5d0..900f44338 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafC.java
@@ -30,11 +30,13 @@ public class PIdSTSDMSCLeafC
 extends PIdSTSDMSCMappedSuperclass implements LeafC {
     private String leafCData;
 
+    @Override
     public String getLeafCData()
     {
         return leafCData;
     }
 
+    @Override
     public void setLeafCData(String leafCData) {
         this.leafCData = leafCData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java
index 590a66a62..ee81ccd3d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD1.java
@@ -31,9 +31,11 @@ public class PIdSTSDMSCLeafD1
 extends PIdSTSDMSCEntityD implements LeafD1 {
     private String leafD1Data;
 
+    @Override
     public String getLeafD1Data() {
         return leafD1Data;
     }
+    @Override
     public void setLeafD1Data(String leafD1Data) {
         this.leafD1Data = leafD1Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java
index aa94d71b3..2670e2827 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCLeafD2.java
@@ -31,9 +31,11 @@ public class PIdSTSDMSCLeafD2
 extends PIdSTSDMSCEntityD implements LeafD2 {
     private String leafD2Data;
 
+    @Override
     public String getLeafD2Data() {
         return leafD2Data;
     }
+    @Override
     public void setLeafD2Data(String leafD2Data) {
         this.leafD2Data = leafD2Data;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java
index 67a023b8c..f8a9fa9de 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCMappedSuperclass.java
@@ -28,10 +28,12 @@ public class PIdSTSDMSCMappedSuperclass
 extends PIdSTSDMSCRootEntity implements MSC {
     private String mappedSuperclassData;
 
+    @Override
     public String getMappedSuperclassData() {
         return mappedSuperclassData;
     }
 
+    @Override
     public void setMappedSuperclassData(String mappedSuperclassData) {
         this.mappedSuperclassData = mappedSuperclassData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java
index 86888ae2a..8ae8a3b8b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/idmsc/singletable/stringdiscriminator/PIdSTSDMSCRootEntity.java
@@ -38,9 +38,11 @@ public class PIdSTSDMSCRootEntity
     extends PrimitiveIDMappedSuperclass implements RootEntity {
     private String rootEntityData;
 
+    @Override
     public String getRootEntityData() {
         return rootEntityData;
     }
+    @Override
     public void setRootEntityData(String rootEntityData) {
         this.rootEntityData = rootEntityData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/EntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/EntityB.java
index 5dcb57e5f..f4bf8dca7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/EntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/EntityB.java
@@ -20,6 +20,6 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface EntityB extends RootEntity {
-    public String getEntityBData();
-    public void setEntityBData(String entityBData);
+    String getEntityBData();
+    void setEntityBData(String entityBData);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/EntityD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/EntityD.java
index f3a5e4e18..df9600bf9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/EntityD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/EntityD.java
@@ -20,6 +20,6 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface EntityD {
-    public String getEntityDData();
-    public void setEntityDData(String entityDData);
+    String getEntityDData();
+    void setEntityDData(String entityDData);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafA.java
index 4f8e32687..d7c571226 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafA.java
@@ -20,6 +20,6 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface LeafA extends RootEntity {
-    public String getLeafAData();
-    public void setLeafAData(String leafAData);
+    String getLeafAData();
+    void setLeafAData(String leafAData);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafB1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafB1.java
index 444ec9752..bf0ff0e20 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafB1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafB1.java
@@ -20,7 +20,7 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface LeafB1 extends EntityB {
-    public String getLeafB1Data();
+    String getLeafB1Data();
 
-    public void setLeafB1Data(String leafB1Data);
+    void setLeafB1Data(String leafB1Data);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafB2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafB2.java
index 4f7820bcd..f042cbf5e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafB2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafB2.java
@@ -20,7 +20,7 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface LeafB2 {
-    public String getLeafB2Data();
+    String getLeafB2Data();
 
-    public void setLeafB2Data(String leafB2Data);
+    void setLeafB2Data(String leafB2Data);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafC.java
index 8cf612480..edb00928e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafC.java
@@ -20,6 +20,6 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface LeafC {
-    public String getLeafCData();
-    public void setLeafCData(String leafCData);
+    String getLeafCData();
+    void setLeafCData(String leafCData);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafD1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafD1.java
index 8072af4d2..a326e9d33 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafD1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafD1.java
@@ -20,6 +20,6 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface LeafD1 {
-    public String getLeafD1Data();
-    public void setLeafD1Data(String leafD1Data);
+    String getLeafD1Data();
+    void setLeafD1Data(String leafD1Data);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafD2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafD2.java
index 3218e05d2..a718ff1fc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafD2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/LeafD2.java
@@ -20,6 +20,6 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface LeafD2 {
-    public String getLeafD2Data();
-    public void setLeafD2Data(String leafD2Data);
+    String getLeafD2Data();
+    void setLeafD2Data(String leafD2Data);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/MSC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/MSC.java
index a49c07cba..b79272800 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/MSC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/MSC.java
@@ -20,6 +20,6 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface MSC {
-    public String getMappedSuperclassData();
-    public void setMappedSuperclassData(String mappedSuperclassData);
+    String getMappedSuperclassData();
+    void setMappedSuperclassData(String mappedSuperclassData);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/RootEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/RootEntity.java
index 9b09866c4..09659e819 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/RootEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entities/testinterfaces/RootEntity.java
@@ -20,9 +20,9 @@
 package org.apache.openjpa.persistence.inheritance.entities.testinterfaces;
 
 public interface RootEntity {
-    public Object fetchId();
-    public void updateId(Object obj);
+    Object fetchId();
+    void updateId(Object obj);
 
-    public String getRootEntityData();
-    public void setRootEntityData(String rootEntityData);
+    String getRootEntityData();
+    void setRootEntityData(String rootEntityData);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/AbstractClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/AbstractClass.java
index fa747da64..8bef74fcd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/AbstractClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/AbstractClass.java
@@ -51,6 +51,7 @@ public abstract class AbstractClass {
         return name;
     }
 
+    @Override
     public String toString() {
         return "Id=" + id +
                ";Name=" + name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Admin.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Admin.java
index 8d6e2100b..35de3020a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Admin.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Admin.java
@@ -29,7 +29,7 @@ import javax.persistence.OneToMany;
 @DiscriminatorValue("admin")
 public class Admin extends ComputerUser {
 	@OneToMany(mappedBy = "admin")
-	protected Set<RegularUser> regularUsers = new HashSet<RegularUser>();
+	protected Set<RegularUser> regularUsers = new HashSet<>();
 
 	public boolean addRegularUser(RegularUser version) {
 		return regularUsers.add(version);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass.java
index 8e50d755a..0427462f7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass.java
@@ -59,6 +59,7 @@ public class BaseClass {
         return name;
     }
 
+    @Override
     public String toString() {
         return "Id=" + id +
                ";Version=" + version +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass2.java
index a37a0e1cb..d679b4adf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass2.java
@@ -59,6 +59,7 @@ public class BaseClass2 {
         return name;
     }
 
+    @Override
     public String toString() {
         return "Id=" + id +
                ";Version=" + version +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass3.java
index b6b2c69b2..561fef8ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass3.java
@@ -60,6 +60,7 @@ public class BaseClass3 {
         return name;
     }
 
+    @Override
     public String toString() {
         return "Id=" + id +
                ";Version=" + version +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass4.java
index d0e972135..d14481c17 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass4.java
@@ -59,6 +59,7 @@ public class BaseClass4 {
         return name;
     }
 
+    @Override
     public String toString() {
         return "Id=" + id +
                ";Version=" + version +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass5.java
index d8df0de07..ef84943fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass5.java
@@ -63,6 +63,7 @@ public class BaseClass5 {
         return name;
     }
 
+    @Override
     public String toString() {
         return "Id=" + id +
                ";Version=" + version +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass6.java
index 4fff61f72..fc279e256 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass6.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/BaseClass6.java
@@ -47,6 +47,7 @@ public class BaseClass6 {
         return name;
     }
 
+    @Override
     public String toString() {
         return "Id=" + id +
                ";Name=" + name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java
index feb888be2..28a200017 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java
@@ -50,11 +50,11 @@ public class Department {
     private List<Employee> employeeList;
 
     public Department() {
-        this.employeeList = new ArrayList<Employee>();
+        this.employeeList = new ArrayList<>();
     }
 
     public Department(int id, String departmentName) {
-        this.employeeList = new ArrayList<Employee>();
+        this.employeeList = new ArrayList<>();
         this.id = id;
         this.departmentName = departmentName;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ImplClassA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ImplClassA.java
index 666962b0b..ca2c48266 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ImplClassA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ImplClassA.java
@@ -44,23 +44,28 @@ public class ImplClassA implements ManagedIface {
         return implClassAName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";implClassAName=" + implClassAName +
             ";intFieldSup=" + intFieldSup;
     }
 
+    @Override
     public int getId() {
         return this.id;
     }
 
+    @Override
     public int getIntFieldSup() {
         return intFieldSup;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public void setIntFieldSup(int i) {
         this.intFieldSup = i;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface.java
index ca73892d8..7e6b56dab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface.java
@@ -27,10 +27,9 @@ import org.apache.openjpa.persistence.ManagedInterface;
 @ManagedInterface
 @Entity
 public interface ManagedIface {
-    @Id @GeneratedValue
-    public int getId();
-    public void setId(int id);
+    @Id @GeneratedValue int getId();
+    void setId(int id);
 
-    public int getIntFieldSup();
-    public void setIntFieldSup(int i);
+    int getIntFieldSup();
+    void setIntFieldSup(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface2.java
index 029fbbbd5..2273a2c83 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/ManagedIface2.java
@@ -27,10 +27,9 @@ import org.apache.openjpa.persistence.ManagedInterface;
 @ManagedInterface
 @Entity
 public interface ManagedIface2 {
-    @Id @GeneratedValue
-    public int getId();
-    public void setId(int id);
+    @Id @GeneratedValue int getId();
+    void setId(int id);
 
-    public int getIntFieldSup();
-    public void setIntFieldSup(int i);
+    int getIntFieldSup();
+    void setIntFieldSup(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java
index 3201cb429..145839152 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java
@@ -42,6 +42,7 @@ public class Manager extends FTEmployee {
         return managesList;
     }
 
+    @Override
     public String toString() {
         String str = super.toString();
         return "Manager " + str;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MappedSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MappedSuper.java
index 6937de613..27d27498a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MappedSuper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MappedSuper.java
@@ -47,6 +47,7 @@ public class MappedSuper {
         return name;
     }
 
+    @Override
     public String toString() {
         return "Id=" + id +
                ";Name=" + name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass.java
index 8e63a43c7..4c4b0b410 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass.java
@@ -35,6 +35,7 @@ public class MidClass extends BaseClass2 {
         return midClassName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";midClassName=" + midClassName;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass2.java
index 61f531334..051335980 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass2.java
@@ -35,6 +35,7 @@ public class MidClass2 extends BaseClass5 {
         return midClass2Name;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";midClass2Name=" + midClass2Name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass3.java
index 976600d5a..c5d17a5f1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/MidClass3.java
@@ -30,6 +30,7 @@ public class MidClass3 extends BaseClass6 {
         return midClass3Name;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";midClass3Name=" + midClass3Name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java
index 56935b6fa..02b1c0c1a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java
@@ -17,7 +17,8 @@
  * under the License.
  */
 package org.apache.openjpa.persistence.inheritance.entity;
-import javax.persistence.*;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
 
 /**
  * Test case and domain classes were originally part of the reported issue
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassA.java
index e1d088e71..07aae75cf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassA.java
@@ -35,6 +35,7 @@ public class SubclassA extends BaseClass {
         return classAName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classAName=" + classAName;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassB.java
index 36babef17..bccfc2545 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassB.java
@@ -35,6 +35,7 @@ public class SubclassB extends BaseClass {
         return classBName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classBName=" + classBName;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassC.java
index 5c498976b..01c81a4ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassC.java
@@ -35,6 +35,7 @@ public class SubclassC extends MappedSuper {
         return classCName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classCName=" + classCName;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassD.java
index 65e8dbe14..c25d41c16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassD.java
@@ -35,6 +35,7 @@ public class SubclassD extends MappedSuper {
         return classDName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classDName=" + classDName;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassE.java
index 07493eb09..b7581b4a7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassE.java
@@ -35,6 +35,7 @@ public class SubclassE extends MidClass {
         return classEName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classEName=" + classEName;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassF.java
index 797da4797..a0e248079 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassF.java
@@ -38,15 +38,18 @@ public class SubclassF extends BaseClass3 implements ManagedIface2  {
         return classFName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classFName=" + classFName +
             ";intFieldSup=" + intFieldSup;
     }
 
+    @Override
     public int getIntFieldSup() {
         return intFieldSup;
     }
 
+    @Override
     public void setIntFieldSup(int i) {
         this.intFieldSup = i;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassG.java
index 80c3f176d..f64be1ee8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassG.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassG.java
@@ -40,6 +40,7 @@ public class SubclassG extends BaseClass4 {
         return classGName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classGName=" + classGName +
             ";intFieldSup=" + intFieldSup;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassH.java
index 1da5c86a7..551b0f619 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassH.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassH.java
@@ -42,6 +42,7 @@ public class SubclassH extends MidClass2 {
         return classHName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classHName=" + classHName +
             ";intFieldSup=" + intFieldSup;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassI.java
index a0878e409..044f2fdf1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassI.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassI.java
@@ -39,15 +39,18 @@ public class SubclassI extends AbstractClass {
         return classIName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classIName=" + classIName +
         ";Version=" + version;
     }
 
+    @Override
     public void setVersion(int version) {
         this.version = version;
     }
 
+    @Override
     public int getVersion() {
         return version;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassJ.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassJ.java
index 7618ac86e..0331aaf7a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassJ.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassJ.java
@@ -39,15 +39,18 @@ public class SubclassJ extends AbstractClass {
         return classJName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classJName=" + classJName +
         ";Version=" + version;
     }
 
+    @Override
     public void setVersion(int version) {
         this.version = version;
     }
 
+    @Override
     public int getVersion() {
         return version;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassK.java
index ecb904d2f..10d80710e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/SubclassK.java
@@ -35,6 +35,7 @@ public class SubclassK extends MidClass3 {
         return classKName;
     }
 
+    @Override
     public String toString() {
         return super.toString() + ";classKName=" + classKName;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Contractor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Contractor.java
index 558a48805..1a57ef3ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Contractor.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/Contractor.java
@@ -68,6 +68,7 @@ public class Contractor extends Employee {
         this.dept = dept;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other instanceof Contractor) {
             Contractor c = (Contractor) other;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/FulltimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/FulltimeEmployee.java
index cc71a672d..227dc3659 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/FulltimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/FulltimeEmployee.java
@@ -68,6 +68,7 @@ public class FulltimeEmployee extends Employee {
         this.dept = dept;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other instanceof FulltimeEmployee) {
             FulltimeEmployee c = (FulltimeEmployee) other;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/ParttimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/ParttimeEmployee.java
index 73536b1f3..3833a4f0b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/ParttimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/ParttimeEmployee.java
@@ -68,6 +68,7 @@ public class ParttimeEmployee extends Employee {
         this.dept = dept;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other instanceof ParttimeEmployee) {
             ParttimeEmployee c = (ParttimeEmployee) other;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java
index b7d660b5b..e2bbc6c52 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/TestInheritanceTypeJoinedQuery.java
@@ -34,6 +34,7 @@ public class TestInheritanceTypeJoinedQuery  extends SQLListenerTestCase {
     private int numFTEmployees = 2;
     private int numContractors = 3;
 
+    @Override
     public void setUp() {
         setUp(Contractor.class, Employee.class, Department.class, Person.class,
             FulltimeEmployee.class, ParttimeEmployee.class,
@@ -99,7 +100,7 @@ public class TestInheritanceTypeJoinedQuery  extends SQLListenerTestCase {
             assertTrue(rs.get(i) instanceof Contractor);
 
         qS = "select p from Person p where TYPE(p) in ?1 order by p.name";
-        Collection<Class<?>> params = new ArrayList<Class<?>>(2);
+        Collection<Class<?>> params = new ArrayList<>(2);
         params.add(Contractor.class);
         params.add(Employee.class);
         try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestJointableOneToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestJointableOneToMany.java
index 748ee0b4f..0b68e2c73 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestJointableOneToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestJointableOneToMany.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestJointableOneToMany extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(UMLType.class, UMLPrimitiveType.class, UMLClass.class,
             UMLPackage.class, UMLNamed.class, CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java
index 013a32efe..1f8232def 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/TestMapsIdWithAutoGeneratedKey.java
@@ -67,6 +67,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestMapsIdWithAutoGeneratedKey extends SingleEMFTestCase {
     boolean disabled = true;
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES,
         	Textile.class, TextilePK.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPackage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPackage.java
index 472d94587..fbcca9f34 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPackage.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/UMLPackage.java
@@ -21,7 +21,9 @@ package org.apache.openjpa.persistence.inheritance.jointable.onetomany;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 @Entity
 //@Inheritance(strategy = InheritanceType.JOINED)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/CashBaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/CashBaseEntity.java
index 04c643ecf..d34292f31 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/CashBaseEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/CashBaseEntity.java
@@ -20,7 +20,9 @@ package org.apache.openjpa.persistence.inheritance.mappedsuperclass;
 
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
 
 /**
  * Entity used to test MappedSuperClass which does not have IdClass.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SituationDA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SituationDA.java
index 5936e8409..38e15c974 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SituationDA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/SituationDA.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.inheritance.mappedsuperclass;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Table;
 
 /**
  * Entity used to test MappedSuperClass which does not have IdClass.
@@ -57,6 +61,7 @@ public class SituationDA extends CashBaseEntity {
         }
 
 
+        @Override
         public boolean equals(Object other){
             if (other instanceof SituationId) {
                 final SituationId otherId = (SituationId)other;
@@ -66,6 +71,7 @@ public class SituationDA extends CashBaseEntity {
                 return false;
         }
 
+        @Override
         public int hashCode() {
             return super.hashCode();
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java
index 695794313..2e48a8726 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/TestMappedSuperClass.java
@@ -39,6 +39,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestMappedSuperClass extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CashBaseEntity.class,
               SituationDA.class, ValuableItemDA.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/ValuableItemDA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/ValuableItemDA.java
index 9b1a35d84..ede3ffdf0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/ValuableItemDA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/ValuableItemDA.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.inheritance.mappedsuperclass;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 /**
  * Entity used to test MappedSuperClass which does not have IdClass.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TIdClass.java
index af95c15bd..b6b8de3f1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TIdClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TIdClass.java
@@ -21,7 +21,9 @@ package org.apache.openjpa.persistence.inheritance.mappedsuperclass.idclass;
 import java.io.Serializable;
 
 public class TIdClass implements Serializable {
-	private int id;
+	
+    private static final long serialVersionUID = 1L;
+    private int id;
 
 	public int getId() {
 		return id;
@@ -31,11 +33,13 @@ public class TIdClass implements Serializable {
 		this.id = id;
 	}
 
-	public boolean equals(Object obj) {
+	@Override
+    public boolean equals(Object obj) {
 		return super.equals(obj);
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		return super.hashCode();
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TestIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TestIdClass.java
index f4054824b..f54255f39 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TestIdClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/idclass/TestIdClass.java
@@ -24,7 +24,8 @@ import javax.persistence.Query;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestIdClass extends SingleEMFTestCase {
-	 public void setUp() {
+	 @Override
+    public void setUp() {
 	        setUp(IdClassTestMSC.class, IdClassEntity.class);
 	 }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java
index e0dc973bc..ebe365895 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/TestTablePerClassInheritanceWithAbstractRoot.java
@@ -57,6 +57,7 @@ public class TestTablePerClassInheritanceWithAbstractRoot extends
 			FrenchParagraph.class,
 			GermanParagraph.class};
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES,
         		Translation.class, BaseEntity.class,
@@ -144,7 +145,8 @@ public class TestTablePerClassInheritanceWithAbstractRoot extends
 	/**
      * Count the number of instances in the given class by aggregate JPQL query.
 	 */
-	public int count(Class c) {
+	@Override
+    public int count(Class c) {
 		OpenJPAEntityManager em = emf.createEntityManager();
 		Number n = ((Number) em.createQuery("SELECT COUNT(p) FROM " +
                 c.getSimpleName() + " p").getSingleResult()).intValue();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translatable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translatable.java
index 1b3445cb1..96c997e48 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translatable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/polymorphic/Translatable.java
@@ -47,7 +47,7 @@ public abstract class Translatable extends BaseEntity {
 
 	public void addTranslation(Translation t) {
 		if (translations == null)
-			translations = new HashSet<Translation>();
+			translations = new HashSet<>();
 		translations.add(t);
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Employee.java
index 031fea4df..5136e5abc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/Employee.java
@@ -23,6 +23,8 @@ import javax.persistence.Entity;
 @Entity
 public class Employee extends Person {
 
+    
+    private static final long serialVersionUID = 1L;
     private float salary;
 
     public float getSalary() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java
index 548b6551d..896c50129 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/serializable/TestSerialization.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestSerialization extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Person.class, Employee.class, DROP_TABLES, "openjpa.DetachState",
                 "fgs(DetachedStateField=true)");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/SQLSniffer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/SQLSniffer.java
index 8f93d42a2..70f515eee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/SQLSniffer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/SQLSniffer.java
@@ -33,7 +33,7 @@ import org.apache.regexp.RE;
  */
 public class SQLSniffer {
 
-	private static Map<String, RE> cache = new HashMap<String, RE>();
+	private static Map<String, RE> cache = new HashMap<>();
 	/**
      * Checks that the given set of regular expressions occur in at least one of
 	 * the given input SQL.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationFecthHint.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationFecthHint.java
index 27df2658e..4748dafdc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationFecthHint.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationFecthHint.java
@@ -30,7 +30,8 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestIsolationFecthHint extends SQLListenerTestCase{
 
-	public void setUp(){
+	@Override
+    public void setUp(){
 		setUp(AllFieldTypes.class, CLEAR_TABLES);
 
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java
index 4316d37ea..095760cd8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java
@@ -20,19 +20,20 @@ package org.apache.openjpa.persistence.jdbc;
 
 import javax.persistence.Query;
 
-import org.apache.openjpa.persistence.test.SQLListenerTestCase;
-import org.apache.openjpa.persistence.simple.AllFieldTypes;
-import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.sql.DB2Dictionary;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.HSQLDictionary;
 import org.apache.openjpa.persistence.InvalidStateException;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
-import org.apache.openjpa.jdbc.sql.DBDictionary;
-import org.apache.openjpa.jdbc.sql.DB2Dictionary;
-import org.apache.openjpa.jdbc.sql.HSQLDictionary;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestIsolationLevelOverride
     extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class,
             "openjpa.Optimistic", "false",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
index a85af01a3..77b5eb22b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
@@ -20,11 +20,12 @@ package org.apache.openjpa.persistence.jdbc;
 
 import java.sql.ResultSet;
 
-import junit.framework.TestCase;
 import org.apache.openjpa.jdbc.kernel.EagerFetchModes;
 import org.apache.openjpa.jdbc.kernel.LRSSizes;
 import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
 
+import junit.framework.TestCase;
+
 public class TestJDBCEnumToKernelConstantMappings
     extends TestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestLobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestLobs.java
index 523daf364..e1b4e36d5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestLobs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestLobs.java
@@ -22,13 +22,13 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.RollbackException;
 
-import junit.framework.AssertionFailedError;
-
 import org.apache.openjpa.jdbc.sql.SybaseDictionary;
 import org.apache.openjpa.persistence.kernel.common.apps.Blobs;
 import org.apache.openjpa.persistence.kernel.common.apps.Lobs;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.framework.AssertionFailedError;
+
 public class TestLobs extends SingleEMFTestCase {
     /**
      * Support method to get a random Byte for testing.
@@ -37,6 +37,7 @@ public class TestLobs extends SingleEMFTestCase {
         return new Byte((byte) (Math.random() * Byte.MAX_VALUE));
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(DROP_TABLES, Lobs.class, Blobs.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestOptimizeForClause.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestOptimizeForClause.java
index 091ce7cd5..d263d9780 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestOptimizeForClause.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestOptimizeForClause.java
@@ -20,20 +20,21 @@ package org.apache.openjpa.persistence.jdbc;
 
 import javax.persistence.Query;
 
-import org.apache.openjpa.persistence.test.SQLListenerTestCase;
-import org.apache.openjpa.persistence.simple.AllFieldTypes;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.sql.DB2Dictionary;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.HSQLDictionary;
 import org.apache.openjpa.persistence.InvalidStateException;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
-import org.apache.openjpa.jdbc.sql.DBDictionary;
-import org.apache.openjpa.jdbc.sql.DB2Dictionary;
-import org.apache.openjpa.jdbc.sql.HSQLDictionary;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestOptimizeForClause
     extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class);
     }
@@ -99,7 +100,7 @@ public class TestOptimizeForClause
                         ("select o from AllFieldTypes o where o.intField " +
                          "= :p"));
                     q.setParameter("p", 0);
-                    q.setHint(q.HINT_RESULT_COUNT, new Integer(8));
+                    q.setHint(OpenJPAQuery.HINT_RESULT_COUNT, new Integer(8));
                     q.getResultList();
                }
                if (dict instanceof DB2Dictionary) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java
index b16a9fa02..c51cfeb4f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java
@@ -20,18 +20,19 @@ package org.apache.openjpa.persistence.jdbc;
 
 import javax.persistence.LockModeType;
 
-import org.apache.openjpa.persistence.test.SQLListenerTestCase;
-import org.apache.openjpa.persistence.simple.AllFieldTypes;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DB2Dictionary;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.HSQLDictionary;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestSelectForUpdateOverride
     extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class,
             "openjpa.Optimistic", "false",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
index cee92844d..bd55a9010 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestTimestampPKDeletion extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(EntityWithTimestampPK.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java
index f6e9a19cd..7b8c5999b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java
@@ -19,11 +19,38 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.ManyToMany;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.SecondaryTable;
+import javax.persistence.SecondaryTables;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
-import org.apache.openjpa.persistence.jdbc.*;
+import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
 
 @Entity
 @Table(name = "ANNOTEST1")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest2.java
index 843d15d04..37c5b82bc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest2.java
@@ -19,9 +19,27 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import java.util.*;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 @Entity
 @Table(name = "ANNOTEST2")
@@ -142,6 +160,7 @@ public class AnnoTest2 {
             }
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == this)
                 return true;
@@ -155,10 +174,12 @@ public class AnnoTest2 {
             return pk2.equals(other.pk2);
         }
 
+        @Override
         public int hashCode() {
             return ((int) pk1) + (pk2 == null ? 0 : pk2.hashCode());
         }
 
+        @Override
         public String toString() {
             return pk1 + "," + (pk2 == null ? "null" : pk2);
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest3.java
index 3cd7171e5..adf9cc0dc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest3.java
@@ -19,7 +19,15 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.PrimaryKeyJoinColumns;
+import javax.persistence.Table;
 
 @Entity
 @DiscriminatorValue("ANNO3")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue.java
index ee9cf4a39..da11c5324 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue.java
@@ -19,7 +19,13 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Transient;
 
 @Embeddable
 public class EmbedValue {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue2.java
index 34b756cb3..bd405c9b9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue2.java
@@ -19,7 +19,9 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 
 /**
  * Same as EmbedValue but no blobs for suitable use as key/value/element
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue3.java
index 6c9e5ef5f..77074f972 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbedValue3.java
@@ -21,7 +21,9 @@ package org.apache.openjpa.persistence.jdbc.annotations;
 
 import java.awt.Point;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 
 import org.apache.openjpa.persistence.Persistent;
 import org.apache.openjpa.persistence.jdbc.Strategy;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuper.java
index d9ae68732..1b474d33d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuper.java
@@ -19,7 +19,13 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 @MappedSuperclass
 public class EmbeddableSuper {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuperSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuperSub.java
index 13b768b6a..6a8e43f0f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuperSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddableSuperSub.java
@@ -19,7 +19,12 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
 
 @Entity
 @DiscriminatorColumn(name = "DISC")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdClass.java
index b20bbab33..b71bbd46c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdClass.java
@@ -19,7 +19,9 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.GeneratedValue;
 
 @Embeddable
 public class EmbeddedIdClass {
@@ -58,14 +60,17 @@ public class EmbeddedIdClass {
         this.pk3 = pk3;
     }
 
+    @Override
     public String toString() {
         return pk1 + ":" + pk2 + ":" + pk3;
     }
 
+    @Override
     public int hashCode() {
         return (int) ((pk1 ^ pk2 ^ pk3) % Integer.MAX_VALUE);
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdEntity.java
index dbefaa304..a3b017811 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/EmbeddedIdEntity.java
@@ -19,7 +19,16 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.SqlResultSetMapping;
+import javax.persistence.Table;
 
 @Entity
 @Table(name = "EMIDENTITY")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/ExtensionsEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/ExtensionsEntity.java
index 55523c355..1ded53145 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/ExtensionsEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/ExtensionsEntity.java
@@ -19,13 +19,37 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import java.util.*;
+import java.util.Collection;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
 
-import org.apache.openjpa.jdbc.meta.strats.*;
-import org.apache.openjpa.persistence.*;
-import org.apache.openjpa.persistence.jdbc.*;
+import org.apache.openjpa.jdbc.meta.strats.StateComparisonVersionStrategy;
+import org.apache.openjpa.persistence.DataCache;
+import org.apache.openjpa.persistence.DataStoreId;
+import org.apache.openjpa.persistence.Dependent;
+import org.apache.openjpa.persistence.ElementDependent;
+import org.apache.openjpa.persistence.ExternalValues;
+import org.apache.openjpa.persistence.Externalizer;
+import org.apache.openjpa.persistence.Factory;
+import org.apache.openjpa.persistence.FetchAttribute;
+import org.apache.openjpa.persistence.FetchGroup;
+import org.apache.openjpa.persistence.InverseLogical;
+import org.apache.openjpa.persistence.LRS;
+import org.apache.openjpa.persistence.Persistent;
+import org.apache.openjpa.persistence.ReadOnly;
+import org.apache.openjpa.persistence.Type;
+import org.apache.openjpa.persistence.jdbc.EagerFetchMode;
+import org.apache.openjpa.persistence.jdbc.ElementClassCriteria;
+import org.apache.openjpa.persistence.jdbc.FetchMode;
+import org.apache.openjpa.persistence.jdbc.VersionStrategy;
 
 
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat1.java
index df2b5cfd8..42e6684b5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat1.java
@@ -19,7 +19,15 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 @Entity(name="Flat1")
 @Table(name="Flat1")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat2.java
index e295af95f..25be89c9a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Flat2.java
@@ -19,7 +19,8 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
 
 @Entity(name="Flat2")
 public class Flat2
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Generator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Generator.java
index b0ab6d098..45b34b76a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Generator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/Generator.java
@@ -19,9 +19,15 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import java.util.*;
+import java.util.StringTokenizer;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.TableGenerator;
 
 @Entity
 // non-psql/ora dbs cause issues with SequenceGenerator in auto-mapping
@@ -85,6 +91,7 @@ public class Generator {
             pk3 = Long.valueOf(tok.nextToken());
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == null || !(o instanceof Oid))
                 return false;
@@ -98,11 +105,13 @@ public class Generator {
             return pk2.equals(other.pk2);
         }
 
+        @Override
         public int hashCode() {
             return pk + (pk2 == null ? 0 : pk2.hashCode())
                 + (int) (pk3 % Integer.MAX_VALUE);
         }
 
+        @Override
         public String toString() {
             return pk + "," + pk2 + "," + pk3;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NativeSequenceEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NativeSequenceEntity.java
index 554b07063..6867e73cd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NativeSequenceEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NativeSequenceEntity.java
@@ -18,14 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.annotations;
 
+import static javax.persistence.GenerationType.SEQUENCE;
+
 import javax.persistence.Basic;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.Table;
-
-import static javax.persistence.GenerationType.SEQUENCE;
 import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="NativeSeqEnt")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity.java
index e260aa62e..df5175c7e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity.java
@@ -19,18 +19,47 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import java.awt.*;
-import java.util.*;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Table;
 
-import org.apache.openjpa.jdbc.meta.strats.*;
-import org.apache.openjpa.persistence.*;
-import org.apache.openjpa.persistence.jdbc.*;
+import org.apache.openjpa.jdbc.meta.strats.ClassNameDiscriminatorStrategy;
+import org.apache.openjpa.persistence.Persistent;
+import org.apache.openjpa.persistence.PersistentCollection;
+import org.apache.openjpa.persistence.PersistentMap;
+import org.apache.openjpa.persistence.jdbc.Columns;
+import org.apache.openjpa.persistence.jdbc.ContainerTable;
+import org.apache.openjpa.persistence.jdbc.DataStoreIdColumn;
+import org.apache.openjpa.persistence.jdbc.DiscriminatorStrategy;
+import org.apache.openjpa.persistence.jdbc.ElementColumn;
+import org.apache.openjpa.persistence.jdbc.ElementEmbeddedMapping;
+import org.apache.openjpa.persistence.jdbc.ElementForeignKey;
+import org.apache.openjpa.persistence.jdbc.ElementIndex;
+import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
+import org.apache.openjpa.persistence.jdbc.ElementNonpolymorphic;
+import org.apache.openjpa.persistence.jdbc.EmbeddedMapping;
 import org.apache.openjpa.persistence.jdbc.ForeignKey;
 import org.apache.openjpa.persistence.jdbc.Index;
+import org.apache.openjpa.persistence.jdbc.KeyColumn;
+import org.apache.openjpa.persistence.jdbc.KeyForeignKey;
+import org.apache.openjpa.persistence.jdbc.KeyIndex;
+import org.apache.openjpa.persistence.jdbc.KeyJoinColumn;
+import org.apache.openjpa.persistence.jdbc.KeyNonpolymorphic;
+import org.apache.openjpa.persistence.jdbc.MappingOverride;
+import org.apache.openjpa.persistence.jdbc.NonpolymorphicType;
 import org.apache.openjpa.persistence.jdbc.OrderColumn;
+import org.apache.openjpa.persistence.jdbc.Strategy;
+import org.apache.openjpa.persistence.jdbc.XJoinColumn;
+import org.apache.openjpa.persistence.jdbc.XMappingOverride;
 
 
 @Entity
@@ -71,7 +100,7 @@ public class NonstandardMappingEntity
     @ElementForeignKey
     @ElementNonpolymorphic(NonpolymorphicType.JOINABLE)
     private List<NonstandardMappingEntity> joinCollection =
-        new ArrayList<NonstandardMappingEntity>();
+        new ArrayList<>();
 
     @PersistentMap(keyType = String.class, elementType = String.class)
     @ContainerTable(name = "STRINGS_MAP",
@@ -94,7 +123,7 @@ public class NonstandardMappingEntity
     @ElementForeignKey
     @ElementNonpolymorphic
     private Map<NonstandardMappingEntity, NonstandardMappingEntity> joinMap =
-        new HashMap<NonstandardMappingEntity, NonstandardMappingEntity>();
+        new HashMap<>();
 
     @Embedded
     @EmbeddedMapping(nullIndicatorAttributeName = "uuid", overrides = {
@@ -111,7 +140,7 @@ public class NonstandardMappingEntity
     @ElementEmbeddedMapping(overrides = {
     @XMappingOverride(name = "basic", columns = @Column(name = "EM_BASIC"))
         })
-    private List<EmbedValue2> embedCollection = new ArrayList<EmbedValue2>();
+    private List<EmbedValue2> embedCollection = new ArrayList<>();
 
     public Point getCustom() {
         return this.custom;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity3.java
index ef9259413..9fe7e9a80 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingEntity3.java
@@ -40,7 +40,7 @@ public class NonstandardMappingEntity3 {
 
     @ElementCollection(fetch=FetchType.EAGER)
     @CollectionTable(name="EmbedVal3s")
-    private List<EmbedValue3> embedVal3s = new ArrayList<EmbedValue3>();
+    private List<EmbedValue3> embedVal3s = new ArrayList<>();
 
     @Embedded
     private EmbedValue3 embedVal3;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper.java
index 27a59b0c9..ae7f41b90 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper.java
@@ -19,18 +19,20 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
 
-import org.apache.openjpa.persistence.*;
-import org.apache.openjpa.persistence.jdbc.*;
+import org.apache.openjpa.persistence.PersistentCollection;
+import org.apache.openjpa.persistence.jdbc.Nonpolymorphic;
 
 @MappedSuperclass
 public class NonstandardMappingMappedSuper {
 
     @PersistentCollection
-    private List<String> superCollection = new ArrayList<String>();
+    private List<String> superCollection = new ArrayList<>();
 
     @ManyToOne
     @Nonpolymorphic
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper4.java
index bda835c63..b0399aa55 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/NonstandardMappingMappedSuper4.java
@@ -21,10 +21,11 @@ package org.apache.openjpa.persistence.jdbc.annotations;
 
 import java.awt.Point;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
 
-import org.apache.openjpa.persistence.*;
-import org.apache.openjpa.persistence.jdbc.*;
+import org.apache.openjpa.persistence.Persistent;
+import org.apache.openjpa.persistence.jdbc.Strategy;
 
 @MappedSuperclass
 public abstract class NonstandardMappingMappedSuper4 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PointHandler.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PointHandler.java
index 5effef1cc..bfe3935ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PointHandler.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PointHandler.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.jdbc.annotations;
 
-import java.awt.*;
+import java.awt.Point;
 
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ValueMapping;
@@ -33,6 +33,9 @@ import org.apache.openjpa.meta.JavaTypes;
  */
 public class PointHandler extends AbstractValueHandler {
 
+    
+    private static final long serialVersionUID = 1L;
+
     /**
      * Create columns with default names and java type values.  Kodo will
      * fill in the rest of the information and merge in any information given
@@ -42,6 +45,7 @@ public class PointHandler extends AbstractValueHandler {
      *
      * @param    name    default base name for columns
      */
+    @Override
     public Column[] map(ValueMapping vm, String name, ColumnIO io,
         boolean adapt) {
         Column xcol = new Column();
@@ -64,6 +68,7 @@ public class PointHandler extends AbstractValueHandler {
     /**
      * Convert the object value to its datastore equivalent.
      */
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val,
         JDBCStore store) {
         if (val == null)
@@ -76,6 +81,7 @@ public class PointHandler extends AbstractValueHandler {
     /**
      *  Convert the datastore value to its object equivalent.
      */
+    @Override
     public Object toObjectValue(ValueMapping vm, Object val) {
         Object[] vals = (Object[]) val;
         if (vals[0] == null || vals[1] == null)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PropertyAccess1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PropertyAccess1.java
index 83b79c637..386420adf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PropertyAccess1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/PropertyAccess1.java
@@ -19,7 +19,8 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
 
 /**
  * Entity test object that uses property access mode.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass1.java
index d85eb3d66..71a924ace 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass1.java
@@ -19,7 +19,15 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass2.java
index 96e259d27..e1334c77a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TablePerClass2.java
@@ -19,7 +19,8 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
 
 @Entity
 public class TablePerClass2
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestDiscriminator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestDiscriminator.java
index f4a3db5fe..5325168d1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestDiscriminator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestDiscriminator.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestDiscriminator
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(AnnoTest1.class, AnnoTest2.class, Flat1.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEJBEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEJBEmbedded.java
index c3365068e..c1c9a0e9a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEJBEmbedded.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEJBEmbedded.java
@@ -53,6 +53,7 @@ public class TestEJBEmbedded extends SingleEMFTestCase {
         CLOB = buf.toString();
     }
 
+    @Override
     public void setUp() {
         setUp(EmbedOwner.class, EmbedValue.class, CLEAR_TABLES
 //        ,"openjpa.Log","SQL=trace"
@@ -71,7 +72,7 @@ public class TestEJBEmbedded extends SingleEMFTestCase {
         embed.setBlob("foobar".getBytes());
         embed.setOwner(owner);
         owner.setEmbed(embed);
-        Set<EmbedValue> embedVals = new HashSet<EmbedValue>();
+        Set<EmbedValue> embedVals = new HashSet<>();
         embedVals.add(embed);
         owner.setEmbedCollection(embedVals);
         em.persist(owner);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddableSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddableSuperclass.java
index 3a42af546..15217b613 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddableSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddableSuperclass.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.jdbc.meta.strats.NoneClassStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.StringFieldStrategy;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.ValueStrategies;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
@@ -42,6 +43,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestEmbeddableSuperclass
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(EmbeddableSuper.class, EmbeddableSuperSub.class, CLEAR_TABLES);
     }
@@ -60,7 +62,7 @@ public class TestEmbeddableSuperclass
             getMapping(EmbeddableSuperSub.class, null, true);
         assertTrue(!cls.isEmbeddedOnly());
         assertTrue(cls.getStrategy() instanceof FullClassStrategy);
-        assertEquals(ClassMapping.ID_APPLICATION, cls.getIdentityType());
+        assertEquals(ClassMetaData.ID_APPLICATION, cls.getIdentityType());
         assertTrue(cls.isOpenJPAIdentity());
 
         FieldMapping fm = cls.getFieldMapping("pk");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddedId.java
index 6eb8fc66e..8d4e7e39c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddedId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEmbeddedId.java
@@ -35,6 +35,7 @@ public class TestEmbeddedId
     EmbeddedIdClass _oid;
     EmbeddedIdClass _roid;
 
+    @Override
     public void setUp() {
         setUp(EmbeddedIdEntity.class, EmbeddedIdClass.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEnumerated.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEnumerated.java
index faeb4c7a2..5c8b5a46d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEnumerated.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestEnumerated.java
@@ -22,6 +22,7 @@ import javax.persistence.InheritanceType;
 
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
@@ -34,6 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestEnumerated
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AnnoTest1.class, AnnoTest2.class, Flat1.class, CLEAR_TABLES);
     }
@@ -44,19 +46,19 @@ public class TestEnumerated
             null, true);
         FieldMapping fm = cls.getDeclaredFieldMapping("enumeration");
         assertNotNull(fm);
-        assertEquals(FieldMapping.MANAGE_PERSISTENT, fm.getManagement());
+        assertEquals(FieldMetaData.MANAGE_PERSISTENT, fm.getManagement());
         assertEquals(JavaTypes.ENUM, fm.getTypeCode());
         assertEquals(JavaTypes.SHORT, fm.getColumns()[0].getJavaType());
 
         fm = cls.getDeclaredFieldMapping("ordinalEnumeration");
         assertNotNull(fm);
-        assertEquals(FieldMapping.MANAGE_PERSISTENT, fm.getManagement());
+        assertEquals(FieldMetaData.MANAGE_PERSISTENT, fm.getManagement());
         assertEquals(JavaTypes.ENUM, fm.getTypeCode());
         assertEquals(JavaTypes.SHORT, fm.getColumns()[0].getJavaType());
 
         fm = cls.getDeclaredFieldMapping("stringEnumeration");
         assertNotNull(fm);
-        assertEquals(FieldMapping.MANAGE_PERSISTENT, fm.getManagement());
+        assertEquals(FieldMetaData.MANAGE_PERSISTENT, fm.getManagement());
         assertEquals(JavaTypes.ENUM, fm.getTypeCode());
         assertEquals(JavaTypes.STRING, fm.getColumns()[0].getJavaType());
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestExtensionAnnotations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestExtensionAnnotations.java
index bbd9f592a..91e95419c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestExtensionAnnotations.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestExtensionAnnotations.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.jdbc.annotations;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FetchGroup;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.UpdateStrategies;
@@ -38,6 +39,7 @@ public class TestExtensionAnnotations
 
     private ClassMapping _mapping;
 
+    @Override
     public void setUp() {
         setUp(ExtensionsEntity.class);
         _mapping = ((JDBCConfiguration) emf.getConfiguration()).
@@ -46,7 +48,7 @@ public class TestExtensionAnnotations
     }
 
     public void testDataStoreId() {
-        assertEquals(ClassMapping.ID_DATASTORE, _mapping.getIdentityType());
+        assertEquals(ClassMetaData.ID_DATASTORE, _mapping.getIdentityType());
         assertEquals(ValueStrategies.SEQUENCE, _mapping.getIdentityStrategy());
         assertEquals("system", _mapping.getIdentitySequenceName());
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestFlatInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestFlatInheritance.java
index db637442d..65c87b50b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestFlatInheritance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestFlatInheritance.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestFlatInheritance extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Flat1.class, Flat2.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestGenerators.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestGenerators.java
index 3a011670b..e02de6495 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestGenerators.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestGenerators.java
@@ -34,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestGenerators extends SingleEMFTestCase {
     Log _log;
+    @Override
     public void setUp()
         throws Exception {
         setUp(Generator.class, CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestJoinedInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestJoinedInheritance.java
index 6e82a3edc..69184ca0d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestJoinedInheritance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestJoinedInheritance.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestJoinedInheritance extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AnnoTest1.class, AnnoTest2.class, AnnoTest3.class, Flat1.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestManyToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestManyToMany.java
index 1c803aefd..ced6dc92e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestManyToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestManyToMany.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 import java.util.Set;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
@@ -31,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestManyToMany
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AnnoTest1.class, AnnoTest2.class, Flat1.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMapKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMapKey.java
index cc608b41c..002d74ff8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMapKey.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMapKey.java
@@ -38,6 +38,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestMapKey
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Flat1.class, AnnoTest1.class, AnnoTest2.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java
index 0efbf00a0..382284dd1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersion.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  * @author Pinaki Poddar
  */
 public class TestMultiColumnVersion extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(MultiColumnVersionPC.class, MultiColumnSecondaryVersionPC.class,
         		CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersionXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersionXML.java
index 5897cac41..6df01ec62 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersionXML.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestMultiColumnVersionXML.java
@@ -19,10 +19,12 @@
 package org.apache.openjpa.persistence.jdbc.annotations;
 
 public class TestMultiColumnVersionXML extends TestMultiColumnVersion {
+    @Override
     public void setUp() {
         super.setUp();
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "version-columns-xml";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java
index be4fe8c42..d3bed7d79 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestNonstandardMappingAnnotations.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.jdbc.annotations;
 
-import java.awt.*;
+import java.awt.Point;
 import java.util.Map;
 
 import javax.persistence.Query;
@@ -32,6 +32,7 @@ import org.apache.openjpa.jdbc.meta.strats.ClassNameDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.PostgresDictionary;
+import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
@@ -47,6 +48,7 @@ public class TestNonstandardMappingAnnotations
     private ClassMapping _mapping;
     private DBDictionary _dict;
 
+    @Override
     public void setUp() {
         setUp(NonstandardMappingEntity.class, NonstandardMappingEntity3.class, ExtensionsEntity.class,
             NonstandardMappingMappedSuper.class, EmbedValue2.class, EmbedValue3.class,
@@ -78,7 +80,7 @@ public class TestNonstandardMappingAnnotations
 
     public void testDataStoreIdColumn() {
         assertEquals("NONSTD_ENTITY", _mapping.getTable().getName());
-        assertEquals(ClassMapping.ID_DATASTORE, _mapping.getIdentityType());
+        assertEquals(ClassMetaData.ID_DATASTORE, _mapping.getIdentityType());
         assertEquals(1, _mapping.getPrimaryKeyColumns().length);
         assertEquals("OID", _mapping.getPrimaryKeyColumns()[0].getName());
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToMany.java
index c2e4dadf7..ba55a9a70 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToMany.java
@@ -31,6 +31,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestOneToMany
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AnnoTest1.class, AnnoTest2.class, Flat1.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java
index 89321aabc..4de2d575b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestOneToOne
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AnnoTest1.class, AnnoTest2.class, Flat1.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java
index 9be9314ea..9cdbdcea2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestPropertyAccess.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestPropertyAccess
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(PropertyAccess1.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSequenceGenerator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSequenceGenerator.java
index 85ebb65f2..23b46a8d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSequenceGenerator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSequenceGenerator.java
@@ -51,6 +51,7 @@ public class TestSequenceGenerator extends SingleEMFTestCase {
 
     private boolean enabled = true;
 
+    @Override
     public void setUp()
         throws Exception {
         setUp(NativeSequenceEntity.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSerializedLobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSerializedLobs.java
index 1fc20cba1..d61365d03 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSerializedLobs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestSerializedLobs.java
@@ -24,6 +24,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Date;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
@@ -40,6 +41,7 @@ public class TestSerializedLobs extends SingleEMFTestCase {
 
     private static final Date DATE = new Date();
 
+    @Override
     public void setUp() {
         setUp(AnnoTest1.class, AnnoTest2.class, Flat1.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestTablePerClassInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestTablePerClassInheritance.java
index d2bf954af..84a7f31a8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestTablePerClassInheritance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestTablePerClassInheritance.java
@@ -35,6 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestTablePerClassInheritance
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(TablePerClass1.class, TablePerClass2.class, EmbedOwner.class,
             EmbedValue.class, CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestVersion.java
index 5931de7f4..a4d0527f8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestVersion.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestVersion extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AnnoTest1.class, AnnoTest2.class, AnnoTest3.class, Flat1.class,
             EmbedOwner.class, EmbedValue.class, CLEAR_TABLES
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedInappropriateTransient.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedInappropriateTransient.java
index 86e82cc04..626f4f960 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedInappropriateTransient.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/UnenhancedInappropriateTransient.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.jdbc.annotations;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.Transient;
 import javax.persistence.PrePersist;
+import javax.persistence.Transient;
 
 @Entity
 public class UnenhancedInappropriateTransient {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/auto/TestAutoIncrement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/auto/TestAutoIncrement.java
index 6b5d4a721..810d9e593 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/auto/TestAutoIncrement.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/auto/TestAutoIncrement.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestAutoIncrement extends SingleEMTestCase {
     boolean disabled = false;
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES, AutoIncrementEntity.class);
         DBDictionary dic = ((JDBCConfiguration)emf.getConfiguration()).getDBDictionaryInstance();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java
index bae636ffa..0d591b85b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachA.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -29,6 +32,8 @@ public class AttachA
     implements Serializable, PreDetachCallback,
     PostDetachCallback, PreAttachCallback, PostAttachCallback {
 
+    
+    private static final long serialVersionUID = 1L;
     // transient method for testing callbacks
     public transient Object detachSource = null;
     public transient Object attachSource = null;
@@ -43,19 +48,23 @@ public class AttachA
     private String [] stringArray = new String [0];
     private AttachE [] attachEArray = new AttachE [0];
 
+    @Override
     public void jdoPreDetach() {
         preDetachCalls++;
     }
 
+    @Override
     public void jdoPostDetach(Object orig) {
         postDetachCalls++;
         detachSource = orig;
     }
 
+    @Override
     public void jdoPreAttach() {
         preAttachCalls++;
     }
 
+    @Override
     public void jdoPostAttach(Object orig) {
         postAttachCalls++;
         attachSource = orig;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachB.java
index b67371977..7d3a62bc5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachB.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 import javax.persistence.Entity;
 
@@ -26,6 +29,8 @@ import javax.persistence.Entity;
 public class AttachB
     extends AttachA {
 
+    
+    private static final long serialVersionUID = 1L;
     private String bstr;
     private int bint;
     private double bdbl;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachC.java
index 1cbccd5e4..42630286f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachC.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.persistence.Entity;
 
@@ -26,6 +27,8 @@ import javax.persistence.Entity;
 public class AttachC
     extends AttachB {
 
+    
+    private static final long serialVersionUID = 1L;
     private String cstr;
     private int cint;
     private double cdbl;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachD.java
index ca2234b8d..3f405550d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachD.java
@@ -18,8 +18,12 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
-import java.io.*;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 import javax.persistence.Entity;
 
@@ -27,6 +31,9 @@ import javax.persistence.Entity;
 public class AttachD
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private Object version;
 
     private String dstr;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java
index 32b4627e3..e27fbcac7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachE.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
-import java.io.*;
+import java.io.Serializable;
+import java.util.Date;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -29,6 +29,9 @@ import javax.persistence.Table;
 public class AttachE
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private Object version;
 
     private String estr;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachF.java
index 3ad73e67e..c92fdf716 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AttachF.java
@@ -18,16 +18,20 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import javax.persistence.Entity;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
 
-import java.util.*;
-import java.io.*;
+import javax.persistence.Entity;
 
 
 @Entity
 public class AttachF
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private int id1;
     private String id2;
 
@@ -93,14 +97,17 @@ public class AttachF
             id2 = tok.nextToken();
         }
 
+        @Override
         public int hashCode() {
             return id1 + (id2 == null ? 0 : id2.hashCode());
         }
 
+        @Override
         public String toString() {
             return id1 + ":" + id2;
         }
 
+        @Override
         public boolean equals(Object other) {
             return other instanceof ID
                 && ((ID) other).id1 == id1
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPC.java
index 4297e2cbd..32ecb56c7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPC.java
@@ -19,13 +19,13 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
 
-import java.util.*;
-
-
 @Entity
 public class AutoIncrementOpOrderPC {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPCSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPCSub.java
index 07175b337..55754d1c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPCSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementOpOrderPCSub.java
@@ -31,6 +31,7 @@ public class AutoIncrementOpOrderPCSub
 	@Id
     private String sub;
 
+    @Override
     public String getSub() {
         return sub;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC1.java
index 1cccd7e31..405f6e4db 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC1.java
@@ -19,8 +19,17 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC2.java
index 4a5298f4d..d1e01ce00 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC2.java
@@ -19,7 +19,8 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import javax.persistence.*;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3.java
index c27a9a3f1..063e12e21 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3.java
@@ -19,10 +19,16 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3Id.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3Id.java
index 92055dca8..6e3548d82 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3Id.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/AutoIncrementPC3Id.java
@@ -19,17 +19,19 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import java.io.*;
+import java.io.Serializable;
 
 
 /**
  * Auto-generated by:
  * kodo.enhance.ApplicationIdTool
  */
-@SuppressWarnings("serial")
 public class AutoIncrementPC3Id	implements Serializable
 {
-	static
+    private static final long serialVersionUID = 1L;
+
+
+    static
 	{
 		// register persistent class in JVM
 		Class c = AutoIncrementPC3.class;
@@ -49,19 +51,22 @@ public class AutoIncrementPC3Id	implements Serializable
 	}
 
 
-	public String toString ()
+	@Override
+    public String toString ()
 	{
 		return String.valueOf (id);
 	}
 
 
-	public int hashCode ()
+	@Override
+    public int hashCode ()
 	{
 		return (int) (id % Integer.MAX_VALUE);
 	}
 
 
-	public boolean equals (Object obj)
+	@Override
+    public boolean equals (Object obj)
 	{
 		if (this == obj)
 			return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Base.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Base.java
index ffe9e53ea..e55a5dc5d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Base.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Base.java
@@ -34,6 +34,7 @@ public class Base
         this.baseField = baseField;
     }
 
+    @Override
     public int compareTo(Object other) {
         if (other == this)
             return 0;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC.java
index 87311f471..3aac63c41 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC.java
@@ -18,9 +18,13 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.Entity;
 
+import org.apache.openjpa.persistence.jdbc.kernel.TestByteArrayAppId;
+
 /**
  * <p>Persistent type using a byte[] for a primary key field.  Used in
  * {@link TestByteArrayAppId}.</p>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC2.java
index 3570755a3..eba465803 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPC2.java
@@ -20,6 +20,8 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 
 import javax.persistence.Entity;
 
+import org.apache.openjpa.persistence.jdbc.kernel.TestByteArrayAppId;
+
 /**
  * <p>Persistent type using a byte[] for a primary key field.  Used in
  * {@link TestByteArrayAppId}.</p>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPCId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPCId.java
index c88e4f50b..4741ba64a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPCId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ByteArrayPKPCId.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Auto-generated by:
@@ -26,6 +26,8 @@ import java.io.*;
  */
 public class ByteArrayPKPCId implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private static final char[] HEX = new char[]{
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
@@ -45,14 +47,17 @@ public class ByteArrayPKPCId implements Serializable {
         pk = toBytes(fromString);
     }
 
+    @Override
     public String toString() {
         return toString(pk);
     }
 
+    @Override
     public int hashCode() {
         return hashCode(pk);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (this == obj)
             return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ComplexEmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ComplexEmbeddedPC.java
index 3a74b50d3..b6dfecc13 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ComplexEmbeddedPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ComplexEmbeddedPC.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
+
 import javax.persistence.Entity;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC.java
index 85d71646e..1600f4dc7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+
 import javax.persistence.Entity;
 
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC4.java
index 998978332..c723b1475 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC4.java
@@ -19,8 +19,16 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="conjoinpc4")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC5.java
index f87f20180..d5a3c184e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/ConstantJoinPC5.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="conjoinpc5")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CustomMappingPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CustomMappingPC.java
index b213ed7f3..25a3cf8b9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CustomMappingPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/CustomMappingPC.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 /**
  *	<p>Persistent type used in testing.</p>
  *
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC.java
index b0299cd16..3771318aa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
 import javax.persistence.Entity;
 
 /**
@@ -85,6 +89,7 @@ public class EagerOuterJoinPC {
         this.name = name;
     }
 
+    @Override
     public String toString() {
         return getClass().getName() + ": " + name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC2.java
index 92cf14465..dd6a696c8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerOuterJoinPC2.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+
 import javax.persistence.Entity;
 
 /**
@@ -50,6 +52,7 @@ public class EagerOuterJoinPC2 {
         this.ref = ref;
     }
 
+    @Override
     public String toString() {
         return getClass().getName() + ": " + name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPC.java
index c67882d70..edcd20aab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPC.java
@@ -18,8 +18,17 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToOne;
+import javax.persistence.Transient;
 
 /**
  *	<p>Persistent type used in testing.</p>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPCSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPCSub.java
index c04b7017d..b03551cb3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPCSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/EagerPCSub.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.Transient;
 
 /**
  *	<p>Persistent type used in testing.</p>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC.java
index 9e77bbd4d..520add10a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC.java
@@ -20,17 +20,22 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
 /**
  *	<p>Persistent type used in testing.</p>
  *
  *	@author		Abe White
  */
-@SuppressWarnings("serial")
 @Entity
 public class HelperPC implements Serializable
 {
-	@Column(length=50, name="strngfld")
+    private static final long serialVersionUID = 1L;
+
+    @Column(length=50, name="strngfld")
 	private String 		stringField;
 
 	private HelperPC 	helper;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC2.java
index 7df76405b..bb6f43ea4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC2.java
@@ -18,9 +18,15 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC3.java
index 005bbf7cd..16f0032c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC3.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC4.java
index d5ab7c923..214e68edf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HelperPC4.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
 
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizA.java
index 6f6e6656e..7e1a3f1c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizA.java
@@ -18,14 +18,18 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
-import java.io.*;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
 import javax.persistence.Entity;
 
 @Entity
 public abstract class HorizA
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringA;
     private int intA;
     private Set relations = new HashSet();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppA.java
index a6c6e639e..4d86b6abd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppA.java
@@ -20,19 +20,19 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 
 public interface HorizAppA {
 
-    public void setPk1(String pk1);
+    void setPk1(String pk1);
 
-    public String getPk1();
+    String getPk1();
 
-    public void setPk2(int pk2);
+    void setPk2(int pk2);
 
-    public int getPk2();
+    int getPk2();
 
-    public void setStringA(String stringA);
+    void setStringA(String stringA);
 
-    public String getStringA();
+    String getStringA();
 
-    public void setIntA(int intA);
+    void setIntA(int intA);
 
-    public int getIntA();
+    int getIntA();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppB.java
index 39f242d7a..6833b3735 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppB.java
@@ -21,12 +21,12 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 public interface HorizAppB
     extends HorizAppA {
 
-    public void setStringB(String stringB);
+    void setStringB(String stringB);
 
-    public String getStringB();
+    String getStringB();
 
-    public void setIntB(int intB);
+    void setIntB(int intB);
 
-    public int getIntB();
+    int getIntB();
 }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppC.java
index e3773181f..550d66e6c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppC.java
@@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 public interface HorizAppC
     extends HorizAppA {
 
-    public void setStringC(String stringC);
+    void setStringC(String stringC);
 
-    public String getStringC();
+    String getStringC();
 
-    public void setIntC(int intC);
+    void setIntC(int intC);
 
-    public int getIntC();
+    int getIntC();
 }
 
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppD.java
index b10325347..1ff5347c6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppD.java
@@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 public interface HorizAppD
     extends HorizAppA {
 
-    public void setStringD(String stringD);
+    void setStringD(String stringD);
 
-    public String getStringD();
+    String getStringD();
 
-    public void setIntD(int intD);
+    void setIntD(int intD);
 
-    public int getIntD();
+    int getIntD();
 }
 
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalA.java
index 3b9b0c687..e124bfb84 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalA.java
@@ -33,24 +33,30 @@ public class HorizAppInterVerticalA
     private String stringA;
     private int intA;
 
+    @Override
     public void setStringA(String stringA) {
         this.stringA = stringA;
     }
 
+    @Override
     public String getStringA() {
         return this.stringA;
     }
 
+    @Override
     public void setIntA(int intA) {
         this.intA = intA;
     }
 
+    @Override
     public int getIntA() {
         return this.intA;
     }
 
     public static class Id implements java.io.Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public int pk;
 
         public Id() {
@@ -60,14 +66,17 @@ public class HorizAppInterVerticalA
             pk = Integer.parseInt(str);
         }
 
+        @Override
         public String toString() {
             return pk + "";
         }
 
+        @Override
         public int hashCode() {
             return pk;
         }
 
+        @Override
         public boolean equals(Object other) {
             return other instanceof Id
                 && ((Id) other).pk == pk;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalB.java
index d78fbe432..6aecc8523 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalB.java
@@ -33,18 +33,22 @@ public class HorizAppInterVerticalB
     private String stringB;
     private int intB;
 
+    @Override
     public void setStringB(String stringB) {
         this.stringB = stringB;
     }
 
+    @Override
     public String getStringB() {
         return this.stringB;
     }
 
+    @Override
     public void setIntB(int intB) {
         this.intB = intB;
     }
 
+    @Override
     public int getIntB() {
         return this.intB;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalC.java
index 19710569c..f54965c51 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalC.java
@@ -33,18 +33,22 @@ public class HorizAppInterVerticalC
     private String stringC;
     private int intC;
 
+    @Override
     public void setStringC(String stringC) {
         this.stringC = stringC;
     }
 
+    @Override
     public String getStringC() {
         return this.stringC;
     }
 
+    @Override
     public void setIntC(int intC) {
         this.intC = intC;
     }
 
+    @Override
     public int getIntC() {
         return this.intC;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalD.java
index 01fbb3073..9e093f659 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppInterVerticalD.java
@@ -33,18 +33,22 @@ public class HorizAppInterVerticalD
     private String stringD;
     private int intD;
 
+    @Override
     public void setStringD(String stringD) {
         this.stringD = stringD;
     }
 
+    @Override
     public String getStringD() {
         return this.stringD;
     }
 
+    @Override
     public void setIntD(int intD) {
         this.intD = intD;
     }
 
+    @Override
     public int getIntD() {
         return this.intD;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiA.java
index 283a65cff..ffc389303 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiA.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
 
 import javax.persistence.Entity;
 
@@ -42,34 +44,42 @@ public class HorizAppMultiA
     private int intA;
     private List relations = new ArrayList();
 
+    @Override
     public void setPk1(String pk1) {
         this.pk1 = pk1;
     }
 
+    @Override
     public String getPk1() {
         return this.pk1;
     }
 
+    @Override
     public void setPk2(int pk2) {
         this.pk2 = pk2;
     }
 
+    @Override
     public int getPk2() {
         return this.pk2;
     }
 
+    @Override
     public void setStringA(String stringA) {
         this.stringA = stringA;
     }
 
+    @Override
     public String getStringA() {
         return this.stringA;
     }
 
+    @Override
     public void setIntA(int intA) {
         this.intA = intA;
     }
 
+    @Override
     public int getIntA() {
         return this.intA;
     }
@@ -77,6 +87,8 @@ public class HorizAppMultiA
     public static class ID
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public String pk1;
         public int pk2;
 
@@ -89,15 +101,18 @@ public class HorizAppMultiA
             pk2 = Integer.parseInt(tok.nextToken());
         }
 
+        @Override
         public String toString() {
             return pk1 + ":" + pk2;
         }
 
+        @Override
         public int hashCode() {
             return (pk2 + (pk1 == null ? 0 : pk1.hashCode()))
                 % Integer.MAX_VALUE;
         }
 
+        @Override
         public boolean equals(Object other) {
             return other instanceof ID
                 && ((ID) other).pk2 == pk2
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiB.java
index 75f404cfd..2e62317bf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiB.java
@@ -28,18 +28,22 @@ public class HorizAppMultiB
     private String stringB;
     private int intB;
 
+    @Override
     public void setStringB(String stringB) {
         this.stringB = stringB;
     }
 
+    @Override
     public String getStringB() {
         return this.stringB;
     }
 
+    @Override
     public void setIntB(int intB) {
         this.intB = intB;
     }
 
+    @Override
     public int getIntB() {
         return this.intB;
     }
@@ -47,6 +51,9 @@ public class HorizAppMultiB
     public static class ID
         extends HorizAppMultiA.ID {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public ID() {
             super();
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiC.java
index 1e521d36f..9cc00f796 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiC.java
@@ -28,18 +28,22 @@ public class HorizAppMultiC
     private String stringC;
     private int intC;
 
+    @Override
     public void setStringC(String stringC) {
         this.stringC = stringC;
     }
 
+    @Override
     public String getStringC() {
         return this.stringC;
     }
 
+    @Override
     public void setIntC(int intC) {
         this.intC = intC;
     }
 
+    @Override
     public int getIntC() {
         return this.intC;
     }
@@ -47,6 +51,9 @@ public class HorizAppMultiC
     public static class ID
         extends HorizAppMultiA.ID {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public ID() {
             super();
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiD.java
index 5815de9a6..09c90218a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppMultiD.java
@@ -28,18 +28,22 @@ public class HorizAppMultiD
     private String stringD;
     private int intD;
 
+    @Override
     public void setStringD(String stringD) {
         this.stringD = stringD;
     }
 
+    @Override
     public String getStringD() {
         return this.stringD;
     }
 
+    @Override
     public void setIntD(int intD) {
         this.intD = intD;
     }
 
+    @Override
     public int getIntD() {
         return this.intD;
     }
@@ -47,6 +51,9 @@ public class HorizAppMultiD
     public static class ID
         extends HorizAppMultiA.ID {
 
+        
+        private static final long serialVersionUID = 1L;
+
         public ID() {
             super();
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleA.java
index 6b9b191f1..e894e7f76 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleA.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
 
 import javax.persistence.Entity;
 
@@ -41,34 +43,42 @@ public class HorizAppSingleA
     private int intA;
     private List relations = new ArrayList();
 
+    @Override
     public void setPk1(String pk1) {
         this.pk1 = pk1;
     }
 
+    @Override
     public String getPk1() {
         return this.pk1;
     }
 
+    @Override
     public void setPk2(int pk2) {
         this.pk2 = pk2;
     }
 
+    @Override
     public int getPk2() {
         return this.pk2;
     }
 
+    @Override
     public void setStringA(String stringA) {
         this.stringA = stringA;
     }
 
+    @Override
     public String getStringA() {
         return this.stringA;
     }
 
+    @Override
     public void setIntA(int intA) {
         this.intA = intA;
     }
 
+    @Override
     public int getIntA() {
         return this.intA;
     }
@@ -76,6 +86,8 @@ public class HorizAppSingleA
     public static class ID
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public String pk1;
         public int pk2;
 
@@ -88,15 +100,18 @@ public class HorizAppSingleA
             pk2 = Integer.parseInt(tok.nextToken());
         }
 
+        @Override
         public String toString() {
             return pk1 + ":" + pk2;
         }
 
+        @Override
         public int hashCode() {
             return (pk2 + (pk1 == null ? 0 : pk1.hashCode()))
                 % Integer.MAX_VALUE;
         }
 
+        @Override
         public boolean equals(Object other) {
             return other instanceof ID
                 && ((ID) other).pk2 == pk2
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleB.java
index 32953a7cd..96d72eb96 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleB.java
@@ -28,18 +28,22 @@ public class HorizAppSingleB
     private String stringB;
     private int intB;
 
+    @Override
     public void setStringB(String stringB) {
         this.stringB = stringB;
     }
 
+    @Override
     public String getStringB() {
         return this.stringB;
     }
 
+    @Override
     public void setIntB(int intB) {
         this.intB = intB;
     }
 
+    @Override
     public int getIntB() {
         return this.intB;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleC.java
index ceae52462..55d38d6ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleC.java
@@ -28,18 +28,22 @@ public class HorizAppSingleC
     private String stringC;
     private int intC;
 
+    @Override
     public void setStringC(String stringC) {
         this.stringC = stringC;
     }
 
+    @Override
     public String getStringC() {
         return this.stringC;
     }
 
+    @Override
     public void setIntC(int intC) {
         this.intC = intC;
     }
 
+    @Override
     public int getIntC() {
         return this.intC;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleD.java
index 8c74d128d..4cbe6d956 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizAppSingleD.java
@@ -28,18 +28,22 @@ public class HorizAppSingleD
     private String stringD;
     private int intD;
 
+    @Override
     public void setStringD(String stringD) {
         this.stringD = stringD;
     }
 
+    @Override
     public String getStringD() {
         return this.stringD;
     }
 
+    @Override
     public void setIntD(int intD) {
         this.intD = intD;
     }
 
+    @Override
     public int getIntD() {
         return this.intD;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizB.java
index 94acd396f..f73c3db22 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizB.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizB
     extends HorizA {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringB;
     private int intB;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizC.java
index 4176faa65..39fee97bc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizC.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public abstract class HorizC
     extends HorizA {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringC;
     private int intC;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizD.java
index 7d4f8cabd..7cfa8df53 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizD.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizD
     extends HorizC {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringD;
     private int intD;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizE.java
index 79130a27f..a19c98e6e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizE.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizE
     extends HorizC {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringE;
     private int intE;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizF.java
index a61772a6c..0c61fb486 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizF.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizF
     extends HorizE {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringF;
     private int intF;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizG.java
index ed3c59101..69dea0570 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizG.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizG.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizG
     extends HorizE {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringG;
     private int intG;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizH.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizH.java
index 6052715d3..74c017aaf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizH.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizH.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizH
     extends HorizG {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringH;
     private int intH;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizI.java
index 838ada28c..edc3331d4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizI.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizI.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizI
     extends HorizG {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringI;
     private int intI;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterA.java
index 43f06701c..58414bfa1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterA.java
@@ -25,11 +25,11 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
  */
 public interface HorizInterA {
 
-    public void setStringA(String stringA);
+    void setStringA(String stringA);
 
-    public String getStringA();
+    String getStringA();
 
-    public void setIntA(int intA);
+    void setIntA(int intA);
 
-    public int getIntA();
+    int getIntA();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterB.java
index 4718e4dfe..dff4e3880 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterB.java
@@ -26,11 +26,11 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 public interface HorizInterB
     extends HorizInterA {
 
-    public void setStringB(String stringB);
+    void setStringB(String stringB);
 
-    public String getStringB();
+    String getStringB();
 
-    public void setIntB(int intB);
+    void setIntB(int intB);
 
-    public int getIntB();
+    int getIntB();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterC.java
index ec720cfad..8b72d0656 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterC.java
@@ -26,11 +26,11 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 public interface HorizInterC
     extends HorizInterB {
 
-    public void setStringC(String stringC);
+    void setStringC(String stringC);
 
-    public String getStringC();
+    String getStringC();
 
-    public void setIntC(int intC);
+    void setIntC(int intC);
 
-    public int getIntC();
+    int getIntC();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterD.java
index 1977538a2..eebc7bcd3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterD.java
@@ -26,11 +26,11 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 public interface HorizInterD
     extends HorizInterB {
 
-    public void setStringD(String stringD);
+    void setStringD(String stringD);
 
-    public String getStringD();
+    String getStringD();
 
-    public void setIntD(int intD);
+    void setIntD(int intD);
 
-    public int getIntD();
+    int getIntD();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatA.java
index f758d05c8..df7e653df 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatA.java
@@ -32,18 +32,22 @@ public class HorizInterFlatA
     private String stringA;
     private int intA;
 
+    @Override
     public void setStringA(String stringA) {
         this.stringA = stringA;
     }
 
+    @Override
     public String getStringA() {
         return this.stringA;
     }
 
+    @Override
     public void setIntA(int intA) {
         this.intA = intA;
     }
 
+    @Override
     public int getIntA() {
         return this.intA;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatB.java
index 6c1aa691c..ffb539acf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatB.java
@@ -33,18 +33,22 @@ public class HorizInterFlatB
     private String stringB;
     private int intB;
 
+    @Override
     public void setStringB(String stringB) {
         this.stringB = stringB;
     }
 
+    @Override
     public String getStringB() {
         return this.stringB;
     }
 
+    @Override
     public void setIntB(int intB) {
         this.intB = intB;
     }
 
+    @Override
     public int getIntB() {
         return this.intB;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatC.java
index a75c14053..649e179b9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatC.java
@@ -33,18 +33,22 @@ public class HorizInterFlatC
     private String stringC;
     private int intC;
 
+    @Override
     public void setStringC(String stringC) {
         this.stringC = stringC;
     }
 
+    @Override
     public String getStringC() {
         return this.stringC;
     }
 
+    @Override
     public void setIntC(int intC) {
         this.intC = intC;
     }
 
+    @Override
     public int getIntC() {
         return this.intC;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatD.java
index 80c5e033e..b2aedc662 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterFlatD.java
@@ -33,18 +33,22 @@ public class HorizInterFlatD
     private String stringD;
     private int intD;
 
+    @Override
     public void setStringD(String stringD) {
         this.stringD = stringD;
     }
 
+    @Override
     public String getStringD() {
         return this.stringD;
     }
 
+    @Override
     public void setIntD(int intD) {
         this.intD = intD;
     }
 
+    @Override
     public int getIntD() {
         return this.intD;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalA.java
index 8e5aac4bb..a950e2926 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalA.java
@@ -32,18 +32,22 @@ public class HorizInterVerticalA
     private String stringA;
     private int intA;
 
+    @Override
     public void setStringA(String stringA) {
         this.stringA = stringA;
     }
 
+    @Override
     public String getStringA() {
         return this.stringA;
     }
 
+    @Override
     public void setIntA(int intA) {
         this.intA = intA;
     }
 
+    @Override
     public int getIntA() {
         return this.intA;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalB.java
index c97d9f91d..2766d680b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalB.java
@@ -33,18 +33,22 @@ public class HorizInterVerticalB
     private String stringB;
     private int intB;
 
+    @Override
     public void setStringB(String stringB) {
         this.stringB = stringB;
     }
 
+    @Override
     public String getStringB() {
         return this.stringB;
     }
 
+    @Override
     public void setIntB(int intB) {
         this.intB = intB;
     }
 
+    @Override
     public int getIntB() {
         return this.intB;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalC.java
index ad9258be0..9dfb6f377 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalC.java
@@ -33,18 +33,22 @@ public class HorizInterVerticalC
     private String stringC;
     private int intC;
 
+    @Override
     public void setStringC(String stringC) {
         this.stringC = stringC;
     }
 
+    @Override
     public String getStringC() {
         return this.stringC;
     }
 
+    @Override
     public void setIntC(int intC) {
         this.intC = intC;
     }
 
+    @Override
     public int getIntC() {
         return this.intC;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalD.java
index ea0405aaf..7c5ae6414 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizInterVerticalD.java
@@ -33,18 +33,22 @@ public class HorizInterVerticalD
     private String stringD;
     private int intD;
 
+    @Override
     public void setStringD(String stringD) {
         this.stringD = stringD;
     }
 
+    @Override
     public String getStringD() {
         return this.stringD;
     }
 
+    @Override
     public void setIntD(int intD) {
         this.intD = intD;
     }
 
+    @Override
     public int getIntD() {
         return this.intD;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizJ.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizJ.java
index 45e1848d5..799e373eb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizJ.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizJ.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizJ
     extends HorizD {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringJ;
     private int intJ;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizK.java
index a8cf01c0e..184982a78 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizK.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizK
     extends HorizJ {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringK;
     private int intK;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizL.java
index 0fbd00cc7..a018b2b43 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizL.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizL
     extends HorizJ {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringL;
     private int intL;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizM.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizM.java
index 23b6a1e28..41165dd61 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizM.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizM.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizM
     extends HorizL {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringM;
     private int intM;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizN.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizN.java
index 7dc83946f..856f4a3d0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizN.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizN.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizN
     extends HorizM {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringN;
     private int intN;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizO.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizO.java
index 1fff8498e..ae64d7681 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizO.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizO.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class HorizO
     extends HorizN {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringO;
     private int intO;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizRelation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizRelation.java
index 0b6f42bc3..e04c1b0bc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizRelation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/HorizRelation.java
@@ -42,6 +42,8 @@ public class HorizRelation
     // One to one mappings
     ///////////////////////
 
+    
+    private static final long serialVersionUID = 1L;
     private HorizA obHorizA;
     private HorizB obHorizB;
     private HorizC obHorizC;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InverseKeyMapPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InverseKeyMapPC.java
index 981c8351e..4122be55b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InverseKeyMapPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InverseKeyMapPC.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.persistence.Entity;
 
 @Entity
@@ -28,6 +30,7 @@ public class InverseKeyMapPC
     private String name;
     private Map helpers = new HashMap();
 
+    @Override
     public Map getHelpers() {
         return this.helpers;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertA.java
index ea12ad891..a2778ee59 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertA.java
@@ -21,18 +21,23 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
 
 /**
  *	Used to test invert one-to-ones and stuff
  *
  *	@author		skim
  */
-@SuppressWarnings("serial")
 @Entity
 public class InvertA implements Serializable
 {
-	@Id
+    private static final long serialVersionUID = 1L;
+
+    @Id
 	private int id;
 
 	@Column(length=35)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertB.java
index aeeff327a..921792975 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/InvertB.java
@@ -20,7 +20,11 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
 
 
 /**
@@ -28,12 +32,12 @@ import javax.persistence.*;
  *
  *	@author		skim
  */
-@SuppressWarnings("serial")
 @Entity
 public class InvertB implements Serializable
 {
+    private static final long serialVersionUID = 1L;
 
-	@Id
+    @Id
 	private int id;
 
 	@OneToOne(cascade={CascadeType.PERSIST, CascadeType.REMOVE})
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBase.java
index 528942495..919d7f248 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinSubclassBase.java
@@ -34,6 +34,7 @@ public class JoinSubclassBase
         this.baseField = baseField;
     }
 
+    @Override
     public int compareTo(Object other) {
         if (other == this)
             return 0;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinTableMapPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinTableMapPC.java
index 2389ab84e..222842f64 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinTableMapPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/JoinTableMapPC.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.persistence.Entity;
 
 @Entity
@@ -28,6 +30,7 @@ public class JoinTableMapPC
     private String name;
     private Map helpers = new HashMap();
 
+    @Override
     public Map getHelpers() {
         return this.helpers;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSCompoundPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSCompoundPC.java
index 65122996b..d042f1010 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSCompoundPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSCompoundPC.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import javax.persistence.Entity;
 
 /**
@@ -52,62 +58,77 @@ public class LRSCompoundPC
         stringField = str;
     }
 
+    @Override
     public LRSPCIntf newInstance(String stringField) {
         return new LRSCompoundPC(stringField);
     }
 
+    @Override
     public Set getStringSet() {
         return this.stringSet;
     }
 
+    @Override
     public void setStringSet(Set stringSet) {
         this.stringSet = stringSet;
     }
 
+    @Override
     public Set getRelSet() {
         return this.relSet;
     }
 
+    @Override
     public void setRelSet(Set relSet) {
         this.relSet = relSet;
     }
 
+    @Override
     public Collection getStringCollection() {
         return this.stringCollection;
     }
 
+    @Override
     public void setStringCollection(Collection stringCollection) {
         this.stringCollection = stringCollection;
     }
 
+    @Override
     public Collection getRelCollection() {
         return this.relCollection;
     }
 
+    @Override
     public void setRelCollection(Collection relCollection) {
         this.relCollection = relCollection;
     }
 
+    @Override
     public Map getStringMap() {
         return this.stringMap;
     }
 
+    @Override
     public void setStringMap(Map stringMap) {
         this.stringMap = stringMap;
     }
 
+    @Override
     public Map getRelMap() {
         return this.relMap;
     }
 
+    @Override
     public void setRelMap(Map relMap) {
         this.relMap = relMap;
     }
 
+    @Override
     public String getStringField() {
         return this.stringField;
     }
 
+    @Override
     public int compareTo(Object other) {
         return stringField.compareTo(((LRSCompoundPC) other).stringField);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPC.java
index f39aaa94c..a7b42c662 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPC.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import javax.persistence.Entity;
 
 /**
@@ -45,62 +51,77 @@ public class LRSPC
         stringField = str;
     }
 
+    @Override
     public LRSPCIntf newInstance(String stringField) {
         return new LRSPC(stringField);
     }
 
+    @Override
     public Set getStringSet() {
         return this.stringSet;
     }
 
+    @Override
     public void setStringSet(Set stringSet) {
         this.stringSet = stringSet;
     }
 
+    @Override
     public Set getRelSet() {
         return this.relSet;
     }
 
+    @Override
     public void setRelSet(Set relSet) {
         this.relSet = relSet;
     }
 
+    @Override
     public Collection getStringCollection() {
         return this.stringCollection;
     }
 
+    @Override
     public void setStringCollection(Collection stringCollection) {
         this.stringCollection = stringCollection;
     }
 
+    @Override
     public Collection getRelCollection() {
         return this.relCollection;
     }
 
+    @Override
     public void setRelCollection(Collection relCollection) {
         this.relCollection = relCollection;
     }
 
+    @Override
     public Map getStringMap() {
         return this.stringMap;
     }
 
+    @Override
     public void setStringMap(Map stringMap) {
         this.stringMap = stringMap;
     }
 
+    @Override
     public Map getRelMap() {
         return this.relMap;
     }
 
+    @Override
     public void setRelMap(Map relMap) {
         this.relMap = relMap;
     }
 
+    @Override
     public String getStringField() {
         return this.stringField;
     }
 
+    @Override
     public int compareTo(Object other) {
         return stringField.compareTo(((LRSPC) other).stringField);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPCIntf.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPCIntf.java
index 59ab643a4..221f56e33 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPCIntf.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LRSPCIntf.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>Common interface for persistent types used in LRS testing.</p>
@@ -28,31 +30,31 @@ import java.util.*;
 public interface LRSPCIntf
     extends Comparable {
 
-    public Set getStringSet();
+    Set getStringSet();
 
-    public void setStringSet(Set stringSet);
+    void setStringSet(Set stringSet);
 
-    public Set getRelSet();
+    Set getRelSet();
 
-    public void setRelSet(Set relSet);
+    void setRelSet(Set relSet);
 
-    public Collection getStringCollection();
+    Collection getStringCollection();
 
-    public void setStringCollection(Collection stringCollection);
+    void setStringCollection(Collection stringCollection);
 
-    public Collection getRelCollection();
+    Collection getRelCollection();
 
-    public void setRelCollection(Collection relCollection);
+    void setRelCollection(Collection relCollection);
 
-    public Map getStringMap();
+    Map getStringMap();
 
-    public void setStringMap(Map stringMap);
+    void setStringMap(Map stringMap);
 
-    public Map getRelMap();
+    Map getRelMap();
 
-    public void setRelMap(Map relMap);
+    void setRelMap(Map relMap);
 
-    public String getStringField();
+    String getStringField();
 
-    public LRSPCIntf newInstance(String stringField);
+    LRSPCIntf newInstance(String stringField);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LockGroupSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LockGroupSubclass.java
index 34ab71f52..28a2b5091 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LockGroupSubclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/LockGroupSubclass.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class LockGroupSubclass
     extends HorizB {
 
+    
+    private static final long serialVersionUID = 1L;
     private String nonDefaultLockGroupField;
     private String defaultLockGroupField;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappedByMapPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappedByMapPC.java
index 0d511683d..598f0e80a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappedByMapPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappedByMapPC.java
@@ -18,12 +18,12 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.Map;
 
 public interface MappedByMapPC {
 
     /**
      * Map of string to {@link HelperPC}.
      */
-    public Map getHelpers();
+    Map getHelpers();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest1.java
index 7005039a4..06fcc238e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest1.java
@@ -19,7 +19,13 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import javax.persistence.Entity;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2.java
index 7ed1688a3..d7d126960 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2.java
@@ -19,8 +19,10 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import java.util.*;
-import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Entity;
 
 /**
  *	<p>Persistent class used in testing.</p>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2ID.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2ID.java
index 7c9438d7b..31fe78109 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2ID.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MappingTest2ID.java
@@ -19,18 +19,18 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.StringTokenizer;
 
 
 /**
  *	Application object ID class for MappingTest2.
  *	Auto-generated by kodo.enhance.ApplicationIdTool.
  */
-@SuppressWarnings("serial")
 public class MappingTest2ID	implements Serializable
 {
-	// each pk field in MappingTest2
+    private static final long serialVersionUID = 1L;
+    // each pk field in MappingTest2
 	// must be listed as a public field here
 	public int         pk1;
 	public int         pk2;
@@ -61,7 +61,8 @@ public class MappingTest2ID	implements Serializable
 	/**
 	 *	Implementation of equals method.
 	 */
-	public boolean equals (Object ob)
+	@Override
+    public boolean equals (Object ob)
 	{
 		if (this == ob)
 			return true;
@@ -78,10 +79,11 @@ public class MappingTest2ID	implements Serializable
 	 *	Implementation of hashCode method that supports the
 	 *	equals-hashCode contract.
 	 */
-	public int hashCode ()
+	@Override
+    public int hashCode ()
 	{
-		return (int) this.pk1
-			+ (int) this.pk2;
+		return this.pk1
+			+ this.pk2;
 	}
 
 
@@ -89,7 +91,8 @@ public class MappingTest2ID	implements Serializable
 	 *	Implementation of toString that outputs this object id's
 	 *	primary key values.
 	 */
-	public String toString ()
+	@Override
+    public String toString ()
 	{
 		return String.valueOf (this.pk1)
 			+ "::" + String.valueOf (this.pk2);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MultiA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MultiA.java
index 7a7f466c8..1f8b1e14b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MultiA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MultiA.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public class MultiA {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MultiC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MultiC.java
index 461441ef2..7eba405f4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MultiC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/MultiC.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public class MultiC
     extends MultiB {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/NonPKJoinPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/NonPKJoinPC.java
index c0539e469..9718615ca 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/NonPKJoinPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/NonPKJoinPC.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public class NonPKJoinPC {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/NonPKJoinPC3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/NonPKJoinPC3.java
index 780f5fc1d..410b05611 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/NonPKJoinPC3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/NonPKJoinPC3.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public class NonPKJoinPC3
     extends NonPKJoinPC2 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrder.java
index 874aa6ea8..9e0fec8ec 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrder.java
@@ -19,26 +19,26 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
-import java.util.*;
+import java.util.List;
 
 
 
 public interface OpOrder {
 
 
-    public long getId();
+    long getId();
 
-    public OpOrder getRel();
+    OpOrder getRel();
 
-    public OpOrder getOwner();
+    OpOrder getOwner();
 
-    public String getSecondary();
+    String getSecondary();
 
-    public String getSub();
+    String getSub();
 
-    public List getRelList();
+    List getRelList();
 
-    public List getMappedRelList();
+    List getMappedRelList();
 
-    public List getInverseKeyRelList();
+    List getInverseKeyRelList();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPC.java
index b7bbdebd3..f1258bbdc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPC.java
@@ -19,11 +19,12 @@
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import java.util.*;
-
 
 @Entity
 public class OpOrderPC {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPCSub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPCSub.java
index f328ffc74..e6b6184fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPCSub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/OpOrderPCSub.java
@@ -30,6 +30,7 @@ public class OpOrderPCSub
 	@Id
     private String sub;
 
+    @Override
     public String getSub() {
         return sub;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingAppIdPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingAppIdPC.java
index 3759a398a..cea25045a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingAppIdPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingAppIdPC.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.Entity;
 
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingPC.java
index 821f47f07..d58de5d4e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PagingPC.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.Entity;
 
 
@@ -59,6 +61,7 @@ public class PagingPC {
         this.rels = rels;
     }
 
+    @Override
     public String toString() {
         return "PagingPC: " + intField;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PartialJoinPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PartialJoinPC.java
index f7ff27ffe..8bd2ef430 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PartialJoinPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PartialJoinPC.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public class PartialJoinPC {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PartialJoinPC3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PartialJoinPC3.java
index 8288e3ede..8c49016fd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PartialJoinPC3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PartialJoinPC3.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Set;
 
 public class PartialJoinPC3
     extends PartialJoinPC2 {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PostAttachCallback.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PostAttachCallback.java
index 858a6a6d6..97d86e028 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PostAttachCallback.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PostAttachCallback.java
@@ -24,6 +24,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
  *
  * @deprecated
  */
+@Deprecated
 public interface PostAttachCallback {
 
     /**
@@ -33,5 +34,5 @@ public interface PostAttachCallback {
      * @param detached the detached instance that corresponds to
      * this managed instance
      */
-    public void jdoPostAttach(Object detached);
+    void jdoPostAttach(Object detached);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PostDetachCallback.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PostDetachCallback.java
index cfabe9597..a4a18be86 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PostDetachCallback.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PostDetachCallback.java
@@ -24,6 +24,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
  *
  * @deprecated
  */
+@Deprecated
 public interface PostDetachCallback {
 
     /**
@@ -35,5 +36,5 @@ public interface PostDetachCallback {
      * @param managed the managed instance that was the
      * source of the detached instance
      */
-    public void jdoPostDetach(Object managed);
+    void jdoPostDetach(Object managed);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PreAttachCallback.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PreAttachCallback.java
index 7e7b5d055..8569debaa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PreAttachCallback.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PreAttachCallback.java
@@ -24,11 +24,12 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
  *
  * @deprecated
  */
+@Deprecated
 public interface PreAttachCallback {
 
     /**
      * Invoked on the detached instance immediately before it is
      * to be attached.
      */
-    public void jdoPreAttach();
+    void jdoPreAttach();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PreDetachCallback.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PreDetachCallback.java
index 51c296a09..3efd5f4e7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PreDetachCallback.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/PreDetachCallback.java
@@ -24,10 +24,11 @@ package org.apache.openjpa.persistence.jdbc.common.apps;
  *
  * @deprecated
  */
+@Deprecated
 public interface PreDetachCallback {
 
     /**
      * Invoked on the persistent instance before it is detached.
      */
-    public void jdoPreDetach();
+    void jdoPreDetach();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/QueryTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/QueryTest1.java
index c15122922..8b89968a4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/QueryTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/QueryTest1.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
 
 /**
  * <p>Used in testing; should be enhanced.</p>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawField.java
index a259bb089..5177f3443 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawField.java
@@ -18,10 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import org.apache.openjpa.jdbc.kernel.*;
-import org.apache.openjpa.jdbc.sql.*;
-import org.apache.openjpa.jdbc.meta.*;
-import org.apache.openjpa.jdbc.meta.strats.*;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
+import org.apache.openjpa.jdbc.meta.ValueMapping;
+import org.apache.openjpa.jdbc.meta.strats.ImmutableValueHandler;
+import org.apache.openjpa.jdbc.sql.Raw;
 
 public class RawField {
 
@@ -38,6 +38,10 @@ public class RawField {
     public static class RawMapping
         extends ImmutableValueHandler {
 
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         public Object toDataStoreValue(ValueMapping vm, Object val,
             JDBCStore store) {
             return new Raw("'" + val + "FOO'");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawSQL.java
index af0e17879..9df32263f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawSQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RawSQL.java
@@ -47,6 +47,7 @@ public class RawSQL {
         return intField;
     }
 
+    @Override
     public String toString() {
         return "stringField: " + stringField + "; intField: " + intField;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Relations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Relations.java
index 621827fbb..4895a6e53 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Relations.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/Relations.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class Relations {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest1.java
index 9b5425a87..cab27b7b5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest1.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -115,6 +117,7 @@ import javax.persistence.Transient;
         this.selfOneMany = selfOneMany;
     }
 
+    @Override
     public String toString() {
         return "IntField: "+intField+", StringField: "+stringField+" .";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest2.java
index 4c5912c97..ab271fc7e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest2.java
@@ -29,6 +29,8 @@ import javax.persistence.Entity;
 public class RuntimeTest2
     extends RuntimeTest1 {
 
+    
+    private static final long serialVersionUID = 1L;
     private int intField2;
 
     public RuntimeTest2() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest3.java
index ab92488ca..c24c5c206 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/RuntimeTest3.java
@@ -30,6 +30,8 @@ import javax.persistence.Entity;
 public class RuntimeTest3
     extends RuntimeTest2 {
 
+    
+    private static final long serialVersionUID = 1L;
     private int intField3;
 
     public RuntimeTest3() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/CompositeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/CompositeId.java
index 8e0158ae5..9997a9f1e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/CompositeId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/CompositeId.java
@@ -26,7 +26,9 @@ import java.io.Serializable;
  *
  */
 public class CompositeId implements Serializable {
-	public Integer id;
+	
+    private static final long serialVersionUID = 1L;
+    public Integer id;
 	public String  name;
 
 	public CompositeId ()
@@ -66,7 +68,8 @@ public class CompositeId implements Serializable {
 		this.name = name;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
 		return id + ":" + name;
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java
index 1d9cc2d2b..dc16e772d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity1.java
@@ -115,7 +115,8 @@ public class Entity1 implements Serializable
 		return entity2Field;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return("PK: " + pk + " StringField: " + stringField
                 + " IntField: " + intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity2.java
index 9828ef7d5..ee8c87bdb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/Entity2.java
@@ -35,9 +35,7 @@ import javax.persistence.Id;
 @Entity
 public class Entity2 implements Serializable
 {
-	/**
-	 *
-	 */
+	
 	private static final long serialVersionUID = 4723739219953167343L;
 
 	@Id
@@ -90,7 +88,8 @@ public class Entity2 implements Serializable
 		return intField;
 	}
 
-	public String toString()
+	@Override
+    public String toString()
 	{
         return("PK: " + pk + " StringField: " + stringField
                 + " IntField: " + intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/EntityWithCompositeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/EntityWithCompositeId.java
index 39cb6f2db..c8e6366d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/EntityWithCompositeId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/EntityWithCompositeId.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Table;
 
 @Entity
 @IdClass(CompositeId.class)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/OwnerOfEntityWithCompositeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/OwnerOfEntityWithCompositeId.java
index d8d5cad92..204ed82ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/OwnerOfEntityWithCompositeId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/OwnerOfEntityWithCompositeId.java
@@ -18,7 +18,18 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.OneToOne;
+import javax.persistence.SqlResultSetMapping;
+import javax.persistence.SqlResultSetMappings;
+import javax.persistence.Table;
 
 @SqlResultSetMappings(value={
 @SqlResultSetMapping(name="SQLSelectsBothEndOfTheRelation",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/RecursiveEntityWithCompositeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/RecursiveEntityWithCompositeId.java
index 103260174..4e25862ec 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/RecursiveEntityWithCompositeId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/RecursiveEntityWithCompositeId.java
@@ -18,7 +18,19 @@
  */
 package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.OneToOne;
+import javax.persistence.SqlResultSetMapping;
+import javax.persistence.SqlResultSetMappings;
+import javax.persistence.Table;
 
 @SqlResultSetMappings(value={
 	@SqlResultSetMapping(name="SQLSelectsChainedRelation",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapAddress.java
index 1282cedba..5747dc856 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapAddress.java
@@ -20,7 +20,16 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.ColumnResult;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.Id;
+import javax.persistence.PostLoad;
+import javax.persistence.SqlResultSetMapping;
+import javax.persistence.SqlResultSetMappings;
+import javax.persistence.Table;
 
 /** This domain class uses a all possible nature of annotations. Nature of
  * annotation from the point of view of nature of result they produce are
@@ -114,7 +123,9 @@ import javax.persistence.*;
 @Entity
 @Table(name = "SQLMAP_ADDRESS")
 public class SQLMapAddress implements Serializable {
-	private int    id;
+	
+    private static final long serialVersionUID = 1L;
+    private int    id;
 	private String street;
 	private String state;
 	private int    zip;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapItem.java
index 301ce66cb..cc2f62695 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapItem.java
@@ -20,7 +20,14 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.FieldResult;
+import javax.persistence.Id;
+import javax.persistence.SqlResultSetMapping;
+import javax.persistence.SqlResultSetMappings;
+import javax.persistence.Table;
 
 
 /** This simple domain class without any relationship is for testing basic
@@ -78,7 +85,9 @@ public class SQLMapItem
 	implements Serializable
 {
 
-	private int id;
+	
+    private static final long serialVersionUID = 1L;
+    private int id;
 	private String name;
 	private float  price;
 
@@ -109,7 +118,8 @@ public class SQLMapItem
 	}
 
 
-	public String toString()
+	@Override
+    public String toString()
 	{
 		return getId() + ":"+getName();
 		//System.identityHashCode(this) + ":[" + id + "." + name + "]";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java
index 8750f8c37..07992856c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java
@@ -20,7 +20,14 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.ColumnResult;
+import javax.persistence.Entity;
+import javax.persistence.EntityResult;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.PostLoad;
+import javax.persistence.SqlResultSetMapping;
+import javax.persistence.Table;
 
 /** Exemplifies a mapping that is overwritten in orm.xml file.
  *
@@ -39,7 +46,10 @@ import javax.persistence.*;
 @Entity
 @Table(name = "SQLMAP_ORDER")
 public class SQLMapOrder implements Serializable {
-	@Id
+	
+    private static final long serialVersionUID = 1L;
+
+    @Id
 	int id;
 
 	int quantity;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java
index 6f8cb907b..6447a42ef 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java
@@ -20,7 +20,14 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.ColumnResult;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.SqlResultSetMapping;
+import javax.persistence.Table;
 
 /**
  * @author ppoddar
@@ -36,7 +43,9 @@ import javax.persistence.*;
 @Entity
 @Table(name = "SQLMAP_PERSON")
 public class SQLMapPerson implements Serializable {
-	private String name;
+	
+    private static final long serialVersionUID = 1L;
+    private String name;
 	private SQLMapAddress address;
 	private SQLMapPerson partner;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/TestDBCS.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/TestDBCS.java
index 6a612450f..425ab29cf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/TestDBCS.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/TestDBCS.java
@@ -18,9 +18,6 @@
  */
 package org.apache.openjpa.persistence.jdbc.dbcs;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 /*
@@ -30,6 +27,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  */
 public class TestDBCS extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(MyDBCSEntity.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/JDBCTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/JDBCTestCase.java
index bec00877d..7fb75ccac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/JDBCTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/JDBCTestCase.java
@@ -28,11 +28,12 @@
 package org.apache.openjpa.persistence.jdbc.kernel;
 
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-import org.apache.openjpa.conf.*;
-import org.apache.openjpa.jdbc.conf.*;
-import org.apache.openjpa.jdbc.meta.*;
-import org.apache.openjpa.jdbc.meta.strats.*;
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.jdbc.meta.strats.VerticalClassStrategy;
+import org.apache.openjpa.persistence.jdbc.common.apps.RuntimeTest2;
 
 
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java
index c96dc2da3..29625323a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestByteArrayAppId.java
@@ -27,21 +27,26 @@ package org.apache.openjpa.persistence.jdbc.kernel;
  */
 
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.persistence.EntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.apache.openjpa.jdbc.meta.MappingTool;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.meta.MappingTool;
 import org.apache.openjpa.kernel.Extent;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.kernel.Query;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.jdbc.common.apps.ByteArrayPKPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.ByteArrayPKPC2;
+import org.apache.openjpa.persistence.jdbc.common.apps.ByteArrayPKPCId;
 
 
 public class TestByteArrayAppId extends BaseJDBCTest {
@@ -87,6 +92,7 @@ public class TestByteArrayAppId extends BaseJDBCTest {
         TEST_COUNT++;
     }
 
+    @Override
     public void tearDown()
     throws Exception {
         // closing the pmf every time slows things down too much b/c
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestCircularFK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestCircularFK.java
index 2f0754048..b2dd13248 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestCircularFK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestCircularFK.java
@@ -19,10 +19,9 @@
 package org.apache.openjpa.persistence.jdbc.kernel;
 
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.CircularFKPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.CircularFKPC2;
 
 
 public class TestCircularFK extends BaseJDBCTest{
@@ -38,6 +37,7 @@ public class TestCircularFK extends BaseJDBCTest{
     public TestCircularFK() {
     }
 
+    @Override
     public void setUp() {
         OpenJPAEntityManager pm = getPM();
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestDataStoreTrips.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestDataStoreTrips.java
index 66adef474..e1a6e2d51 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestDataStoreTrips.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestDataStoreTrips.java
@@ -27,23 +27,21 @@
  */
 package org.apache.openjpa.persistence.jdbc.kernel;
 
-import java.util.*;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.Iterator;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.lib.jdbc.AbstractJDBCListener;
 import org.apache.openjpa.lib.jdbc.JDBCEvent;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.persistence.Extent;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.jdbc.common.apps.DataStoreTripsPC;
 
 
 
@@ -63,6 +61,7 @@ public class TestDataStoreTrips extends BaseJDBCTest{
         super(name);
     }
 
+    @Override
     public void setUp()
         throws Exception {
        deleteAll(DataStoreTripsPC.class);
@@ -185,6 +184,7 @@ public class TestDataStoreTrips extends BaseJDBCTest{
             _table = table;
         }
 
+        @Override
         public void beforeExecuteStatement(JDBCEvent event) {
             if (event.getSQL().indexOf(_table) != -1)
                 selects++;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEJBAutoIncrement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEJBAutoIncrement.java
index c1cd8a136..cbdc02a42 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEJBAutoIncrement.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEJBAutoIncrement.java
@@ -39,7 +39,8 @@ public class TestEJBAutoIncrement extends BaseJDBCTest
 		super(name);
 	}
 
-	public void setUp()
+	@Override
+    public void setUp()
 	{
 		deleteAll(AutoIncrementPC1.class);
 		deleteAll(AutoIncrementPC2.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEfficientAttach.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEfficientAttach.java
index 183e51d19..e739a3dad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEfficientAttach.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEfficientAttach.java
@@ -28,17 +28,20 @@
 package org.apache.openjpa.persistence.jdbc.kernel;
 
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.meta.MetaDataRepository;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.MetaDataRepository;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.jdbc.common.apps.AttachA;
+import org.apache.openjpa.persistence.jdbc.common.apps.AttachB;
+import org.apache.openjpa.persistence.jdbc.common.apps.AttachC;
+import org.apache.openjpa.persistence.jdbc.common.apps.AttachD;
+import org.apache.openjpa.persistence.jdbc.common.apps.AttachE;
+import org.apache.openjpa.persistence.jdbc.common.apps.AttachF;
 
 public class TestEfficientAttach extends TestSQLListenerTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java
index 9c50ae36a..5055b5923 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java
@@ -19,18 +19,19 @@
 package org.apache.openjpa.persistence.jdbc.kernel;
 
 
-import java.util.*;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.FetchPlan;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase;
+import org.apache.openjpa.persistence.jdbc.common.apps.ComplexEmbeddedPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.EmbeddedOwnerPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.EmbeddedPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.RecursivelyEmbeddedPC;
 
 
 /**
@@ -53,13 +54,15 @@ public class TestEmbeddedPessimisticLocking
     	super(name);
     }
 
-	public void setUp() throws Exception{
+	@Override
+    public void setUp() throws Exception{
 		super.setUp();
 		emf = (OpenJPAEntityManagerFactory)getEmf(getProps());
 	}
 
 
 
+    @Override
     public void setUpTestCase() {
 
         JDBCConfiguration conf =
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestIncrementalJDBCFlushes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestIncrementalJDBCFlushes.java
index 7b362605c..ee5632314 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestIncrementalJDBCFlushes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestIncrementalJDBCFlushes.java
@@ -18,21 +18,22 @@
  */
 package org.apache.openjpa.persistence.jdbc.kernel;
 
-import java.sql.*;
-import java.util.*;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
-import org.apache.openjpa.kernel.StoreManager;
-import org.apache.openjpa.kernel.DelegatingStoreManager;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
+import org.apache.openjpa.kernel.DelegatingStoreManager;
+import org.apache.openjpa.kernel.StoreManager;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.jdbc.common.apps.RuntimeTest1;
 
 public class TestIncrementalJDBCFlushes
         extends BaseJDBCTest {
@@ -48,6 +49,7 @@ public class TestIncrementalJDBCFlushes
     }
 
 
+    @Override
     public void setUp() {
         emf = getEmf(getProps());
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java
index 79857f932..9e3f29b08 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestOperationOrderUpdateManager.java
@@ -20,14 +20,17 @@ package org.apache.openjpa.persistence.jdbc.kernel;
 
 
 
-import java.util.*;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-import org.apache.openjpa.persistence.common.utils.*;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.jdbc.common.apps.AutoIncrementOpOrderPCSub;
+import org.apache.openjpa.persistence.jdbc.common.apps.OpOrder;
+import org.apache.openjpa.persistence.jdbc.common.apps.OpOrderPCSub;
+
 
 public class TestOperationOrderUpdateManager
     extends AbstractTestCase {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java
index c8c259409..01c3bcc91 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java
@@ -18,22 +18,26 @@
  */
 package org.apache.openjpa.persistence.jdbc.kernel;
 
-import java.util.*;
-
-import org.apache.openjpa.jdbc.sql.*;
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
 //import org.apache.openjpa.kernel.Extent;
 import org.apache.openjpa.persistence.Extent;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.PagingAppIdPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.PagingHelperPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.PagingPC;
 
 /**
  * <p>Test large result, to-many eager paging.</p>
@@ -49,6 +53,7 @@ public class TestPagingResultObjectProvider
 		super(name);
 	}
 
+    @Override
     public void setUp() throws Exception{
 		super.setUp();
 		emf = getEmf(getProps());
@@ -62,7 +67,7 @@ public class TestPagingResultObjectProvider
             (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI)
             OpenJPAPersistence.cast(emf)).getConfiguration();
         DBDictionary dict = conf.getDBDictionaryInstance();
-        if (dict.joinSyntax == Join.SYNTAX_TRADITIONAL)
+        if (dict.joinSyntax == JoinSyntaxes.SYNTAX_TRADITIONAL)
             return true;
 
         // skip test case that requires subselect for DBs that don't support it
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestRawSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestRawSQL.java
index a8f549e20..9d2f6b09f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestRawSQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestRawSQL.java
@@ -20,29 +20,27 @@
 package org.apache.openjpa.persistence.jdbc.kernel;
 
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.Iterator;
 
 import javax.persistence.EntityManager;
 
-import java.sql.*;
-import java.util.*;
-import org.apache.openjpa.kernel.Broker;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.jdbc.kernel.GenericResultObjectProvider;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.sql.ResultSetResult;
-import org.apache.openjpa.lib.rop.ResultObjectProvider;
-import org.apache.openjpa.jdbc.kernel.GenericResultObjectProvider;
-import org.apache.openjpa.lib.rop.ResultList;
-import org.apache.openjpa.lib.rop.EagerResultList;
-import org.apache.openjpa.lib.rop.ResultObjectProvider;
 import org.apache.openjpa.kernel.AbstractPCResultObjectProvider;
-import org.apache.openjpa.meta.ClassMetaData;
-import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.FetchConfiguration;
-/**
- *
- */
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.lib.rop.EagerResultList;
+import org.apache.openjpa.lib.rop.ResultList;
+import org.apache.openjpa.lib.rop.ResultObjectProvider;
+import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.jdbc.common.apps.RawSQL;
+
 
 
 public class TestRawSQL extends BaseJDBCTest {
@@ -56,6 +54,7 @@ public class TestRawSQL extends BaseJDBCTest {
         super(test);
     }
 
+    @Override
     public void setUp() {
        deleteAll(RawSQL.class);
         EntityManager em = currentEntityManager();
@@ -104,38 +103,47 @@ public class TestRawSQL extends BaseJDBCTest {
         ResultObjectProvider rop = new AbstractPCResultObjectProvider(broker) {
             private int _row = -1;
 
+            @Override
             public boolean supportsRandomAccess() {
                 return true;
             }
 
+            @Override
             public boolean next() {
                 return ++_row < _oids.length;
             }
 
+            @Override
             public boolean absolute(int pos) {
                 _row = pos;
                 return _row < _oids.length;
             }
 
+            @Override
             public int size() {
                 return _oids.length;
             }
 
+            @Override
             public void close() {
             }
 
+            @Override
             public void handleCheckedException(Exception e) {
                 throw new RuntimeException(e.toString());
             }
 
+            @Override
             protected Object getObjectId(ClassMetaData meta) {
                 return _oids[_row];
             }
 
+            @Override
             protected Class getPCType() {
                 return RawSQL.class;
             }
 
+            @Override
             protected void load(OpenJPAStateManager sm,
                 FetchConfiguration fetch) {
                 ClassMetaData meta = sm.getMetaData();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestSQLListenerTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestSQLListenerTestCase.java
index 1c3ab6924..6affd5ba1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestSQLListenerTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestSQLListenerTestCase.java
@@ -18,10 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.kernel;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
 
-
-import org.apache.openjpa.lib.jdbc.*;
+import org.apache.openjpa.lib.jdbc.AbstractJDBCListener;
+import org.apache.openjpa.lib.jdbc.JDBCEvent;
 
 /**
  * Test case that provides access to all the SQL that is executed.
@@ -40,6 +44,7 @@ public abstract class TestSQLListenerTestCase
         super(name);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp();
@@ -53,6 +58,7 @@ public abstract class TestSQLListenerTestCase
     public void setUpTestCase() {
     }
 
+    @Override
     public final void tearDown()
         throws Exception {
         super.tearDown();
@@ -164,6 +170,7 @@ public abstract class TestSQLListenerTestCase
     public static class Listener
         extends AbstractJDBCListener {
 
+        @Override
         public void beforeExecuteStatement(JDBCEvent event) {
             if (event.getSQL() != null)
                 sql.add(event.getSQL());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUnknownSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUnknownSubclass.java
index 3f9da9dd9..33dde85a8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUnknownSubclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUnknownSubclass.java
@@ -27,17 +27,16 @@
 package org.apache.openjpa.persistence.jdbc.kernel;
 
 
-import java.sql.*;
-import javax.sql.*;
-import org.apache.openjpa.jdbc.conf.*;
+import java.sql.Connection;
+
+import javax.persistence.EntityManager;
+import javax.sql.DataSource;
+
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
-
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-import javax.persistence.EntityManager;
-
 import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.jdbc.common.apps.UnknownSubclassParent;
 
 
 public class TestUnknownSubclass  extends JDBCTestCase {
@@ -54,6 +53,7 @@ public class TestUnknownSubclass  extends JDBCTestCase {
     public TestUnknownSubclass(String name) {
         super(name);
     }
+    @Override
     public void setUp()
         throws Exception {
         // pcl: in the new (registration-less) system, this should not
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java
index 240e5d6d7..114caedd6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java
@@ -40,6 +40,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  */
 public class TestUpdateWithSubSelect extends SQLListenerTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(CLEAR_TABLES, Person.class, Address.class);
         DBDictionary dict = ((JDBCConfiguration)emf.getConfiguration()).getDBDictionaryInstance();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestCompositeIdTraversalInSQLMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestCompositeIdTraversalInSQLMapping.java
index a84de7878..954523e05 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestCompositeIdTraversalInSQLMapping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestCompositeIdTraversalInSQLMapping.java
@@ -19,11 +19,14 @@
 package org.apache.openjpa.persistence.jdbc.mapping;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.apache.openjpa.persistence.jdbc.common.apps.mappingApp.*;
-import org.apache.openjpa.persistence.common.utils.*;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.jdbc.common.apps.mappingApp.EntityWithCompositeId;
+import org.apache.openjpa.persistence.jdbc.common.apps.mappingApp.OwnerOfEntityWithCompositeId;
+import org.apache.openjpa.persistence.jdbc.common.apps.mappingApp.RecursiveEntityWithCompositeId;
 
 
 public class TestCompositeIdTraversalInSQLMapping extends AbstractTestCase {
@@ -35,7 +38,8 @@ public class TestCompositeIdTraversalInSQLMapping extends AbstractTestCase {
 	}
 
 
-	public void setUp()
+	@Override
+    public void setUp()
 	{
 		deleteAll(OwnerOfEntityWithCompositeId.class);
 		deleteAll(EntityWithCompositeId.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestEnumXmlTypeMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestEnumXmlTypeMapping.java
index 24f5584ba..5ab41cc65 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestEnumXmlTypeMapping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestEnumXmlTypeMapping.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestEnumXmlTypeMapping extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Authority.class, DROP_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestNativeQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestNativeQueries.java
index 95c6e23a2..f0b70289b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestNativeQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestNativeQueries.java
@@ -38,6 +38,7 @@ public class TestNativeQueries extends SingleEMFTestCase {
 
     private EntityManager em;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Entity1.class, Entity2.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestPrecisionMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestPrecisionMapping.java
index bfd365cc2..e4b766ad6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestPrecisionMapping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/TestPrecisionMapping.java
@@ -31,6 +31,7 @@ public class TestPrecisionMapping extends SingleEMFTestCase {
             { "primDbl", "dbl" };
     private static final String _BIG_DECIMAL_FIELD = "bigDecimal";
 
+    @Override
     public void setUp() {
         setUp(PrecisionTestEntity.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/IParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/IParent.java
index 104fd63be..51fe34bbf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/IParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/IParent.java
@@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.jdbc.mapping.bidi;
 import java.util.Collection;
 
 public interface IParent {
-	public long getId();
-	public void setId(long id);
-	public String getName();
-	public void setName(String name);
-	public Collection<Child> getChildren();
-	public void addChild(Child child);
+	long getId();
+	void setId(long id);
+	String getName();
+	void setName(String name);
+	Collection<Child> getChildren();
+	void addChild(Child child);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAppIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAppIdentity.java
index bb15f7eda..fec79a603 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAppIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAppIdentity.java
@@ -57,30 +57,36 @@ public class ParentWithAppIdentity implements IParent {
     @ElementJoinColumn(name="FK_PARENT_APP_ID", referencedAttributeName="id")
 	private Set<Child> children;
 
-	public long getId() {
+	@Override
+    public long getId() {
 		return id;
 	}
 
-	public void setId(long id) {
+	@Override
+    public void setId(long id) {
 		this.id = id;
 		postIdSet();
 	}
 
-	public String getName() {
+	@Override
+    public String getName() {
 		return name;
 	}
 
-	public void setName(String name) {
+	@Override
+    public void setName(String name) {
 		this.name = name;
 	}
 
-	public Collection<Child> getChildren() {
+	@Override
+    public Collection<Child> getChildren() {
 		return children;
 	}
 
-	public void addChild(Child child) {
+	@Override
+    public void addChild(Child child) {
 		if (children == null)
-			children = new HashSet<Child>();
+			children = new HashSet<>();
 		children.add(child);
 		child.setAppParentId(this.id);
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAutoIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAutoIdentity.java
index 03c181a2e..08ec0d902 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAutoIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithAutoIdentity.java
@@ -61,30 +61,36 @@ public class ParentWithAutoIdentity implements IParent {
     @ElementJoinColumn(name="FK_PARENT_AUTO_ID", referencedAttributeName="id")
 	private Set<Child> children;
 
-	public long getId() {
+	@Override
+    public long getId() {
 		return id;
 	}
 
-	public void setId(long id) {
+	@Override
+    public void setId(long id) {
         throw new RuntimeException(getClass() + ".setId() is not to be " +
             "invoked directly. This class is using AUTO Generation Starategy");
 	}
 
-	public String getName() {
+	@Override
+    public String getName() {
 		return name;
 	}
 
-	public void setName(String name) {
+	@Override
+    public void setName(String name) {
 		this.name = name;
 	}
 
-	public Collection<Child> getChildren() {
+	@Override
+    public Collection<Child> getChildren() {
 		return children;
 	}
 
-	public void addChild(Child child) {
+	@Override
+    public void addChild(Child child) {
 		if (children == null)
-			children = new HashSet<Child>();
+			children = new HashSet<>();
 		children.add(child);
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithSequenceIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithSequenceIdentity.java
index 6e750aaea..2d07f05ab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithSequenceIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/ParentWithSequenceIdentity.java
@@ -61,30 +61,36 @@ public class ParentWithSequenceIdentity  implements IParent {
     @ElementJoinColumn(name="FK_PARENT_SEQ_ID", referencedAttributeName="id")
 	private Set<Child> children;
 
-	public long getId() {
+	@Override
+    public long getId() {
 		return id;
 	}
 
-	public String getName() {
+	@Override
+    public String getName() {
 		return name;
 	}
 
-	public void setId(long id) {
+	@Override
+    public void setId(long id) {
         throw new RuntimeException(getClass() + ".setId() is not to be " +
             "invoked directly. This class is using SEQ Generation Starategy");
 	}
 
-	public void setName(String name) {
+	@Override
+    public void setName(String name) {
 		this.name = name;
 	}
 
-	public Collection<Child> getChildren() {
+	@Override
+    public Collection<Child> getChildren() {
 		return children;
 	}
 
-	public void addChild(Child child) {
+	@Override
+    public void addChild(Child child) {
 		if (children == null)
-			children = new HashSet<Child>();
+			children = new HashSet<>();
 		children.add(child);
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Person.java
index ecb8003e2..ac9af18fe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/Person.java
@@ -50,7 +50,7 @@ public class Person {
                     referencedColumnName="SSN"),
             inverseJoinColumns = @JoinColumn(name="ADDRESS_PHONE",
                     referencedColumnName="PHONE"))
-    private Set<Address> addresses = new HashSet<Address>();
+    private Set<Address> addresses = new HashSet<>();
 
 	public long getSsn() {
 		return ssn;
@@ -65,7 +65,7 @@ public class Person {
 	 */
 	public void addAddress(Address address) {
 		if (addresses == null)
-			addresses = new HashSet<Address>();
+			addresses = new HashSet<>();
 		addresses.add(address);
 		address.setPerson(this);
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java
index d8f3c87d4..8c231af9e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/mapping/bidi/TestBiDirectionalJoinTable.java
@@ -50,7 +50,8 @@ public class TestBiDirectionalJoinTable extends SQLListenerTestCase {
 	private static String[] CITIS    = {"Berlin", "Paris", "Rome"};
 	private static int[] ZIPS        = {123456, 234567, 345678};
 
-	public void setUp() {
+	@Override
+    public void setUp() {
 		super.setUp(CLEAR_TABLES, Person.class, Address.class);
 		createData(SSN);
 		sql.clear();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Division.java
index 4004f3b72..801dc3c80 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Division.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex0;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="m2mDivision")
@@ -44,6 +46,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         Division d = (Division) o;
         if (d.name.equals(name) &&
@@ -52,6 +55,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Employee.java
index aec5cef37..0ee11163e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex0;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="m2mEmp")
@@ -30,7 +35,7 @@ public class Employee {
 
     @ManyToMany // Bidirectional
     Map<Division, PhoneNumber> phones =
-        new HashMap<Division, PhoneNumber>();
+        new HashMap<>();
 
     public Map<Division, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -52,6 +57,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<Division, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/PhoneNumber.java
index fafbba0ac..811ccbd3f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex0;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="m2mPhone")
@@ -29,7 +34,7 @@ public class PhoneNumber {
     int number;
 
     @ManyToMany(mappedBy = "phones")
-    Map<Division, Employee> emps = new HashMap<Division, Employee>();
+    Map<Division, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -51,6 +56,7 @@ public class PhoneNumber {
         emps.remove(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<Division, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java
index f1a1b2c56..095ecc623 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex0/TestMany2ManyMap.java
@@ -27,20 +27,20 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.ArgumentException;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMap extends SQLListenerTestCase {
 
     public int numEmployees = 2;
     public int numPhoneNumbersPerEmployee = 2;
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
 
     public int empId = 1;
@@ -49,6 +49,7 @@ public class TestMany2ManyMap extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Division.class,
             Employee.class, PhoneNumber.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Department.java
index 1be4497ed..572eb8ac8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Department.java
@@ -46,6 +46,7 @@ public class Department {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Department))
             return false;
@@ -56,6 +57,7 @@ public class Department {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Division.java
index 2353e37e7..3817962e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Division.java
@@ -58,6 +58,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Division))
             return false;
@@ -68,6 +69,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Employee.java
index 9f8316479..9f5fbf6f6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex1;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx1Emp")
@@ -30,7 +35,7 @@ public class Employee {
 
     @ManyToMany
     Map<Department, PhoneNumber> phones =
-        new HashMap<Department, PhoneNumber>();
+        new HashMap<>();
 
     public Map<Department, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -52,6 +57,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<Department, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/PhoneNumber.java
index ec1302599..e7b45a3a2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/PhoneNumber.java
@@ -18,9 +18,15 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex1;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx1Phone")
@@ -28,7 +34,7 @@ public class PhoneNumber {
     @Id int number;
 
     @ManyToMany(mappedBy="phones")
-    Map<Division, Employee> emps = new HashMap<Division, Employee>();
+    Map<Division, Employee> emps = new HashMap<>();
 
     @OneToOne(mappedBy="phone")
     Division division;
@@ -61,6 +67,7 @@ public class PhoneNumber {
         emps.remove(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<Division, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java
index 2629a45d0..e356161ae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex1/TestMany2ManyMapEx1.java
@@ -28,20 +28,20 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx1 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
     public int numPhoneNumbersPerEmployee = 2;
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -51,6 +51,7 @@ public class TestMany2ManyMapEx1 extends SQLListenerTestCase {
     public List rsAllEmps = null;
     public List rsAllDivisions = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Department.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/Employee.java
index c226ca96c..5c15f5a46 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/Employee.java
@@ -18,9 +18,15 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex10;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
-import java.util.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="M10Emp")
@@ -29,7 +35,7 @@ public class Employee {
     EmployeePK empPK;
 
     @ManyToMany // Bidirectional
-    Map<PhonePK, PhoneNumber> phones = new HashMap<PhonePK, PhoneNumber>();
+    Map<PhonePK, PhoneNumber> phones = new HashMap<>();
 
     int salary;
 
@@ -62,6 +68,7 @@ public class Employee {
         this.salary = salary;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<PhonePK, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/EmployeePK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/EmployeePK.java
index 59a3c47b1..bca7060f5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/EmployeePK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/EmployeePK.java
@@ -21,10 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex10;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class EmployeePK implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     String name;
     Date bDay;
 
@@ -42,6 +44,7 @@ public class EmployeePK implements Serializable {
         return bDay;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o)
             return true;
@@ -54,6 +57,7 @@ public class EmployeePK implements Serializable {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int code = 0;
         code += name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhoneNumber.java
index 5c2f34946..a20f5d1a1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex10;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="M10Phone")
@@ -29,7 +34,7 @@ public class PhoneNumber {
     PhonePK phonePK;
 
     @ManyToMany(mappedBy="phones")
-    Map<EmployeePK, Employee> emps = new HashMap<EmployeePK, Employee>();
+    Map<EmployeePK, Employee> emps = new HashMap<>();
 
     int room;
 
@@ -61,6 +66,7 @@ public class PhoneNumber {
         this.room = room;
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<EmployeePK, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhonePK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhonePK.java
index e568619f3..7ef7257ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhonePK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/PhonePK.java
@@ -20,10 +20,12 @@ package org.apache.openjpa.persistence.jdbc.maps.m2mmapex10;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class PhonePK implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     String areaCode;
     String phoneNum;
 
@@ -41,6 +43,7 @@ public class PhonePK implements Serializable {
         return phoneNum;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o)
             return true;
@@ -53,6 +56,7 @@ public class PhonePK implements Serializable {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int code = 0;
         code = code * 31 + areaCode.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java
index 50739b749..52a80b934 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex10/TestMany2ManyMapEx10.java
@@ -29,27 +29,27 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.ArgumentException;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx10 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
     public int numPhoneNumbers = numEmployees + 1;
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
-    public List<String> namedQueries = new ArrayList<String>();
-    public List<EmployeePK> empPKs = new ArrayList<EmployeePK>();
-    public List<PhonePK> phonePKs = new ArrayList<PhonePK>();
+    public List<String> namedQueries = new ArrayList<>();
+    public List<EmployeePK> empPKs = new ArrayList<>();
+    public List<PhonePK> phonePKs = new ArrayList<>();
 
     public Map<String, Employee> empMap =
-        new HashMap<String, Employee>();
+        new HashMap<>();
     public Map<PhonePK, PhoneNumber> phoneMap =
-        new HashMap<PhonePK, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -57,6 +57,7 @@ public class TestMany2ManyMapEx10 extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES,EmployeePK.class, PhonePK.class,
             Employee.class, PhoneNumber.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Department.java
index fef254090..fb0da6949 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Department.java
@@ -46,6 +46,7 @@ public class Department {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Department))
             return false;
@@ -56,6 +57,7 @@ public class Department {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Employee.java
index 4ef6c75ba..ee2f200c6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex2;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx2Emp")
@@ -30,7 +35,7 @@ public class Employee {
 
     @ManyToMany
     Map<Department, PhoneNumber> phones =
-        new HashMap<Department, PhoneNumber>(); // Bidirectional
+        new HashMap<>(); // Bidirectional
 
     public Map<Department, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -52,6 +57,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<Department, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/PhoneNumber.java
index f0028aaad..8ff55dbbf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex2;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx2Phone")
@@ -28,7 +33,7 @@ public class PhoneNumber {
     @Id int number;
 
     @ManyToMany(mappedBy="phones")
-    Map<String, Employee> emps = new HashMap<String, Employee>();
+    Map<String, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -50,6 +55,7 @@ public class PhoneNumber {
         emps.remove(str);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<String, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java
index 1ffe34438..0b9e5628a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex2/TestMany2ManyMapEx2.java
@@ -27,12 +27,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx2 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
@@ -40,9 +40,9 @@ public class TestMany2ManyMapEx2 extends SQLListenerTestCase {
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -51,6 +51,7 @@ public class TestMany2ManyMapEx2 extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Department.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Department.java
index 7c869657c..d347ec509 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Department.java
@@ -46,6 +46,7 @@ public class Department {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Department))
             return false;
@@ -56,6 +57,7 @@ public class Department {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Employee.java
index a5a5fc286..87de2f15c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex3;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx3Emp")
@@ -30,7 +35,7 @@ public class Employee {
 
     @ManyToMany
     Map<Department, PhoneNumber> phones =
-        new HashMap<Department, PhoneNumber>(); // Bidirectional
+        new HashMap<>(); // Bidirectional
 
     public Map<Department, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -52,6 +57,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<Department, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/FullName.java
index 87fe0eb98..0ed5cf33e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/FullName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/FullName.java
@@ -49,6 +49,7 @@ public class FullName {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof FullName)) return false;
         FullName other = (FullName) o;
@@ -58,6 +59,7 @@ public class FullName {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/PhoneNumber.java
index 91b6e24eb..e5a32241e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex3;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx3Phone")
@@ -28,7 +33,7 @@ public class PhoneNumber {
     @Id int number;
 
     @ManyToMany(mappedBy="phones")
-    Map<FullName, Employee> emps = new HashMap<FullName, Employee>();
+    Map<FullName, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -50,6 +55,7 @@ public class PhoneNumber {
         emps.remove(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<FullName, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java
index 5d86988bc..883ba3227 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex3/TestMany2ManyMapEx3.java
@@ -27,12 +27,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx3 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
@@ -40,9 +40,9 @@ public class TestMany2ManyMapEx3 extends SQLListenerTestCase {
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -51,6 +51,7 @@ public class TestMany2ManyMapEx3 extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Department.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Address.java
index bc98bdfc9..0d421886c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Address.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex4;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class Address {
@@ -41,7 +41,8 @@ public class Address {
 		this.zip=zip;
 	}
 
-	public String toString(){
+	@Override
+    public String toString(){
 		return street+" "+" "+city+","+state+" "+zip;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Division.java
index e053ede19..4573edb95 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Division.java
@@ -65,6 +65,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Division)) return false;
         Division other = (Division) o;
@@ -74,6 +75,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Employee.java
index f66b9c120..10b93783e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex4;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx4Emp")
@@ -29,7 +34,7 @@ public class Employee {
     int empId;
 
     @ManyToMany // Bidirectional
-    Map<String, PhoneNumber> phones = new HashMap<String, PhoneNumber>();
+    Map<String, PhoneNumber> phones = new HashMap<>();
     public Map<String, PhoneNumber> getPhoneNumbers() {
         return phones;
     }
@@ -50,6 +55,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<String, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Office.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Office.java
index e977490cc..a63b3e162 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Office.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/Office.java
@@ -76,6 +76,7 @@ public class Office {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Office)) return false;
         Office other = (Office) o;
@@ -85,6 +86,7 @@ public class Office {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/PhoneNumber.java
index e435e2efe..1e272792c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex4;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx4Phone")
@@ -28,7 +33,7 @@ public class PhoneNumber {
     @Id int number;
 
     @ManyToMany(mappedBy="phones")
-    Map<Division, Employee> emps = new HashMap<Division, Employee>();
+    Map<Division, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -50,6 +55,7 @@ public class PhoneNumber {
         emps.remove(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<Division, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java
index c5bc6c678..749edc0c5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex4/TestMany2ManyMapEx4.java
@@ -28,12 +28,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx4 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
@@ -41,12 +41,12 @@ public class TestMany2ManyMapEx4 extends SQLListenerTestCase {
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
     public Map<Integer, PhoneNumber> phones =
-        new HashMap<Integer, PhoneNumber>();
-    public List<String> namedQueries = new ArrayList<String>();
+        new HashMap<>();
+    public List<String> namedQueries = new ArrayList<>();
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -57,6 +57,7 @@ public class TestMany2ManyMapEx4 extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Division.class,
@@ -153,7 +154,7 @@ public class TestMany2ManyMapEx4 extends SQLListenerTestCase {
         findObj();
     }
 
-    protected List<String> sql = new ArrayList<String>();
+    protected List<String> sql = new ArrayList<>();
     protected int sqlCount;
 
     public List<String> getSql() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/Employee.java
index f314654eb..858fc53c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex5;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx5Emp")
@@ -29,7 +34,7 @@ public class Employee {
     int empId;
 
     @ManyToMany  // bidirectional
-    Map<String, PhoneNumber> phones = new HashMap<String, PhoneNumber>();
+    Map<String, PhoneNumber> phones = new HashMap<>();
 
     public Map<String, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -51,6 +56,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<String, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/PhoneNumber.java
index 7e89b2914..27121eabd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex5;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx5Phone")
@@ -28,7 +33,7 @@ public class PhoneNumber {
     @Id int number;
 
     @ManyToMany(mappedBy="phones")
-    Map<String, Employee> emps = new HashMap<String, Employee>();
+    Map<String, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -50,6 +55,7 @@ public class PhoneNumber {
         emps.remove(str);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<String, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java
index 852ac0054..e738cb089 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex5/TestMany2ManyMapEx5.java
@@ -28,12 +28,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx5 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
@@ -41,12 +41,12 @@ public class TestMany2ManyMapEx5 extends SQLListenerTestCase {
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
     public Map<Integer, PhoneNumber> phones =
-        new HashMap<Integer, PhoneNumber>();
-    public List<String> namedQueries = new ArrayList<String>();
+        new HashMap<>();
+    public List<String> namedQueries = new ArrayList<>();
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -55,6 +55,7 @@ public class TestMany2ManyMapEx5 extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Employee.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/Employee.java
index 382102909..bd09bc709 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex6;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx6Emp")
@@ -29,7 +34,7 @@ public class Employee {
     int empId;
 
     @ManyToMany // Bidirectional
-    Map<String, PhoneNumber> phones = new HashMap<String, PhoneNumber>();
+    Map<String, PhoneNumber> phones = new HashMap<>();
 
     public Map<String, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -51,6 +56,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<String, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/FullName.java
index 9751b98c8..766eaa836 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/FullName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/FullName.java
@@ -52,6 +52,7 @@ public class FullName {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof FullName))
             return false;
@@ -62,6 +63,7 @@ public class FullName {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/PhoneNumber.java
index 88b133328..e7d55c754 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/PhoneNumber.java
@@ -18,10 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex6;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx6Phone")
@@ -29,7 +33,7 @@ public class PhoneNumber {
     @Id int number;
 
     @ManyToMany(mappedBy="phones")
-    Map<FullName, Employee> emps = new HashMap<FullName, Employee>();
+    Map<FullName, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -51,6 +55,7 @@ public class PhoneNumber {
         emps.remove(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<FullName, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java
index c1b3e6ee5..fba3d77d5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex6/TestMany2ManyMapEx6.java
@@ -28,12 +28,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx6 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
@@ -41,12 +41,12 @@ public class TestMany2ManyMapEx6 extends SQLListenerTestCase {
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
     public Map<Integer, PhoneNumber> phones =
-        new HashMap<Integer, PhoneNumber>();
-    public List<String> namedQueries = new ArrayList<String>();
+        new HashMap<>();
+    public List<String> namedQueries = new ArrayList<>();
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -56,6 +56,7 @@ public class TestMany2ManyMapEx6 extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Employee.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Division.java
index caa4b4e53..c2ff138c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Division.java
@@ -46,6 +46,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Division))
             return false;
@@ -56,6 +57,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Employee.java
index 06eff3063..9d3042b00 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex7;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx7Emp")
@@ -29,7 +34,7 @@ public class Employee {
     int empId;
 
     @ManyToMany // Bidirectional
-    Map<FullName, PhoneNumber> phones = new HashMap<FullName, PhoneNumber>();
+    Map<FullName, PhoneNumber> phones = new HashMap<>();
 
     public Map<FullName, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -51,6 +56,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<FullName, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/FullName.java
index f14eaa48d..fbf3faab0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/FullName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/FullName.java
@@ -49,6 +49,7 @@ public class FullName {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof FullName))
             return false;
@@ -59,6 +60,7 @@ public class FullName {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/PhoneNumber.java
index 66efebcd8..bcee48c59 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex7;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx7Phone")
@@ -28,7 +33,7 @@ public class PhoneNumber {
     @Id int number;
 
     @ManyToMany(mappedBy="phones")
-    Map<Division, Employee> emps = new HashMap<Division, Employee>();
+    Map<Division, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -50,6 +55,7 @@ public class PhoneNumber {
         emps.remove(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<Division, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java
index 8e17aa7e0..006ded3e0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex7/TestMany2ManyMapEx7.java
@@ -28,12 +28,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx7 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
@@ -41,12 +41,12 @@ public class TestMany2ManyMapEx7 extends SQLListenerTestCase {
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
     public Map<Integer, PhoneNumber> phones =
-        new HashMap<Integer, PhoneNumber>();
-    public List<String> namedQueries = new ArrayList<String>();
+        new HashMap<>();
+    public List<String> namedQueries = new ArrayList<>();
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -55,6 +55,7 @@ public class TestMany2ManyMapEx7 extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Division.class,
@@ -125,7 +126,7 @@ public class TestMany2ManyMapEx7 extends SQLListenerTestCase {
         findObj();
     }
 
-    protected List<String> sql = new ArrayList<String>();
+    protected List<String> sql = new ArrayList<>();
     protected int sqlCount;
 
     public List<String> getSql() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/Employee.java
index 6f5fc3c09..f7e370203 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/Employee.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex8;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx8Emp")
@@ -29,7 +34,7 @@ public class Employee {
     int empId;
 
     @ManyToMany // Bidirectional
-    Map<FullName, PhoneNumber> phones = new HashMap<FullName, PhoneNumber>();
+    Map<FullName, PhoneNumber> phones = new HashMap<>();
 
     public Map<FullName, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -51,6 +56,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<FullName, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/FullName.java
index 3bae0c217..7bfeb6da3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/FullName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/FullName.java
@@ -49,6 +49,7 @@ public class FullName {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof FullName))
             return false;
@@ -59,6 +60,7 @@ public class FullName {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/PhoneNumber.java
index 89049ffdd..187736a23 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex8;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx8Phone")
@@ -28,7 +33,7 @@ public class PhoneNumber {
     @Id int number;
 
     @ManyToMany(mappedBy="phones")
-    Map<String, Employee> emps = new HashMap<String, Employee>();
+    Map<String, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -50,6 +55,7 @@ public class PhoneNumber {
         emps.remove(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<String, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java
index f4ee8795b..fd025f188 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex8/TestMany2ManyMapEx8.java
@@ -27,12 +27,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestMany2ManyMapEx8 extends SQLListenerTestCase {
 
     public int numEmployees = 2;
@@ -40,11 +40,11 @@ public class TestMany2ManyMapEx8 extends SQLListenerTestCase {
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
     public Map<Integer, PhoneNumber> phones =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public int empId = 1;
     public int phoneId = 1;
@@ -53,6 +53,7 @@ public class TestMany2ManyMapEx8 extends SQLListenerTestCase {
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Employee.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/Employee.java
index c6fe40229..557b2e60b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/Employee.java
@@ -18,10 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex9;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx9Emp")
@@ -35,7 +39,7 @@ public class Employee {
     //    @AttributeOverride(name="lName", column=@Column(name="lName_Emp"))
     //})
     Map<FullPhoneName, PhoneNumber> phones =
-        new HashMap<FullPhoneName, PhoneNumber>(); // Bidirectional
+        new HashMap<>(); // Bidirectional
 
     public Map<FullPhoneName, PhoneNumber> getPhoneNumbers() {
         return phones;
@@ -57,6 +61,7 @@ public class Employee {
         this.empId = empId;
     }
 
+    @Override
     public boolean equals(Object o) {
         Employee e = (Employee) o;
         Map<FullPhoneName, PhoneNumber> map = e.getPhoneNumbers();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullName.java
index c240cd0ce..938ceb439 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullName.java
@@ -49,6 +49,7 @@ public class FullName {
         this.lName1 = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof FullName))
             return false;
@@ -59,6 +60,7 @@ public class FullName {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName1.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullPhoneName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullPhoneName.java
index ef1f02302..26361bd6f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullPhoneName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/FullPhoneName.java
@@ -49,6 +49,7 @@ public class FullPhoneName {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof FullPhoneName)) return false;
         FullPhoneName other = (FullPhoneName) o;
@@ -58,6 +59,7 @@ public class FullPhoneName {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/PhoneNumber.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/PhoneNumber.java
index 6a28daa4c..5a4b2154f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/PhoneNumber.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/PhoneNumber.java
@@ -18,9 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.m2mmapex9;
 
-import javax.persistence.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
-import java.util.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="MEx9Phone")
@@ -32,7 +37,7 @@ public class PhoneNumber {
     //    @AttributeOverride(name="fName", column=@Column(name="fName_phone")),
     //    @AttributeOverride(name="lName", column=@Column(name="lName_phone"))
     //})
-    Map<FullName, Employee> emps = new HashMap<FullName, Employee>();
+    Map<FullName, Employee> emps = new HashMap<>();
 
     public int getNumber() {
         return number;
@@ -54,6 +59,7 @@ public class PhoneNumber {
         emps.remove(d);
     }
 
+    @Override
     public boolean equals(Object o) {
         PhoneNumber p = (PhoneNumber) o;
         Map<FullName, Employee> map = p.getEmployees();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java
index a0159cc1b..c57b34941 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/m2mmapex9/TestMany2ManyMapEx9.java
@@ -28,12 +28,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 
 public class TestMany2ManyMapEx9 extends SQLListenerTestCase {
 
@@ -42,21 +42,22 @@ public class TestMany2ManyMapEx9 extends SQLListenerTestCase {
     public int numEmployeesPerPhoneNumber = 2;
     public int numPhoneNumbersPerEmployee = 2;
     public Map<Integer, PhoneNumber> phones =
-        new HashMap<Integer, PhoneNumber>();
-    public List<String> namedQueries = new ArrayList<String>();
+        new HashMap<>();
+    public List<String> namedQueries = new ArrayList<>();
 
     public int empId = 1;
     public int phoneId = 1;
     public int divId = 1;
     public int deptId = 1;
 
-    public Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    public Map<Integer, Employee> empMap = new HashMap<>();
     public Map<Integer, PhoneNumber> phoneMap =
-        new HashMap<Integer, PhoneNumber>();
+        new HashMap<>();
 
     public List rsAllPhones = null;
     public List rsAllEmps = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Employee.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Division.java
index 4ffb3e544..e77972efc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/Division.java
@@ -33,7 +33,7 @@ public class Division {
     private int id;
 
     @ElementCollection
-    private Map<Employee, String> employees = new HashMap<Employee, String>();
+    private Map<Employee, String> employees = new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/PersonalInfo.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/PersonalInfo.java
index a957f8e33..a4e180f57 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/PersonalInfo.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/PersonalInfo.java
@@ -30,7 +30,7 @@ public class PersonalInfo {
     private String lastName;
 
     @ElementCollection
-    private Set<Phone> phones = new HashSet<Phone>();
+    private Set<Phone> phones = new HashSet<>();
 
     public String getFirstName() {
         return firstName;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java
index e70fd24c7..5aebf6841 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/qualified/path/TestQualifiedPath.java
@@ -48,6 +48,7 @@ public class TestQualifiedPath extends SQLListenerTestCase {
 
     OpenJPAEntityManager em;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Division.class, Employee.class, Phone.class, PersonalInfo.class);
@@ -111,7 +112,7 @@ public class TestQualifiedPath extends SQLListenerTestCase {
     private void createDivision(int id) {
         Division division = new Division();
         division.setId(id);
-        Map<Employee, String> employees = new HashMap<Employee, String>();
+        Map<Employee, String> employees = new HashMap<>();
         for (int i = 0; i < numEmployeesPerDivision; i++) {
             Employee employee = createEmployee(employeeId++);
             employees.put(employee, employee.getPersonalInfo().getLastName());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department1.java
index e53845ac6..e4fb89667 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department1.java
@@ -21,7 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="T6D1")
@@ -33,7 +38,7 @@ public class Department1 {
 
     //@OneToMany(mappedBy="department", fetch=FetchType.EAGER)
     //@MapKey(name="empId")
-    Map<Integer, Employee1> empMap = new HashMap<Integer, Employee1>();
+    Map<Integer, Employee1> empMap = new HashMap<>();
 
     @Id
     public int getDeptId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department2.java
index 4b483f1bb..8d1720329 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department2.java
@@ -21,14 +21,18 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="T6D2")
 public class Department2 {
 
     int deptId;
-    Map<EmployeePK2, Employee2> empMap = new HashMap<EmployeePK2, Employee2>();
+    Map<EmployeePK2, Employee2> empMap = new HashMap<>();
 
     @Id
     public int getDeptId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department3.java
index d961836e2..a1affe77d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Department3.java
@@ -38,7 +38,7 @@ public class Department3 {
     @OneToMany(mappedBy="department", fetch=FetchType.EAGER)
     @MapKey(name="name")
     Map<EmployeeName3, Employee3> emps =
-        new HashMap<EmployeeName3, Employee3>();
+        new HashMap<>();
 
     public int getDeptId() {
         return deptId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee1.java
index f435d6b1a..4039f6a13 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee1.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="T6E1")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee2.java
index e28981dd9..b21458a09 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee2.java
@@ -20,7 +20,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0;
 
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="T6E2")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee3.java
index 5bdea9044..2f206a77e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/Employee3.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0;
 
-import javax.persistence.*;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="T6E3")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeeName3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeeName3.java
index 9944e4d08..7aa45e2d1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeeName3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeeName3.java
@@ -49,6 +49,7 @@ public class EmployeeName3 {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EmployeeName3))
             return false;
@@ -59,6 +60,7 @@ public class EmployeeName3 {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeePK2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeePK2.java
index aadc5abc6..d3c990ccb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeePK2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/EmployeePK2.java
@@ -21,10 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex0;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class EmployeePK2 implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     String name;
     Date bDay;
 
@@ -34,6 +36,7 @@ public class EmployeePK2 implements Serializable {
         this.bDay = bDay;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o)
             return true;
@@ -46,6 +49,7 @@ public class EmployeePK2 implements Serializable {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int code = 0;
         code += name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java
index e19053729..35f679919 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex0/TestSpec10_1_26.java
@@ -30,17 +30,17 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_26 extends SQLListenerTestCase {
 
     public int numDepartments = 2;
     public int numEmployeesPerDept = 2;
-    public List<String> namedQueries = new ArrayList<String>();
+    public List<String> namedQueries = new ArrayList<>();
 
     public int deptId = 1;
     public int empId = 1;
@@ -49,6 +49,7 @@ public class TestSpec10_1_26 extends SQLListenerTestCase {
     public List<Department2> rsAllDepartment2 = null;
     public List<Department3> rsAllDepartment3 = null;
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES,
             Department1.class,
@@ -201,7 +202,7 @@ public class TestSpec10_1_26 extends SQLListenerTestCase {
     public void createDepartment1(EntityManager em, int id) {
         Department1 d = new Department1();
         d.setDeptId(id);
-        Map<Integer,Employee1> empMap = new HashMap<Integer,Employee1>();
+        Map<Integer,Employee1> empMap = new HashMap<>();
         for (int i = 0; i < numEmployeesPerDept; i++) {
             Employee1 e = createEmployee1(em, empId++);
             //d.addEmployee1(e);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Department.java
index 075cd2ead..9aac0700c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Department.java
@@ -21,7 +21,13 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex1;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S26x1Dept")
@@ -32,7 +38,7 @@ public class Department {
 
     @OneToMany(cascade=CascadeType.ALL, mappedBy="dept", fetch=FetchType.EAGER)
     @MapKey(name="empId")
-    Map<Integer, Employee> empMap = new HashMap<Integer, Employee>();
+    Map<Integer, Employee> empMap = new HashMap<>();
 
     public int getDeptId() {
         return deptId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Employee.java
index e77d85815..d5b027e29 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/Employee.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex1;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S26x1Emp")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java
index e412ae3d6..011aa696c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex1/TestSpec10_1_26_Ex1.java
@@ -28,22 +28,23 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_26_Ex1 extends SQLListenerTestCase {
 
     public int numDepartments = 2;
     public int numEmployeesPerDept = 2;
-    public List<String> namedQueries = new ArrayList<String>();
+    public List<String> namedQueries = new ArrayList<>();
 
     public int deptId = 1;
     public int empId = 1;
     public List rsAllDepartments = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Department.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Department.java
index 14ea85110..3312e2aa7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Department.java
@@ -21,14 +21,19 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex2;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S6Dept")
 public class Department {
 
     int deptId;
-    Map<EmployeePK, Employee> empMap = new HashMap<EmployeePK, Employee>();
+    Map<EmployeePK, Employee> empMap = new HashMap<>();
 
     @Id
     public int getDeptId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Employee.java
index 75dcd0f9c..468621c11 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/Employee.java
@@ -20,7 +20,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex2;
 
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S6E2Emp")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/EmployeePK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/EmployeePK.java
index ec421a35f..fdeaf2842 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/EmployeePK.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/EmployeePK.java
@@ -21,10 +21,12 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex2;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class EmployeePK implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     String name;
     Date bDay;
 
@@ -42,6 +44,7 @@ public class EmployeePK implements Serializable {
         return bDay;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o)
             return true;
@@ -54,6 +57,7 @@ public class EmployeePK implements Serializable {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int code = 0;
         code += name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java
index e559a2407..a1970fab4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex2/TestSpec10_1_26_Ex2.java
@@ -28,12 +28,12 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_26_Ex2 extends SQLListenerTestCase {
     public int numDepartments = 2;
     public int numEmployeesPerDept = 2;
@@ -41,6 +41,7 @@ public class TestSpec10_1_26_Ex2 extends SQLListenerTestCase {
     public int empId = 1;
     public List rsAllDepartments = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Department.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Department.java
index 552ad0493..649837a21 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Department.java
@@ -37,7 +37,7 @@ public class Department {
 
     @OneToMany(cascade=CascadeType.ALL)
     @MapKey(name="name")
-    Map<EmployeeName, Employee> emps = new HashMap<EmployeeName, Employee>();
+    Map<EmployeeName, Employee> emps = new HashMap<>();
 
     public int getDeptId() {
         return deptId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Employee.java
index c85dbcc55..b285acac0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/Employee.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_26_ex3;
 
-import javax.persistence.*;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="A63Emp")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/EmployeeName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/EmployeeName.java
index 792bbb099..d0bc0e9fb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/EmployeeName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/EmployeeName.java
@@ -49,6 +49,7 @@ public class EmployeeName {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof EmployeeName))
             return false;
@@ -59,6 +60,7 @@ public class EmployeeName {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret += lName.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java
index e8512d48e..0feead4a8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_26_ex3/TestSpec10_1_26_Ex3.java
@@ -28,22 +28,23 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_26_Ex3 extends SQLListenerTestCase {
 
     public int numDepartments = 2;
     public int numEmployeesPerDept = 2;
-    public List<String> namedQueries = new ArrayList<String>();
+    public List<String> namedQueries = new ArrayList<>();
 
     public int deptId = 1;
     public int empId = 1;
     public List rsAllDepartments = null;
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES,
             Department.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny1.java
index 4983895cb..ccaf953ac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny1.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKeyClass;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x0Comp1")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny2.java
index b807f8db0..adf68232c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Compny2.java
@@ -21,7 +21,9 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 @Entity
 public class Compny2 {
@@ -30,7 +32,7 @@ public class Compny2 {
 
     @OneToMany
     Map<Division, VicePresident> orgs =
-        new HashMap<Division, VicePresident>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Division.java
index e17df38ce..87fa93dd5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Division.java
@@ -48,6 +48,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         Division d = (Division) o;
         if (d.name.equals(name) &&
@@ -56,6 +57,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item1.java
index f251f1275..3441a4ec1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item1.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKeyClass;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x0Itm1")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item2.java
index 6c87286f3..0ecad9275 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/Item2.java
@@ -21,7 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x0Itm2")
@@ -30,7 +33,7 @@ public class Item2 {
     int id;
 
     @ElementCollection
-    Map<String, String> images = new HashMap<String, String>();
+    Map<String, String> images = new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
index 3ff41cc69..ecb9c310b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/TestSpec10_1_27.java
@@ -26,12 +26,12 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_27 extends SQLListenerTestCase {
     public int numItems = 2;
     public int numImagesPerItem = 3;
@@ -44,6 +44,7 @@ public class TestSpec10_1_27 extends SQLListenerTestCase {
     public List<Compny1> rsAllCompny1 = null;
     public List<Compny2> rsAllCompny2 = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
                 Compny1.class, Compny2.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/VicePresident.java
index ec5fafd94..d8c5ee585 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex0/VicePresident.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex0;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x0VP")
@@ -56,6 +60,7 @@ public class VicePresident {
         this.co = co;
     }
 
+    @Override
     public boolean equals(Object v) {
         if (this == v)
             return true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Company.java
index 7d37b1db0..304790093 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Company.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex3;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKeyClass;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S273Comp")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Division.java
index af2cd125a..1322cd30f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/Division.java
@@ -47,6 +47,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         Division d = (Division) o;
         if (d.name.equals(name) &&
@@ -55,6 +56,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java
index 465329d06..f60e4e5eb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/TestSpec10_1_27_Ex3.java
@@ -28,16 +28,16 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_27_Ex3 extends SQLListenerTestCase {
     public int numCompany = 2;
     public int numDivisionsPerCo = 2;
-    public List<String> namedQueries = new ArrayList<String>();
+    public List<String> namedQueries = new ArrayList<>();
 
     public int compId = 1;
     public int divId = 1;
@@ -46,6 +46,7 @@ public class TestSpec10_1_27_Ex3 extends SQLListenerTestCase {
     public int newVpId = 100;
     public List rsAllCompany = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Company.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/VicePresident.java
index cc56f5fcb..a3d9eba52 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex3/VicePresident.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex3;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x3VP")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Company.java
index 4872d68d0..d4c111c50 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Company.java
@@ -21,7 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex4;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S274Comp")
@@ -31,7 +34,7 @@ public class Company {
 
     @OneToMany
     Map<Division, VicePresident> organization =
-        new HashMap<Division, VicePresident>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Division.java
index e23adf4e0..77c267b16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/Division.java
@@ -48,6 +48,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         Division d = (Division) o;
         if (d.name.equals(name) &&
@@ -56,6 +57,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java
index e908106d0..6c0672569 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/TestSpec10_1_27_Ex4.java
@@ -27,12 +27,12 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_27_Ex4 extends SQLListenerTestCase {
     public int numCompany = 2;
     public int numDivisionsPerCo = 2;
@@ -44,6 +44,7 @@ public class TestSpec10_1_27_Ex4 extends SQLListenerTestCase {
     public int newVpId = 100;
     public List rsAllCompany = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Company.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/VicePresident.java
index b321ea818..708ef5c16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex4/VicePresident.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex4;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x4VP")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Company.java
index 768fcf0ea..2439ae67d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Company.java
@@ -21,7 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex5;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S275Comp")
@@ -31,7 +34,7 @@ public class Company {
 
     @OneToMany(mappedBy="co")
     Map<Division, VicePresident> orgs =
-        new HashMap<Division, VicePresident>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Division.java
index 145661909..61e3f2262 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/Division.java
@@ -46,6 +46,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         Division d = (Division) o;
         if (d.name.equals(name) &&
@@ -54,6 +55,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java
index 3d9c82b4a..7817e79ee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/TestSpec10_1_27_Ex5.java
@@ -28,16 +28,16 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_27_Ex5 extends SQLListenerTestCase {
     public int numCompany = 2;
     public int numDivisionsPerCo = 2;
-    public List<String> namedQueries = new ArrayList<String>();
+    public List<String> namedQueries = new ArrayList<>();
 
     public int compId = 1;
     public int divId = 1;
@@ -46,6 +46,7 @@ public class TestSpec10_1_27_Ex5 extends SQLListenerTestCase {
     public int newVpId = 100;
     public List rsAllCompany = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Company.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/VicePresident.java
index 7ad284066..180d8de26 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex5/VicePresident.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex5;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x5VP")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Company.java
index 039ab5180..544bbfeb1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Company.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex6;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S276Comp")
@@ -32,7 +36,7 @@ public class Company {
     @OneToMany
     @MapKey(name="div")
     Map<Division, VicePresident> organization =
-        new HashMap<Division, VicePresident>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Division.java
index 315990679..f3a0f765e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/Division.java
@@ -46,6 +46,7 @@ public class Division {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         Division d = (Division) o;
         if (d.name.equals(name) &&
@@ -54,6 +55,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java
index 2a4e702c6..eee5e24e0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/TestSpec10_1_27_Ex6.java
@@ -27,12 +27,12 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_27_Ex6 extends SQLListenerTestCase {
     public int numCompany = 2;
     public int numDivisionsPerCo = 2;
@@ -44,6 +44,7 @@ public class TestSpec10_1_27_Ex6 extends SQLListenerTestCase {
     public int newVpId = 100;
     public List rsAllCompany = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Company.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/VicePresident.java
index d17254835..20dff5dc4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex6/VicePresident.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex6;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x6VP")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Company.java
index 2ae73586c..5c1033399 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Company.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex7;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S277Comp")
@@ -32,7 +36,7 @@ public class Company {
     @OneToMany(mappedBy="co")
     @MapKey(name="div")
     Map<Division, VicePresident> orgs =
-        new HashMap<Division, VicePresident>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Division.java
index 7ea83da00..aab5a0f9f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/Division.java
@@ -58,6 +58,7 @@ public class Division {
         this.vp = vp;
     }
 
+    @Override
     public boolean equals(Object o) {
         Division d = (Division) o;
         if (d.name.equals(name) &&
@@ -66,6 +67,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java
index 0f8a5ab44..f8fad0ac2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/TestSpec10_1_27_Ex7.java
@@ -28,16 +28,16 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_27_Ex7 extends SQLListenerTestCase {
     public int numCompany = 2;
     public int numDivisionsPerCo = 2;
-    public List<String> namedQueries = new ArrayList<String>();
+    public List<String> namedQueries = new ArrayList<>();
 
     public int compId = 1;
     public int divId = 1;
@@ -46,6 +46,7 @@ public class TestSpec10_1_27_Ex7 extends SQLListenerTestCase {
     public int newVpId = 100;
     public List rsAllCompany = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Company.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/VicePresident.java
index 30b9cded8..4458697c6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex7/VicePresident.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex7;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x7VP")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/Company.java
index 96d594995..77344ea16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/Company.java
@@ -21,7 +21,10 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex8;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S278Comp")
@@ -31,7 +34,7 @@ public class Company {
 
     @OneToMany(mappedBy="co")
     Map<FileName, VicePresident> orgs =
-        new HashMap<FileName, VicePresident>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/FileName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/FileName.java
index fb9f7f521..2ab4cfa16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/FileName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/FileName.java
@@ -49,6 +49,7 @@ public class FileName {
         this.lName = lName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof FileName)) return false;
         FileName other = (FileName) o;
@@ -58,6 +59,7 @@ public class FileName {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         if (lName != null)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java
index a3b8ccc1c..eb19c5b40 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/TestSpec10_1_27_Ex8.java
@@ -28,17 +28,17 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 
 public class TestSpec10_1_27_Ex8 extends SQLListenerTestCase {
     public int numCompany = 2;
     public int numDivisionsPerCo = 2;
-    public List<String> namedQueries = new ArrayList<String>();
+    public List<String> namedQueries = new ArrayList<>();
 
     public int compId = 1;
     public int divId = 1;
@@ -48,6 +48,7 @@ public class TestSpec10_1_27_Ex8 extends SQLListenerTestCase {
     public int newVpId = 100;
     public List rsAllCompany = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Company.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/VicePresident.java
index 1a1ed1a76..03435fba3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_27_ex8/VicePresident.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_27_ex8;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="S27x8VP")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Company.java
index 6223726ba..a5e2c1a27 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Company.java
@@ -21,7 +21,13 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex1;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.MapKeyJoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="T291Comp")
@@ -36,7 +42,7 @@ public class Company {
     )
     @MapKeyJoinColumn(name="DIVISION")
     Map<Division, VicePresident> organization =
-        new HashMap<Division, VicePresident>();
+        new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Division.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Division.java
index a6fa6c82e..47eaca0c2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Division.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/Division.java
@@ -38,7 +38,7 @@ public class Division {
     @ElementCollection
     @CollectionTable(name="branch")
     @Column(name="branch", length=20)
-    protected Set<String> branches = new HashSet<String>();
+    protected Set<String> branches = new HashSet<>();
 
     public int getId() {
         return id;
@@ -64,6 +64,7 @@ public class Division {
         branches.add(name);
     }
 
+    @Override
     public boolean equals(Object o) {
         Division d = (Division) o;
         if (d.name.equals(name) &&
@@ -72,6 +73,7 @@ public class Division {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java
index 03afb8875..8c187525d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/TestSpec10_1_29_Ex1.java
@@ -27,12 +27,12 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_29_Ex1 extends SQLListenerTestCase {
     public int numCompany = 2;
     public int numDivisionsPerCo = 2;
@@ -42,6 +42,7 @@ public class TestSpec10_1_29_Ex1 extends SQLListenerTestCase {
     public int divId = 1;
     public int vpId = 1;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Company.class,
@@ -130,7 +131,7 @@ public class TestSpec10_1_29_Ex1 extends SQLListenerTestCase {
         em.close();
     }
 
-    protected List<String> sql = new ArrayList<String>();
+    protected List<String> sql = new ArrayList<>();
     protected int sqlCount;
 
     public List<String> getSql() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/VicePresident.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/VicePresident.java
index 8396ae961..e2ba8860f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/VicePresident.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex1/VicePresident.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex1;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="T29x1VP")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Course.java
index a37ead0cd..728876223 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Course.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Course.java
@@ -46,6 +46,7 @@ public class Course {
         this.name = name;
     }
 
+    @Override
     public boolean equals(Object o) {
         Course c = (Course) o;
         if (c.name.equals(name) &&
@@ -54,6 +55,7 @@ public class Course {
         return false;
     }
 
+    @Override
     public int hashCode() {
         int ret = 0;
         ret = ret * 31 + name.hashCode();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Student.java
index 54df593be..0844aa500 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Student.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/Student.java
@@ -21,7 +21,13 @@ package org.apache.openjpa.persistence.jdbc.maps.spec_10_1_29_ex3;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.MapKeyJoinColumn;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="T29x3Stud")
@@ -37,7 +43,7 @@ public class Student {
             inverseJoinColumns=@JoinColumn(name="SEMESTER"))
             @MapKeyJoinColumn(name="COURSE")
             Map<Course, Semester> enrollment =
-                new HashMap<Course, Semester>();
+                new HashMap<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java
index 836d1f45a..24ebd3110 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/spec_10_1_29_ex3/TestSpec10_1_29_Ex3.java
@@ -26,12 +26,12 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 public class TestSpec10_1_29_Ex3 extends SQLListenerTestCase {
     public int numStudents = 2;
     public int numCoursesPerStudent = 2;
@@ -41,6 +41,7 @@ public class TestSpec10_1_29_Ex3 extends SQLListenerTestCase {
     public int semesterId = 1;
     public List rsAllStudents = null;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
             Course.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/MultilingualString.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/MultilingualString.java
index d469cd3e5..32ea59d88 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/MultilingualString.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/MultilingualString.java
@@ -48,7 +48,7 @@ public class MultilingualString {
     @ElementCollection(fetch=FetchType.EAGER)
     @MapKeyColumn(name = "language_key")
     @CollectionTable(name = "multilingual_string_map", joinColumns = @JoinColumn(name = "string_id"))
-    private Map<String, LocalizedString> map = new HashMap<String, LocalizedString>();
+    private Map<String, LocalizedString> map = new HashMap<>();
 
     public MultilingualString() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java
index 97f8e7ee5..fb69b99fd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/maps/update/TestMapUpdate.java
@@ -35,7 +35,8 @@ public class TestMapUpdate extends SQLListenerTestCase {
     private MultilingualString entity1;
 	private OpenJPAEntityManagerSPI em;
 
-	public void setUp() {
+	@Override
+    public void setUp() {
         super.setUp(CLEAR_TABLES,
             MultilingualString.class,
             LocalizedString.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestBuildSchema.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestBuildSchema.java
index 6e5985f17..d180df910 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestBuildSchema.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestBuildSchema.java
@@ -31,11 +31,10 @@ import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 
-import org.apache.regexp.REUtil;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.MappingTool;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
+import org.apache.openjpa.persistence.jdbc.common.apps.BuildSchemaPC;
+import org.apache.regexp.REUtil;
 
 
 public class TestBuildSchema
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestDFG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestDFG.java
index a240ac7d1..2394b2fc7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestDFG.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestDFG.java
@@ -28,13 +28,11 @@
 package org.apache.openjpa.persistence.jdbc.meta;
 
 import javax.persistence.EntityTransaction;
+
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.meta.FieldMetaData;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.DFGTest;
 
 
 
@@ -48,6 +46,7 @@ public class TestDFG
     	super(name);
     }
 
+    @Override
     public void setUp() {
        deleteAll(DFGTest.class);
         OpenJPAEntityManager pm = (OpenJPAEntityManager)currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBByteArray.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBByteArray.java
index 68630434e..1d8224ee0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBByteArray.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBByteArray.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.meta;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.kernel.common.apps.*;
+import org.apache.openjpa.persistence.kernel.common.apps.ByteArray;
 
 public class TestEJBByteArray
         extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
@@ -35,7 +35,8 @@ public class TestEJBByteArray
 		super(name);
 	}
 
-	public void setUp() throws Exception
+	@Override
+    public void setUp() throws Exception
 	{
 		deleteAll(ByteArray.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBColumnIOMappings.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBColumnIOMappings.java
index 0d696f039..4f2cf0315 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBColumnIOMappings.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBColumnIOMappings.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.jdbc.meta;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.kernel.common.apps.*;
+import org.apache.openjpa.persistence.kernel.common.apps.ColumnIOPC;
 
 public class TestEJBColumnIOMappings
         extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
@@ -29,7 +29,8 @@ public class TestEJBColumnIOMappings
 		super(name);
 	}
 
-	public void setUp()
+	@Override
+    public void setUp()
 	{
 		deleteAll(ColumnIOPC.class);
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBConstantJoinOnSameRefTable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBConstantJoinOnSameRefTable.java
index 8d193d4d1..cd02def44 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBConstantJoinOnSameRefTable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBConstantJoinOnSameRefTable.java
@@ -34,7 +34,8 @@ public class TestEJBConstantJoinOnSameRefTable
 		super(name);
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+    @SuppressWarnings("unchecked")
 	public void setUp ()
 	{
 		deleteAll(ConstantJoinPC4.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBCustomMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBCustomMapping.java
index 2a3bcc05a..c68fe2c66 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBCustomMapping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBCustomMapping.java
@@ -32,7 +32,8 @@ public class TestEJBCustomMapping
 		super(name);
 	}
 
-	public void setUp ()
+	@Override
+    public void setUp ()
 	{
 		deleteAll(CustomMappingPC.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBDateVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBDateVersion.java
index 7a2f29cd0..011f8d01c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBDateVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBDateVersion.java
@@ -31,7 +31,8 @@ public class TestEJBDateVersion
 		super(name);
 	}
 
-	public void setUp() throws Exception
+	@Override
+    public void setUp() throws Exception
 	{
 		deleteAll(DateVersion.class);
 
@@ -61,12 +62,14 @@ public class TestEJBDateVersion
 	pc1.setString ("pc-2-1");
 	pc2.setString ("pc-2-2");
 
-	// some DBs do not distinguish dates unless there is 1 sec diff
-	Thread.currentThread ().sleep (1 * 1000);
+	Thread.currentThread ();
+    // some DBs do not distinguish dates unless there is 1 sec diff
+	Thread.sleep (1 * 1000);
 	endTx(pm1);
 	try
 	{
-		Thread.currentThread ().sleep (1 * 1000);
+		Thread.currentThread ();
+        Thread.sleep (1 * 1000);
 		endTx(pm2);
 		fail ("Should have caused OL exception.");
 	}
@@ -90,11 +93,13 @@ public class TestEJBDateVersion
 	startTx(pm2);
 	pc2.setString ("pc-string-5-2");
 
-	Thread.currentThread ().sleep (1 * 1000);
+	Thread.currentThread ();
+    Thread.sleep (1 * 1000);
 	endTx(pm1);
 	try
 	{
-		Thread.currentThread ().sleep (1 * 1000);
+		Thread.currentThread ();
+        Thread.sleep (1 * 1000);
 		endTx(pm2);
 		fail ("Should have caused OL exception2.");
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBEager.java
index 77bd26c6c..22114c607 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBEager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBEager.java
@@ -20,7 +20,12 @@ package org.apache.openjpa.persistence.jdbc.meta;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
+import org.apache.openjpa.persistence.jdbc.common.apps.EagerPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.EagerPCSub;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC2;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC3;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC4;
 
 public class TestEJBEager
         extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
@@ -31,7 +36,8 @@ public class TestEJBEager
 		super(name);
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+    @SuppressWarnings("unchecked")
 	public void setUp()
 	{
 		deleteAll(EagerPCSub.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBInverseOneToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBInverseOneToOne.java
index 29a8e07d2..a94d00546 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBInverseOneToOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBInverseOneToOne.java
@@ -31,7 +31,8 @@ public class TestEJBInverseOneToOne
 		super(name);
 	}
 
-	public void setUp ()
+	@Override
+    public void setUp ()
 	{
 		deleteAll(InvertA.class);
 		deleteAll(InvertB.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBOuterJoinValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBOuterJoinValues.java
index 836b0f104..a1092280e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBOuterJoinValues.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEJBOuterJoinValues.java
@@ -31,7 +31,8 @@ public class TestEJBOuterJoinValues
 		super(name);
 	}
 
-	public void setUp()
+	@Override
+    public void setUp()
 	{
 		deleteAll(OuterJoinValuePC.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java
index ac4eb50fc..3a3062240 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerDistinct.java
@@ -27,15 +27,15 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
+import java.util.List;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.sql.Join;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
+import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.EagerPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC2;
 
 
 public class TestEagerDistinct
@@ -49,9 +49,10 @@ public class TestEagerDistinct
 
     public boolean skipTest() {
         return ((JDBCConfiguration) getConfiguration()).
-                getDBDictionaryInstance().joinSyntax == Join.SYNTAX_TRADITIONAL;
+                getDBDictionaryInstance().joinSyntax == JoinSyntaxes.SYNTAX_TRADITIONAL;
     }
 
+    @Override
     public void setUpTestCase() {
        deleteAll(EagerPC.class);
        deleteAll(HelperPC.class);
@@ -83,6 +84,7 @@ public class TestEagerDistinct
         pm.close();
     }
 
+    @Override
     public OpenJPAEntityManager getPM() {
         OpenJPAEntityManager pm = (OpenJPAEntityManager)currentEntityManager();
         pm.getFetchPlan().setMaxFetchDepth(-1);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerOuterToManyJoins.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerOuterToManyJoins.java
index e33dd5053..de9bec275 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerOuterToManyJoins.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerOuterToManyJoins.java
@@ -28,16 +28,19 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.persistence.FetchPlan;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.EagerOuterJoinPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.EagerOuterJoinPC2;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC;
 
 
 public class TestEagerOuterToManyJoins
@@ -54,6 +57,7 @@ public class TestEagerOuterToManyJoins
         return !dict.supportsSubselect;
     }
 
+    @Override
     public void setUp() {
 
        deleteAll(HelperPC.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIntermediate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIntermediate.java
index 3bd500774..e3be40220 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIntermediate.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIntermediate.java
@@ -32,11 +32,8 @@ import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.RuntimeTest1;
 
 
 public class TestIntermediate
@@ -53,6 +50,7 @@ public class TestIntermediate
     public TestIntermediate() {
     }
 
+    @Override
     public void setUp() {
         RuntimeTest1 pc = new RuntimeTest1("pc", 1);
         RuntimeTest1 rel = new RuntimeTest1("rel", 2);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIrregularJoins.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIrregularJoins.java
index b822ab524..23132c357 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIrregularJoins.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIrregularJoins.java
@@ -27,12 +27,18 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.Collection;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.ConstantJoinPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.ConstantJoinPC2;
+import org.apache.openjpa.persistence.jdbc.common.apps.ConstantJoinPC3;
+import org.apache.openjpa.persistence.jdbc.common.apps.NonPKJoinPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.NonPKJoinPC2;
+import org.apache.openjpa.persistence.jdbc.common.apps.NonPKJoinPC3;
+import org.apache.openjpa.persistence.jdbc.common.apps.PartialJoinPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.PartialJoinPC2;
+import org.apache.openjpa.persistence.jdbc.common.apps.PartialJoinPC3;
 
 
 public class TestIrregularJoins
@@ -53,6 +59,7 @@ public class TestIrregularJoins
     public TestIrregularJoins() {
     }
 
+    @Override
     public void setUp()
         throws Exception {
         // make sure these classes are registered since we're using metadata
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestJDBCType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestJDBCType.java
index 4feb6479d..cfb7fe25a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestJDBCType.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestJDBCType.java
@@ -30,6 +30,7 @@ package org.apache.openjpa.persistence.jdbc.meta;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
+import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.meta.RefreshStrategyInstaller;
 import org.apache.openjpa.jdbc.meta.strats.BlobValueHandler;
@@ -40,10 +41,7 @@ import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.SchemaGroup;
 import org.apache.openjpa.jdbc.schema.Table;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
-
-
-import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
-import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.meta.JavaTypes;
 
 public class TestJDBCType
         extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
@@ -93,7 +91,7 @@ public class TestJDBCType
                 || cols[i].getName().equalsIgnoreCase("typ"))
                 continue;
             if ("longToInt".equalsIgnoreCase(cols[i].getName()))
-                assertEquals(dict.getPreferredType(JavaSQLTypes.INT),
+                assertEquals(dict.getPreferredType(JavaTypes.INT),
                     cols[i].getType());
             else if ("longToSQL".equalsIgnoreCase(cols[i].getName()))
                 assertEquals("varchar", cols[i].getTypeName());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestJoinToBaseClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestJoinToBaseClass.java
index bdc05e906..4b2424121 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestJoinToBaseClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestJoinToBaseClass.java
@@ -33,12 +33,11 @@ import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.jdbc.schema.ForeignKey;
 import org.apache.openjpa.jdbc.schema.Table;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.jdbc.common.apps.MappingTest1;
+import org.apache.openjpa.persistence.jdbc.common.apps.MappingTest2;
+import org.apache.openjpa.persistence.jdbc.common.apps.MappingTest5;
 
 
 public class TestJoinToBaseClass
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestLRSProxies.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestLRSProxies.java
index 9d4c407d8..292a1bc80 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestLRSProxies.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestLRSProxies.java
@@ -27,13 +27,17 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeSet;
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.jdbc.common.apps.LRSCompoundPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.LRSPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.LRSPCIntf;
 
 
 public class TestLRSProxies
@@ -50,6 +54,7 @@ public class TestLRSProxies
     /** Creates a new instance of TestLRSProxies */
     public TestLRSProxies() {
     }
+    @Override
     public void setUp() {
        deleteAll(LRSPC.class);
        deleteAll(LRSCompoundPC.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestLocators.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestLocators.java
index 96441ea84..579aa179c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestLocators.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestLocators.java
@@ -27,17 +27,17 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Iterator;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.persistence.Extent;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.jdbc.common.apps.LocatorTestObject;
 
 
 public class TestLocators
@@ -52,6 +52,7 @@ public class TestLocators
     /** Creates a new instance of TestLocators */
     public TestLocators() {
     }
+    @Override
     public void setUp() {
         OpenJPAEntityManager pm =(OpenJPAEntityManager)currentEntityManager();
         startTx(pm);
@@ -65,6 +66,7 @@ public class TestLocators
         pm.close();
     }
 
+    @Override
     public void tearDown()
         throws Exception {
         super.tearDown();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMappedByKeyMaps.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMappedByKeyMaps.java
index bf171c1d5..a8e34a222 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMappedByKeyMaps.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMappedByKeyMaps.java
@@ -27,19 +27,23 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.meta.strats.RelationMapInverseKeyFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationMapTableFieldStrategy;
-import org.apache.openjpa.util.AbstractLRSProxyMap;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.InverseKeyMapPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.JoinTableMapPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.MappedByMapPC;
+import org.apache.openjpa.util.AbstractLRSProxyMap;
 
 
 public class TestMappedByKeyMaps
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMetaDataValueIndicator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMetaDataValueIndicator.java
index a85673a82..37920546e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMetaDataValueIndicator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMetaDataValueIndicator.java
@@ -27,15 +27,16 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
+import java.util.Iterator;
+
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.strats.SuperclassDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.meta.strats.ValueMapDiscriminatorStrategy;
 import org.apache.openjpa.persistence.Extent;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiE;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiF;
 
 
 public class TestMetaDataValueIndicator
@@ -53,6 +54,7 @@ public class TestMetaDataValueIndicator
     public TestMetaDataValueIndicator() {
     }
 
+    @Override
     public void setUp() {
         // ### I hate that we have to do this
         Class c = MultiE.class;
@@ -70,6 +72,7 @@ public class TestMetaDataValueIndicator
             pm.getClassLoader(), true);
     }
 
+    @Override
     public void tearDown()
     throws Exception {
         if (pm.getTransaction().isActive())
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiDFG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiDFG.java
index 7616f5348..f2af588f5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiDFG.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiDFG.java
@@ -31,11 +31,8 @@ import javax.persistence.EntityTransaction;
 
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.meta.FieldMetaData;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiB;
 
 
 public class TestMultiDFG
@@ -51,6 +48,7 @@ public class TestMultiDFG
     public TestMultiDFG() {
     }
 
+    @Override
     public void setUp() {
 
        deleteAll(MultiB.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableMappings.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableMappings.java
index b756f1679..f28aebfad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableMappings.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableMappings.java
@@ -27,16 +27,19 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
 import javax.persistence.EntityTransaction;
 
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.jdbc.JDBCFetchPlan;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiA;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiB;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiC;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiD;
 
 
 public class TestMultiTableMappings
@@ -56,6 +59,7 @@ public class TestMultiTableMappings
     public TestMultiTableMappings() {
     }
 
+    @Override
     public void setUpTestCase() {
        deleteAll(MultiA.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableSelfCollection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableSelfCollection.java
index 0d9164e73..afe53c3b2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableSelfCollection.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestMultiTableSelfCollection.java
@@ -27,12 +27,12 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.ArrayList;
+import java.util.Collection;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiA;
+import org.apache.openjpa.persistence.jdbc.common.apps.MultiC;
 
 
 public class TestMultiTableSelfCollection
@@ -55,6 +55,7 @@ public class TestMultiTableSelfCollection
     public TestMultiTableSelfCollection() {
     }
 
+    @Override
     public void setUp() {
        deleteAll(MultiA.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestNoClassColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestNoClassColumn.java
index 3467102ab..2a89f6c0f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestNoClassColumn.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestNoClassColumn.java
@@ -27,14 +27,12 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
-
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.NoClassColumn;
 
 
 public class TestNoClassColumn
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestRangeQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestRangeQuery.java
index 7400d2093..2001795fe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestRangeQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestRangeQuery.java
@@ -18,17 +18,17 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
+import java.util.List;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.FetchPlan;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.EagerOuterJoinPC;
+import org.apache.openjpa.persistence.jdbc.common.apps.EagerOuterJoinPC2;
+import org.apache.openjpa.persistence.jdbc.common.apps.HelperPC;
 
 
 public class TestRangeQuery extends
@@ -45,6 +45,7 @@ public class TestRangeQuery extends
         return !dict.supportsSubselect;
     }
 
+    @Override
     public void setUp() {
 
        deleteAll(HelperPC.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestRawField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestRawField.java
index 372e08b90..5df13f4eb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestRawField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestRawField.java
@@ -27,10 +27,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.RawField;
 
 
 public class TestRawField
@@ -42,6 +40,7 @@ public class TestRawField
     	super(name);
     }
 
+    @Override
     public void setUp() {
        deleteAll(RawField.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestStateImage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestStateImage.java
index 7107af223..648262cf6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestStateImage.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestStateImage.java
@@ -27,14 +27,12 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta;
 
-import java.util.*;
-
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.Collection;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.StateImagePC2;
+import org.apache.openjpa.persistence.jdbc.common.apps.StateImagePC3;
 
 
 public class TestStateImage
@@ -49,6 +47,7 @@ public class TestStateImage
     }
 
 
+    @Override
     public void setUpTestCase() {
        deleteAll(StateImagePC2.class);
        deleteAll(StateImagePC3.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java
index c3210b8b4..c8acf8581 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestUseSchemaElement.java
@@ -39,6 +39,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestUseSchemaElement extends /*TestCase*/ SingleEMFTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         File f = new File("target/orm.xml");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestLockGroupsWithHorizontalBaseType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestLockGroupsWithHorizontalBaseType.java
index 8c88b09ea..cc7988a4f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestLockGroupsWithHorizontalBaseType.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestLockGroupsWithHorizontalBaseType.java
@@ -28,9 +28,9 @@
 package org.apache.openjpa.persistence.jdbc.meta.horizontal;
 
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-import org.apache.openjpa.persistence.common.utils.*;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.jdbc.common.apps.LockGroupSubclass;
 
 
 public class TestLockGroupsWithHorizontalBaseType extends AbstractTestCase
@@ -42,6 +42,7 @@ public class TestLockGroupsWithHorizontalBaseType extends AbstractTestCase
     }
 
 
+    @Override
     public void setUp() {
        deleteAll(LockGroupSubclass.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java
index a385fb029..bcd0d334e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/horizontal/TestQueryAgainstEntireMappedHierarchy.java
@@ -27,10 +27,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta.horizontal;
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.HorizD;
+import org.apache.openjpa.persistence.jdbc.common.apps.HorizJ;
+import org.apache.openjpa.persistence.jdbc.common.apps.HorizK;
 
 
 public class TestQueryAgainstEntireMappedHierarchy
@@ -42,6 +42,7 @@ public class TestQueryAgainstEntireMappedHierarchy
     	super(name);
     }
 
+    @Override
     public void setUpTestCase()
     {
         // this test depends on this fact
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/tableperclass/TestUnionPlaceholderTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/tableperclass/TestUnionPlaceholderTypes.java
index ac66bede8..9f7f07752 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/tableperclass/TestUnionPlaceholderTypes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/tableperclass/TestUnionPlaceholderTypes.java
@@ -30,10 +30,10 @@ package org.apache.openjpa.persistence.jdbc.meta.tableperclass;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.kernel.Broker;
+import org.apache.openjpa.persistence.jdbc.common.apps.PlaceholderTypesA;
+import org.apache.openjpa.persistence.jdbc.common.apps.PlaceholderTypesB;
 import org.apache.openjpa.util.Id;
 
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
 
 public class TestUnionPlaceholderTypes
     extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase {
@@ -46,6 +46,7 @@ public class TestUnionPlaceholderTypes
 
     private boolean _union = false;
 
+    @Override
     public void setUpTestCase() {
         JDBCConfiguration conf = (JDBCConfiguration) getConfiguration();
         //FIXME jthomas
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestJoinSubclasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestJoinSubclasses.java
index e16444689..45e222ae7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestJoinSubclasses.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestJoinSubclasses.java
@@ -28,16 +28,18 @@
 package org.apache.openjpa.persistence.jdbc.meta.vertical;
 
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.TreeSet;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.sql.Join;
+import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
 import org.apache.openjpa.persistence.Extent;
-import org.apache.openjpa.util.Id;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.JoinSubclassBase;
+import org.apache.openjpa.persistence.jdbc.common.apps.JoinSubclassBaseSubFlat;
+import org.apache.openjpa.persistence.jdbc.common.apps.JoinSubclassBaseSubVert;
+import org.apache.openjpa.util.Id;
 
 
 public class TestJoinSubclasses
@@ -64,9 +66,10 @@ public class TestJoinSubclasses
         return false;
     }
 
+    @Override
     public void setUpTestCase() {
         if (((JDBCConfiguration) getConfiguration()).getDBDictionaryInstance().
-                joinSyntax == Join.SYNTAX_DATABASE)
+                joinSyntax == JoinSyntaxes.SYNTAX_DATABASE)
             _outer = "(+)";
 
        deleteAll(JoinSubclassBase.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinExtent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinExtent.java
index d7b9664b2..79421fccd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinExtent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinExtent.java
@@ -27,16 +27,19 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta.vertical;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.TreeSet;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.sql.Join;
+import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
 import org.apache.openjpa.persistence.Extent;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.Base;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1Sub1;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1Sub2;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub2;
 
 
 public class TestSubclassJoinExtent
@@ -60,6 +63,7 @@ public class TestSubclassJoinExtent
         return false;
     }
 
+    @Override
     public void setUpTestCase() {
         // make sure all classes are registered
         Class[] reg = new Class[]{
@@ -68,7 +72,7 @@ public class TestSubclassJoinExtent
         };
 
         if (((JDBCConfiguration) getConfiguration()).getDBDictionaryInstance().
-                joinSyntax == Join.SYNTAX_DATABASE)
+                joinSyntax == JoinSyntaxes.SYNTAX_DATABASE)
             _outer = "(+)";
 
        deleteAll(Base.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinGetObjectById.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinGetObjectById.java
index 429589414..61cfb8383 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinGetObjectById.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinGetObjectById.java
@@ -28,13 +28,14 @@
 package org.apache.openjpa.persistence.jdbc.meta.vertical;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.sql.Join;
-import org.apache.openjpa.util.Id;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
+import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.Base;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1Sub1;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1Sub2;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub2;
+import org.apache.openjpa.util.Id;
 
 
 public class TestSubclassJoinGetObjectById
@@ -60,6 +61,7 @@ public class TestSubclassJoinGetObjectById
         return false;
     }
 
+    @Override
     public void setUpTestCase() {
         // make sure all classes are registered
         Class[] reg = new Class[]{
@@ -68,7 +70,7 @@ public class TestSubclassJoinGetObjectById
         };
 
         if (((JDBCConfiguration) getConfiguration()).getDBDictionaryInstance().
-                joinSyntax == Join.SYNTAX_DATABASE)
+                joinSyntax == JoinSyntaxes.SYNTAX_DATABASE)
             _outer = "(+)";
 
        deleteAll(Base.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinRelations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinRelations.java
index b6ce5fb88..c21026d3c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinRelations.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinRelations.java
@@ -27,15 +27,18 @@
  */
 package org.apache.openjpa.persistence.jdbc.meta.vertical;
 
-import java.util.*;
+import java.util.List;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.sql.Join;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
+import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.Base;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1Sub1;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub1Sub2;
+import org.apache.openjpa.persistence.jdbc.common.apps.BaseSub2;
+import org.apache.openjpa.persistence.jdbc.common.apps.Relations;
 
 
 public class TestSubclassJoinRelations
@@ -59,6 +62,7 @@ public class TestSubclassJoinRelations
         return false;
     }
 
+    @Override
     public void setUpTestCase() {
         // make sure all classes are registered
         Class[] reg = new Class[]{
@@ -67,7 +71,7 @@ public class TestSubclassJoinRelations
         };
 
         if (((JDBCConfiguration) getConfiguration()).getDBDictionaryInstance().
-            joinSyntax == Join.SYNTAX_DATABASE)
+            joinSyntax == JoinSyntaxes.SYNTAX_DATABASE)
             _outer = "(+)";
 
        deleteAll(Relations.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
index be344a2bf..7880c3e51 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
@@ -46,6 +46,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 @DatabasePlatform("oracle.jdbc.driver.OracleDriver")
 public class TestAutoIncrement extends SingleEMFTestCase {
 
+    @Override
     public void setUp() throws Exception {
         // Only run on Oracle
         setSupportedDatabases(
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement.java
index c4837f813..bdb6dcbc0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement.java
@@ -48,7 +48,8 @@ public class BaseTestElement {
       return id;
   }
 
-  public boolean equals(Object obj) {
+  @Override
+public boolean equals(Object obj) {
       if (obj instanceof BaseTestElement) {
           BaseTestElement bte = (BaseTestElement)obj;
           return getId() == bte.getId() &&
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement1.java
index 74f2b1494..eb39e016e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement1.java
@@ -48,7 +48,8 @@ public class BaseTestElement1 {
       return id;
   }
 
-  public boolean equals(Object obj) {
+  @Override
+public boolean equals(Object obj) {
       if (obj instanceof BaseTestElement1) {
           BaseTestElement1 bte = (BaseTestElement1)obj;
           return getId() == bte.getId() &&
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement2.java
index 603fb8010..06629ad78 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement2.java
@@ -48,7 +48,8 @@ public class BaseTestElement2 {
       return id;
   }
 
-  public boolean equals(Object obj) {
+  @Override
+public boolean equals(Object obj) {
       if (obj instanceof BaseTestElement2) {
           BaseTestElement2 bte = (BaseTestElement2)obj;
           return getId() == bte.getId() &&
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement3.java
index 6b3aec3bb..a658312a9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BaseTestElement3.java
@@ -48,7 +48,8 @@ public class BaseTestElement3 {
       return id;
   }
 
-  public boolean equals(Object obj) {
+  @Override
+public boolean equals(Object obj) {
       if (obj instanceof BaseTestElement3) {
           BaseTestElement3 bte = (BaseTestElement3)obj;
           return getId() == bte.getId() &&
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderEntity.java
index e699e0a2d..9a20ad2f1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderEntity.java
@@ -67,6 +67,7 @@ public  class BiOrderEntity implements java.io.Serializable {
         this.bo2mbEntity = ent;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof BiOrderEntity) {
             BiOrderEntity boe = (BiOrderEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderMappedByEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderMappedByEntity.java
index c3dcb3707..39ba61a6a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderMappedByEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/BiOrderMappedByEntity.java
@@ -55,7 +55,7 @@ public class BiOrderMappedByEntity  {
 
     public void addBo2mEntity(BiOrderEntity name) {
         if( bo2mEntities == null) {
-            bo2mEntities = new ArrayList<BiOrderEntity>();
+            bo2mEntities = new ArrayList<>();
         }
         bo2mEntities.add(name);
     }
@@ -70,11 +70,12 @@ public class BiOrderMappedByEntity  {
 
     public void insertBo2mEntity(int location, BiOrderEntity name) {
         if( bo2mEntities == null) {
-            bo2mEntities = new ArrayList<BiOrderEntity>();
+            bo2mEntities = new ArrayList<>();
         }
         bo2mEntities.add(location, name);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof BiOrderMappedByEntity) {
             BiOrderMappedByEntity boe = (BiOrderMappedByEntity)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Bicycle.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Bicycle.java
index f67e27dd5..c54b1656e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Bicycle.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Bicycle.java
@@ -54,6 +54,7 @@ public class Bicycle {
         return model;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Bicycle) {
             Bicycle bike = (Bicycle)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Car.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Car.java
index 75cb6c421..947275367 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Car.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Car.java
@@ -94,6 +94,7 @@ public class Car {
         return owner;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Car) {
             Car car = (Car)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestElement.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestElement.java
index b85951860..ca2ed32ae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestElement.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/ColDefTestElement.java
@@ -57,7 +57,8 @@ public class ColDefTestElement {
       return id;
   }
 
-  public boolean equals(Object obj) {
+  @Override
+public boolean equals(Object obj) {
       if (obj instanceof ColDefTestElement) {
           ColDefTestElement bte = (ColDefTestElement)obj;
           return getId() == bte.getId() &&
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Course.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Course.java
index accfa990b..07d6aa54e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Course.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Course.java
@@ -89,6 +89,7 @@ public class Course {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Course) {
             Course course = (Course)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Game.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Game.java
index 9c801ce1f..a1f01b78e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Game.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Game.java
@@ -26,8 +26,8 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
-import javax.persistence.Table;
 import javax.persistence.OrderColumn;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="OCGame")
@@ -68,6 +68,7 @@ public class Game {
         return playedIn;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Game) {
             Game game = (Game)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Home.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Home.java
index 882564b75..326a28088 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Home.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Home.java
@@ -56,6 +56,7 @@ public class Home {
         return buildYear;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Home) {
             Home home = (Home)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Inning.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Inning.java
index 4a0622bdb..330265cf2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Inning.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Inning.java
@@ -62,6 +62,7 @@ public class Inning {
         return hitsAway;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Inning) {
             Inning in = (Inning)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java
index e31ae2e0e..94aefc053 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Owner.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.persistence.jdbc.order;
 
+import static javax.persistence.InheritanceType.SINGLE_TABLE;
+
 import java.util.Collection;
 
 import javax.persistence.CascadeType;
@@ -31,8 +33,6 @@ import javax.persistence.OneToMany;
 import javax.persistence.OrderColumn;
 import javax.persistence.Table;
 
-import static javax.persistence.InheritanceType.SINGLE_TABLE;
-
 @Entity
 @Table(name="OC_OWNER")
 @Inheritance(strategy=SINGLE_TABLE)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Person.java
index 76cf60759..06af3201c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Person.java
@@ -47,6 +47,7 @@ public abstract class Person {
         return id;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Player) {
             Player player = (Player)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Player.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Player.java
index d7c7ac451..05bc5c150 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Player.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Player.java
@@ -60,6 +60,7 @@ public class Player extends Person {
         return trainers;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Player) {
             Player player = (Player)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Student.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Student.java
index a80486ec5..568cb84af 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Student.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Student.java
@@ -73,6 +73,7 @@ public class Student {
         return name;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Student) {
             Student student = (Student)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
index 9ac659813..aa61da226 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
@@ -43,6 +43,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
     private Student[] students = new Student[12];
 
+    @Override
     public void setUp() {
         super.setUp(
                 CLEAR_TABLES,
@@ -72,7 +73,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
         // Create some data
         Player[] players = new Player[10];
-        ArrayList<Player> playersArr = new ArrayList<Player>();
+        ArrayList<Player> playersArr = new ArrayList<>();
         em.getTransaction().begin();
         for (int i = 0; i < 10 ; i++) {
             players[i] = new Player("Player" + i, i+100);
@@ -137,7 +138,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
         // Create some data
         BiOrderMappedByEntity bome = new BiOrderMappedByEntity();
         bome.setId(1);
-        List<BiOrderEntity> boea = new ArrayList<BiOrderEntity>();
+        List<BiOrderEntity> boea = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
             BiOrderEntity boe = new BiOrderEntity();
             boe.setId(i+1);
@@ -205,7 +206,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
         // Create a list of basic types
         java.sql.Date dates[] = new java.sql.Date[10];
-        ArrayList<java.sql.Date> rainDates = new ArrayList<java.sql.Date>(10);
+        ArrayList<java.sql.Date> rainDates = new ArrayList<>(10);
         Calendar today = Calendar.getInstance();
         for (int i = 0; i < 10; i++) {
             today.set(2009, 1, i+1);
@@ -270,7 +271,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
         // Create some data
         Player[] players = new Player[10];
-        ArrayList<Player> playersArr = new ArrayList<Player>();
+        ArrayList<Player> playersArr = new ArrayList<>();
         em.getTransaction().begin();
         for (int i = 0; i < 10 ; i++) {
             players[i] = new Player("Player" + i, i+100);
@@ -339,7 +340,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
         // Create a list of basic types
         java.sql.Date dates[] = new java.sql.Date[10];
-        ArrayList<java.sql.Date> rainDates = new ArrayList<java.sql.Date>(10);
+        ArrayList<java.sql.Date> rainDates = new ArrayList<>(10);
         Calendar today = Calendar.getInstance();
         for (int i = 0; i < 10; i++) {
             today.set(2009, 1, i+1);
@@ -413,7 +414,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
 
         // Add it to the persistent list in reverse order
-        ArrayList<Player> playersArr = new ArrayList<Player>();
+        ArrayList<Player> playersArr = new ArrayList<>();
         for (int i = 0; i < 10 ; i++) {
             playersArr.add(players[9 - i]);
         }
@@ -476,7 +477,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
         em.getTransaction().commitAndResume();
 
         // Add it to the persistent list in reverse order
-        ArrayList<Player> pinchArr = new ArrayList<Player>();
+        ArrayList<Player> pinchArr = new ArrayList<>();
         for (int i = 0; i < players.length ; i++) {
             pinchArr.add(players[players.length - 1 - i]);
         }
@@ -522,7 +523,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
         Trainer[] trainers = new Trainer[5];
         for (int i = 0; i < trainers.length; i++) {
             trainers[i] = new Trainer("Trainer" + i);
-            ArrayList<Player> trained = new ArrayList<Player>();
+            ArrayList<Player> trained = new ArrayList<>();
             for (int j = ((i * 5) + 4); j >= (i * 5); j--) {
                 trained.add(players[j]);
                 if (players[j].getTrainers() == null)
@@ -580,7 +581,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
         Game[] games = new Game[5];
         for (int i = 0; i < games.length; i++) {
             games[i] = new Game();
-            ArrayList<Player> playedIn = new ArrayList<Player>();
+            ArrayList<Player> playedIn = new ArrayList<>();
             for (int j = ((i * 5) + 4); j >= (i * 5); j--) {
                 playedIn.add(players[j]);
                 if (players[j].getGamesPlayedIn() == null)
@@ -629,7 +630,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
         // Create a list of basic types
         java.sql.Date dates[] = new java.sql.Date[10];
-        ArrayList<java.sql.Date> rainDates = new ArrayList<java.sql.Date>(10);
+        ArrayList<java.sql.Date> rainDates = new ArrayList<>(10);
         Calendar today = Calendar.getInstance();
         for (int i = 0; i < 10; i++) {
             today.set(2009, 1, i+1);
@@ -670,7 +671,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
         // Create a list of basic types
         Inning innings[] = new Inning[9];
-        Collection<Inning> inningCol = new ArrayList<Inning>();
+        Collection<Inning> inningCol = new ArrayList<>();
         Random rnd = new Random();
         for (int i = 8; i >= 0; i--) {
             innings[i] = new Inning(i, Math.abs(rnd.nextInt()) % 10,
@@ -761,11 +762,11 @@ public class TestOrderColumn extends SingleEMFTestCase {
                 "widget_m2m_table", "widgets_ORDER");
 
         Owner owner = new Owner();
-        Collection<Car> cars = new ArrayList<Car>();
-        Collection<Home> homes = new ArrayList<Home>();
-        Collection<Bicycle> bicycles = new ArrayList<Bicycle>();
-        Collection<Widget> widgets = new ArrayList<Widget>();
-        Collection<Owner> owners = new ArrayList<Owner>();
+        Collection<Car> cars = new ArrayList<>();
+        Collection<Home> homes = new ArrayList<>();
+        Collection<Bicycle> bicycles = new ArrayList<>();
+        Collection<Widget> widgets = new ArrayList<>();
+        Collection<Owner> owners = new ArrayList<>();
         owner.setCars(cars);
         owner.setHomes(homes);
         owner.setBikeColl(bicycles);
@@ -898,26 +899,26 @@ public class TestOrderColumn extends SingleEMFTestCase {
         Course courseA = new Course("Course A");
         Course courseB = new Course("Course B");
 
-        HashSet<Course> courses = new HashSet<Course>();
+        HashSet<Course> courses = new HashSet<>();
         courses.add(courseA);
         courses.add(courseB);
-        HashSet<Student> cAstudents = new HashSet<Student>();
+        HashSet<Student> cAstudents = new HashSet<>();
         for (int i = 0; i < 5; i++) {
             cAstudents.add(students[i]);
             students[i].setCourses(courses);
         }
         courseA.setStudents(cAstudents);
-        ArrayList<Student> cAwaitlist = new ArrayList<Student>();
+        ArrayList<Student> cAwaitlist = new ArrayList<>();
         cAwaitlist.add(students[11]);
         cAwaitlist.add(students[10]);
         courseA.setWaitList(cAwaitlist);
 
-        HashSet<Student> cBstudents = new HashSet<Student>();
+        HashSet<Student> cBstudents = new HashSet<>();
         for (int i = 5; i < 10; i++) {
             cBstudents.add(students[i]);
         }
         courseB.setStudents(cBstudents);
-        ArrayList<Student> cBwaitlist = new ArrayList<Student>();
+        ArrayList<Student> cBwaitlist = new ArrayList<>();
         cBwaitlist.add(students[10]);
         cBwaitlist.add(students[11]);
         courseB.setWaitList(cBwaitlist);
@@ -942,7 +943,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
         assertNotNull(rlist);
         assertEquals(objs.length, rlist.size());
-        TreeMap<Long, Object> objMap = new TreeMap<Long, Object>();
+        TreeMap<Long, Object> objMap = new TreeMap<>();
         for (int i = 0; i < objs.length; i++)
         {
             Object[] rvals = (Object[])rlist.get(i);
@@ -969,7 +970,7 @@ public class TestOrderColumn extends SingleEMFTestCase {
 
     assertNotNull(rlist);
     assertEquals(objs.length, rlist.size());
-    TreeMap<Long, Object> objMap = new TreeMap<Long, Object>();
+    TreeMap<Long, Object> objMap = new TreeMap<>();
     for (int i = 0; i < objs.length; i++)
     {
         Object[] rvals = (Object[])rlist.get(i);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumnXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumnXML.java
index 468c35988..06adc6272 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumnXML.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumnXML.java
@@ -119,20 +119,20 @@ public class TestOrderColumnXML extends AbstractCachedEMFTestCase {
         ColDefTestElement cdel3 = new ColDefTestElement("Element3");
 
         List<ColDefTestElement> one2Mcoldef =
-            new ArrayList<ColDefTestElement>();
+            new ArrayList<>();
         one2Mcoldef.add(cdel3);
         one2Mcoldef.add(cdel2);
         one2Mcoldef.add(cdel1);
         cdent.setOne2Mcoldef(one2Mcoldef);
 
         Set<ColDefTestElement> collcoldef =
-            new LinkedHashSet<ColDefTestElement>();
+            new LinkedHashSet<>();
         collcoldef.add(cdel1);
         collcoldef.add(cdel2);
         collcoldef.add(cdel3);
         cdent.setCollcoldef(collcoldef);
 
-        List<ColDefTestElement> m2mcoldef = new ArrayList<ColDefTestElement>();
+        List<ColDefTestElement> m2mcoldef = new ArrayList<>();
         m2mcoldef.add(cdel2);
         m2mcoldef.add(cdel1);
         m2mcoldef.add(cdel3);
@@ -200,7 +200,7 @@ public class TestOrderColumnXML extends AbstractCachedEMFTestCase {
             em = emf1.createEntityManager();
 
             ObOcEntity ent = new ObOcEntity();
-            List<Integer> intList = new ArrayList<Integer>();
+            List<Integer> intList = new ArrayList<>();
             intList.add(new Integer(10));
             intList.add(new Integer(20));
             ent.setIntList(intList);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Widget.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Widget.java
index cc00c759e..2c99020de 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Widget.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/Widget.java
@@ -70,6 +70,7 @@ public class Widget {
         return owners;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Widget) {
             Widget widget = (Widget)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/JDBCTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/JDBCTestCase.java
index 448fee503..2c00921b5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/JDBCTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/JDBCTestCase.java
@@ -32,9 +32,8 @@ import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.meta.strats.VerticalClassStrategy;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.jdbc.common.apps.RuntimeTest2;
 
 
 public abstract class JDBCTestCase extends AbstractTestCase {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java
index 41699bcc8..104a32fd4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java
@@ -37,7 +37,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestAggregateQueryWithNoResult extends SingleEMFTestCase {
     EntityManager em;
-	public void setUp() {
+	@Override
+    public void setUp() {
         super.setUp(CLEAR_TABLES,
                 "openjpa.Compatibility", "ReturnNullOnAggregateResult=false",  //OPENJPA-1794
                 Game.class, IndoorGame.class, Scrabble.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java
index 6e7105cbd..a1031a593 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java
@@ -31,7 +31,8 @@ public class TestEJBQLSelectNPlusOne
 		super(name);
 	}
 
-	public void setUp()
+	@Override
+    public void setUp()
 	{
 		deleteAll (RuntimeTest1.class);
 		EntityManager pm = currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java
index 99f78dcfa..3beed7418 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java
@@ -22,10 +22,10 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.jdbc.query.domain.IndoorGame;
-import org.apache.openjpa.persistence.jdbc.query.domain.Scrabble;
 import org.apache.openjpa.persistence.jdbc.query.domain.Chess;
 import org.apache.openjpa.persistence.jdbc.query.domain.Game;
+import org.apache.openjpa.persistence.jdbc.query.domain.IndoorGame;
+import org.apache.openjpa.persistence.jdbc.query.domain.Scrabble;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 /**
@@ -38,7 +38,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  *
  */
 public class TestGroupByQuery extends SingleEMFTestCase {
-	public void setUp() {
+	@Override
+    public void setUp() {
         super.setUp(DROP_TABLES, Game.class, IndoorGame.class, Scrabble.class,
 				Chess.class);
 		try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestHintedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestHintedQuery.java
index 253eca7da..43ec1e71b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestHintedQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestHintedQuery.java
@@ -36,6 +36,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  */
 public class TestHintedQuery extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, TimeKeeper.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestJDBCGrouping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestJDBCGrouping.java
index 6d154395a..aa4758f84 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestJDBCGrouping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestJDBCGrouping.java
@@ -24,6 +24,7 @@ import org.apache.openjpa.persistence.query.GroupingTestCase;
 
 public class TestJDBCGrouping extends GroupingTestCase {
 
+    @Override
     protected void prepareQuery(Query q) {
         // nothing to do for JDBC case
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java
index d0f157b3c..501e645fe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java
@@ -58,7 +58,8 @@ public class TestMultipleEntityProjection extends SingleEMFTestCase {
 
 	};
 
-	public void setUp() {
+	@Override
+    public void setUp() {
 		super.setUp(CLEAR_TABLES, Magazine.class, Publisher.class);
 		createData();
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNamedSQLQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNamedSQLQueries.java
index 94f0684a7..7a752f22c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNamedSQLQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNamedSQLQueries.java
@@ -27,13 +27,12 @@
  */
 package org.apache.openjpa.persistence.jdbc.query;
 
-import java.util.*;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.Collection;
+import java.util.Iterator;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.NamedSQL;
 
 
 public class TestNamedSQLQueries
@@ -48,6 +47,7 @@ public class TestNamedSQLQueries
         super(test);
     }
 
+    @Override
     public void setUp() {
        deleteAll(NamedSQL.class);
         OpenJPAEntityManager pm =(OpenJPAEntityManager)currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java
index 4370d0d3e..02015936a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java
@@ -28,8 +28,8 @@ import org.apache.openjpa.jdbc.sql.DerbyDictionary;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.jdbc.query.domain.Applicant;
 import org.apache.openjpa.persistence.jdbc.query.domain.Game;
-import org.apache.openjpa.persistence.jdbc.query.procedure.DerbyProcedureList;
 import org.apache.openjpa.persistence.jdbc.query.procedure.AbstractProcedureList;
+import org.apache.openjpa.persistence.jdbc.query.procedure.DerbyProcedureList;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
@@ -75,6 +75,7 @@ public class TestNativeQueryProcedures extends SingleEMFTestCase {
         }
     }
 
+    @Override
     public void tearDown() throws Exception {
         if (procedureList != null) {
             EntityManager em = emf.createEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNewJavaObjectQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNewJavaObjectQuery.java
index 142ba815e..c331a81d8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNewJavaObjectQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNewJavaObjectQuery.java
@@ -35,6 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  *
  */
 public class TestNewJavaObjectQuery extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Game.class,
                 DtaSrc.class, DtaSrcField.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java
index 6135b857b..411f03710 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java
@@ -23,10 +23,10 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.jdbc.query.domain.IndoorGame;
-import org.apache.openjpa.persistence.jdbc.query.domain.Scrabble;
 import org.apache.openjpa.persistence.jdbc.query.domain.Chess;
 import org.apache.openjpa.persistence.jdbc.query.domain.Game;
+import org.apache.openjpa.persistence.jdbc.query.domain.IndoorGame;
+import org.apache.openjpa.persistence.jdbc.query.domain.Scrabble;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 /**
@@ -39,6 +39,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  *
  */
 public class TestOrderByQuery extends SingleEMFTestCase {
+    @Override
     public void setUp() {
     	super.setUp(DROP_TABLES, Game.class, IndoorGame.class,
     			Scrabble.class, Chess.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestSQLQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestSQLQueries.java
index 0c3f1a1a9..97d336506 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestSQLQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestSQLQueries.java
@@ -28,23 +28,26 @@
 package org.apache.openjpa.persistence.jdbc.query;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.MappingRepository;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.AttachA;
+import org.apache.openjpa.persistence.jdbc.common.apps.AttachD;
+import org.apache.openjpa.persistence.jdbc.common.apps.RuntimeTest1;
 
 
 public class TestSQLQueries
@@ -67,6 +70,7 @@ public class TestSQLQueries
     private String _stringColName = null;
     private String _relColName = null;
 
+    @Override
     public void setUp() {
        deleteAll(RuntimeTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestStringFunctions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestStringFunctions.java
index bfc603024..12dd3dc33 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestStringFunctions.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestStringFunctions.java
@@ -27,13 +27,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.query;
 
-import java.util.*;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
+import java.util.Collection;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.jdbc.common.apps.QueryTest1;
 
 
 public class TestStringFunctions
@@ -47,6 +45,7 @@ public class TestStringFunctions
     	super(name);
     }
 
+    @Override
     public void setUp() {
        deleteAll(QueryTest1.class);
 
@@ -66,6 +65,7 @@ public class TestStringFunctions
         _match = (QueryTest1) _pm.getObjectId(oid);
     }
 
+    @Override
     public void tearDown()
         throws Exception {
         if (_pm != null)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociationXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociationXML.java
index 8bc2d6d2b..15dfd3756 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociationXML.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociationXML.java
@@ -21,10 +21,12 @@ package org.apache.openjpa.persistence.jdbc.query;
 public class TestUpdateSingleValuedAssociationXML extends
     TestUpdateSingleValuedAssociation {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "foreign-key-xml";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/AbstractQueryCacheTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/AbstractQueryCacheTest.java
index 8fe56de29..95201e3e3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/AbstractQueryCacheTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/AbstractQueryCacheTest.java
@@ -36,6 +36,7 @@ public abstract class AbstractQueryCacheTest extends SingleEMFTestCase {
     protected boolean deleteData = false;
     protected boolean recreateData = true;
 
+    @Override
     public void setUp(Object... props) {
         int arrLen = entityClassTypes.length + props.length;
         Object args[] = new Object[arrLen];
@@ -63,6 +64,7 @@ public abstract class AbstractQueryCacheTest extends SingleEMFTestCase {
         }
     }
 
+    @Override
     public void tearDown() throws Exception {
         if (deleteData) {
             deleteAllData();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Department.java
index 2b93b8ea6..ead504e6a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Department.java
@@ -57,7 +57,7 @@ public class Department {
 
 	public void addEmployee(FullTimeEmployee e) {
 		if (fullTimeEmployees == null)
-			fullTimeEmployees = new ArrayList<FullTimeEmployee>();
+			fullTimeEmployees = new ArrayList<>();
 		this.fullTimeEmployees.add(e);
 		e.setDept(this);
 	}
@@ -68,7 +68,7 @@ public class Department {
 
 	public void addEmployee(PartTimeEmployee e) {
 		if (partTimeEmployees == null)
-			partTimeEmployees = new ArrayList<PartTimeEmployee>();
+			partTimeEmployees = new ArrayList<>();
 		this.partTimeEmployees.add(e);
 		e.setDept(this);
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/DepartmentId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/DepartmentId.java
index eb9a2b111..9237d2ef7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/DepartmentId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/DepartmentId.java
@@ -21,7 +21,9 @@ package org.apache.openjpa.persistence.jdbc.query.cache;
 import java.io.Serializable;
 
 public class DepartmentId implements Serializable {
-	private String name;
+	
+    private static final long serialVersionUID = 1L;
+    private String name;
 
 	public DepartmentId() {
 		this(null);
@@ -31,11 +33,13 @@ public class DepartmentId implements Serializable {
 		this.name = name;
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		return name.hashCode();
 	}
 
-	public boolean equals(Object obj) {
+	@Override
+    public boolean equals(Object obj) {
 		if (this == obj) {
 			return true;
 		}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/EmployeeId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/EmployeeId.java
index 5a8e2e4af..854f41d3c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/EmployeeId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/EmployeeId.java
@@ -22,13 +22,16 @@ import java.io.Serializable;
 
 public class EmployeeId implements Serializable {
 
-	private String ssn;
+	
+    private static final long serialVersionUID = 1L;
+    private String ssn;
 
 	public EmployeeId(){
 	}
 	public EmployeeId(String ssn){
 		this.ssn = ssn;
 	}
+    @Override
     public boolean equals (Object other)
     {
         if (other == this)
@@ -49,6 +52,7 @@ public class EmployeeId implements Serializable {
     }
 
 
+    @Override
     public int hashCode ()
     {
         return (ssn.hashCode());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Invoice.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Invoice.java
index 34ef21947..5d72c2bcb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Invoice.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Invoice.java
@@ -19,7 +19,11 @@ package org.apache.openjpa.persistence.jdbc.query.cache;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.OneToMany;
 /**
  * @version $Revision$ $Date$
  */
@@ -35,7 +39,7 @@ public class Invoice {
     private double price;
 
     @OneToMany(cascade={CascadeType.ALL})
-    private List<LineItem> lineItems = new ArrayList<LineItem>();
+    private List<LineItem> lineItems = new ArrayList<>();
 
     public Invoice() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/LineItem.java
index 6cc7e3626..5cf459e9e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/LineItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/LineItem.java
@@ -15,7 +15,9 @@
  *  limitations under the License.
  */
 package org.apache.openjpa.persistence.jdbc.query.cache;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 
 /**
  * @version $Revision$ $Date$
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Part.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Part.java
index 9fca6071e..c4b9cac44 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Part.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Part.java
@@ -47,7 +47,7 @@ abstract public class Part {
     int inventory;
 
     @OneToMany(mappedBy="child",cascade=CascadeType.PERSIST)
-    protected Collection<Usage> usedIn = new ArrayList<Usage>();
+    protected Collection<Usage> usedIn = new ArrayList<>();
 
     @Version
     long version;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartBase.java
index a4f717bcf..cd4e79749 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartBase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartBase.java
@@ -36,7 +36,7 @@ public class PartBase extends Part  {
     int backOrder;
 
     @ManyToMany(mappedBy="supplies")
-    protected List<Supplier> suppliers = new ArrayList<Supplier>();
+    protected List<Supplier> suppliers = new ArrayList<>();
 
     public PartBase() {}
 
@@ -73,6 +73,7 @@ public class PartBase extends Part  {
         this.suppliers = suppliers;
     }
 
+    @Override
     public String toString() {
         String sup= "";
         if (getSuppliers()!=null)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java
index 9820f4e66..266464288 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java
@@ -37,7 +37,7 @@ public class PartComposite extends  Part  {
     double massIncrement;
 
     @OneToMany( mappedBy="parent")
-    Collection<Usage> partsUsed = new ArrayList<Usage>();
+    Collection<Usage> partsUsed = new ArrayList<>();
 
     public PartComposite() {}
 
@@ -74,6 +74,7 @@ public class PartComposite extends  Part  {
         this.massIncrement = massIncrement;
     }
 
+    @Override
     public String toString() {
 
         return "PartComposite:"+partno+" name:+"+name+" assemblyCost:"+
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Supplier.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Supplier.java
index 1fc801f50..622ced416 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Supplier.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Supplier.java
@@ -21,7 +21,11 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Version;
 
 import org.apache.openjpa.persistence.DataCache;
 
@@ -35,7 +39,7 @@ public class Supplier {
     String name;
 
     @ManyToMany
-    List<PartBase> supplies = new ArrayList<PartBase>();
+    List<PartBase> supplies = new ArrayList<>();
 
     @Version
     long version;
@@ -77,6 +81,7 @@ public class Supplier {
         this.supplies = supplies;
     }
 
+    @Override
     public String toString() {
 
         return "Supplier:"+sid+" name:+"+name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java
index edd34e48b..f01e23e38 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java
@@ -53,7 +53,8 @@ public class TestNonPrimaryKeyQueryParameters extends SQLListenerTestCase {
     private static final int LINEITEM_PER_INVOICE = 1;
 	private static final String DEPT_NAME = "ENGINEERING";
 
-	public void setUp() {
+	@Override
+    public void setUp() {
 		super.setUp(CLEAR_TABLES, Department.class, Employee.class,
 				FullTimeEmployee.class, PartTimeEmployee.class,
 				Invoice.class, LineItem.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryDefaultEviction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryDefaultEviction.java
index a0d579b68..ba32c5d74 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryDefaultEviction.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryDefaultEviction.java
@@ -18,10 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.query.cache;
 
-import org.apache.openjpa.datacache.ConcurrentQueryCache;
 import org.apache.openjpa.datacache.AbstractQueryCache.EvictPolicy;
+import org.apache.openjpa.datacache.ConcurrentQueryCache;
 
 public class TestQueryDefaultEviction extends AbstractQueryCacheTest {
+    @Override
     public void setUp() throws Exception {
         super.setUp(
                 "openjpa.DataCache", "true",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryTimestampEviction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryTimestampEviction.java
index 4c45a6fea..c2b02eee0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryTimestampEviction.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestQueryTimestampEviction.java
@@ -23,17 +23,18 @@ import java.util.List;
 
 import javax.persistence.Query;
 
+import org.apache.openjpa.datacache.AbstractQueryCache.EvictPolicy;
 import org.apache.openjpa.datacache.ConcurrentQueryCache;
 import org.apache.openjpa.datacache.QueryCache;
-import org.apache.openjpa.datacache.AbstractQueryCache.EvictPolicy;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.lib.jdbc.JDBCListener;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.test.FilteringJDBCListener;
 
 public class TestQueryTimestampEviction extends AbstractQueryCacheTest {
-    private List<String> _sql = new ArrayList<String>();
+    private List<String> _sql = new ArrayList<>();
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(
                 "openjpa.DataCache", "true",
@@ -115,6 +116,7 @@ public class TestQueryTimestampEviction extends AbstractQueryCacheTest {
     public void testWriteLock() throws Exception {
         final QueryCache qc = emf.getConfiguration().getDataCacheManagerInstance().getSystemQueryCache();
         Thread t2 = new Thread() {
+            @Override
             public void run() {
                 qc.writeLock();
                 qc.writeUnlock();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Usage.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Usage.java
index 4fff55eeb..d7287854a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Usage.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/Usage.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.jdbc.query.cache;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 import org.apache.openjpa.persistence.DataCache;
 
@@ -84,6 +90,7 @@ public class Usage {
         this.child = child;
     }
 
+    @Override
     public String toString() {
         return "Usage:"+id+" quantity:"+quantity+" child:"+child.getPartno()+
             " parent"+parent.getPartno();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Applicant.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Applicant.java
index 86e3eac80..096a0ad49 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Applicant.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Applicant.java
@@ -18,7 +18,9 @@
  */
 package org.apache.openjpa.persistence.jdbc.query.domain;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 /**
  * Simple persistent entity as a target of uni-directional one-to-one
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Application.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Application.java
index 505ee6779..04eb6ae9e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Application.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Application.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.persistence.jdbc.query.domain;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 import org.apache.openjpa.persistence.jdbc.ForeignKey;
 import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Customer.java
index c3f9a87ad..5605a47b6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Customer.java
@@ -57,7 +57,7 @@ public class Customer {
 
 	public void addOrder(Order order) {
 		if (orders == null)
-			orders = new ArrayList<Order>();
+			orders = new ArrayList<>();
 		this.orders.add(order);
 		order.setCustomer(this);
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrc.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrc.java
index c3440197a..a01ea6fe5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrc.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrc.java
@@ -19,12 +19,17 @@
 package org.apache.openjpa.persistence.jdbc.query.domain;
 
 import java.io.Serializable;
-import javax.persistence.*;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 import org.apache.openjpa.persistence.Generator;
 
-import java.util.List;
-
 /**
  * The persistent class for the DtaSrc database table.
  *
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrcField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrcField.java
index f7d57d72e..a40e28072 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrcField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/DtaSrcField.java
@@ -19,7 +19,15 @@
 package org.apache.openjpa.persistence.jdbc.query.domain;
 
 import java.io.Serializable;
-import javax.persistence.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 
 import org.apache.openjpa.persistence.Generator;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Magazine.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Magazine.java
index 68a566a6d..da38f95ae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Magazine.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Magazine.java
@@ -21,7 +21,11 @@ package org.apache.openjpa.persistence.jdbc.query.domain;
 import java.sql.Timestamp;
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 /**
  * Simple persistent entity as a target of bi-directional one-to-one
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Publisher.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Publisher.java
index 4a37b49ab..c028018d3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Publisher.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Publisher.java
@@ -18,7 +18,10 @@
  */
 package org.apache.openjpa.persistence.jdbc.query.domain;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 /**
  * Simple persistent entity as a target of uni-directional one-to-one
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/DerbyProcedureList.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/DerbyProcedureList.java
index 75920dda8..3099df734 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/DerbyProcedureList.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/DerbyProcedureList.java
@@ -30,8 +30,9 @@ import java.util.List;
  */
 public class DerbyProcedureList extends AbstractProcedureList {
 
+    @Override
     public List<String> getCreateProcedureList () {
-        ArrayList<String> retList = new ArrayList<String>();
+        ArrayList<String> retList = new ArrayList<>();
 
         retList.add("create procedure ADD_X_TO_CHARLIE () "
             + "PARAMETER STYLE JAVA LANGUAGE JAVA MODIFIES SQL DATA "
@@ -66,8 +67,9 @@ public class DerbyProcedureList extends AbstractProcedureList {
         return retList;
     }
 
+    @Override
     public List<String> getDropProcedureList () {
-        ArrayList<String> retList = new ArrayList<String>();
+        ArrayList<String> retList = new ArrayList<>();
 
         retList.add ("drop procedure ADD_X_TO_CHARLIE");
         retList.add ("drop procedure ADD_SUFFIX_TO_NAME");
@@ -79,6 +81,7 @@ public class DerbyProcedureList extends AbstractProcedureList {
         return retList;
     }
 
+    @Override
     public String callAddXToCharlie () {
         return "{ call ADD_X_TO_CHARLIE () }";
     }
@@ -95,6 +98,7 @@ public class DerbyProcedureList extends AbstractProcedureList {
         conn.close();
     }
 
+    @Override
     public String callAddSuffixToName () {
         return "{ call ADD_SUFFIX_TO_NAME (?, ?) }";
     }
@@ -113,6 +117,7 @@ public class DerbyProcedureList extends AbstractProcedureList {
         conn.close();
     }
 
+    @Override
     public String callGetAllApplicants () {
         return "{ call GET_ALL_APPLICANTS () }";
     }
@@ -127,6 +132,7 @@ public class DerbyProcedureList extends AbstractProcedureList {
         conn.close();
     }
 
+    @Override
     public String callGetTwoApplicants () {
         return "{ call GET_TWO_APPLICANTS (?, ?) }";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/ProcedureList.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/ProcedureList.java
index 3f9facf97..995701d86 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/ProcedureList.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/procedure/ProcedureList.java
@@ -21,15 +21,15 @@ package org.apache.openjpa.persistence.jdbc.query.procedure;
 import java.util.List;
 
 public interface ProcedureList {
-    public List<String> getCreateProcedureList();
+    List<String> getCreateProcedureList();
 
-    public List<String> getDropProcedureList();
+    List<String> getDropProcedureList();
 
-    public String callAddXToCharlie();
+    String callAddXToCharlie();
 
-    public String callAddSuffixToName();
+    String callAddSuffixToName();
 
-    public String callGetAllApplicants();
+    String callGetAllApplicants();
 
-    public String callGetTwoApplicants();
+    String callGetTwoApplicants();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/TestSubQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/TestSubQuery.java
index ffb29278a..dd326f804 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/TestSubQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/sub/TestSubQuery.java
@@ -25,6 +25,7 @@ import javax.persistence.Query;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestSubQuery extends SingleEMFTestCase {
+    @Override
     public void setUp() throws Exception {
         super.setUp(CLEAR_TABLES, MaxQueryEntity.class, MaxQueryMapEntity.class);
         populate();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TestTableNameInXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TestTableNameInXml.java
index 9aa1b9950..4d59b8fa2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TestTableNameInXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/xml/TestTableNameInXml.java
@@ -28,6 +28,7 @@ public class TestTableNameInXml extends SQLListenerTestCase {
     String containsSQL = " FROM TableNameInXml ";
     String notContainsSQL = " FROM TableNameInXmlEntity ";
 
+    @Override
     public void setUp() {
         super.setUp(TableNameInXmlEntity.class);
     }
@@ -79,6 +80,7 @@ public class TestTableNameInXml extends SQLListenerTestCase {
         em.close();
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "TableNameInXml-PU";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassDBSequenceFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassDBSequenceFactory.java
index c14d5bd97..95109bfb5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassDBSequenceFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassDBSequenceFactory.java
@@ -28,19 +28,22 @@
  */
 package org.apache.openjpa.persistence.jdbc.schema;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.kernel.ClassTableJDBCSeq;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.schema.Sequence;
 import org.apache.openjpa.kernel.Broker;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.jdbc.common.apps.PerClassTestObject3;
+import org.apache.openjpa.persistence.jdbc.common.apps.SeqD;
+import org.apache.openjpa.persistence.jdbc.common.apps.SeqE;
 
 
 public class TestClassDBSequenceFactory
@@ -55,6 +58,7 @@ public class TestClassDBSequenceFactory
         super(test);
     }
 
+    @Override
     public void setUp() {
        deleteAll(SeqE.class);
     }
@@ -217,6 +221,7 @@ public class TestClassDBSequenceFactory
             _broker = broker;
         }
 
+        @Override
         public void run() {
             try {
                 ClassMapping mapping =
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassSequenceFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassSequenceFactory.java
index 3e3bc7985..91e2978f5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassSequenceFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassSequenceFactory.java
@@ -63,6 +63,7 @@ public class TestClassSequenceFactory extends BaseJDBCTest{
         super(test);
     }
 
+    @Override
     public void setUp()
     throws Exception {
         JDBCConfiguration conf = new JDBCConfigurationImpl();
@@ -187,6 +188,7 @@ public class TestClassSequenceFactory extends BaseJDBCTest{
             _conf = conf;
         }
 
+        @Override
         public void run() {
             DataSource ds = _conf.getDataSource2(null);
             try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDBSequenceFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDBSequenceFactory.java
index 5dd1341a1..5c8aa922a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDBSequenceFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDBSequenceFactory.java
@@ -27,14 +27,17 @@
  */
 package org.apache.openjpa.persistence.jdbc.schema;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 import javax.sql.DataSource;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
 import org.apache.openjpa.jdbc.kernel.TableJDBCSeq;
 import org.apache.openjpa.kernel.Broker;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
+import org.apache.openjpa.persistence.jdbc.common.apps.RuntimeTest1;
 
 
 public class TestDBSequenceFactory
@@ -86,6 +89,7 @@ public class TestDBSequenceFactory
             _set = set;
         }
 
+        @Override
         public void run() {
             try {
                 JDBCConfiguration conf = new JDBCConfigurationImpl();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDynamicSchemaFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDynamicSchemaFactory.java
index 3aab2e77f..d313c3310 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDynamicSchemaFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDynamicSchemaFactory.java
@@ -38,8 +38,7 @@ import org.apache.openjpa.jdbc.meta.Version;
 import org.apache.openjpa.jdbc.schema.DynamicSchemaFactory;
 import org.apache.openjpa.jdbc.schema.Schemas;
 import org.apache.openjpa.jdbc.schema.Table;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
+import org.apache.openjpa.persistence.jdbc.common.apps.MappingTest1;
 
 
 public class TestDynamicSchemaFactory
@@ -54,6 +53,7 @@ public class TestDynamicSchemaFactory
         super(test);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         JDBCConfiguration conf = new JDBCConfigurationImpl();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestJDBCListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestJDBCListener.java
index c26e25bab..f31485192 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestJDBCListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestJDBCListener.java
@@ -27,15 +27,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.schema;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.openjpa.lib.jdbc.AbstractJDBCListener;
 import org.apache.openjpa.lib.jdbc.JDBCEvent;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.jdbc.common.apps.RuntimeTest1;
 
 
 public class TestJDBCListener
@@ -73,6 +72,7 @@ public class TestJDBCListener
     public static class Listener
         extends AbstractJDBCListener {
 
+        @Override
         public void beforeCommit(JDBCEvent event) {
             commitOccurred = true;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestLazySchemaFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestLazySchemaFactory.java
index 774639612..85fb1b4f5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestLazySchemaFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestLazySchemaFactory.java
@@ -31,7 +31,6 @@ import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.schema.LazySchemaFactory;
 import org.apache.openjpa.jdbc.schema.SchemaGroup;
 import org.apache.openjpa.jdbc.schema.Table;
-
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 
@@ -49,6 +48,7 @@ public class TestLazySchemaFactory
         super(test);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         // see if the dict supports foreign keys; mysql can support them, but
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestPerClassSequenceFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestPerClassSequenceFactory.java
index dff8d93fb..577ed2aed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestPerClassSequenceFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestPerClassSequenceFactory.java
@@ -27,18 +27,19 @@
  */
 package org.apache.openjpa.persistence.jdbc.schema;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.kernel.Seq;
 import org.apache.openjpa.kernel.StoreContext;
 import org.apache.openjpa.meta.ClassMetaData;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.jdbc.common.apps.PerClassTestObject;
+import org.apache.openjpa.persistence.jdbc.common.apps.PerClassTestObject2;
+import org.apache.openjpa.persistence.jdbc.common.apps.RuntimeTest1;
 
 
 public class TestPerClassSequenceFactory
@@ -91,21 +92,26 @@ public class TestPerClassSequenceFactory
 
         private long _val = 1;
 
+        @Override
         public void setType(int type) {
         }
 
+        @Override
         public Object next(StoreContext ctx, ClassMetaData meta) {
             _val++;
             return current(ctx, meta);
         }
 
+        @Override
         public Object current(StoreContext ctx, ClassMetaData meta) {
             return new Long(_val);
         }
 
+        @Override
         public void allocate(int num, StoreContext ctx, ClassMetaData meta) {
         }
 
+        @Override
         public void close() {
         }
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaClone.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaClone.java
index c5d1348e2..649ae7581 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaClone.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaClone.java
@@ -40,6 +40,7 @@ public class TestSchemaClone extends TestXMLSchemaParser {
         super(test);
     }
 
+    @Override
     protected SchemaGroup getSchemaGroup()
     throws Exception {
         // parse in the schema group, then clone it, and test against clone
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java
index 24561595e..c2e75fe39 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java
@@ -18,26 +18,23 @@
  */
 package org.apache.openjpa.persistence.jdbc.schema;
 
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.meta.MappingTool;
-import org.apache.openjpa.jdbc.schema.Schema;
-import org.apache.openjpa.jdbc.schema.SchemaGroup;
-import org.apache.openjpa.jdbc.schema.SchemaTool;
-import org.apache.openjpa.jdbc.schema.Table;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
-import org.apache.openjpa.persistence.jdbc.common.apps.InvertA;
-import org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest;
+import static org.apache.openjpa.jdbc.identifier.DBIdentifier.newTable;
+import static org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier.getPath;
 
 import java.io.File;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.apache.openjpa.jdbc.identifier.DBIdentifier.newSchema;
-import static org.apache.openjpa.jdbc.identifier.DBIdentifier.newTable;
-import static org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier.getPath;
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.meta.MappingTool;
+import org.apache.openjpa.jdbc.schema.SchemaGroup;
+import org.apache.openjpa.jdbc.schema.SchemaTool;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.jdbc.common.apps.InvertA;
+import org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest;
 
 /**
  * @author Roberto Cortez
@@ -89,7 +86,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     // TODO - Add validation when source uses script but no script is provided?.
 
     public void testSchemaGenMetadataDrop() throws Exception {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "drop");
 
         SchemaGroup dbSchemaGroup = getSchemaGroup(properties);
@@ -101,7 +98,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     }
 
     public void testSchemaGenMetadataCreate() throws Exception {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "create");
 
         SchemaGroup dbSchemaGroup = getSchemaGroup(properties);
@@ -113,7 +110,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     }
 
     public void testSchemaGenMetadataDropAndCreate() throws Exception {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "drop-and-create");
 
         SchemaGroup dbSchemaGroup = getSchemaGroup(properties);
@@ -127,7 +124,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     public void testSchemaGenScriptDrop() throws Exception {
         testSchemaGenMetadataCreate();
 
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "drop");
         properties.put("javax.persistence.schema-generation.drop-source", "script");
         properties.put("javax.persistence.schema-generation.drop-script-source",
@@ -144,7 +141,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     public void testSchemaGenScriptCreate() throws Exception {
         testSchemaGenMetadataDrop();
 
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "create");
         properties.put("javax.persistence.schema-generation.create-source", "script");
         properties.put("javax.persistence.schema-generation.create-script-source",
@@ -161,7 +158,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     public void testSchemaGenScriptDropAndCreate() throws Exception {
         testSchemaGenMetadataCreate();
 
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "drop-and-create");
         properties.put("javax.persistence.schema-generation.drop-source", "script");
         properties.put("javax.persistence.schema-generation.drop-script-source",
@@ -189,7 +186,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
             schemaTool.run();
         } catch (SQLException e) {}
 
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "drop-and-create");
         properties.put("javax.persistence.schema-generation.drop-source", "metadata-then-script");
         properties.put("javax.persistence.schema-generation.drop-script-source",
@@ -220,7 +217,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
             schemaTool.run();
         } catch (SQLException e) {}
 
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "create");
         properties.put("javax.persistence.schema-generation.create-script-source",
                        "org/apache/openjpa/persistence/jdbc/schema/create-after-metadata.sql");
@@ -232,7 +229,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     }
 
     public void testSchemaGenNoCreateSourceAndCreateScriptSourceSpecified() throws Exception {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "create");
 
         SchemaGroup dbSchemaGroup = getSchemaGroup(properties);
@@ -246,7 +243,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     public void testSchemaGenNoDropSourceSpecifiedAndDropScriptSourceSpecified() throws Exception {
         testSchemaGenMetadataCreate();
 
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "drop");;
         properties.put("javax.persistence.schema-generation.drop-script-source",
                        "org/apache/openjpa/persistence/jdbc/schema/drop.sql");
@@ -262,7 +259,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     public void testSchemaGenScriptLoad() throws Exception {
         testSchemaGenMetadataDropAndCreate();
 
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.sql-load-script-source",
                        "org/apache/openjpa/persistence/jdbc/schema/load.sql");
 
@@ -284,7 +281,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     }
 
     public void testSchemaGenOutputScriptCreate() throws Exception {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "create");
         properties.put("javax.persistence.schema-generation.scripts.create-target",
                        "target/create-db-output.sql");
@@ -297,7 +294,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     }
 
     public void testSchemaGenOutputScriptDrop() throws Exception {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "drop");
         properties.put("javax.persistence.schema-generation.scripts.drop-target",
                        "target/drop-db-output.sql");
@@ -310,7 +307,7 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
     }
 
     public void testSchemaGenOutputScriptDropAndCreate() throws Exception {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.schema-generation.database.action", "drop-and-create");
         properties.put("javax.persistence.schema-generation.scripts.create-target",
                        "target/create-db-output.sql");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerator.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerator.java
index 49ecad518..66d580819 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerator.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerator.java
@@ -22,9 +22,8 @@ import java.io.StringWriter;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.schema.SchemaTool;
-
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 
 public class TestSchemaGenerator extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSequenceGeneratorEnsureCapacityCall.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSequenceGeneratorEnsureCapacityCall.java
index ae4428437..c9cb20cb9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSequenceGeneratorEnsureCapacityCall.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSequenceGeneratorEnsureCapacityCall.java
@@ -25,11 +25,9 @@ import org.apache.openjpa.jdbc.schema.Sequence;
 import org.apache.openjpa.kernel.Seq;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.SequenceMetaData;
-
-import org.apache.openjpa.persistence.jdbc.common.apps.*;
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.jdbc.common.apps.SeqA;
+import org.apache.openjpa.persistence.jdbc.common.apps.SeqD;
 
 
 public class TestSequenceGeneratorEnsureCapacityCall
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaParser.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaParser.java
index 0f0d34900..da999b1c5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaParser.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaParser.java
@@ -58,6 +58,7 @@ public class TestXMLSchemaParser
         super(test);
     }
 
+    @Override
     public void setUp()
     throws Exception {
         this.conf = new JDBCConfigurationImpl();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaSerializer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaSerializer.java
index f2699b8fa..659767f15 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaSerializer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaSerializer.java
@@ -37,6 +37,7 @@ import org.apache.openjpa.jdbc.schema.SchemaParser;
 import org.apache.openjpa.jdbc.schema.SchemaSerializer;
 import org.apache.openjpa.jdbc.schema.XMLSchemaParser;
 import org.apache.openjpa.jdbc.schema.XMLSchemaSerializer;
+import org.apache.openjpa.lib.meta.MetaDataSerializer;
 
 
 public class TestXMLSchemaSerializer extends TestXMLSchemaParser{
@@ -51,6 +52,7 @@ public class TestXMLSchemaSerializer extends TestXMLSchemaParser{
         super(test);
     }
 
+    @Override
     protected SchemaGroup getSchemaGroup()
     throws Exception {
         // parse in the schema group, then serialize it to a buffer, then
@@ -61,7 +63,7 @@ public class TestXMLSchemaSerializer extends TestXMLSchemaParser{
         ser.addAll(group);
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ser.serialize(new OutputStreamWriter(out), ser.PRETTY);
+        ser.serialize(new OutputStreamWriter(out), MetaDataSerializer.PRETTY);
         byte[] bytes = out.toByteArray();
 
         SchemaParser parser = new XMLSchemaParser(this.conf);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Author.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Author.java
index cb25141e4..00736b5fe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Author.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Author.java
@@ -56,7 +56,7 @@ public class Author extends Person {
 
     public void addBook(Book b) {
         if (books == null)
-            books = new HashSet<Book>();
+            books = new HashSet<>();
         if (books.add(b)) {
             b.addAuthor(this);
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Book.java
index 33fea3fa4..ff8dfe408 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Book.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Book.java
@@ -63,7 +63,7 @@ public class Book extends Merchandise {
 
     public void addAuthor(Author a) {
         if (authors == null)
-            authors = new HashSet<Author>();
+            authors = new HashSet<>();
         if (authors.add(a)) {
             a.addBook(this);
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java
index 4e5e4367c..660c49c4b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java
@@ -21,7 +21,14 @@ package org.apache.openjpa.persistence.jdbc.sqlcache;
 import java.util.Collection;
 import java.util.HashSet;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="COMPANY_PQC")
@@ -47,7 +54,7 @@ public class Company {
 	private int startYear;
 
 	@OneToMany(mappedBy="company", cascade=CascadeType.ALL)
-	private Collection<Department> departments = new HashSet<Department>();
+	private Collection<Department> departments = new HashSet<>();
 
 	public String getName() {
 		return name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Department.java
index 418643686..a9928597e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Department.java
@@ -21,7 +21,12 @@ package org.apache.openjpa.persistence.jdbc.sqlcache;
 import java.util.Collection;
 import java.util.HashSet;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="DEPT_PQC")
@@ -37,7 +42,7 @@ public class Department {
 	private Company company;
 
 	@OneToMany
-	private Collection<Employee> employees = new HashSet<Employee>();
+	private Collection<Employee> employees = new HashSet<>();
 
 	public Company getCompany() {
 		return company;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Employee.java
index 8d4925168..13e648994 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Employee.java
@@ -20,7 +20,14 @@ package org.apache.openjpa.persistence.jdbc.sqlcache;
 
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="EMPLOYEE_PQC")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java
index 309567847..93205f715 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Parent.java
@@ -97,7 +97,7 @@ public class Parent {
 		child.setName(name);
 		child.setParent(this);
 		if (children == null)
-			children = new ArrayList<Child>();
+			children = new ArrayList<>();
 		children.add(child);
 		return child;
 	}
@@ -113,7 +113,7 @@ public class Parent {
 	 */
 	public void add(Child child) {
 		if (children == null)
-			children = new ArrayList<Child>();
+			children = new ArrayList<>();
 		children.add(child);
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java
index a8ad98a68..84b81b9ff 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/ParentId.java
@@ -55,6 +55,7 @@ public class ParentId implements java.io.Serializable {
         this.addrId = addrId;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o == this) {
             return true;
@@ -72,6 +73,7 @@ public class ParentId implements java.io.Serializable {
         return false;
     }
 
+    @Override
     public int hashCode() {
         if (hashcode == null) {
             String hashStr = this.id + ":" + this.name + ":" + this.addrId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Singer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Singer.java
index 12209042e..28c546d11 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Singer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Singer.java
@@ -46,7 +46,7 @@ public class Singer extends Person {
 
     public void addCd(CD cd) {
         if (cds == null)
-            cds = new HashSet<CD>();
+            cds = new HashSet<>();
         if (cds.add(cd))
             cd.setSinger(this);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestDefaultQueryStatistics.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestDefaultQueryStatistics.java
index c8ee118a9..a2beabd42 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestDefaultQueryStatistics.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestDefaultQueryStatistics.java
@@ -38,13 +38,14 @@ public class TestDefaultQueryStatistics extends SingleEMFTestCase {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        statistics = new QueryStatistics.Default<String>();
+        statistics = new QueryStatistics.Default<>();
     }
 
     public void testThreadSafety() throws Exception{
         final QueryStatistics<String> finalStats = statistics;
 
         Runnable runner = new Runnable() {
+            @Override
             public void run() {
                 for (int i = 0; i < 10000; i++) {
                     finalStats.recordExecution("query " + Thread.currentThread().getId() + " " + i);
@@ -52,7 +53,7 @@ public class TestDefaultQueryStatistics extends SingleEMFTestCase {
             }
         };
 
-        List<Thread> threads = new ArrayList<Thread>();
+        List<Thread> threads = new ArrayList<>();
         for(int i = 0;i<10;i++){
             threads.add(new Thread(runner));
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestExternalizedParameter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestExternalizedParameter.java
index e82690442..03a64af53 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestExternalizedParameter.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestExternalizedParameter.java
@@ -24,14 +24,14 @@ import java.util.Properties;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.kernel.StoreQuery;
 import org.apache.openjpa.kernel.exps.QueryExpressions;
 import org.apache.openjpa.lib.rop.ResultList;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 
+import junit.framework.TestCase;
+
 /**
  * Tests that we can detect if a query is using query parameters for fields whose values are externalized.
  *
@@ -43,6 +43,7 @@ public class TestExternalizedParameter extends TestCase {
     private static String UNIT_NAME = "PreparedQuery";
     private static EntityManagerFactory emf;
 
+    @Override
     public void setUp() throws Exception {
         if (emf == null) {
             Properties config = new Properties();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java
index fcf49f537..75d1fbf84 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java
@@ -60,6 +60,7 @@ public class TestFinderCache extends SQLListenerTestCase {
         em.close();
     }
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES,
                 "openjpa.RuntimeUnenhancedClasses", "unsupported",
@@ -102,7 +103,7 @@ public class TestFinderCache extends SQLListenerTestCase {
      */
     <T> long run(int N, Class<T> cls, long[] ids) {
         EntityManager em = emf.createEntityManager();
-        List<Long> stats = new ArrayList<Long>();
+        List<Long> stats = new ArrayList<>();
         for (int n = 0; n < N; n++) {
             em.clear();
             long start = System.nanoTime();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestInExpressionParameterBinding.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestInExpressionParameterBinding.java
index 56cbae158..d01dba751 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestInExpressionParameterBinding.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestInExpressionParameterBinding.java
@@ -54,6 +54,7 @@ public class TestInExpressionParameterBinding extends SingleEMFTestCase {
     private static List<Integer> ORIGINAL_ZIPS;
     private OpenJPAEntityManager _em;
 
+    @Override
     public void setUp() throws Exception {
         if (_emf == null) {
             super.setUp(Address.class, "openjpa.ConnectionFactoryProperties", "PrintParameters=true", CLEAR_TABLES);
@@ -65,6 +66,7 @@ public class TestInExpressionParameterBinding extends SingleEMFTestCase {
         _em = _emf.createEntityManager();
     }
 
+    @Override
     public void tearDown() throws Exception {
         // block super class tear down
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestMultithreadedReparameterization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestMultithreadedReparameterization.java
index 99208fea5..f10d14f15 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestMultithreadedReparameterization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestMultithreadedReparameterization.java
@@ -28,12 +28,12 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.kernel.QueryStatistics;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 
+import junit.framework.TestCase;
+
 /**
  * Test reparameterization of cached query under heavy load.
  *
@@ -45,6 +45,7 @@ public class TestMultithreadedReparameterization extends TestCase {
     private static String UNIT_NAME = "PreparedQuery";
     protected static OpenJPAEntityManagerFactory emf;
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         if (emf == null) {
@@ -193,6 +194,7 @@ public class TestMultithreadedReparameterization extends TestCase {
             this.exceptions = exceptions;
         }
 
+        @Override
         public void run()  {
             try {
                 for (int i = 0; i < nTimes; i++) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
index 456fb2546..fb4fc87dc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
@@ -1297,7 +1297,7 @@ public class TestPreparedQueryCache extends AbstractPersistenceTestCase {
      * @return median time to execute a query and iterate through its results
      */
     long run(String jpql, boolean isNamedQuery, Object[] params, int expectedCount, boolean useCache, int N) {
-        List<Long> stats = new ArrayList<Long>();
+        List<Long> stats = new ArrayList<>();
         String cacheKey = getJPQLString(jpql, isNamedQuery);
         QueryStatistics<String> cacheStats = getPreparedQueryCache().getStatistics();
         getPreparedQueryCache().clear();
@@ -1395,7 +1395,7 @@ public class TestPreparedQueryCache extends AbstractPersistenceTestCase {
      *
      */
     public class SQLAuditor extends AbstractJDBCListener {
-        private List<String> sqls = new ArrayList<String>();
+        private List<String> sqls = new ArrayList<>();
 
         @Override
         public void beforeExecuteStatement(JDBCEvent event) {
@@ -1409,7 +1409,7 @@ public class TestPreparedQueryCache extends AbstractPersistenceTestCase {
         }
 
         List<String> getSQLs() {
-            return new ArrayList<String>(sqls);
+            return new ArrayList<>(sqls);
         }
     }
 
@@ -1423,6 +1423,7 @@ public class TestPreparedQueryCache extends AbstractPersistenceTestCase {
             this.jpql = jpql;
         }
 
+        @Override
         public void run() {
             try {
                 for (int i = 0; i < 10 && !failed; i++) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCacheExclusion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCacheExclusion.java
index e00e99bf1..73ead3ed4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCacheExclusion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCacheExclusion.java
@@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.jdbc.sqlcache;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.jdbc.kernel.PreparedQueryCacheImpl;
 import org.apache.openjpa.jdbc.kernel.PreparedQueryImpl;
 import org.apache.openjpa.kernel.PreparedQuery;
 import org.apache.openjpa.kernel.PreparedQueryCache;
 
+import junit.framework.TestCase;
+
 /**
  * Test exclusion patterns of PreparedQueryCache in isolation.
  *
@@ -39,7 +39,8 @@ public class TestPreparedQueryCacheExclusion extends TestCase {
 	private String[] keys   = {"jpql1", "jpql2", "jpql3"};
 	private String[] values = {"sql1", "sql2", "sql3"};
 
-	protected void setUp() throws Exception {
+	@Override
+    protected void setUp() throws Exception {
 		super.setUp();
 		cache = new PreparedQueryCacheImpl();
 		for (int i = 0; i < keys.length; i++) {
@@ -48,7 +49,8 @@ public class TestPreparedQueryCacheExclusion extends TestCase {
 		}
 	}
 
-	protected void tearDown() throws Exception {
+	@Override
+    protected void tearDown() throws Exception {
 		super.tearDown();
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Address.java
index 5c269154b..80909ae76 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Address.java
@@ -18,7 +18,13 @@
  */
 package org.apache.openjpa.persistence.jdbc.strategy;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="ADDR_STR")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/InnerJoinStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/InnerJoinStrategy.java
index fd124c28d..5bba9b8e3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/InnerJoinStrategy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/InnerJoinStrategy.java
@@ -25,6 +25,10 @@ import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 
 public class InnerJoinStrategy extends RelationFieldStrategy {
+    
+    private static final long serialVersionUID = 1L;
+
+    @Override
     public void selectEagerJoin(Select sel, OpenJPAStateManager sm,
         JDBCStore store, JDBCFetchConfiguration fetch, int eagerMode) {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MapperEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MapperEntity.java
index 6934a46a9..7d0683bf8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MapperEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/MapperEntity.java
@@ -37,7 +37,7 @@ public class MapperEntity {
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     @MapKeyColumn(name = "CODE")
     @MapKeyEnumerated(EnumType.STRING)
-    private Map<Key, MappedEntity> values = new HashMap<Key, MappedEntity>();
+    private Map<Key, MappedEntity> values = new HashMap<>();
 
     public MappedEntity get(Key key) {
         if (!values.containsKey(key)) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Person.java
index df23abef8..03a14a2d1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/strategy/Person.java
@@ -18,7 +18,16 @@
  */
 package org.apache.openjpa.persistence.jdbc.strategy;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 import org.apache.openjpa.persistence.jdbc.Strategy;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueB.java
index 7489dbf47..1489dba4c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/NamedUniqueB.java
@@ -20,7 +20,16 @@ package org.apache.openjpa.persistence.jdbc.unique;
 
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
 
 @Entity
 @Table(name="N_UNIQUE_B",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraint.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraint.java
index 6f90abb14..cc354e246 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraint.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraint.java
@@ -91,8 +91,8 @@ public class TestNamedUniqueConstraint extends SQLListenerTestCase {
     }
 
     public static String getUniqueConstraint(DBDictionary dict, String unique) {
-        List<String> tokens = new ArrayList<String>();
-        List<String> tokens1 = new ArrayList<String>();
+        List<String> tokens = new ArrayList<>();
+        List<String> tokens1 = new ArrayList<>();
         StringTokenizer st = new StringTokenizer(unique);
         while (st.hasMoreTokens()) {
             tokens.add(st.nextToken());
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraintWithXMLDescriptor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraintWithXMLDescriptor.java
index 64fc4dd71..b9c2136a2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraintWithXMLDescriptor.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestNamedUniqueConstraintWithXMLDescriptor.java
@@ -39,6 +39,7 @@ public class TestNamedUniqueConstraintWithXMLDescriptor extends SQLListenerTestC
         super.setUp(DROP_TABLES, NamedUniqueA.class, NamedUniqueB.class);
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "NamedUniqueConstraintTest";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraintWithXMLDescriptor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraintWithXMLDescriptor.java
index 53ade6ded..2d0d3baa6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraintWithXMLDescriptor.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraintWithXMLDescriptor.java
@@ -43,7 +43,8 @@ public class TestUniqueConstraintWithXMLDescriptor extends SQLListenerTestCase {
 		super.setUp(DROP_TABLES, UniqueA.class, UniqueB.class);
 	}
 
-	protected String getPersistenceUnitName() {
+	@Override
+    protected String getPersistenceUnitName() {
 		return "test-unique-constraint";
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java
index a1558ae1b..247a3dc53 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java
@@ -18,7 +18,14 @@
  */
 package org.apache.openjpa.persistence.jdbc.unique;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
 
 @Entity
 @Table(name="UNIQUE_B",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java
index 7cf6eec73..bec1003e2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java
@@ -78,7 +78,7 @@ public class Parent {
 		child.setName(name);
 		child.setParent(this);
 		if (children == null)
-			children = new ArrayList<Child>();
+			children = new ArrayList<>();
 		children.add(child);
 		return child;
 	}
@@ -94,7 +94,7 @@ public class Parent {
 	 */
 	public void add(Child child) {
 		if (children == null)
-			children = new ArrayList<Child>();
+			children = new ArrayList<>();
 		children.add(child);
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java
index 92ebb32fe..2618280e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java
@@ -101,7 +101,8 @@ public class TestParentChild extends CombinatorialPersistenceTestCase {
         getHelper().addOption(Key_PersistOrder, PersistOrder.values(), true);
 	}
 
-	public void setUp() {
+	@Override
+    public void setUp() {
         // The options can also be added in setup() as well but then
         // coutTestCase() will only record test methods and not multiply them
         // with number of configuration combinations the same tests will run.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestTimestampVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestTimestampVersion.java
index 2dc784dcb..ee3152b6c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestTimestampVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestTimestampVersion.java
@@ -36,7 +36,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  *
  */
 public class TestTimestampVersion extends SingleEMFTestCase {
-	public void setUp() {
+	@Override
+    public void setUp() {
         super.setUp(CLEAR_TABLES, TimestampedEntity.class, NumericVersionedEntity.class, BaseTimestampedEntity.class);
     }
 	public void testQueryOnVersion() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/TestVersionColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/TestVersionColumn.java
index c62b64906..02c838574 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/TestVersionColumn.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/version/TestVersionColumn.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.jdbc.version.model.TimestampVersion;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestVersionColumn extends SQLListenerTestCase {
+    @Override
     public void setUp() {
         super.setUp(IntVersion.class, TimestampVersion.class, ShortVersion.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/xml/TestNonstandardMappingXML.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/xml/TestNonstandardMappingXML.java
index 3e15ce284..0c89ef7a5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/xml/TestNonstandardMappingXML.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/xml/TestNonstandardMappingXML.java
@@ -23,6 +23,7 @@ import org.apache.openjpa.persistence.jdbc.annotations.TestNonstandardMappingAnn
 public class TestNonstandardMappingXML extends
     TestNonstandardMappingAnnotations {
 
+    @Override
     public void setUp() {
         super.setUp();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/TestOneToManySubQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/TestOneToManySubQuery.java
index b6f639a8a..f8e1e4695 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/TestOneToManySubQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/TestOneToManySubQuery.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.util.EagerEntity;
 
 public class TestOneToManySubQuery extends SingleEMFTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(CLEAR_TABLES, EagerEntity.class, EagerEmbed.class, EagerEmbedRel.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestBulkUpdate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestBulkUpdate.java
index 4dcb05541..a6b74d629 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestBulkUpdate.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestBulkUpdate.java
@@ -21,7 +21,8 @@ package org.apache.openjpa.persistence.jpql.clauses;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.apache.openjpa.persistence.common.apps.*;
+import org.apache.openjpa.persistence.common.apps.Entity1;
+import org.apache.openjpa.persistence.common.apps.Entity2;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestBulkUpdate extends AbstractTestCase {
@@ -30,6 +31,7 @@ public class TestBulkUpdate extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(Entity1.class);
         deleteAll(Entity2.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBClauses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBClauses.java
index c82a6f85a..a4bae9f9f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBClauses.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBClauses.java
@@ -20,13 +20,14 @@ package org.apache.openjpa.persistence.jpql.clauses;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import org.apache.openjpa.persistence.common.apps.Course;
 import org.apache.openjpa.persistence.common.apps.ArtCourse;
+import org.apache.openjpa.persistence.common.apps.Course;
 import org.apache.openjpa.persistence.common.apps.Department;
 import org.apache.openjpa.persistence.common.apps.Student;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestEJBClauses extends AbstractTestCase {
 
@@ -34,6 +35,7 @@ public class TestEJBClauses extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(Course.class);
         deleteAll(Student.class);
@@ -43,8 +45,8 @@ public class TestEJBClauses extends AbstractTestCase {
         startTx(em);
 
         String name = "";
-        List<Course> clist = new ArrayList<Course>();
-        List<Department> dlist = new ArrayList<Department>();
+        List<Course> clist = new ArrayList<>();
+        List<Department> dlist = new ArrayList<>();
 
         for (int i = 0; i < 5; i++) {
             Course curr = new Course("Math " + i, i * 2, i);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java
index 69b5b81c6..2e299e71e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java
@@ -34,6 +34,7 @@ public class TestEJBDeleteUpdateImpl extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java
index 3d5632e73..c7de2de54 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.jpql.clauses;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.common.apps.RuntimeTest1;
@@ -31,6 +32,7 @@ public class TestEJBPolymorphicQuery extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
         deleteAll(RuntimeTest2.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java
index 32491c395..a4940ace9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.jpql.clauses;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.NamedQuery;
 
@@ -34,6 +35,7 @@ public class TestEJBQueryInterface extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(Entity1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IColumnEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IColumnEntity.java
index 701be13e2..c31dbf24b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IColumnEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IColumnEntity.java
@@ -22,11 +22,11 @@ import java.util.List;
 
 public interface IColumnEntity extends INameEntity {
 
-    public List<IOrderedEntity> getEntities();
+    List<IOrderedEntity> getEntities();
 
-    public void setEntities(List<IOrderedEntity> columns);
+    void setEntities(List<IOrderedEntity> columns);
 
-    public void addEntity(IOrderedEntity entity);
+    void addEntity(IOrderedEntity entity);
 
-    public IOrderedEntity removeEntity(IOrderedEntity entity);
+    IOrderedEntity removeEntity(IOrderedEntity entity);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/INameEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/INameEntity.java
index 3beb8577c..9ccf81712 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/INameEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/INameEntity.java
@@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.jpql.entities;
 
 public interface INameEntity {
 
-    public int getId();
+    int getId();
 
-    public void setId(int id);
+    void setId(int id);
 
-    public String getName();
+    String getName();
 
-    public void setName(String name);
+    void setName(String name);
 
-    public String toString();
+    @Override String toString();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IOrderedElements.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IOrderedElements.java
index c6bdf2821..5cd6cc44e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IOrderedElements.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IOrderedElements.java
@@ -23,19 +23,19 @@ import java.util.List;
 
 public interface IOrderedElements {
 
-    public int getId();
+    int getId();
 
-    public void setId(int id);
+    void setId(int id);
 
-    public List<String> getListElements();
+    List<String> getListElements();
 
-    public void setListElements(List<String> elements);
+    void setListElements(List<String> elements);
 
-    public void addListElements(String element);
+    void addListElements(String element);
 
-    public String removeListElements(int location);
+    String removeListElements(int location);
 
-    public void insertListElements(int location, String name);
+    void insertListElements(int location, String name);
 
-    public String toString();
+    @Override String toString();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IOrderedEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IOrderedEntity.java
index e12da1069..b4f3f3dcb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IOrderedEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/IOrderedEntity.java
@@ -22,19 +22,19 @@ import java.util.List;
 
 public interface IOrderedEntity {
 
-    public int getId();
+    int getId();
 
-    public void setId(int id);
+    void setId(int id);
 
-    public List<INameEntity> getEntities();
+    List<INameEntity> getEntities();
 
-    public void setEntities(List<INameEntity> entities);
+    void setEntities(List<INameEntity> entities);
 
-    public void addEntity(INameEntity newElement);
+    void addEntity(INameEntity newElement);
 
-    public INameEntity removeEntity(int location);
+    INameEntity removeEntity(int location);
 
-    public void insertEntity(int location, INameEntity entity);
+    void insertEntity(int location, INameEntity entity);
 
-    public String toString();
+    @Override String toString();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedElementEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedElementEntity.java
index 73c4be1de..9cb33ad0a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedElementEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedElementEntity.java
@@ -29,6 +29,9 @@ import javax.persistence.OrderColumn;
 @Entity
 public class OrderedElementEntity implements IOrderedElements, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
@@ -36,29 +39,35 @@ public class OrderedElementEntity implements IOrderedElements, java.io.Serializa
     @OrderColumn
     private List<String> elements;
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public List<String> getListElements() {
         return elements;
     }
 
+    @Override
     public void setListElements(List<String> elements) {
         this.elements = elements;
     }
 
+    @Override
     public void addListElements(String element) {
         if( elements == null) {
-            elements = new ArrayList<String>();
+            elements = new ArrayList<>();
         }
         elements.add(element);
     }
 
+    @Override
     public String removeListElements(int location) {
         String rtnVal = null;
         if( elements != null) {
@@ -67,13 +76,15 @@ public class OrderedElementEntity implements IOrderedElements, java.io.Serializa
         return rtnVal;
     }
 
+    @Override
     public void insertListElements(int location, String name) {
         if( elements == null) {
-            elements = new ArrayList<String>();
+            elements = new ArrayList<>();
         }
         elements.add(location, name);
     }
 
+    @Override
     public String toString() {
         return "OrderedElementEntity[" + id + "]=" + elements;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedManyToManyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedManyToManyEntity.java
index fbbe0db11..0509c80a7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedManyToManyEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedManyToManyEntity.java
@@ -29,6 +29,9 @@ import javax.persistence.OrderColumn;
 @Entity
 public class OrderedManyToManyEntity implements IOrderedEntity, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
@@ -37,29 +40,35 @@ public class OrderedManyToManyEntity implements IOrderedEntity, java.io.Serializ
     private List<INameEntity> entities;
 
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public List<INameEntity> getEntities() {
         return entities;
     }
 
+    @Override
     public void setEntities(List<INameEntity> entities) {
         this.entities = entities;
     }
 
+    @Override
     public void addEntity(INameEntity entity) {
         if( entities == null) {
-            entities = new ArrayList<INameEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(entity);
     }
 
+    @Override
     public INameEntity removeEntity(int location) {
         INameEntity rtnVal = null;
         if( entities != null) {
@@ -68,13 +77,15 @@ public class OrderedManyToManyEntity implements IOrderedEntity, java.io.Serializ
         return rtnVal;
     }
 
+    @Override
     public void insertEntity(int location, INameEntity entity) {
         if( entities == null) {
-            entities = new ArrayList<INameEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(location, entity);
     }
 
+    @Override
     public String toString() {
         return "OrderedManyToManyEntity[" + id + "]=" + entities;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedNameEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedNameEntity.java
index 434668e63..3c8289f44 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedNameEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedNameEntity.java
@@ -29,6 +29,9 @@ import javax.persistence.OrderColumn;
 @Entity
 public class OrderedNameEntity implements IColumnEntity, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
@@ -47,41 +50,50 @@ public class OrderedNameEntity implements IColumnEntity, java.io.Serializable {
         this.name = name;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String toString() {
         return "OrderedNameEntity[" + id + "]=" + name;
     }
 
+    @Override
     public List<IOrderedEntity> getEntities() {
         return entities;
     }
 
+    @Override
     public void setEntities(List<IOrderedEntity> entities) {
         this.entities = entities;
     }
 
+    @Override
     public void addEntity(IOrderedEntity entity) {
         if( entities == null) {
-            entities = new ArrayList<IOrderedEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(entity);
     }
 
+    @Override
     public IOrderedEntity removeEntity(IOrderedEntity entity) {
         IOrderedEntity rtnVal = null;
         if( entities != null) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedOneToManyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedOneToManyEntity.java
index 32d621309..ba327f3f2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedOneToManyEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/OrderedOneToManyEntity.java
@@ -29,6 +29,9 @@ import javax.persistence.OrderColumn;
 @Entity
 public class OrderedOneToManyEntity implements IOrderedEntity, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
@@ -37,29 +40,35 @@ public class OrderedOneToManyEntity implements IOrderedEntity, java.io.Serializa
     private List<INameEntity> entities;
 
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public List<INameEntity> getEntities() {
         return entities;
     }
 
+    @Override
     public void setEntities(List<INameEntity> names) {
         this.entities = names;
     }
 
+    @Override
     public void addEntity(INameEntity name) {
         if( entities == null) {
-            entities = new ArrayList<INameEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(name);
     }
 
+    @Override
     public INameEntity removeEntity(int location) {
         INameEntity rtnVal = null;
         if( entities != null) {
@@ -68,13 +77,15 @@ public class OrderedOneToManyEntity implements IOrderedEntity, java.io.Serializa
         return rtnVal;
     }
 
+    @Override
     public void insertEntity(int location, INameEntity name) {
         if( entities == null) {
-            entities = new ArrayList<INameEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(location, name);
     }
 
+    @Override
     public String toString() {
         return "OrderedOneToManyEntity[" + id + "]=" + entities;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/UnorderedNameEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/UnorderedNameEntity.java
index 253f863ac..3a726fba6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/UnorderedNameEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/UnorderedNameEntity.java
@@ -24,6 +24,9 @@ import javax.persistence.Id;
 @Entity
 public class UnorderedNameEntity implements INameEntity, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
@@ -38,22 +41,27 @@ public class UnorderedNameEntity implements INameEntity, java.io.Serializable {
         this.name = name;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String toString() {
         return "UnorderedNameEntity[" + id + "]=" + name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedElementEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedElementEntity.java
index 0db55d5c1..4d33944ca 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedElementEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedElementEntity.java
@@ -23,33 +23,42 @@ import java.util.List;
 
 public class XMLOrderedElementEntity implements IOrderedElements, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private int id;
 
     private List<String> elements;
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public List<String> getListElements() {
         return elements;
     }
 
+    @Override
     public void setListElements(List<String> elements) {
         this.elements = elements;
     }
 
+    @Override
     public void addListElements(String element) {
         if( elements == null) {
-            elements = new ArrayList<String>();
+            elements = new ArrayList<>();
         }
         elements.add(element);
     }
 
+    @Override
     public String removeListElements(int location) {
         String rtnVal = null;
         if( elements != null) {
@@ -58,13 +67,15 @@ public class XMLOrderedElementEntity implements IOrderedElements, java.io.Serial
         return rtnVal;
     }
 
+    @Override
     public void insertListElements(int location, String name) {
         if( elements == null) {
-            elements = new ArrayList<String>();
+            elements = new ArrayList<>();
         }
         elements.add(location, name);
     }
 
+    @Override
     public String toString() {
         return "XMLOrderedElementEntity[" + id + "]=" + elements;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedManyToManyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedManyToManyEntity.java
index 948e952bd..905c3dc6d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedManyToManyEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedManyToManyEntity.java
@@ -23,34 +23,43 @@ import java.util.List;
 
 public class XMLOrderedManyToManyEntity implements IOrderedEntity, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private int id;
 
     private List<INameEntity> entities;
 
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public List<INameEntity> getEntities() {
         return entities;
     }
 
+    @Override
     public void setEntities(List<INameEntity> entities) {
         this.entities = entities;
     }
 
+    @Override
     public void addEntity(INameEntity entity) {
         if( entities == null) {
-            entities = new ArrayList<INameEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(entity);
     }
 
+    @Override
     public INameEntity removeEntity(int location) {
         INameEntity rtnVal = null;
         if( entities != null) {
@@ -59,13 +68,15 @@ public class XMLOrderedManyToManyEntity implements IOrderedEntity, java.io.Seria
         return rtnVal;
     }
 
+    @Override
     public void insertEntity(int location, INameEntity entity) {
         if( entities == null) {
-            entities = new ArrayList<INameEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(location, entity);
     }
 
+    @Override
     public String toString() {
         return "XMLOrderedManyToManyEntity[" + id + "]=" + entities;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedNameEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedNameEntity.java
index c5b85d62e..9533e8063 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedNameEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedNameEntity.java
@@ -26,6 +26,9 @@ import javax.persistence.OrderColumn;
 
 public class XMLOrderedNameEntity implements INameEntity, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private int id;
 
     private String name;
@@ -43,22 +46,27 @@ public class XMLOrderedNameEntity implements INameEntity, java.io.Serializable {
         this.name = name;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String toString() {
         return "XMLOrderedNameEntity[" + id + "]=" + name;
     }
@@ -73,7 +81,7 @@ public class XMLOrderedNameEntity implements INameEntity, java.io.Serializable {
 
     public void addColumns(IColumnEntity column) {
         if( columns == null) {
-            columns = new ArrayList<IColumnEntity>();
+            columns = new ArrayList<>();
         }
         columns.add(column);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedOneToManyEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedOneToManyEntity.java
index b3c2d748a..5852ecce1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedOneToManyEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLOrderedOneToManyEntity.java
@@ -23,34 +23,43 @@ import java.util.List;
 
 public class XMLOrderedOneToManyEntity implements IOrderedEntity, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private int id;
 
     private List<INameEntity> entities;
 
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public List<INameEntity> getEntities() {
         return entities;
     }
 
+    @Override
     public void setEntities(List<INameEntity> entities) {
         this.entities = entities;
     }
 
+    @Override
     public void addEntity(INameEntity entity) {
         if( entities == null) {
-            entities = new ArrayList<INameEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(entity);
     }
 
+    @Override
     public INameEntity removeEntity(int location) {
         INameEntity rtnVal = null;
         if( entities != null) {
@@ -59,13 +68,15 @@ public class XMLOrderedOneToManyEntity implements IOrderedEntity, java.io.Serial
         return rtnVal;
     }
 
+    @Override
     public void insertEntity(int location, INameEntity entity) {
         if( entities == null) {
-            entities = new ArrayList<INameEntity>();
+            entities = new ArrayList<>();
         }
         entities.add(location, entity);
     }
 
+    @Override
     public String toString() {
         return "XMLOrderedOneToManyEntity[" + id + "]=" + entities;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLUnorderedNameEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLUnorderedNameEntity.java
index 1b8c32b2d..e874023cc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLUnorderedNameEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/entities/XMLUnorderedNameEntity.java
@@ -20,6 +20,9 @@ package org.apache.openjpa.persistence.jpql.entities;
 
 public class XMLUnorderedNameEntity implements INameEntity, java.io.Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private int id;
 
     private String name;
@@ -33,22 +36,27 @@ public class XMLUnorderedNameEntity implements INameEntity, java.io.Serializable
         this.name = name;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String toString() {
         return "XMLUnorderedNameEntity[" + id + "]=" + name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java
index a4afffdb8..409a25b6a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java
@@ -19,9 +19,13 @@
 package org.apache.openjpa.persistence.jpql.expressions;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.common.apps.*;
+import org.apache.openjpa.persistence.common.apps.Address;
+import org.apache.openjpa.persistence.common.apps.CompUser;
+import org.apache.openjpa.persistence.common.apps.FemaleUser;
+import org.apache.openjpa.persistence.common.apps.MaleUser;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestEJBQLCondExpression extends AbstractTestCase {
@@ -32,6 +36,7 @@ public class TestEJBQLCondExpression extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(CompUser.class);
         EntityManager em = currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java
index 97e805634..c5e4caf87 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java
@@ -21,9 +21,13 @@ package org.apache.openjpa.persistence.jpql.expressions;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.common.apps.*;
+import org.apache.openjpa.persistence.common.apps.Address;
+import org.apache.openjpa.persistence.common.apps.CompUser;
+import org.apache.openjpa.persistence.common.apps.FemaleUser;
+import org.apache.openjpa.persistence.common.apps.MaleUser;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestEntityTypeExpression extends AbstractTestCase {
@@ -34,6 +38,7 @@ public class TestEntityTypeExpression extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(CompUser.class);
         EntityManager em = currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestInMemoryScalarExpressions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestInMemoryScalarExpressions.java
index 9051e82bc..5b02aefe6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestInMemoryScalarExpressions.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestInMemoryScalarExpressions.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.jpql.expressions;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
@@ -27,7 +28,10 @@ import org.apache.openjpa.jdbc.sql.SybaseDictionary;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.QueryImpl;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
-import org.apache.openjpa.persistence.common.apps.*;
+import org.apache.openjpa.persistence.common.apps.Address;
+import org.apache.openjpa.persistence.common.apps.CompUser;
+import org.apache.openjpa.persistence.common.apps.FemaleUser;
+import org.apache.openjpa.persistence.common.apps.MaleUser;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestInMemoryScalarExpressions extends AbstractTestCase {
@@ -44,6 +48,7 @@ public class TestInMemoryScalarExpressions extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(CompUser.class);
         OpenJPAEntityManagerSPI em = (OpenJPAEntityManagerSPI) currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java
index c4bda12bd..8dbcea9fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java
@@ -80,10 +80,12 @@ public class TestIndex extends SingleEMFTestCase {
             return clazz;
         }
 
+        @Override
         public String getEntityClassName() {
             return fullEntityName;
         }
 
+        @Override
         public String getEntityName() {
             return entityName;
         }
@@ -225,7 +227,7 @@ public class TestIndex extends SingleEMFTestCase {
 
             // create the elements to add
             Constructor<INameEntity> elementConstrctor = elementClass.getConstructor(String.class);
-            List<INameEntity> newElements = new ArrayList<INameEntity>();
+            List<INameEntity> newElements = new ArrayList<>();
             for (int i=0; i<Element_Names.length; i++) {
                 newElements.add(elementConstrctor.newInstance(Element_Names[i]));
             }
@@ -279,7 +281,7 @@ public class TestIndex extends SingleEMFTestCase {
             em.getTransaction().begin();
 
             // create and persist the entities
-            List<IOrderedEntity> newEntities = new ArrayList<IOrderedEntity>();
+            List<IOrderedEntity> newEntities = new ArrayList<>();
             for (int i=0; i<3; i++) {
                 IOrderedEntity newEntity = (IOrderedEntity)constructNewEntityObject(entityType);
                 newEntity.setId(i);
@@ -289,7 +291,7 @@ public class TestIndex extends SingleEMFTestCase {
 
             // create and persist the elements
             Constructor<IColumnEntity> elementConstrctor = elementClass.getConstructor(String.class);
-            List<INameEntity> newElements = new ArrayList<INameEntity>();
+            List<INameEntity> newElements = new ArrayList<>();
             IColumnEntity newElement;
             for (int i=0; i<Element_Names.length; i++) {
                 newElement = elementConstrctor.newInstance(Element_Names[i]);
@@ -341,7 +343,7 @@ public class TestIndex extends SingleEMFTestCase {
 
             IOrderedElements newEntity = (IOrderedElements)constructNewEntityObject(entityType);
             newEntity.setId(entityId);
-            List<String> namesList = new ArrayList<String>();
+            List<String> namesList = new ArrayList<>();
             for (int i=0; i<Element_Names.length; i++) {
                 namesList.add(Element_Names[i]);
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
index 075acdc18..e96fab64c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
@@ -20,14 +20,17 @@ package org.apache.openjpa.persistence.jpql.expressions;
 
 import java.util.List;
 
-import javax.persistence.Query;
 import javax.persistence.EntityManager;
+import javax.persistence.Query;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.SybaseDictionary;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
-import org.apache.openjpa.persistence.common.apps.*;
+import org.apache.openjpa.persistence.common.apps.Address;
+import org.apache.openjpa.persistence.common.apps.CompUser;
+import org.apache.openjpa.persistence.common.apps.FemaleUser;
+import org.apache.openjpa.persistence.common.apps.MaleUser;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestJPQLScalarExpressions extends AbstractTestCase {
@@ -44,6 +47,7 @@ public class TestJPQLScalarExpressions extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(CompUser.class);
         OpenJPAEntityManagerSPI em = (OpenJPAEntityManagerSPI) currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java
index 9a0e2311b..085e64e29 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.jpql.functions;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
@@ -46,6 +47,7 @@ public class TestEJBQLFunction extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(CompUser.class);
         OpenJPAEntityManagerSPI em = (OpenJPAEntityManagerSPI) currentEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java
index 0627c93f6..40a142fdc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java
@@ -44,6 +44,7 @@ public class TestSetParameter extends SingleEMFTestCase {
     private static String UPDATED_NAME  = "Obama";
     private static int UPDATED_AGE      = 29;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, CompUser.class, MaleUser.class,
             FemaleUser.class, Address.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java
index 3719f3f4d..e6e80389c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department.java
@@ -98,6 +98,7 @@ public class Department implements Serializable {
         this.employee2s = employees;
     }
 
+    @Override
     public String toString() {
         return "[Department:depno=" + deptno + ", version=" + version + ", name=" + name +
                         ", employees=" + employees + ", employee2s=" + employee2s+ ']';
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java
index 51e21d110..3221ae497 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Department_.java
@@ -18,8 +18,6 @@
  */
 package org.apache.openjpa.persistence.jpql.joins;
 
-import java.lang.Integer;
-import java.lang.String;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java
index 91ca1d7af..0e35559e0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee.java
@@ -19,8 +19,14 @@
 package org.apache.openjpa.persistence.jpql.joins;
 
 import java.io.Serializable;
-import java.lang.String;
-import javax.persistence.*;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 /**
  * Entity implementation class for Entity: Child
@@ -84,6 +90,7 @@ public class Employee implements Serializable {
         this.dept = dept;
     }
 
+    @Override
     public String toString() {
         return "[Employee:id=" + empno + ", version=" + version + ", name="
                 + name + ']';
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java
index 6803e0501..f07afa22f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/Employee_.java
@@ -18,8 +18,6 @@
  */
 package org.apache.openjpa.persistence.jpql.joins;
 
-import java.lang.Integer;
-import java.lang.String;
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java
index 975b3df7b..c708c6bc6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.jpql.joins;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.common.apps.ArtCourse;
@@ -34,6 +35,7 @@ public class TestEJBJoins extends AbstractTestCase {
         super(name, "jpqlclausescactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(Course.class);
         deleteAll(Student.class);
@@ -43,8 +45,8 @@ public class TestEJBJoins extends AbstractTestCase {
         startTx(em);
 
         String name = "";
-        List<Course> clist = new ArrayList<Course>();
-        List<Department> dlist = new ArrayList<Department>();
+        List<Course> clist = new ArrayList<>();
+        List<Department> dlist = new ArrayList<>();
 
         for (int i = 0; i < 5; i++) {
             Course curr = new Course("Math " + i, i * 2, i);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java
index 333821fc0..d63aa636b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestJoinFetchWithQueryDataCache.java
@@ -28,18 +28,17 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Root;
 
-import junit.framework.Assert;
-
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.framework.Assert;
+
 /**
  * Tests JQPL and Criteria API equivalent using left join fetch with QueryCache and DataCache enabled.
  */
 public class TestJoinFetchWithQueryDataCache extends SQLListenerTestCase {
     EntityManager em;
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES, Employee.class, Department.class, "openjpa.QueryCompilationCache", "all",
             "openjpa.DataCache", "true", "openjpa.RemoteCommitProvider", "sjvm", "openjpa.QueryCache", "true"
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/DepartmentTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/DepartmentTest.java
index 12e0b3548..74feba7ab 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/DepartmentTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/DepartmentTest.java
@@ -34,7 +34,7 @@ public class DepartmentTest{
 
     @OrderBy("name")
     @OneToMany(mappedBy = "departmentTest")
-	private Set<PersonTest> persons = new HashSet<PersonTest>();
+	private Set<PersonTest> persons = new HashSet<>();
 
 	private String name;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/TestJoinLeftFetch.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/TestJoinLeftFetch.java
index a329ecbc0..7ba778419 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/TestJoinLeftFetch.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/leftfetch/TestJoinLeftFetch.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestJoinLeftFetch extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(DROP_TABLES, DepartmentTest.class, PersonTest.class);
         createTestData();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java
index 7fd78606c..1c0ab465b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.persistence.simple.AllFieldTypes;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestLiteralInSQL extends SQLListenerTestCase {
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class, "openjpa.jdbc.QuerySQLCache", "false");
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java
index f1a86bbb4..496d0683f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/TestJoinVersionField.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestJoinVersionField extends SingleEMFTestCase {
 
+    @Override
     public void setUp(){
         setUp(CLEAR_TABLES, Author.class,Document.class);
         createTestData();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/BaseEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/BaseEntity.java
index 6340013a2..756048a93 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/BaseEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/BaseEntity.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.jpql.version.type;
 
-import javax.persistence.*;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
 
 @MappedSuperclass
 abstract class BaseEntity {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/LongVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/LongVersionEntity.java
index c4dbc45a8..744b33505 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/LongVersionEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/LongVersionEntity.java
@@ -20,10 +20,15 @@ package org.apache.openjpa.persistence.jpql.version.type;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
 
 @Entity
 public class LongVersionEntity implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeLongVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeLongVersionEntity.java
index e66a10fda..a360a651a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeLongVersionEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeLongVersionEntity.java
@@ -20,10 +20,15 @@ package org.apache.openjpa.persistence.jpql.version.type;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
 
 @Entity
 public class PrimativeLongVersionEntity implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeShortVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeShortVersionEntity.java
index cc527c259..eef644b31 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeShortVersionEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/PrimativeShortVersionEntity.java
@@ -20,10 +20,15 @@ package org.apache.openjpa.persistence.jpql.version.type;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
 
 @Entity
 public class PrimativeShortVersionEntity implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ShortVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ShortVersionEntity.java
index eafacf31e..3c2047ccb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ShortVersionEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/ShortVersionEntity.java
@@ -20,10 +20,15 @@ package org.apache.openjpa.persistence.jpql.version.type;
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
 
 @Entity
 public class ShortVersionEntity implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TestVersionFieldType.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TestVersionFieldType.java
index b712f0100..e154651e9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TestVersionFieldType.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TestVersionFieldType.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestVersionFieldType extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, LongVersionEntity.class,
             ShortVersionEntity.class, PrimativeLongVersionEntity.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TimestampVersionEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TimestampVersionEntity.java
index 3c8b47d68..e52f51047 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TimestampVersionEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/version/type/TimestampVersionEntity.java
@@ -21,10 +21,15 @@ package org.apache.openjpa.persistence.jpql.version.type;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
 
 @Entity
 public class TimestampVersionEntity implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java
index 232a26ad0..18934cbd5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java
@@ -27,7 +27,9 @@
  */
 package org.apache.openjpa.persistence.kernel;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.lib.conf.ConfigurationProvider;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/DummyBrokerFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/DummyBrokerFactory.java
index 88bb2e1a0..e9e82f524 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/DummyBrokerFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/DummyBrokerFactory.java
@@ -24,8 +24,8 @@ import org.apache.openjpa.jdbc.kernel.JDBCBrokerFactory;
 import org.apache.openjpa.kernel.StoreManager;
 import org.apache.openjpa.lib.conf.ConfigurationProvider;
 
-@SuppressWarnings("serial")
 public class DummyBrokerFactory extends JDBCBrokerFactory {
+    private static final long serialVersionUID = 1L;
     JDBCConfiguration _conf;
     public DummyBrokerFactory(JDBCConfiguration conf) {
         super(conf);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java
index f2521680b..9e85f0b51 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java
@@ -20,9 +20,8 @@ package org.apache.openjpa.persistence.kernel;
 
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.Entity1;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.Entity1;
 
 public class Test2EJBConcurrency extends AbstractTestCase {
 
@@ -32,6 +31,7 @@ public class Test2EJBConcurrency extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         deleteAll(Entity1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestArrayValues2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestArrayValues2.java
index 31f51180e..76963ca8c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestArrayValues2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestArrayValues2.java
@@ -24,10 +24,10 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.ArraysTest;
-import junit.framework.AssertionFailedError;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.ArraysTest;
+
+import junit.framework.AssertionFailedError;
 
 /**
  * Test varying kinds of array values.
@@ -446,6 +446,7 @@ public class TestArrayValues2 extends BaseKernelTest {
 
         private Collator collator = Collator.getInstance();
 
+        @Override
         public int compare(Object o1, Object o2) {
             if (o1.equals(o2))
                 return 0;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestBigDecimals.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestBigDecimals.java
index 92327f5fa..9883a56ac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestBigDecimals.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestBigDecimals.java
@@ -29,12 +29,10 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.math.BigDecimal;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
-import junit.framework.AssertionFailedError;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
+
+import junit.framework.AssertionFailedError;
 
 public class TestBigDecimals extends BaseKernelTest {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
index 18472e6ba..87e51f48f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
@@ -31,13 +31,10 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.CalendarFields;
-
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.lib.util.JavaVersions;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.CalendarFields;
 
 public class TestCalendarFields extends BaseKernelTest {
 
@@ -48,6 +45,7 @@ public class TestCalendarFields extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(CalendarFields.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCheckConsistency.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCheckConsistency.java
index 326266fa0..34974abe7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCheckConsistency.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCheckConsistency.java
@@ -29,10 +29,9 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
 public class TestCheckConsistency extends BaseKernelTest {
 
@@ -45,6 +44,7 @@ public class TestCheckConsistency extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestClassStringConstructor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestClassStringConstructor.java
index afbc82c3d..9c6ea3225 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestClassStringConstructor.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestClassStringConstructor.java
@@ -28,9 +28,8 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.AppIdClassString;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.AppIdClassString;
 
 public class TestClassStringConstructor extends BaseKernelTest {
 
@@ -41,6 +40,7 @@ public class TestClassStringConstructor extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(AppIdClassString.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestConnectionRetainMode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestConnectionRetainMode.java
index d79056a31..fdaaea7d4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestConnectionRetainMode.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestConnectionRetainMode.java
@@ -30,9 +30,6 @@ package org.apache.openjpa.persistence.kernel;
 import java.util.HashMap;
 import java.util.Map;
 
-
-
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDateQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDateQueries.java
index 89b3949e2..4ff28decf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDateQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDateQueries.java
@@ -34,12 +34,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
 
 public class TestDateQueries extends BaseKernelTest {
 
@@ -58,6 +55,7 @@ public class TestDateQueries extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp(AllFieldTypesTest.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
index 5f2461378..43909b95d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
@@ -22,11 +22,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.DependentFieldsPC;
 import org.apache.openjpa.persistence.Extent;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.kernel.common.apps.DependentFieldsPC;
 
 public class TestDependentFields2 extends BaseKernelTest {
 
@@ -48,6 +47,7 @@ public class TestDependentFields2 extends BaseKernelTest {
         super(casename);
     }
 
+    @Override
     public void setUp() throws Exception {
         deleteAll(DependentFieldsPC.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java
index 4865981bb..005d625f1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java
@@ -24,14 +24,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.AttachA;
-import org.apache.openjpa.persistence.kernel.common.apps.AttachB;
-import org.apache.openjpa.persistence.kernel.common.apps.AttachD;
-import org.apache.openjpa.persistence.kernel.common.apps.AttachE;
-import org.apache.openjpa.persistence.kernel.common.apps.DetachSMPC;
-
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.enhance.PCEnhancer;
@@ -41,6 +33,11 @@ import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.persistence.DetachStateType;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.kernel.common.apps.AttachA;
+import org.apache.openjpa.persistence.kernel.common.apps.AttachB;
+import org.apache.openjpa.persistence.kernel.common.apps.AttachD;
+import org.apache.openjpa.persistence.kernel.common.apps.AttachE;
+import org.apache.openjpa.persistence.kernel.common.apps.DetachSMPC;
 
 public class TestDetachedStateManager extends BaseKernelTest {
 
@@ -61,6 +58,7 @@ public class TestDetachedStateManager extends BaseKernelTest {
         deleteAll(AttachD.class);
     }
 
+    @Override
     public OpenJPAEntityManager getPM() {
         OpenJPAEntityManager pm = super.getPM();
         //FIXME jthomas
@@ -68,6 +66,7 @@ public class TestDetachedStateManager extends BaseKernelTest {
         return pm;
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDynamicFetchPlan.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDynamicFetchPlan.java
index cba71679b..f2846e9a0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDynamicFetchPlan.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDynamicFetchPlan.java
@@ -41,7 +41,8 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestDynamicFetchPlan extends SingleEMFTestCase {
 	private static final String JPQL = "select a from FetchA a";
 
-	public void setUp() {
+	@Override
+    public void setUp() {
         super.setUp(CLEAR_TABLES, FetchBase.class, FetchA.class, FetchB.class);
 		createData();
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java
index e32383c3e..4c96b821d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java
@@ -20,7 +20,6 @@ package org.apache.openjpa.persistence.kernel;
 
 import javax.persistence.EntityManager;
 
-
 import org.apache.openjpa.persistence.kernel.common.apps.ComplexEmbeddedPC;
 import org.apache.openjpa.persistence.kernel.common.apps.EmbeddedOwnerPC;
 import org.apache.openjpa.persistence.kernel.common.apps.EmbeddedPC;
@@ -37,6 +36,7 @@ public class TestEJBEmbedded extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public void setUp() {
         deleteAll(EmbeddedOwnerPC.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java
index cc99893d0..aebd1b32e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java
@@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestEJBEntityManager extends AbstractTestCase {
 
@@ -36,6 +36,7 @@ public class TestEJBEntityManager extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
 
@@ -93,6 +94,7 @@ public class TestEJBEntityManager extends AbstractTestCase {
         em.close();
 
         new Thread() {
+            @Override
             @SuppressWarnings("unchecked")
             public void run() {
                 try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java
index 80fcfb340..dc1d70c81 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java
@@ -20,12 +20,11 @@ package org.apache.openjpa.persistence.kernel;
 
 import javax.persistence.EntityManager;
 
-
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.kernel.common.apps.AImplB;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestEJBGetObjectByIdValue extends AbstractTestCase {
 
@@ -33,6 +32,7 @@ public class TestEJBGetObjectByIdValue extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class, AImplB.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java
index 9bb24f540..7095c12c3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java
@@ -20,10 +20,9 @@ package org.apache.openjpa.persistence.kernel;
 
 import javax.persistence.EntityManager;
 
-
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.kernel.common.apps.InstanceCallbacksTest;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestEJBIncrementalFlushes extends AbstractTestCase {
 
@@ -31,6 +30,7 @@ public class TestEJBIncrementalFlushes extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java
index dd15fdc69..6878b0762 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java
@@ -20,12 +20,11 @@ package org.apache.openjpa.persistence.kernel;
 
 import javax.persistence.EntityManager;
 
-
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.kernel.common.apps.InterfaceHolder;
 import org.apache.openjpa.persistence.kernel.common.apps.InterfaceTestImpl1;
 import org.apache.openjpa.persistence.kernel.common.apps.InterfaceTestImpl2;
 import org.apache.openjpa.persistence.kernel.common.apps.InterfaceTestImpl3;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 /**
  * Test for persistent interfaces.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
index 1f97285f3..954106636 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel;
 
 import java.io.Serializable;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -37,6 +38,7 @@ public class TestEJBLobs extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(Inner.class, Inner2.class);
 
@@ -156,11 +158,10 @@ public class TestEJBLobs extends AbstractTestCase {
         }
     }
 
-    @SuppressWarnings("serial")
     @Entity
     @Table(name="Inner2")
     public static class Inner2 implements Serializable {
-
+        private static final long serialVersionUID = 1L;
         @Id
         public String string = null;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java
index b183f9a38..da455836c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLocales.java
@@ -21,13 +21,13 @@ package org.apache.openjpa.persistence.kernel;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+
 import javax.persistence.EntityManager;
 
-
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestEJBLocales extends AbstractTestCase {
 
@@ -35,6 +35,7 @@ public class TestEJBLocales extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java
index d82e7b1b5..8db8c1549 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java
@@ -20,10 +20,9 @@ package org.apache.openjpa.persistence.kernel;
 
 import javax.persistence.EntityManager;
 
-
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.kernel.common.apps.InverseA;
 import org.apache.openjpa.persistence.kernel.common.apps.InverseB;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 public class TestEJBManagedInverses extends AbstractTestCase {
 
@@ -31,6 +30,7 @@ public class TestEJBManagedInverses extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(InverseA.class, InverseB.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java
index e1eb43373..6df8ae223 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel;
 
 import java.io.Serializable;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -36,6 +37,7 @@ public class TestEJBNoPersistentFields extends AbstractTestCase {
         super(test, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         deleteAll(Nholder.class);
     }
@@ -59,10 +61,10 @@ public class TestEJBNoPersistentFields extends AbstractTestCase {
         endEm(em);
     }
 
-    @SuppressWarnings("serial")
     @Entity
     @Table(name = "nholder2")
     public static class Nholder implements Serializable {
+        private static final long serialVersionUID = 1L;
 
         @Id
         private int idkey;
@@ -95,11 +97,10 @@ public class TestEJBNoPersistentFields extends AbstractTestCase {
         }
     }
 
-    @SuppressWarnings("serial")
     @Entity
     @Table(name = "npfp")
     public static class NoPersistentFieldsPC implements Serializable {
-
+        private static final long serialVersionUID = 1L;
         public transient int blankInt;
         public transient String blankString;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
index af61e4bbe..001a481d0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBNullValues.java
@@ -20,9 +20,8 @@ package org.apache.openjpa.persistence.kernel;
 
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.Inner;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.Inner;
 
 public class TestEJBNullValues extends AbstractTestCase {
 
@@ -30,6 +29,7 @@ public class TestEJBNullValues extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(Inner.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java
index aa5fba01e..65658dd15 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java
@@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.Arrays;
 import java.util.HashSet;
+
 import javax.persistence.EntityManager;
 
-
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.kernel.common.apps.AllFieldsTypeTest;
 import org.apache.openjpa.persistence.kernel.common.apps.ObjectCollectionHolder;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 /**
  * Tests that Collections of type {@link Object} can hold all
@@ -48,11 +48,13 @@ public class TestEJBObjectCollections extends AbstractTestCase {
             .getHashSet().size());
     }
 
+    @Override
     public void setUp() {
         deleteAll(ObjectCollectionHolder.class);
         deleteAll(AllFieldsTypeTest.class);
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java
index e4c19f442..d996070c5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java
@@ -19,11 +19,11 @@
 package org.apache.openjpa.persistence.kernel;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
 public class TestEJBRetainValues extends AbstractTestCase {
 
@@ -31,6 +31,7 @@ public class TestEJBRetainValues extends AbstractTestCase {
         super(testName, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java
index c36595c81..0778db3ae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBState.java
@@ -19,11 +19,11 @@
 package org.apache.openjpa.persistence.kernel;
 
 import java.math.BigDecimal;
+
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.AllFieldsTypeTest;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.AllFieldsTypeTest;
 
 public class TestEJBState extends AbstractTestCase {
 
@@ -31,6 +31,7 @@ public class TestEJBState extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(AllFieldsTypeTest.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java
index 14a42713b..2ac80ed0e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java
@@ -20,9 +20,8 @@ package org.apache.openjpa.persistence.kernel;
 
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.TransactionalClassPC;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.TransactionalClassPC;
 
 public class TestEJBTransactionalClass extends AbstractTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactions.java
index ababd4388..0d48530f1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactions.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBTransactions.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel;
 
 import java.util.ArrayList;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
@@ -30,6 +31,7 @@ public class TestEJBTransactions extends AbstractTestCase {
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() {
     }
 
@@ -46,6 +48,7 @@ public class TestEJBTransactions extends AbstractTestCase {
         endTx(em);
 
         Thread thread = new Thread() {
+            @Override
             @SuppressWarnings("unchecked")
             public void run() {
                 try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestExtents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestExtents.java
index f8cf9e0cc..28371b39e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestExtents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestExtents.java
@@ -32,13 +32,10 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
-
 import org.apache.openjpa.persistence.Extent;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
 
 public class TestExtents extends BaseKernelTest {
 
@@ -52,6 +49,7 @@ public class TestExtents extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestExtents2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestExtents2.java
index e83c28f75..490d39206 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestExtents2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestExtents2.java
@@ -29,15 +29,12 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.Iterator;
 
-
-
+import org.apache.openjpa.persistence.Extent;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
 
-import org.apache.openjpa.persistence.Extent;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
 public class TestExtents2 extends BaseKernelTest {
 
     private Object _oid1 = null;
@@ -54,6 +51,7 @@ public class TestExtents2 extends BaseKernelTest {
     public TestExtents2() {
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroups.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroups.java
index f5fbbdb81..951b7292e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroups.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroups.java
@@ -34,8 +34,11 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
-
-
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.meta.FieldMetaData;
+import org.apache.openjpa.persistence.FetchPlan;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.kernel.common.apps.AttachA;
 import org.apache.openjpa.persistence.kernel.common.apps.AttachB;
 import org.apache.openjpa.persistence.kernel.common.apps.AttachC;
@@ -46,12 +49,6 @@ import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
 import org.apache.openjpa.persistence.kernel.common.apps.
         FetchGroupTestObjectChild;
 
-import org.apache.openjpa.kernel.OpenJPAStateManager;
-import org.apache.openjpa.meta.FieldMetaData;
-import org.apache.openjpa.persistence.FetchPlan;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-
 public class TestFetchGroups extends BaseKernelTest {
 
     private int oid1;
@@ -68,6 +65,7 @@ public class TestFetchGroups extends BaseKernelTest {
     public TestFetchGroups() {
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(FetchGroupTestObject.class, FetchGroupTestObjectChild.class,
             AttachA.class, AttachB.class, AttachC.class, AttachD.class, AttachE.class, AttachF.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java
index cee00af30..bbc3d7a54 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java
@@ -29,15 +29,12 @@ package org.apache.openjpa.persistence.kernel;
 import java.util.Collection;
 import java.util.List;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
-import org.apache.openjpa.persistence.kernel.common.apps.
-        FetchGroupTestObjectChild;
-
 import org.apache.openjpa.persistence.Extent;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
+import org.apache.openjpa.persistence.kernel.common.apps.
+        FetchGroupTestObjectChild;
 
 public class TestFetchGroupsExtent extends TestFetchGroups {
 
@@ -51,6 +48,7 @@ public class TestFetchGroupsExtent extends TestFetchGroups {
         super(s);
     }
 
+    @Override
     protected FetchGroupTestObject getO1(OpenJPAEntityManager pm) {
         Extent e = (Extent) pm.createExtent(FetchGroupTestObject.class,
             true);
@@ -64,6 +62,7 @@ public class TestFetchGroupsExtent extends TestFetchGroups {
             ((Collection) q.getResultList()).iterator().next();
     }
 
+    @Override
     protected FetchGroupTestObject getO2(OpenJPAEntityManager pm) {
         Extent e = (Extent) pm.createExtent(FetchGroupTestObject.class,
             true);
@@ -77,6 +76,7 @@ public class TestFetchGroupsExtent extends TestFetchGroups {
             ((Collection) q.getResultList()).iterator().next();
     }
 
+    @Override
     protected FetchGroupTestObjectChild getC1(OpenJPAEntityManager pm) {
         Extent e = (Extent) pm.createExtent(FetchGroupTestObject.class,
             true);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java
index ce8953b8b..51fb00d23 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java
@@ -29,15 +29,12 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.List;
 
-
-
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
 import org.apache.openjpa.persistence.kernel.common.apps.
         FetchGroupTestObjectChild;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
 public class TestFetchGroupsQuery extends TestFetchGroups {
 
     /**
@@ -50,6 +47,7 @@ public class TestFetchGroupsQuery extends TestFetchGroups {
         super(s);
     }
 
+    @Override
     protected FetchGroupTestObject getO1(OpenJPAEntityManager pm) {
 //        OpenJPAQuery q = pm.createNativeQuery("a == 5",
 //                FetchGroupTestObject.class);
@@ -63,6 +61,7 @@ public class TestFetchGroupsQuery extends TestFetchGroups {
         return (FetchGroupTestObject) (l.iterator().next());
     }
 
+    @Override
     protected FetchGroupTestObject getO2(OpenJPAEntityManager pm) {
 //        OpenJPAQuery q = pm.createNativeQuery("a == 3",
 //                FetchGroupTestObject.class);
@@ -76,6 +75,7 @@ public class TestFetchGroupsQuery extends TestFetchGroups {
         return (FetchGroupTestObject) (l.iterator().next());
     }
 
+    @Override
     protected FetchGroupTestObjectChild getC1(OpenJPAEntityManager pm) {
 //        OpenJPAQuery q = pm.createNativeQuery("a == 4",
 //                FetchGroupTestObjectChild.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java
index f351b9401..6e0ecbb0a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java
@@ -30,7 +30,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-
+import org.apache.openjpa.persistence.FetchPlan;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.kernel.common.apps.PCAddress;
 import org.apache.openjpa.persistence.kernel.common.apps.PCCompany;
 import org.apache.openjpa.persistence.kernel.common.apps.PCCountry;
@@ -40,10 +42,6 @@ import org.apache.openjpa.persistence.kernel.common.apps.PCEmployee;
 import org.apache.openjpa.persistence.kernel.common.apps.PCFile;
 import org.apache.openjpa.persistence.kernel.common.apps.PCPerson;
 
-import org.apache.openjpa.persistence.FetchPlan;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
 public class TestFetchPlan extends BaseKernelTest {
 
     static Object _rootDirId;
@@ -69,6 +67,7 @@ public class TestFetchPlan extends BaseKernelTest {
      * Clear test data before and not <em>after</em> such that one can analyze
      * the database for test failures.
      */
+    @Override
     public void setUp() throws Exception {
         if (firstTime) {
             firstTime = false;
@@ -487,6 +486,7 @@ public class TestFetchPlan extends BaseKernelTest {
                 FetchPlan.GROUP_DEFAULT));
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java
index 6b3d9cd01..b56bdd049 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange.java
@@ -31,15 +31,13 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
+
 import junit.framework.Assert;
 import junit.framework.AssertionFailedError;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
 public class TestFieldRange extends BaseKernelTest {
 
     protected static String RANDOM_STRING =
@@ -60,6 +58,7 @@ public class TestFieldRange extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange2.java
index b0b92a2ce..de9021876 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldRange2.java
@@ -31,12 +31,10 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
-import junit.framework.AssertionFailedError;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
+
+import junit.framework.AssertionFailedError;
 
 public class TestFieldRange2 extends BaseKernelTest {
 
@@ -58,6 +56,7 @@ public class TestFieldRange2 extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldState.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldState.java
index b317c0711..7fb8c531d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldState.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFieldState.java
@@ -29,13 +29,12 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
 
 public class TestFieldState extends BaseKernelTest {
 
@@ -51,6 +50,7 @@ public class TestFieldState extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestGetObjectsById.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestGetObjectsById.java
index 79a80b221..98d6be8ee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestGetObjectsById.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestGetObjectsById.java
@@ -29,11 +29,10 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest4;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest5;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
 public class TestGetObjectsById extends BaseKernelTest {
 
     private Object[] oids;
@@ -45,6 +44,7 @@ public class TestGetObjectsById extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest5.class);
         deleteAll(RuntimeTest4.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java
index 9920c077c..467ab8d6f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java
@@ -28,15 +28,14 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.
-        ModInstanceCallbackTests;
-import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
-
 import org.apache.openjpa.event.AbstractTransactionListener;
 import org.apache.openjpa.event.TransactionEvent;
 import org.apache.openjpa.kernel.PCState;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.kernel.common.apps.
+        ModInstanceCallbackTests;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
 
 public class TestIncrementalFlushes extends BaseKernelTest {
 
@@ -50,6 +49,7 @@ public class TestIncrementalFlushes extends BaseKernelTest {
     public TestIncrementalFlushes() {
     }
 
+    @Override
     public void setUp() {
         deleteAll(ModRuntimeTest1.class);
 //        deleteAll(ModInstanceCallbackTests.class);
@@ -439,10 +439,11 @@ public class TestIncrementalFlushes extends BaseKernelTest {
         public int flushes = 0;
         public int commits = 0;
 
+        @Override
         protected void eventOccurred(TransactionEvent event) {
-            if (event.getType() == event.BEFORE_FLUSH)
+            if (event.getType() == TransactionEvent.BEFORE_FLUSH)
                 flushes++;
-            else if (event.getType() == event.BEFORE_COMMIT)
+            else if (event.getType() == TransactionEvent.BEFORE_COMMIT)
                 commits++;
         }
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java
index a8752804e..58ea8e588 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java
@@ -29,13 +29,12 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.PCState;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
 
 public class TestIncrementalFlushesDeletes extends BaseKernelTest {
 
@@ -53,6 +52,7 @@ public class TestIncrementalFlushesDeletes extends BaseKernelTest {
     public TestIncrementalFlushesDeletes() {
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
 
@@ -63,6 +63,7 @@ public class TestIncrementalFlushesDeletes extends BaseKernelTest {
         oid = pm.getObjectId(a);
     }
 
+    @Override
     public void tearDown() throws Exception {
         endTx(pm);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIndirectRecursion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIndirectRecursion.java
index f3bd79efe..861daa85d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIndirectRecursion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIndirectRecursion.java
@@ -60,6 +60,7 @@ public class TestIndirectRecursion extends SingleEMFTestCase {
         { 0, 0, 0, 0, 0 }  // s5
     };
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES, State.class, Transition.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInheritance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInheritance.java
index e12950c6a..2095436fb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInheritance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInheritance.java
@@ -28,15 +28,12 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.Collection;
 
-
-
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAQuery;
-
 public class TestInheritance extends BaseKernelTest {
 
     /**
@@ -49,6 +46,7 @@ public class TestInheritance extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java
index dc27a2528..fc129a50d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java
@@ -31,19 +31,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-import org.apache.openjpa.persistence.test.AllowFailure;
-
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.RestoreStateType;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 public class TestInitialValueFetching extends BaseKernelTest {
 
@@ -54,6 +51,7 @@ public class TestInitialValueFetching extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
         OpenJPAEntityManager pm = getPM();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitializeEagerly.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitializeEagerly.java
index 6da8cc2fd..9d0cbadf9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitializeEagerly.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitializeEagerly.java
@@ -23,6 +23,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestInitializeEagerly extends SingleEMFTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class,
             "openjpa.InitializeEagerly", "true",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInstanceCallbacks.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInstanceCallbacks.java
index be5d03573..4a474a771 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInstanceCallbacks.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInstanceCallbacks.java
@@ -29,11 +29,11 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.kernel.common.apps.InstanceCallbacksTest;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import junit.framework.AssertionFailedError;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import junit.framework.AssertionFailedError;
 
 public class TestInstanceCallbacks extends BaseKernelTest {
 
@@ -54,6 +54,7 @@ public class TestInstanceCallbacks extends BaseKernelTest {
     public TestInstanceCallbacks() {
     }
 
+    @Override
     public void setUp() throws Exception {
         deleteAll(InstanceCallbacksTest.class);
         deleteAll(RuntimeTest1.class);
@@ -72,6 +73,7 @@ public class TestInstanceCallbacks extends BaseKernelTest {
             (InstanceCallbacksTest) _pm.find(InstanceCallbacksTest.class, id);
     }
 
+    @Override
     public void tearDown() throws Exception {
         rollbackTx(_pm);
         endEm(_pm);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultiThreaded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultiThreaded.java
index b90382b1e..3642c8062 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultiThreaded.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultiThreaded.java
@@ -30,12 +30,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
 public class TestMultiThreaded extends BaseKernelTest {
 
@@ -57,6 +55,7 @@ public class TestMultiThreaded extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
 
@@ -77,6 +76,7 @@ public class TestMultiThreaded extends BaseKernelTest {
         startTx(pm);
     }
 
+    @Override
     public void tearDown()
         throws Exception {
         try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java
index 209d30823..1984841c3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestMultipleInsertDeleteSameId
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(RuntimeTest1.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestNTW.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestNTW.java
index e811e55c2..554b44cc9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestNTW.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestNTW.java
@@ -31,12 +31,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
 public class TestNTW extends BaseKernelTest {
 
@@ -52,6 +51,7 @@ public class TestNTW extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         deleteAll(RuntimeTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOpenResultsCommit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOpenResultsCommit.java
index 7d4278e4d..4c3992afe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOpenResultsCommit.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOpenResultsCommit.java
@@ -26,16 +26,15 @@
  */
 package org.apache.openjpa.persistence.kernel;
 
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.EnumSet;
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
 public class TestOpenResultsCommit extends BaseKernelTest {
 
@@ -49,6 +48,7 @@ public class TestOpenResultsCommit extends BaseKernelTest {
         super(testName);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java
index 208f5326c..074ee1557 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java
@@ -28,12 +28,11 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.kernel.common.apps.LockGroupPC;
 import org.apache.openjpa.persistence.kernel.common.apps.LockGroupPC2;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
 public class TestOptimisticLockGroups extends BaseKernelTest {
 
     private Object oid;
@@ -48,6 +47,7 @@ public class TestOptimisticLockGroups extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(LockGroupPC.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPCClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPCClass.java
index 32830398f..6384c3900 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPCClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPCClass.java
@@ -28,17 +28,14 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.io.Serializable;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.PCClassInterface;
-import org.apache.openjpa.persistence.kernel.common.apps.PCClassPC;
-
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.PCClassInterface;
+import org.apache.openjpa.persistence.kernel.common.apps.PCClassPC;
 
 public class TestPCClass extends BaseKernelTest {
 
@@ -52,6 +49,7 @@ public class TestPCClass extends BaseKernelTest {
         super(test);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(PCClassPC.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPMMemory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPMMemory.java
index 56ee32213..553efb5fc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPMMemory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPMMemory.java
@@ -30,16 +30,13 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-
 import org.apache.openjpa.event.AbstractTransactionListener;
 import org.apache.openjpa.event.TransactionEvent;
 import org.apache.openjpa.event.TransactionListener;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
 public class TestPMMemory extends BaseKernelTest {
 
@@ -69,6 +66,7 @@ public class TestPMMemory extends BaseKernelTest {
         testpm.testMemoryUse();
     }
 
+    @Override
     public void setUp() {
         System.out.println("About to delete all");
         deleteAllStaged(getPM(), RuntimeTest1.class);
@@ -145,8 +143,10 @@ public class TestPMMemory extends BaseKernelTest {
         if (!_doPause)
             return;
         try {
-            Thread.currentThread().yield();
-            Thread.currentThread().sleep((int) seconds * 1000);
+            Thread.currentThread();
+            Thread.yield();
+            Thread.currentThread();
+            Thread.sleep((int) seconds * 1000);
         } catch (Exception e) {
         }
     }
@@ -168,6 +168,7 @@ public class TestPMMemory extends BaseKernelTest {
         reportMemory();
 
         TransactionListener l = new AbstractTransactionListener() {
+            @Override
             public void afterCommit(TransactionEvent ev) {
                 System.out.println(
                     "My Listener in afterCommit");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManager.java
index fe6ba6b39..8cc97ad1f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManager.java
@@ -34,14 +34,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityNotFoundException;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest4;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.kernel.DelegatingBrokerFactory;
 import org.apache.openjpa.kernel.PCState;
@@ -49,6 +45,9 @@ import org.apache.openjpa.persistence.Extent;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest4;
 import org.apache.openjpa.util.Id;
 
 public class TestPersistenceManager extends BaseKernelTest {
@@ -66,6 +65,7 @@ public class TestPersistenceManager extends BaseKernelTest {
     public TestPersistenceManager() {
     }
 
+    @Override
     public void setUp() throws Exception {
         deleteAll(RuntimeTest1.class);
         deleteAll(RuntimeTest2.class);
@@ -139,6 +139,7 @@ public class TestPersistenceManager extends BaseKernelTest {
         endEm(pm);
 
         new Thread() {
+            @Override
             public void run() {
                 try {
                     endEm(pm);
@@ -152,7 +153,10 @@ public class TestPersistenceManager extends BaseKernelTest {
         }.start();
 
         while (result.size() == 0)
-            Thread.currentThread().yield(); // wait for results
+         {
+            Thread.currentThread();
+            Thread.yield(); // wait for results
+        }
         Object ret = result.get(0);
 
         if (ret instanceof Exception)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
index 8945c4a97..4bb563cc4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
@@ -28,8 +28,6 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.Map;
 
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest4;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.event.LifecycleEvent;
@@ -43,6 +41,8 @@ import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest4;
 
 public class TestPersistenceManagerFactoryImpl extends BaseKernelTest {
 
@@ -58,6 +58,7 @@ public class TestPersistenceManagerFactoryImpl extends BaseKernelTest {
         super(test);
     }
 
+    @Override
     public void setUp() {
         _conf = new OpenJPAConfigurationImpl();
         _conf.setConnection2UserName("user");
@@ -144,9 +145,11 @@ public class TestPersistenceManagerFactoryImpl extends BaseKernelTest {
 
         //FIXME jthomas
         LoadListener listener = new LoadListener() {
+            @Override
             public void afterLoad(LifecycleEvent ev) {
             }
 
+            @Override
             public void afterRefresh(LifecycleEvent ev) {
             }
         };
@@ -200,6 +203,7 @@ public class TestPersistenceManagerFactoryImpl extends BaseKernelTest {
         assertNotNull(pmf.getProperties().get("Platform"));
     }
 
+    @Override
     protected OpenJPAEntityManagerFactory getEmf(Map props) {
         props.put("openjpa.BrokerFactory", BrokerFactoryTest.class.getName());
         return (OpenJPAEntityManagerFactory) super.getEmf(props);
@@ -207,6 +211,9 @@ public class TestPersistenceManagerFactoryImpl extends BaseKernelTest {
 
     public static class BrokerFactoryTest extends AbstractBrokerFactory {
 
+        
+        private static final long serialVersionUID = 1L;
+
         // standard brokerfactory getter implemented by subclasses
         public static synchronized BrokerFactoryTest getInstance(
             ConfigurationProvider cp) {
@@ -232,6 +239,7 @@ public class TestPersistenceManagerFactoryImpl extends BaseKernelTest {
             super(conf);
         }
 
+        @Override
         protected StoreManager newStoreManager() {
             return null;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistentMaps.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistentMaps.java
index 0209dc616..3ad4d6743 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistentMaps.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistentMaps.java
@@ -35,15 +35,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.MapElementPC;
-import org.apache.openjpa.persistence.kernel.common.apps.MapElementPCChild;
-import org.apache.openjpa.persistence.kernel.common.apps.PersistentMapHolder;
-
 import org.apache.openjpa.persistence.Extent;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.kernel.common.apps.MapElementPC;
+import org.apache.openjpa.persistence.kernel.common.apps.MapElementPCChild;
+import org.apache.openjpa.persistence.kernel.common.apps.PersistentMapHolder;
 
 public class TestPersistentMaps extends BaseKernelTest {
 
@@ -59,6 +56,7 @@ public class TestPersistentMaps extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(PersistentMapHolder.class);
         OpenJPAEntityManager pm = getPM();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLockException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLockException.java
index 7a0eef224..f7a2863c8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLockException.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLockException.java
@@ -90,6 +90,7 @@ public class TestPessimisticLockException extends SQLListenerTestCase {
         boolean gotPLEx = false;
         int count = 0;
 
+        @Override
         public synchronized void run() {
             OpenJPAEntityManager oem = OpenJPAPersistence.cast(emf.createEntityManager());
             oem.getTransaction().begin();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java
index 088096fb4..e779ef3fd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java
@@ -29,20 +29,17 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
 
-
-
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.jdbc.FetchMode;
+import org.apache.openjpa.persistence.jdbc.JDBCFetchPlan;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import java.util.concurrent.locks.ReentrantLock;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
-import org.apache.openjpa.persistence.jdbc.FetchMode;
-import org.apache.openjpa.persistence.jdbc.JDBCFetchPlan;
 
 public class TestPessimisticLocking extends BaseKernelTest {
 
@@ -225,6 +222,7 @@ public class TestPessimisticLocking extends BaseKernelTest {
             this._lock = lock;
         }
 
+        @Override
         public synchronized void run() {
             getLog().trace(
                 Thread.currentThread().getName()
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
index 92a592617..be64f59ea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java
@@ -36,6 +36,7 @@ public class TestPojoWithoutAnnotationsCannotBePersisted
         super(name, "kernelcactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(new Object[] {});
         pojo = new UnAnnotPojo();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestProxies2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestProxies2.java
index 84e705a0c..1d92daaf5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestProxies2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestProxies2.java
@@ -27,10 +27,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-
-import org.apache.openjpa.persistence.kernel.common.apps.ProxiesPC;
 import org.apache.commons.collections4.comparators.ComparableComparator;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.ProxiesPC;
 import org.apache.openjpa.util.Proxy;
 
 public class TestProxies2 extends BaseKernelTest {
@@ -44,6 +43,7 @@ public class TestProxies2 extends BaseKernelTest {
         super(casename);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(ProxiesPC.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestQueries.java
index eeb34157e..aeced8bcc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestQueries.java
@@ -48,6 +48,7 @@ public class TestQueries extends BaseKernelTest {
     public TestQueries() {
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRestoreValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRestoreValues.java
index 72a778668..1973bd758 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRestoreValues.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRestoreValues.java
@@ -28,12 +28,9 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.math.BigInteger;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.RestoreStateType;
+import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
 
 public class TestRestoreValues extends BaseKernelTest {
 
@@ -46,6 +43,7 @@ public class TestRestoreValues extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(FetchGroupTestObject.class);
 
@@ -64,6 +62,7 @@ public class TestRestoreValues extends BaseKernelTest {
         endEm(pm);
     }
 
+    @Override
     public OpenJPAEntityManager getPM() {
         OpenJPAEntityManager pm = super.getPM();
         pm.setOptimistic(true);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java
index bbea8778d..7df878a0f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java
@@ -31,12 +31,9 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
 public class TestRetainValuesInOptimistic extends BaseKernelTest {
 
@@ -52,6 +49,7 @@ public class TestRetainValuesInOptimistic extends BaseKernelTest {
         super(test);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointEmbedded.java
index eb7b8887b..8bcd1be94 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointEmbedded.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointEmbedded.java
@@ -29,13 +29,10 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.Properties;
 
-
-
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.kernel.common.apps.EmbeddedOwnerPC;
 import org.apache.openjpa.persistence.kernel.common.apps.EmbeddedPC;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
 public class TestSavepointEmbedded extends BaseKernelTest {
 
     private int id = 10000;
@@ -55,12 +52,14 @@ public class TestSavepointEmbedded extends BaseKernelTest {
         return true;
     }
 
+    @Override
     public Properties getProperties(String[] props) {
         Properties properties = super.getProperties(props);
         properties.put("openjpa.SavepointManager", getSavepointPlugin());
         return properties;
     }
 
+    @Override
     public void setUp() {
         deleteAll(EmbeddedOwnerPC.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointEmbeddedPreFlush.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointEmbeddedPreFlush.java
index 0c0a7cd52..aec38e092 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointEmbeddedPreFlush.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointEmbeddedPreFlush.java
@@ -39,10 +39,12 @@ public class TestSavepointEmbeddedPreFlush extends TestSavepointEmbedded {
         super(name);
     }
 
+    @Override
     protected String getSavepointPlugin() {
         return "in-mem(PreFlush=true)";
     }
 
+    @Override
     protected boolean expectNewEmbeddedFailure() {
         return false;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java
index 7c57a4568..e824e7cff 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java
@@ -30,17 +30,14 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.OpenJPASavepoint;
 import org.apache.openjpa.kernel.SavepointManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
 
 public class TestSavepointOrdering extends BaseKernelTest {
 
@@ -48,7 +45,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
     private static final int RELEASED = 2;
     private static final int ROLLBACK = 4;
 
-    static Map<String, TrackingSavepoint> _assigned = new HashMap<String, TrackingSavepoint>();
+    static Map<String, TrackingSavepoint> _assigned = new HashMap<>();
 
     /**
      * Creates a new instance of TestSavepointOrdering
@@ -57,6 +54,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
         _assigned.clear();
@@ -71,7 +69,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
     }
 
     public void doCleanUpTest(boolean commit) {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.SavepointManager",
             TrackingSavepointManager.class.getName());
         OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -97,7 +95,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
     }
 
     private void doOrderingTest(boolean rollback) {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.SavepointManager",
             TrackingSavepointManager.class.getName());
         OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -143,7 +141,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
     }
 
     public void testDisallowFlush() {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.SavepointManager",
             TrackingSavepointManager.class.getName() + "(AllowFlush=false)");
         OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -161,7 +159,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
     }
 
     public void testDisallowFlush2() {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.SavepointManager",
             TrackingSavepointManager.class.getName() + "(AllowFlush=false)");
         OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -180,7 +178,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
     }
 
     public void testAllowFlush() {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.SavepointManager",
             TrackingSavepointManager.class.getName() + "(AllowFlush=true)");
         OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -199,7 +197,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
     }
 
     public void testAllowFlush2() {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.SavepointManager",
             TrackingSavepointManager.class.getName() + "(AllowFlush=true)");
         OpenJPAEntityManagerFactory pmf = getEmf(props);
@@ -228,10 +226,12 @@ public class TestSavepointOrdering extends BaseKernelTest {
 
         public boolean allowFlush = false;
 
+        @Override
         public boolean supportsIncrementalFlush() {
             return allowFlush;
         }
 
+        @Override
         public OpenJPASavepoint newSavepoint(String name, Broker broker) {
             TrackingSavepoint sp = new TrackingSavepoint(broker, name);
             _assigned.put(sp.getName(), sp);
@@ -241,12 +241,15 @@ public class TestSavepointOrdering extends BaseKernelTest {
 
     private static class TrackingSavepoint extends OpenJPASavepoint {
 
+        
+        private static final long serialVersionUID = 1L;
         int flags = 0;
 
         public TrackingSavepoint(Broker broker, String name) {
             super(broker, name, false);
         }
 
+        @Override
         public Collection rollback(Collection previous) {
             if ((flags & (ROLLBACK | RELEASED)) != 0)
                 fail("already used");
@@ -254,6 +257,7 @@ public class TestSavepointOrdering extends BaseKernelTest {
             return super.rollback(previous);
         }
 
+        @Override
         public void release(boolean user) {
             if ((flags & (ROLLBACK | RELEASED)) != 0)
                 fail("already used");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java
index ee742819c..ac86cb577 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSavepoints.java
@@ -29,17 +29,14 @@ package org.apache.openjpa.persistence.kernel;
 import java.util.Iterator;
 import java.util.Properties;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest4;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest5;
-
 import org.apache.openjpa.kernel.PCState;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest4;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest5;
 
 public class TestSavepoints extends BaseKernelTest {
 
@@ -54,12 +51,14 @@ public class TestSavepoints extends BaseKernelTest {
         return "in-mem";
     }
 
+    @Override
     public Properties getProperties(String[] props) {
         Properties properties = super.getProperties(props);
         properties.put("openjpa.SavepointManager", getSavepointPlugin());
         return properties;
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(ModRuntimeTest1.class, ModRuntimeTest2.class, RuntimeTest4.class, RuntimeTest5.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecondClassValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecondClassValues.java
index 5ac27532d..2c83093ff 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecondClassValues.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecondClassValues.java
@@ -40,13 +40,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.SCOTest;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import junit.framework.AssertionFailedError;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.SCOTest;
+
+import junit.framework.AssertionFailedError;
 
 public class TestSecondClassValues extends BaseKernelTest {
 
@@ -67,6 +65,7 @@ public class TestSecondClassValues extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         pm = getPM(true, false);
     }
@@ -771,6 +770,7 @@ public class TestSecondClassValues extends BaseKernelTest {
 
         }
 
+        @Override
         public int compare(Object o1, Object o2) {
             if (o1 != null && !(o1 instanceof Boolean))
                 return collator.compare(o1, o2);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java
index 4780d84da..53de300fc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecurityContext.java
@@ -30,14 +30,11 @@ import java.io.FileDescriptor;
 import java.net.InetAddress;
 import java.security.Permission;
 
-
-
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
 
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
 public class TestSecurityContext extends BaseKernelTest {
 
     private SecurityManager oldManager;
@@ -52,12 +49,14 @@ public class TestSecurityContext extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
         oldManager = System.getSecurityManager();
         // System.setSecurityManager (ssm = new StrictSecurityManager ());
     }
 
+    @Override
     public void tearDown()
         throws Exception {
         System.setSecurityManager(oldManager);
@@ -80,206 +79,247 @@ public class TestSecurityContext extends BaseKernelTest {
             // log.debug (msg);
         }
 
+        @Override
         public void checkAccept(String host, int port) {
             debug("checkAccept: " + host + "," + port);
             super.checkAccept(host, port);
         }
 
+        @Override
         public void checkAccess(Thread t) {
             debug("checkAccess: " + t);
             super.checkAccess(t);
         }
 
+        @Override
         public void checkAccess(ThreadGroup g) {
             debug("checkAccess: " + g);
             super.checkAccess(g);
         }
 
+        @Override
         public void checkAwtEventQueueAccess() {
             debug("checkAwtEventQueueAccess");
             super.checkAwtEventQueueAccess();
         }
 
+        @Override
         public void checkConnect(String host, int port) {
             debug("checkConnect: " + host + "," + port);
             super.checkConnect(host, port);
         }
 
+        @Override
         public void checkConnect(String host, int port, Object context) {
             debug("checkConnect: " + host + "," + port + "," + context);
             super.checkConnect(host, port, context);
         }
 
+        @Override
         public void checkCreateClassLoader() {
             debug("checkCreateClassLoader");
             super.checkCreateClassLoader();
         }
 
+        @Override
         public void checkDelete(String file) {
             debug("checkDelete: " + file);
             super.checkDelete(file);
         }
 
+        @Override
         public void checkExec(String cmd) {
             debug("checkExec: " + cmd);
             super.checkExec(cmd);
         }
 
+        @Override
         public void checkExit(int status) {
             debug("checkExit: " + status);
             super.checkExit(status);
         }
 
+        @Override
         public void checkLink(String lib) {
             debug("checkLink: " + lib);
             super.checkLink(lib);
         }
 
+        @Override
         public void checkListen(int port) {
             debug("checkListen: " + port);
             super.checkListen(port);
         }
 
+        @Override
         public void checkMemberAccess(Class clazz, int which) {
             debug("checkMemberAccess: " + clazz + "," + which);
             super.checkMemberAccess(clazz, which);
         }
 
+        @Override
         public void checkMulticast(InetAddress maddr) {
             debug("checkMulticast: " + maddr);
             super.checkMulticast(maddr);
         }
 
+        @Override
         public void checkMulticast(InetAddress maddr, byte ttl) {
             debug("checkMulticast: " + maddr + "," + ttl);
             super.checkMulticast(maddr, ttl);
         }
 
+        @Override
         public void checkPackageAccess(String pkg) {
             debug("checkPackageAccess: " + pkg);
             super.checkPackageAccess(pkg);
         }
 
+        @Override
         public void checkPackageDefinition(String pkg) {
             debug("checkPackageDefinition: " + pkg);
             super.checkPackageDefinition(pkg);
         }
 
+        @Override
         public void checkPermission(Permission perm) {
             debug("checkPermission: " + perm);
             super.checkPermission(perm);
         }
 
+        @Override
         public void checkPermission(Permission perm, Object context) {
             debug("checkPermission: " + perm + "," + context);
             super.checkPermission(perm, context);
         }
 
+        @Override
         public void checkPrintJobAccess() {
             debug("checkPrintJobAccess");
             super.checkPrintJobAccess();
         }
 
+        @Override
         public void checkPropertiesAccess() {
             debug("checkPropertiesAccess");
             super.checkPropertiesAccess();
         }
 
+        @Override
         public void checkPropertyAccess(String key) {
             debug("checkPropertyAccess: " + key);
             super.checkPropertyAccess(key);
         }
 
+        @Override
         public void checkRead(FileDescriptor fd) {
             debug("checkRead: " + fd);
             super.checkRead(fd);
         }
 
+        @Override
         public void checkRead(String file) {
             debug("checkRead: " + file);
             super.checkRead(file);
         }
 
+        @Override
         public void checkRead(String file, Object context) {
             debug("checkRead: " + file + "," + context);
             super.checkRead(file, context);
         }
 
+        @Override
         public void checkSecurityAccess(String target) {
             debug("checkSecurityAccess: " + target);
             super.checkSecurityAccess(target);
         }
 
+        @Override
         public void checkSetFactory() {
             debug("checkSetFactory");
             super.checkSetFactory();
         }
 
+        @Override
         public void checkSystemClipboardAccess() {
             debug("checkSystemClipboardAccess");
             super.checkSystemClipboardAccess();
         }
 
+        @Override
         public boolean checkTopLevelWindow(Object window) {
             debug("checkTopLevelWindow: " + window);
             return super.checkTopLevelWindow(window);
         }
 
+        @Override
         public void checkWrite(FileDescriptor fd) {
             debug("checkWrite: " + fd);
             super.checkWrite(fd);
         }
 
+        @Override
         public void checkWrite(String file) {
             debug("checkWrite: " + file);
             super.checkWrite(file);
         }
 
+        @Override
         protected int classDepth(String name) {
             debug("classDepth: " + name);
             return super.classDepth(name);
         }
 
+        @Override
         protected int classLoaderDepth() {
             debug("classLoaderDepth");
             return super.classLoaderDepth();
         }
 
+        @Override
         protected ClassLoader currentClassLoader() {
             debug("currentClassLoader");
             return super.currentClassLoader();
         }
 
+        @Override
         protected Class currentLoadedClass() {
             debug("currentLoadedClass");
             return super.currentLoadedClass();
         }
 
+        @Override
         protected Class[] getClassContext() {
             debug("getClassContext");
             return super.getClassContext();
         }
 
+        @Override
         public boolean getInCheck() {
             debug("getInCheck");
             return super.getInCheck();
         }
 
+        @Override
         public Object getSecurityContext() {
             debug("getSecurityContext");
             return super.getSecurityContext();
         }
 
+        @Override
         public ThreadGroup getThreadGroup() {
             debug("getThreadGroup");
             return super.getThreadGroup();
         }
 
+        @Override
         protected boolean inClass(String name) {
             debug("inClass: " + name);
             return super.inClass(name);
         }
 
+        @Override
         protected boolean inClassLoader() {
             debug("inClassLoader");
             return super.inClassLoader();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java
index a840a081b..595e90431 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSequence.java
@@ -28,10 +28,9 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.AImplB;
-
 import org.apache.openjpa.persistence.Generator;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.AImplB;
 
 public class TestSequence extends BaseKernelTest {
 
@@ -45,6 +44,7 @@ public class TestSequence extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(AImplB.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSerialize.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSerialize.java
index 2bfccff2b..a9b5f2d3f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSerialize.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSerialize.java
@@ -28,9 +28,8 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 
 public class TestSerialize extends BaseKernelTest {
 
@@ -47,6 +46,7 @@ public class TestSerialize extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         RuntimeTest1 a = new RuntimeTest1("1NAME", 1);
         a.setSelfOneOne(new RuntimeTest1("2NAME", 2));
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java
index 59feea927..8a647b99e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java
@@ -28,15 +28,12 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.List;
 
-
-
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
-
 import org.apache.openjpa.persistence.Extent;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest3;
 
 public class TestSimple extends BaseKernelTest {
 
@@ -47,6 +44,7 @@ public class TestSimple extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, RuntimeTest2.class, RuntimeTest3.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java
index 45b8da2a3..b607a3ea6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java
@@ -30,12 +30,12 @@ import java.math.BigInteger;
 import java.util.Collection;
 import java.util.EnumSet;
 
-import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import junit.framework.AssertionFailedError;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
+
+import junit.framework.AssertionFailedError;
 
 public class TestSpecialNumbers extends BaseKernelTest {
 
@@ -49,6 +49,7 @@ public class TestSpecialNumbers extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         try {
             deleteAll(AllFieldTypesTest.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java
index 93490620a..6bcb0b888 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java
@@ -18,17 +18,17 @@
  */
 package org.apache.openjpa.persistence.kernel;
 
+import java.math.BigInteger;
 import java.util.Collection;
 import java.util.EnumSet;
-import java.math.BigInteger;
-
-import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.kernel.common.apps.AllFieldTypesTest;
+
+import junit.framework.Assert;
+import junit.framework.AssertionFailedError;
 
 /**
  * Test various special numbers, such as Double.NaN.
@@ -41,6 +41,7 @@ public class TestSpecialNumbers2 extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         try {
             deleteAll(AllFieldTypesTest.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java
index 0fea36364..8266600df 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java
@@ -28,12 +28,11 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2;
-
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2;
 
 public class TestStateManagerImplData extends BaseKernelTest {
 
@@ -53,6 +52,7 @@ public class TestStateManagerImplData extends BaseKernelTest {
         super(test);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(ModRuntimeTest1.class, ModRuntimeTest2.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
index 6bbd7e6c3..944b7a0f5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
@@ -29,6 +29,7 @@ package org.apache.openjpa.persistence.kernel;
 
 import java.util.LinkedList;
 import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -48,6 +49,7 @@ public class TestStaticInnerClasses extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp()
         throws Exception {
         super.setUp(Inner.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java
index 3630b218f..43c6d6643 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStoreBlob.java
@@ -29,9 +29,8 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.BlobTest;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.kernel.common.apps.BlobTest;
 
 public class TestStoreBlob extends BaseKernelTest {
 
@@ -45,6 +44,7 @@ public class TestStoreBlob extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(BlobTest.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSuppressBatchOLE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSuppressBatchOLE.java
index 0e0364627..0e987917c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSuppressBatchOLE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSuppressBatchOLE.java
@@ -44,7 +44,7 @@ public class TestSuppressBatchOLE extends SingleEMFTestCase {
         OpenJPAEntityManagerSPI em2 = emf.createEntityManager();
 
         em1.getTransaction().begin();
-        List<EntityA> entities = new ArrayList<EntityA>();
+        List<EntityA> entities = new ArrayList<>();
         for (int i = 0; i < 25; i++) {
             EntityA a = createEntity();
             entities.add(a);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java
index 799781600..4a685faed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java
@@ -20,14 +20,13 @@ package org.apache.openjpa.persistence.kernel;
 
 
 
-import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
-import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2;
-import org.apache.openjpa.persistence.kernel.common.apps.PersistenceAware;
-
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.RestoreStateType;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
+import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest2;
+import org.apache.openjpa.persistence.kernel.common.apps.PersistenceAware;
 
 public class TestTransition2 extends BaseKernelTest {
 
@@ -45,6 +44,7 @@ public class TestTransition2 extends BaseKernelTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(ModRuntimeTest1.class, ModRuntimeTest2.class, PersistenceAware.class);
         try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AImplB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AImplB.java
index f88f8e24f..89529d2e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AImplB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AImplB.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.IdClass;
@@ -44,10 +45,12 @@ public class AImplB implements AIntf {
         this.pk2 = pk2;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
@@ -70,6 +73,8 @@ public class AImplB implements AIntf {
 
     public static class Idkey implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public int pk1;
         public String pk2;
 
@@ -84,6 +89,7 @@ public class AImplB implements AIntf {
             }
         }
 
+        @Override
         public String toString() {
             return pk1 + "/" + pk2;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AIntf.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AIntf.java
index 0d15780ec..4ec405d46 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AIntf.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AIntf.java
@@ -26,8 +26,8 @@ package org.apache.openjpa.persistence.kernel.common.apps;
  */
 public interface AIntf {
 
-    public String getName();
+    String getName();
 
-    public void setName(String name);
+    void setName(String name);
 }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldTypesTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldTypesTest.java
index 4ab27b75d..00bca614b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldTypesTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldTypesTest.java
@@ -23,6 +23,7 @@ import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -214,6 +215,7 @@ public class AllFieldTypesTest {
         }
     }
 
+    @Override
     public String toString() {
         return "\n{"
             + "testint=" + testint + ";"
@@ -239,6 +241,7 @@ public class AllFieldTypesTest {
             + "}";
     }
 
+    @Override
     public int hashCode() {
         return (int) ((
             testint
@@ -259,6 +262,7 @@ public class AllFieldTypesTest {
             % Integer.MAX_VALUE;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == null && !(other instanceof AllFieldTypesTest))
             return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldsTypeTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldsTypeTest.java
index bdb81494a..3200787fe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldsTypeTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AllFieldsTypeTest.java
@@ -175,6 +175,7 @@ public class AllFieldsTypeTest {
         this.testBigDecimal = testBigDecimal;
     }
 
+    @Override
     public String toString() {
         return "\n{"
             + "testint=" + testint + ";"
@@ -200,6 +201,7 @@ public class AllFieldsTypeTest {
             + "}";
     }
 
+    @Override
     public int hashCode() {
         return (int) ((
             testint
@@ -220,6 +222,7 @@ public class AllFieldsTypeTest {
             % Integer.MAX_VALUE;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == null && !(other instanceof AllFieldsTypeTest))
             return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdClassString.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdClassString.java
index ced4a9279..178b1e6f7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdClassString.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdClassString.java
@@ -47,6 +47,8 @@ public class AppIdClassString {
 
     public static class Idkey implements java.io.Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public int pk;
 
         public Idkey() {
@@ -62,6 +64,7 @@ public class AppIdClassString {
             return pk;
         }
 
+        @Override
         public String toString() {
             return pk + "";
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdHolder.java
index 9acf9ce95..61cac9cef 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdHolder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdHolder.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+
 import javax.persistence.Entity;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubA.java
index ff4935a37..d26bacabb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubA.java
@@ -51,6 +51,8 @@ public abstract class AppIdSubA
     public static abstract class ID
         extends AppIdSuper.ID {
 
+        
+        private static final long serialVersionUID = 1L;
         public int pka;
 
         public ID() {
@@ -62,19 +64,23 @@ public abstract class AppIdSubA
             fromString(str);
         }
 
+        @Override
         public int hashCode() {
             return (super.hashCode() + pka) % Integer.MAX_VALUE;
         }
 
+        @Override
         public boolean equals(Object other) {
             return super.equals(other)
                 && ((ID) other).pka == pka;
         }
 
+        @Override
         public String toString() {
             return super.toString() + DELIMITER + pka;
         }
 
+        @Override
         StringTokenizer fromString(String idString) {
             StringTokenizer tok = super.fromString(idString);
             pka = new Integer(tok.nextToken()).intValue();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubB.java
index 1f88891cf..a5f27578b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubB.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.StringTokenizer;
+
 import javax.persistence.Entity;
 
 /**
@@ -53,6 +54,8 @@ public abstract class AppIdSubB
     public static abstract class ID
         extends AppIdSubA.ID {
 
+        
+        private static final long serialVersionUID = 1L;
         public String pkb;
 
         public ID() {
@@ -64,21 +67,25 @@ public abstract class AppIdSubB
             fromString(str);
         }
 
+        @Override
         public int hashCode() {
             return (super.hashCode() + (pkb == null ? 0 : pkb.hashCode()))
                 % Integer.MAX_VALUE;
         }
 
+        @Override
         public boolean equals(Object other) {
             return super.equals(other)
                 && ((ID) other).pkb == null ? pkb == null
                 : ((ID) other).pkb.equals(pkb);
         }
 
+        @Override
         public String toString() {
             return super.toString() + DELIMITER + pkb;
         }
 
+        @Override
         StringTokenizer fromString(String idString) {
             StringTokenizer tok = super.fromString(idString);
             pkb = tok.nextToken();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSuper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSuper.java
index 7439ef732..dc4b31a11 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSuper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSuper.java
@@ -41,6 +41,8 @@ public abstract class AppIdSuper {
     public static abstract class ID
         implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         static String DELIMITER = ":";
 
         public ID() {
@@ -50,15 +52,18 @@ public abstract class AppIdSuper {
             fromString(str);
         }
 
+        @Override
         public int hashCode() {
             // no key codes; all classes are equal
             return 1;
         }
 
+        @Override
         public boolean equals(Object other) {
             return other != null && other.getClass() == getClass();
         }
 
+        @Override
         public String toString() {
             return "";
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ArraysTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ArraysTest.java
index f55a8be84..0b8f2c513 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ArraysTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ArraysTest.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -98,10 +99,12 @@ public class ArraysTest
     public ArraysTest() {
     }
 
+    @Override
     public boolean equals(Object other) {
         return (other instanceof ArraysTest) && id == ((ArraysTest) other).id;
     }
 
+    @Override
     public int compareTo(Object other) {
         ArraysTest t = (ArraysTest) other;
         if (id < t.id)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java
index ec5a17516..eac2220c5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
@@ -46,6 +47,9 @@ import org.apache.openjpa.persistence.FetchGroups;
 @Table(name="K_ATTACHA")
 public class AttachA implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "A_ID")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachB.java
index 8a412c258..36efed29e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachB.java
@@ -22,12 +22,12 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 import javax.persistence.ManyToMany;
 
-import org.apache.openjpa.persistence.jdbc.KeyColumn;
 import org.apache.openjpa.persistence.FetchAttribute;
 import org.apache.openjpa.persistence.FetchGroup;
 import org.apache.openjpa.persistence.FetchGroups;
@@ -44,6 +44,8 @@ import org.apache.openjpa.persistence.jdbc.KeyColumn;
     })
 public class AttachB extends AttachA {
 
+    
+    private static final long serialVersionUID = 1L;
     private String bstr;
     private int bint;
     private double bdbl;
@@ -53,7 +55,7 @@ public class AttachB extends AttachA {
 
     @PersistentMap
     @KeyColumn(name = "strngmap")
-    private Map<String, Integer> stringIntMap = new TreeMap<String, Integer>();
+    private Map<String, Integer> stringIntMap = new TreeMap<>();
 
     public AttachB() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachC.java
index ae6dd0ddc..3912db61b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachC.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.LinkedList;
 import java.util.List;
+
 import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
@@ -39,6 +40,8 @@ import org.apache.openjpa.persistence.FetchGroups;
 public class AttachC
     extends AttachB {
 
+    
+    private static final long serialVersionUID = 1L;
     private String cstr;
     private int cint;
     private double cdbl;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java
index 31b9b4c87..c857be969 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -37,7 +38,6 @@ import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.apache.openjpa.persistence.jdbc.KeyColumn;
 import org.apache.openjpa.persistence.FetchAttribute;
 import org.apache.openjpa.persistence.FetchGroup;
 import org.apache.openjpa.persistence.FetchGroups;
@@ -57,6 +57,9 @@ import org.apache.openjpa.persistence.jdbc.KeyColumn;
 @Table(name="K_ATTACHD")
 public class AttachD implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "D_ID")
@@ -85,7 +88,7 @@ public class AttachD implements Serializable {
     @PersistentMap(elementCascade = { CascadeType.PERSIST, CascadeType.MERGE })
     @KeyColumn(name = "intmap")
     private TreeMap<BigInteger, AttachF> bigIntegerPCMap =
-        new TreeMap<BigInteger, AttachF>();
+        new TreeMap<>();
 
     @Embedded
     private AttachE embeddedE;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java
index ff7fa543b..b74a1eb21 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -50,6 +51,9 @@ import org.apache.openjpa.persistence.FetchGroups;
 @Table(name="K_ATTACHE")
 public class AttachE implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "E_ID")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java
index 78d48d1f2..80216a518 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java
@@ -50,6 +50,9 @@ import org.apache.openjpa.persistence.PersistentCollection;
 @Table(name="K_ATTACHF")
 public class AttachF implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     private int id1;
 
@@ -129,6 +132,7 @@ public class AttachF implements Serializable {
             return id1 + (id2 == null ? 0 : id2.hashCode());
         }
 
+        @Override
         public String toString() {
             return id1 + ":" + id2;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionA.java
index 0fa8a682e..d1e8bb4df 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachVersionA.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.Set;
+
 import javax.persistence.Entity;
 
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Blobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Blobs.java
index 9743a8a61..2d07dec5d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Blobs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Blobs.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/CalendarFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/CalendarFields.java
index 7e8f265ab..bc2f097ce 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/CalendarFields.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/CalendarFields.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 import java.util.TimeZone;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ComplexEmbeddedPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ComplexEmbeddedPC.java
index 1955783c0..3d428f4cf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ComplexEmbeddedPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ComplexEmbeddedPC.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -42,7 +43,7 @@ public class ComplexEmbeddedPC //extends RecursivelyEmbeddedPC
     @OneToOne
     private EmbeddedOwnerPC ownerField;
 
-    private Set<String> stringSet = new HashSet<String>();
+    private Set<String> stringSet = new HashSet<>();
 
     public String getStringField() {
         return this.stringField;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DateVersion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DateVersion.java
index 6eeef164f..e028636ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DateVersion.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DateVersion.java
@@ -50,6 +50,7 @@ public class DateVersion {
         return string;
     }
 
+    @Override
     public String toString() {
         return string;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DependentFieldsPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DependentFieldsPC.java
index 7c630eac0..b5bcfde73 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DependentFieldsPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DependentFieldsPC.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -34,7 +35,6 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.apache.openjpa.persistence.jdbc.KeyColumn;
 import org.apache.openjpa.persistence.Dependent;
 import org.apache.openjpa.persistence.ElementDependent;
 import org.apache.openjpa.persistence.PersistentMap;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DetachSMPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DetachSMPC.java
index 0cf327d8e..a931b1a87 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DetachSMPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/DetachSMPC.java
@@ -23,15 +23,19 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+
 import javax.persistence.Entity;
 
-import org.apache.openjpa.persistence.jdbc.KeyColumn;
 import org.apache.openjpa.persistence.PersistentCollection;
+import org.apache.openjpa.persistence.jdbc.KeyColumn;
 
 @Entity
 public class DetachSMPC
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private int intField;
 
     @PersistentCollection
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedOwnerPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedOwnerPC.java
index 3fc65b6da..490cc8f7d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedOwnerPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/EmbeddedOwnerPC.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -94,6 +95,8 @@ public class EmbeddedOwnerPC {
 
     public static class EmbKey implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public int id1;
         public int id2;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java
index f93b60006..12f592044 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -95,6 +96,7 @@ public class Entity1 implements Serializable {
         return entity2Field;
     }
 
+    @Override
     public String toString() {
         return ("PK: " + pk + " StringField: " + stringField + " IntField: " +
             intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity2.java
index 5d6010c7b..fe6ad4fa6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity2.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -30,9 +31,7 @@ import javax.persistence.InheritanceType;
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 public class Entity2 implements Serializable {
 
-    /**
-     *
-     */
+    
     private static final long serialVersionUID = 4723739219953167343L;
 
     @Id
@@ -74,6 +73,7 @@ public class Entity2 implements Serializable {
         return intField;
     }
 
+    @Override
     public String toString() {
         return ("PK: " + pk + " StringField: " + stringField + " IntField: " +
             intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObject.java
index 7064e44a4..c92a46ea4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObject.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/FetchGroupTestObject.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.math.BigInteger;
 import java.util.Date;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java
index 29bb106df..8a9dfe6d8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java
@@ -19,12 +19,12 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import javax.persistence.Basic;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Column;
 
 @Entity
 @Table(name = "nullvalue")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceHolder.java
index 0dbffc04c..dab89e890 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceHolder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceHolder.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -34,6 +35,9 @@ import javax.persistence.Table;
 @Table(name = "holder")
 public class InterfaceHolder implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private Set intfs = new HashSet();
 
     @Basic
@@ -78,6 +82,7 @@ public class InterfaceHolder implements Serializable {
         return this.id;
     }
 
+    @Override
     public String toString() {
         return "intfs: " + intfs + ", StringField: " + stringField +
             ", Intf: " + intf + ".";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTest.java
index 32a2fa858..2ce4d8df3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTest.java
@@ -26,7 +26,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 public interface InterfaceTest {
 
-    public String getStringField();
+    String getStringField();
 
-    public void setStringField(String str);
+    void setStringField(String str);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTest2.java
index b5b269ef2..88e678017 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTest2.java
@@ -26,7 +26,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 public interface InterfaceTest2
     extends InterfaceTest {
 
-    public int getIntField();
+    int getIntField();
 
-    public void setIntField(int i);
+    void setIntField(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl1.java
index b0118de64..7b876b1ff 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl1.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -28,11 +29,10 @@ import javax.persistence.Table;
  * @author Abe White
  */
 
-@SuppressWarnings("serial")
 @Entity
 @Table(name = "impl_1")
 public class InterfaceTestImpl1 implements InterfaceTest, Serializable {
-
+    private static final long serialVersionUID = 1L;
     private String stringField;
 
     protected InterfaceTestImpl1() {
@@ -42,10 +42,12 @@ public class InterfaceTestImpl1 implements InterfaceTest, Serializable {
         this.stringField = str;
     }
 
+    @Override
     public String getStringField() {
         return this.stringField;
     }
 
+    @Override
     public void setStringField(String str) {
         this.stringField = str;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl2.java
index f4b562ccd..c2e22e677 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl2.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -31,6 +32,8 @@ import javax.persistence.Table;
 @Table(name = "impl_2")
 public class InterfaceTestImpl2 implements InterfaceTest, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     private String stringField;
 
     protected InterfaceTestImpl2() {
@@ -40,10 +43,12 @@ public class InterfaceTestImpl2 implements InterfaceTest, Serializable {
         this.stringField = str;
     }
 
+    @Override
     public String getStringField() {
         return this.stringField;
     }
 
+    @Override
     public void setStringField(String str) {
         this.stringField = str;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl3.java
index 44414a7e4..2588ae427 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl3.java
@@ -30,6 +30,8 @@ public class InterfaceTestImpl3
     extends InterfaceTestImpl2
     implements InterfaceTest2 {
 
+    
+    private static final long serialVersionUID = 1L;
     private int intField;
 
     protected InterfaceTestImpl3() {
@@ -39,10 +41,12 @@ public class InterfaceTestImpl3
         super(str);
     }
 
+    @Override
     public int getIntField() {
         return this.intField;
     }
 
+    @Override
     public void setIntField(int i) {
         this.intField = i;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl4.java
index 0c9733212..3e461ccd2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InterfaceTestImpl4.java
@@ -40,18 +40,22 @@ public class InterfaceTestImpl4
         this.stringField = str;
     }
 
+    @Override
     public String getStringField() {
         return this.stringField;
     }
 
+    @Override
     public void setStringField(String str) {
         this.stringField = str;
     }
 
+    @Override
     public int getIntField() {
         return this.intField;
     }
 
+    @Override
     public void setIntField(int i) {
         this.intField = i;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseA.java
index 6072f98bf..4a3a5a793 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseA.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseB.java
index 8befcaa26..4a3b2a90a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/InverseB.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Lobs.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Lobs.java
index 3f00831dd..841b0bc2d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Lobs.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Lobs.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC.java
index 40dab54d8..fce9fefa1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 
@@ -26,6 +27,8 @@ import javax.persistence.Entity;
 public class LockGroupPC
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
     @Column(name = "DEF_LockGSF")
     private String defaultLockGroupStringField;
     @Column(name = "EXDEF_LockGIF")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC2.java
index 997fdebad..148f017b8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPC2.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.Entity;
 
 /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPCKnownSubclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPCKnownSubclass.java
index 027bbdca0..5b2a6e3cb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPCKnownSubclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/LockGroupPCKnownSubclass.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class LockGroupPCKnownSubclass
     extends LockGroupPC {
 
+    
+    private static final long serialVersionUID = 1L;
     private String knownSubclassStringField;
 
     public void setKnownSubclassStringField(String knownSubclassStringField) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterface.java
index 8191c92fc..fa767accd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterface.java
@@ -22,33 +22,33 @@ import java.util.Set;
 
 public interface ManagedInterface extends ManagedInterfaceSup {
 
-    public int getIntField();
+    int getIntField();
 
-    public void setIntField(int i);
+    void setIntField(int i);
 
-    public ManagedInterfaceEmbed getEmbed();
+    ManagedInterfaceEmbed getEmbed();
 
-    public void setEmbed(ManagedInterfaceEmbed embed);
+    void setEmbed(ManagedInterfaceEmbed embed);
 
-    public ManagedInterface getSelf();
+    ManagedInterface getSelf();
 
-    public void setSelf(ManagedInterface iface);
+    void setSelf(ManagedInterface iface);
 
-    public Set getSetInteger();
+    Set getSetInteger();
 
-    public void setSetInteger(Set collection);
+    void setSetInteger(Set collection);
 
-    public Set getSetPC();
+    Set getSetPC();
 
-    public void setSetPC(Set collection);
+    void setSetPC(Set collection);
 
-    public Set getSetI();
+    Set getSetI();
 
-    public void setSetI(Set collection);
+    void setSetI(Set collection);
 
-    public RuntimeTest1 getPC();
+    RuntimeTest1 getPC();
 
-    public void setPC(RuntimeTest1 pc);
+    void setPC(RuntimeTest1 pc);
 
-    public void unimplemented();
+    void unimplemented();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceAppId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceAppId.java
index 9b2c936a5..9f210c559 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceAppId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceAppId.java
@@ -22,33 +22,33 @@ import java.util.Set;
 
 public interface ManagedInterfaceAppId extends ManagedInterfaceSupAppId {
 
-    public int getIntField();
+    int getIntField();
 
-    public void setIntField(int i);
+    void setIntField(int i);
 
-    public ManagedInterfaceEmbed getEmbed();
+    ManagedInterfaceEmbed getEmbed();
 
-    public void setEmbed(ManagedInterfaceEmbed embed);
+    void setEmbed(ManagedInterfaceEmbed embed);
 
-    public ManagedInterfaceAppId getSelf();
+    ManagedInterfaceAppId getSelf();
 
-    public void setSelf(ManagedInterfaceAppId iface);
+    void setSelf(ManagedInterfaceAppId iface);
 
-    public Set getSetInteger();
+    Set getSetInteger();
 
-    public void setSetInteger(Set collection);
+    void setSetInteger(Set collection);
 
-    public Set getSetPC();
+    Set getSetPC();
 
-    public void setSetPC(Set collection);
+    void setSetPC(Set collection);
 
-    public Set getSetI();
+    Set getSetI();
 
-    public void setSetI(Set collection);
+    void setSetI(Set collection);
 
-    public RuntimeTest1 getPC();
+    RuntimeTest1 getPC();
 
-    public void setPC(RuntimeTest1 pc);
+    void setPC(RuntimeTest1 pc);
 
-    public void unimplemented();
+    void unimplemented();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceEmbed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceEmbed.java
index bb44a0d79..21f399adb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceEmbed.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceEmbed.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 public interface ManagedInterfaceEmbed {
 
-    public int getIntField();
+    int getIntField();
 
-    public void setIntField(int i);
+    void setIntField(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceSup.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceSup.java
index 10562a233..1428ee2af 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceSup.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceSup.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 public interface ManagedInterfaceSup {
 
-    public int getIntFieldSup();
+    int getIntFieldSup();
 
-    public void setIntFieldSup(int i);
+    void setIntFieldSup(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceSupAppId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceSupAppId.java
index 6ea99da5a..b22512865 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceSupAppId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ManagedInterfaceSupAppId.java
@@ -22,20 +22,22 @@ import java.util.StringTokenizer;
 
 public interface ManagedInterfaceSupAppId {
 
-    public int getId1();
+    int getId1();
 
-    public void setId1(int i);
+    void setId1(int i);
 
-    public int getId2();
+    int getId2();
 
-    public void setId2(int i);
+    void setId2(int i);
 
-    public int getIntFieldSup();
+    int getIntFieldSup();
 
-    public void setIntFieldSup(int i);
+    void setIntFieldSup(int i);
 
     public static class Id implements java.io.Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public int id1;
         public int id2;
 
@@ -48,14 +50,17 @@ public interface ManagedInterfaceSupAppId {
             id2 = Integer.parseInt(tok.nextToken());
         }
 
+        @Override
         public String toString() {
             return id1 + "," + id2;
         }
 
+        @Override
         public int hashCode() {
             return id1 + id2;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof Id))
                 return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementIntf.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementIntf.java
index 72cb5447e..d8046d0da 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementIntf.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementIntf.java
@@ -20,5 +20,5 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 public interface MapElementIntf {
 
-    public String getElementData();
+    String getElementData();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPC.java
index 355b68789..560d37f88 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPC.java
@@ -32,18 +32,22 @@ public class MapElementPC
         this.elementData = elementData;
     }
 
+    @Override
     public String getElementData() {
         return this.elementData;
     }
 
+    @Override
     public int hashCode() {
         return elementData.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         return ((MapElementPC) other).elementData.equals(elementData);
     }
 
+    @Override
     public String toString() {
         return super.toString() + "::" + elementData;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPCChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPCChild.java
index c08921143..94c129a54 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPCChild.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MapElementPCChild.java
@@ -36,17 +36,20 @@ public class MapElementPCChild
         return this.elementDataChild;
     }
 
+    @Override
     public int hashCode() {
         return (super.hashCode() + elementDataChild.hashCode())
             % Integer.MAX_VALUE;
     }
 
+    @Override
     public boolean equals(Object other) {
         return super.equals(other) &&
             ((MapElementPCChild) other)
                 .elementDataChild.equals(elementDataChild);
     }
 
+    @Override
     public String toString() {
         return super.toString() + "::" + elementDataChild;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterface.java
index 9af0099c9..457e19f88 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterface.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 public interface MixedInterface {
 
-    public int getIntField();
+    int getIntField();
 
-    public void setIntField(int i);
+    void setIntField(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterfaceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterfaceImpl.java
index 53b7e6388..a7169ef82 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterfaceImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/MixedInterfaceImpl.java
@@ -25,10 +25,12 @@ public class MixedInterfaceImpl implements MixedInterface {
 
     private int intField;
 
+    @Override
     public int getIntField() {
         return intField;
     }
 
+    @Override
     public void setIntField(int i) {
         intField = i;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest1.java
index fa79378fa..b0af4b726 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest1.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -62,7 +63,7 @@ public class ModRuntimeTest1 {
     private ModRuntimeTest1 selfOneOne;
 
     @OneToMany(cascade = { CascadeType.PERSIST })
-    private Set<ModRuntimeTest1> selfOneMany = new HashSet<ModRuntimeTest1>();
+    private Set<ModRuntimeTest1> selfOneMany = new HashSet<>();
 
     public ModRuntimeTest1() {
     }
@@ -108,6 +109,7 @@ public class ModRuntimeTest1 {
         this.selfOneMany = selfOneMany;
     }
 
+    @Override
     public String toString() {
         return "IntField: " + intField + ", StringField: " + stringField + " .";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest2.java
index be105b6a5..461681a81 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ModRuntimeTest2.java
@@ -44,6 +44,7 @@ public class ModRuntimeTest2 extends ModRuntimeTest1 {
         this.intField2 = intField2;
     }
 
+    @Override
     public String toString() {
         return "IntField: " + intField2 + ", StringField: "
             + super.getStringField() + " .";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterface.java
index 0c87b922f..c0975a27b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterface.java
@@ -20,7 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 public interface NonMappedInterface {
 
-    public int getIntField();
+    int getIntField();
 
-    public void setIntField(int i);
+    void setIntField(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterfaceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterfaceImpl.java
index 2e9d53d8c..536189cc7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterfaceImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/NonMappedInterfaceImpl.java
@@ -26,10 +26,12 @@ public class NonMappedInterfaceImpl
 
     private int mismatch;
 
+    @Override
     public int getIntField() {
         return mismatch;
     }
 
+    @Override
     public void setIntField(int i) {
         mismatch = i;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ObjectCollectionHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ObjectCollectionHolder.java
index f45db0fc6..4117ccead 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ObjectCollectionHolder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ObjectCollectionHolder.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.HashSet;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCClassPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCClassPC.java
index 2bd4eb7b6..980252014 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCClassPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCClassPC.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 
 import org.apache.openjpa.persistence.Persistent;
@@ -33,6 +34,9 @@ import org.apache.openjpa.persistence.Type;
 public class PCClassPC
     implements PCClassInterface, Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Persistent
     @Type(PCClassPC.class)
     private Object specificPC;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCompany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCompany.java
index 45d799bbc..f76c0073a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCompany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCCompany.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDepartment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDepartment.java
index 3a8b6849d..811d1bded 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDepartment.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDepartment.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java
index 5b0aaf90f..a7f6f7cfc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java
@@ -21,7 +21,9 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -29,7 +31,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
-import javax.persistence.Column;
 
 import org.apache.openjpa.persistence.FetchAttribute;
 import org.apache.openjpa.persistence.FetchGroup;
@@ -76,9 +77,7 @@ public class PCDirectory {
     @ManyToMany(cascade = CascadeType.PERSIST)
     private Set<PCFile> _files;
 
-    /**
-     *
-     */
+    
     public PCDirectory() {
         super();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java
index 87e0a6443..7413d76ce 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java
@@ -23,10 +23,10 @@ package org.apache.openjpa.persistence.kernel.common.apps;
  */
 
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.ManyToOne;
-import javax.persistence.Column;
 
 @Entity
 public class PCFile {
@@ -37,9 +37,7 @@ public class PCFile {
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private PCDirectory _dir;
 
-    /**
-     *
-     */
+    
     protected PCFile() {
         super();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCPerson.java
index f7b50a8ce..958b8e329 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCPerson.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCPerson.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistentMapHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistentMapHolder.java
index c7fcc3d2b..ceee96d99 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistentMapHolder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PersistentMapHolder.java
@@ -20,11 +20,12 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 
-import org.apache.openjpa.persistence.jdbc.KeyColumn;
 import org.apache.openjpa.persistence.PersistentMap;
+import org.apache.openjpa.persistence.jdbc.KeyColumn;
 
 @Entity
 public class PersistentMapHolder {
@@ -32,62 +33,62 @@ public class PersistentMapHolder {
     @PersistentMap(keyCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testPCKeyStringValue")
     private Map<MapElementPC, String> testPCKeyStringValue =
-        new HashMap<MapElementPC, String>();
+        new HashMap<>();
 
     @PersistentMap(elementCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testStringKeyPCValue")
     private Map<String, MapElementPC> testStringKeyPCValue =
-        new HashMap<String, MapElementPC>();
+        new HashMap<>();
 
     @PersistentMap(keyCascade = CascadeType.PERSIST,
         elementCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testPCKeyPCValue")
     private Map<MapElementPC, MapElementPC> testPCKeyPCValue =
-        new HashMap<MapElementPC, MapElementPC>();
+        new HashMap<>();
 
     @PersistentMap(keyCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testPCSubKeyStringValue")
     private Map<MapElementPCChild, String> testPCSubKeyStringValue =
-        new HashMap<MapElementPCChild, String>();
+        new HashMap<>();
 
     @PersistentMap(elementCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testStringKeyPCSubValue")
     private Map<String, MapElementPCChild> testStringKeyPCSubValue =
-        new HashMap<String, MapElementPCChild>();
+        new HashMap<>();
 
     @PersistentMap(keyCascade = CascadeType.PERSIST,
         elementCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testPCSubKeyPCValue")
     private Map<MapElementPCChild, MapElementPC> testPCSubKeyPCValue =
-        new HashMap<MapElementPCChild, MapElementPC>();
+        new HashMap<>();
 
     @PersistentMap(keyCascade = CascadeType.PERSIST,
         elementCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testPCSubKeyPCSubValue")
     private Map<MapElementPCChild, MapElementPCChild> testPCSubKeyPCSubValue =
-        new HashMap<MapElementPCChild, MapElementPCChild>();
+        new HashMap<>();
 
     @PersistentMap(keyCascade = CascadeType.PERSIST,
         elementCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testPCKeyPCSubValue")
     private Map<MapElementPC, MapElementPCChild> testPCKeyPCSubValue =
-        new HashMap<MapElementPC, MapElementPCChild>();
+        new HashMap<>();
 
     @PersistentMap(keyCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testPCIntfKeyStringValue")
     private Map<MapElementIntf, String> testPCIntfKeyStringValue =
-        new HashMap<MapElementIntf, String>();
+        new HashMap<>();
 
     @PersistentMap(elementCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testStringKeyPCIntfValue")
     private Map<String, MapElementIntf> testStringKeyPCIntfValue =
-        new HashMap<String, MapElementIntf>();
+        new HashMap<>();
 
     @PersistentMap(keyCascade = CascadeType.PERSIST,
         elementCascade = CascadeType.PERSIST)
     @KeyColumn(name = "testPCIntfKeyPCValue")
     private Map<MapElementIntf, MapElementPC> testPCIntfKeyPCValue =
-        new HashMap<MapElementIntf, MapElementPC>();
+        new HashMap<>();
 
     public Map getNamedMap(String name) {
         if (name.equals("testPCKeyStringValue"))
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ProxiesPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ProxiesPC.java
index 43599bb1e..048a44784 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ProxiesPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/ProxiesPC.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -39,10 +40,10 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.apache.openjpa.persistence.jdbc.KeyColumn;
 import org.apache.commons.collections4.comparators.ComparableComparator;
 import org.apache.openjpa.persistence.PersistentCollection;
 import org.apache.openjpa.persistence.PersistentMap;
+import org.apache.openjpa.persistence.jdbc.KeyColumn;
 
 /**
  * <p>Persistent type used in the {@link TestProxies} tests.</p>
@@ -135,6 +136,7 @@ public class ProxiesPC implements Comparable {
         this.proxyMap = proxyMap;
     }
 
+    @Override
     public int compareTo(Object other) {
         return name.compareTo(((ProxiesPC) other).getName());
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest1.java
index f25110871..6bd6a68e8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest1.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -78,7 +79,7 @@ public class RuntimeTest1 implements Serializable {
 
     @OneToMany(mappedBy = "selfOneOne",
         cascade = { CascadeType.PERSIST, CascadeType.REMOVE })
-    private Set<RuntimeTest1> selfOneMany = new HashSet<RuntimeTest1>();
+    private Set<RuntimeTest1> selfOneMany = new HashSet<>();
 
     @Version
     private int version;
@@ -136,6 +137,7 @@ public class RuntimeTest1 implements Serializable {
         this.selfOneMany = selfOneMany;
     }
 
+    @Override
     public String toString() {
         return "IntField: " + intField + ", StringField: " + stringField + " .";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest2.java
index cfc4285e6..f53d87af1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest2.java
@@ -53,6 +53,7 @@ public class RuntimeTest2 extends RuntimeTest1 {
         this.intField2 = intField2;
     }
 
+    @Override
     public String toString() {
         return "IntField: " + intField2 + ", StringField: " +
             super.getStringField() + " .";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest3.java
index 12b21b46d..0d7a1d322 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest3.java
@@ -31,6 +31,8 @@ import javax.persistence.Entity;
 public class RuntimeTest3
     extends RuntimeTest2 {
 
+    
+    private static final long serialVersionUID = 1L;
     //@Id
     private int intField3;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest4.java
index 90d8fe501..0f446453c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/RuntimeTest4.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SCOTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SCOTest.java
index 2d26ae65d..201a5aa21 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SCOTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SCOTest.java
@@ -23,14 +23,15 @@ import java.math.BigInteger;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
-import org.apache.openjpa.persistence.jdbc.KeyColumn;
 import org.apache.openjpa.persistence.PersistentCollection;
 import org.apache.openjpa.persistence.PersistentMap;
+import org.apache.openjpa.persistence.jdbc.KeyColumn;
 
 /**
  * Used in testing; should be enhanced.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned.java
index f632434a5..2efcef6c8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned.java
@@ -62,9 +62,8 @@ public class SequenceAssigned {
         return other;
     }
 
-    @SuppressWarnings("serial")
     public static class SeqId implements java.io.Serializable {
-
+        private static final long serialVersionUID = 1L;
         public long pk;
 
         public SeqId() {
@@ -74,14 +73,17 @@ public class SequenceAssigned {
             pk = Long.parseLong(str);
         }
 
+        @Override
         public int hashCode() {
-            return (int) (pk % (long) Integer.MAX_VALUE);
+            return (int) (pk % Integer.MAX_VALUE);
         }
 
+        @Override
         public String toString() {
             return pk + "";
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == null || !(o instanceof SeqId))
                 return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned3.java
index 679ae941c..79974df91 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SequenceAssigned3.java
@@ -46,9 +46,8 @@ public class SequenceAssigned3 {
         return pk;
     }
 
-    @SuppressWarnings("serial")
     public static class seq3Id implements java.io.Serializable {
-
+        private static final long serialVersionUID = 1L;
         public Long pk;
 
         public seq3Id() {
@@ -58,15 +57,18 @@ public class SequenceAssigned3 {
             pk = Long.valueOf(str);
         }
 
+        @Override
         public int hashCode() {
             return (int) (pk == null ? 0 : pk.longValue()
-                % (long) Integer.MAX_VALUE);
+                % Integer.MAX_VALUE);
         }
 
+        @Override
         public String toString() {
             return pk + "";
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == null || !(o instanceof seq3Id))
                 return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleId.java
index 08625f2e8..b1a4a9453 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleId.java
@@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.kernel.common.apps;
 
 public interface SingleId {
 
-    public String getPkString();
+    String getPkString();
 
-    public void setString(String s);
+    void setString(String s);
 
-    public String getString();
+    String getString();
 
-    public boolean correctIdClass(Class oid);
+    boolean correctIdClass(Class oid);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdByte.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdByte.java
index 5119b6175..b821abc44 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdByte.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdByte.java
@@ -30,6 +30,7 @@ public class SingleIdByte implements SingleId {
     private byte pk;
     private String str;
 
+    @Override
     public boolean correctIdClass(Class c) {
         return ByteId.class.equals(c);
     }
@@ -42,14 +43,17 @@ public class SingleIdByte implements SingleId {
         pk = i;
     }
 
+    @Override
     public String getPkString() {
         return pk + "";
     }
 
+    @Override
     public String getString() {
         return str;
     }
 
+    @Override
     public void setString(String s) {
         str = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdChar.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdChar.java
index b3d7d8b54..dc577f07f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdChar.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdChar.java
@@ -30,6 +30,7 @@ public class SingleIdChar implements SingleId {
     private char pk;
     private String str;
 
+    @Override
     public boolean correctIdClass(Class c) {
         return CharId.class.equals(c);
     }
@@ -38,6 +39,7 @@ public class SingleIdChar implements SingleId {
         return pk;
     }
 
+    @Override
     public String getPkString() {
         return pk + "";
     }
@@ -46,10 +48,12 @@ public class SingleIdChar implements SingleId {
         pk = i;
     }
 
+    @Override
     public String getString() {
         return str;
     }
 
+    @Override
     public void setString(String s) {
         str = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdInt.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdInt.java
index 196c1f065..92583a509 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdInt.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdInt.java
@@ -30,10 +30,12 @@ public class SingleIdInt implements SingleId {
     private int pk;
     private String str;
 
+    @Override
     public boolean correctIdClass(Class c) {
         return IntId.class.equals(c);
     }
 
+    @Override
     public String getPkString() {
         return pk + "";
     }
@@ -46,10 +48,12 @@ public class SingleIdInt implements SingleId {
         pk = i;
     }
 
+    @Override
     public String getString() {
         return str;
     }
 
+    @Override
     public void setString(String s) {
         str = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdLong.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdLong.java
index 2266b05e3..708402255 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdLong.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdLong.java
@@ -30,10 +30,12 @@ public class SingleIdLong implements SingleId {
     private long pk;
     private String str;
 
+    @Override
     public boolean correctIdClass(Class c) {
         return LongId.class.equals(c);
     }
 
+    @Override
     public String getPkString() {
         return pk + "";
     }
@@ -46,10 +48,12 @@ public class SingleIdLong implements SingleId {
         pk = i;
     }
 
+    @Override
     public String getString() {
         return str;
     }
 
+    @Override
     public void setString(String s) {
         str = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdShort.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdShort.java
index 95e0c57bb..879f43a69 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdShort.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdShort.java
@@ -30,10 +30,12 @@ public class SingleIdShort implements SingleId {
     private short pk;
     private String str;
 
+    @Override
     public boolean correctIdClass(Class c) {
         return ShortId.class.equals(c);
     }
 
+    @Override
     public String getPkString() {
         return pk + "";
     }
@@ -46,10 +48,12 @@ public class SingleIdShort implements SingleId {
         pk = i;
     }
 
+    @Override
     public String getString() {
         return str;
     }
 
+    @Override
     public void setString(String s) {
         str = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdString.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdString.java
index 13c2b1e59..1a011ee16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdString.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdString.java
@@ -30,6 +30,7 @@ public class SingleIdString implements SingleId {
     private String pk;
     private String str;
 
+    @Override
     public boolean correctIdClass(Class c) {
         return StringId.class.equals(c);
     }
@@ -38,6 +39,7 @@ public class SingleIdString implements SingleId {
         return pk;
     }
 
+    @Override
     public String getPkString() {
         return pk;
     }
@@ -46,10 +48,12 @@ public class SingleIdString implements SingleId {
         pk = i;
     }
 
+    @Override
     public String getString() {
         return str;
     }
 
+    @Override
     public void setString(String s) {
         str = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdWrapper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdWrapper.java
index e4c8ab18a..73fe925ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdWrapper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/SingleIdWrapper.java
@@ -30,10 +30,12 @@ public class SingleIdWrapper implements SingleId {
     private Integer pk;
     private String str;
 
+    @Override
     public boolean correctIdClass(Class c) {
         return IntId.class.equals(c);
     }
 
+    @Override
     public String getPkString() {
         return pk == null ? "null" : pk.toString();
     }
@@ -46,10 +48,12 @@ public class SingleIdWrapper implements SingleId {
         pk = new Integer(i);
     }
 
+    @Override
     public String getString() {
         return str;
     }
 
+    @Override
     public void setString(String s) {
         str = s;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java
index c05dbbdf6..76d329945 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/State.java
@@ -30,8 +30,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 
-import org.apache.openjpa.persistence.FetchGroup;
 import org.apache.openjpa.persistence.FetchAttribute;
+import org.apache.openjpa.persistence.FetchGroup;
 import org.apache.openjpa.persistence.FetchGroups;
 import org.apache.openjpa.persistence.kernel.TestIndirectRecursion;
 
@@ -42,12 +42,13 @@ import org.apache.openjpa.persistence.kernel.TestIndirectRecursion;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 @FetchGroups( {
         @FetchGroup(name = "State_OutgoingTransitions", attributes = { @FetchAttribute(name = "outgoingTransitions") }),
         @FetchGroup(name = "State_IncomingTransitions", attributes = { @FetchAttribute(name = "incomingTransitions")})})
 public class State implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
@@ -79,7 +80,7 @@ public class State implements Serializable {
 
     public void addOutgoingTransitions(Transition outgoingTransition) {
         if (outgoingTransitions == null)
-            outgoingTransitions = new ArrayList<Transition>();
+            outgoingTransitions = new ArrayList<>();
         outgoingTransitions.add(outgoingTransition);
     }
 
@@ -89,7 +90,7 @@ public class State implements Serializable {
 
     public void addIncomingTransitions(Transition incomingTransition) {
         if (incomingTransitions == null)
-            incomingTransitions = new ArrayList<Transition>();
+            incomingTransitions = new ArrayList<>();
         incomingTransitions.add(incomingTransition);
     }
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java
index 0168baca2..cc18213d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Transition.java
@@ -38,9 +38,10 @@ import org.apache.openjpa.persistence.kernel.TestIndirectRecursion;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 @Entity
 public class Transition implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestMergeAndPersistWithManagedRelation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestMergeAndPersistWithManagedRelation.java
index faa367e7a..52d5aca44 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestMergeAndPersistWithManagedRelation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestMergeAndPersistWithManagedRelation.java
@@ -29,6 +29,7 @@ public class TestMergeAndPersistWithManagedRelation
 
     private long childId;
 
+    @Override
     public void setUp() {
         setUp(BidiParent.class, BidiChild.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestPessimisticPNonTransToPDirty.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestPessimisticPNonTransToPDirty.java
index 2f543e0fa..4de8342d3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestPessimisticPNonTransToPDirty.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lifecycle/TestPessimisticPNonTransToPDirty.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestPessimisticPNonTransToPDirty
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(UnenhancedPropertyAccess.class, CLEAR_TABLES, "openjpa.RuntimeUnenhancedClasses", "supported");
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/log/TestConnectionRetainModeWarning.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/log/TestConnectionRetainModeWarning.java
index 0aec1083c..ab2db919f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/log/TestConnectionRetainModeWarning.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/log/TestConnectionRetainModeWarning.java
@@ -31,19 +31,22 @@ import org.apache.openjpa.persistence.PersistenceProviderImpl;
 import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
 
 public class TestConnectionRetainModeWarning extends AbstractPersistenceTestCase implements LogFactory {
-    private static List<String> messages = new ArrayList<String>();
+    private static List<String> messages = new ArrayList<>();
 
     Localizer _loc = Localizer.forPackage(PersistenceProviderImpl.class);
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         messages.clear();
     }
 
     // Start LogFactory implementation
+    @Override
     public Log getLog(String channel) {
         return new AbstractLog() {
 
+            @Override
             protected boolean isEnabled(short logLevel) {
                 return true;
             }
@@ -53,6 +56,7 @@ public class TestConnectionRetainModeWarning extends AbstractPersistenceTestCase
                 messages.add(message.toString());
             }
 
+            @Override
             protected void log(short type, String message, Throwable t) {
                 messages.add(message);
             }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedIface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedIface.java
index 08ca30dc9..5c91ffca5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedIface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedIface.java
@@ -18,47 +18,41 @@
  */
 package org.apache.openjpa.persistence.managedinterface;
 
-import java.util.*;
+import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Embedded;
-import javax.persistence.OneToOne;
-import javax.persistence.OneToMany;
 import javax.persistence.CascadeType;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 
-import org.apache.openjpa.persistence.PersistentCollection;
 import org.apache.openjpa.persistence.ManagedInterface;
+import org.apache.openjpa.persistence.PersistentCollection;
 import org.apache.openjpa.persistence.query.SimpleEntity;
 
 @ManagedInterface
 @Entity
 public interface ManagedIface extends ManagedInterfaceSup {
-    public int getIntField();
-    public void setIntField(int i);
+    int getIntField();
+    void setIntField(int i);
 
-    @Embedded
-    public ManagedInterfaceEmbed getEmbed();
-    public void setEmbed(ManagedInterfaceEmbed embed);
+    @Embedded ManagedInterfaceEmbed getEmbed();
+    void setEmbed(ManagedInterfaceEmbed embed);
 
-    @OneToOne(cascade=CascadeType.PERSIST)
-    public ManagedIface getSelf();
-    public void setSelf(ManagedIface iface);
+    @OneToOne(cascade=CascadeType.PERSIST) ManagedIface getSelf();
+    void setSelf(ManagedIface iface);
 
-    @PersistentCollection
-    public Set<Integer> getSetInteger();
-    public void setSetInteger(Set<Integer> collection);
+    @PersistentCollection Set<Integer> getSetInteger();
+    void setSetInteger(Set<Integer> collection);
 
-    @OneToMany(cascade=CascadeType.PERSIST)
-    public Set<SimpleEntity> getSetPC();
-    public void setSetPC(Set<SimpleEntity> collection);
+    @OneToMany(cascade=CascadeType.PERSIST) Set<SimpleEntity> getSetPC();
+    void setSetPC(Set<SimpleEntity> collection);
 
-    @OneToMany(cascade=CascadeType.PERSIST)
-    public Set<ManagedIface> getSetI();
-    public void setSetI(Set<ManagedIface> collection);
+    @OneToMany(cascade=CascadeType.PERSIST) Set<ManagedIface> getSetI();
+    void setSetI(Set<ManagedIface> collection);
 
-    @OneToOne(cascade=CascadeType.PERSIST)
-    public SimpleEntity getPC();
-    public void setPC(SimpleEntity pc);
+    @OneToOne(cascade=CascadeType.PERSIST) SimpleEntity getPC();
+    void setPC(SimpleEntity pc);
 
-    public void unimplemented();
+    void unimplemented();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceEmbed.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceEmbed.java
index 7095a623e..2fda1fc4a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceEmbed.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceEmbed.java
@@ -25,6 +25,6 @@ import org.apache.openjpa.persistence.ManagedInterface;
 @ManagedInterface
 @Embeddable
 public interface ManagedInterfaceEmbed {
-    public int getEmbedIntField();
-    public void setEmbedIntField(int i);
+    int getEmbedIntField();
+    void setEmbedIntField(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceOwner.java
index 1bd4efbbc..ca43172cb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceOwner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceOwner.java
@@ -18,11 +18,11 @@
  */
 package org.apache.openjpa.persistence.managedinterface;
 
-import javax.persistence.OneToOne;
-import javax.persistence.Id;
+import javax.persistence.CascadeType;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
-import javax.persistence.CascadeType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
 
 @Entity
 public class ManagedInterfaceOwner {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceSup.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceSup.java
index d9e553bf9..c7b056077 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceSup.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/ManagedInterfaceSup.java
@@ -19,18 +19,17 @@
 package org.apache.openjpa.persistence.managedinterface;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 import org.apache.openjpa.persistence.ManagedInterface;
 
 @ManagedInterface
 @Entity
 public interface ManagedInterfaceSup {
-    @Id @GeneratedValue
-    public int getId();
-    public void setId(int id);
+    @Id @GeneratedValue int getId();
+    void setId(int id);
 
-    public int getIntFieldSup();
-    public void setIntFieldSup(int i);
+    int getIntFieldSup();
+    void setIntFieldSup(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterface.java
index 92b2f9ff5..24a077a96 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterface.java
@@ -29,10 +29,9 @@ import org.apache.openjpa.persistence.ManagedInterface;
 public interface MixedInterface {
 
     @Id
-    @GeneratedValue
-    public int getId();
-    public void setId(int id);
+    @GeneratedValue int getId();
+    void setId(int id);
 
-    public int getIntField();
-    public void setIntField(int i);
+    int getIntField();
+    void setIntField(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterfaceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterfaceImpl.java
index 3c907cff2..89c997584 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterfaceImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/MixedInterfaceImpl.java
@@ -19,8 +19,8 @@
 package org.apache.openjpa.persistence.managedinterface;
 
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 public class MixedInterfaceImpl implements MixedInterface {
@@ -30,18 +30,22 @@ public class MixedInterfaceImpl implements MixedInterface {
 
     private int intField;
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getIntField() {
         return intField;
     }
 
+    @Override
     public void setIntField(int i) {
         intField = i;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterface.java
index 7d11ab70d..3734015d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterface.java
@@ -19,7 +19,7 @@
 package org.apache.openjpa.persistence.managedinterface;
 
 public interface NonMappedInterface {
-    public int getIntField();
+    int getIntField();
 
-    public void setIntField(int i);
+    void setIntField(int i);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterfaceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterfaceImpl.java
index cfd83aa07..8ab1659e3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterfaceImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/NonMappedInterfaceImpl.java
@@ -25,10 +25,12 @@ public class NonMappedInterfaceImpl
     implements NonMappedInterface {
     private int mismatch;
 
+    @Override
     public int getIntField() {
         return mismatch;
     }
 
+    @Override
     public void setIntField(int i) {
         mismatch = i;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/SimpleManagedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/SimpleManagedInterface.java
index db606a463..c501d51eb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/SimpleManagedInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/SimpleManagedInterface.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.managedinterface;
 
-import javax.persistence.Id;
 import javax.persistence.Entity;
+import javax.persistence.Id;
 
 import org.apache.openjpa.persistence.ManagedInterface;
 
@@ -27,10 +27,9 @@ import org.apache.openjpa.persistence.ManagedInterface;
 @Entity
 public interface SimpleManagedInterface {
 
-    @Id
-    public int getId();
-    public void setId(int id);
+    @Id int getId();
+    void setId(int id);
 
-    public String getString();
-    public void setString(String s);
+    String getString();
+    void setString(String s);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java
index ec02986b7..892044d39 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java
@@ -18,21 +18,22 @@
  */
 package org.apache.openjpa.persistence.managedinterface;
 
-import java.util.Set;
-import java.util.HashSet;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Iterator;
-import javax.persistence.Query;
-import javax.persistence.EntityNotFoundException;
+import java.util.Set;
 
+import javax.persistence.EntityNotFoundException;
+import javax.persistence.Query;
+
+import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.persistence.Extent;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.query.SimpleEntity;
 import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.Extent;
-import org.apache.openjpa.persistence.query.SimpleEntity;
-import org.apache.openjpa.meta.ClassMetaData;
 
 @AllowFailure(message=
     "On JDK6 Upgrade these tests are failing with wrong mapping. " +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestSimpleManagedInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestSimpleManagedInterface.java
index 8bc03f81a..9f32bcdaf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestSimpleManagedInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestSimpleManagedInterface.java
@@ -20,17 +20,18 @@ package org.apache.openjpa.persistence.managedinterface;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.query.SimpleEntity;
 import org.apache.openjpa.kernel.AbstractBrokerFactory;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.MetaDataRepository;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.query.SimpleEntity;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestSimpleManagedInterface
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SimpleManagedInterface.class, SimpleEntity.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Child.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Child.java
index 7d3f57239..88c6de74b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Child.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Child.java
@@ -51,7 +51,7 @@ public class Child implements Serializable {
   private Integer childKey;
 
   @OneToMany(mappedBy = "child", orphanRemoval = true, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private Collection<GrandChild> grandChilds = new ArrayList<GrandChild>();
+  private Collection<GrandChild> grandChilds = new ArrayList<>();
 
   public Parent getParent() { return parent;  }
   public void setParent(Parent parent) { this.parent = parent;  }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java
index a95c3271d..91a6df87e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Order.java
@@ -51,7 +51,7 @@ public class Order {
 
       public Order() {
           orderEntry = new Date( System.currentTimeMillis() );
-          items = new ArrayList<LineItem>();
+          items = new ArrayList<>();
       }
 
       public Order( long id ) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Parent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Parent.java
index 8b8e3fb9c..a71e551ad 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Parent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/Parent.java
@@ -46,7 +46,7 @@ public class Parent implements Serializable {
   private Integer key2;
 
   @OneToMany(mappedBy = "parent", orphanRemoval = true, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private Collection<Child> childs = new ArrayList<Child>();
+  private Collection<Child> childs = new ArrayList<>();
   public Parent() {}
 
   public String getKey1() { return key1;  }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestCascadeOneToManyMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestCascadeOneToManyMerge.java
index 855b56f25..346e2fc49 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestCascadeOneToManyMerge.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestCascadeOneToManyMerge.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.merge.model.ToyBox;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestCascadeOneToManyMerge extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(Toy.class, ToyBox.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestLazyFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestLazyFields.java
index ebded8641..291632b45 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestLazyFields.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestLazyFields.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.merge.model.Outer;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestLazyFields extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, Outer.class, Inner.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java
index a47fa3f81..0a156ca65 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMerge.java
@@ -24,6 +24,7 @@ import javax.persistence.EntityManager;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestMerge extends SQLListenerTestCase {
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, Parent.class,
             Child.class, GrandChild.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeDetachStateField.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeDetachStateField.java
index 99bfe3104..24afe483b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeDetachStateField.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeDetachStateField.java
@@ -33,6 +33,7 @@ import org.apache.openjpa.persistence.merge.model.ShipPackage2;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestMergeDetachStateField extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(Label.class, ShipPackage.class,
         	  Label2.class, ShipPackage2.class,
@@ -158,7 +159,7 @@ public class TestMergeDetachStateField extends SingleEMFTestCase {
         	Car c1 = new Car();
         	Car c2 = new Car();
         	Make mk1 = new Make();
-        	ArrayList<Model> models = new ArrayList<Model>();
+        	ArrayList<Model> models = new ArrayList<>();
         	Model md1 = new Model();
         	models.add(md1);
         	Model md2 = new Model();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java
index 738c85147..59be611da 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  * part of its Id
  */
 public class TestMergeNew extends SQLListenerTestCase {
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, Parent.class,
             Child.class, GrandChild.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java
index f0c09f082..539917717 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMultipleMerge.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestMultipleMerge extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         //Since a JPA 1.0 p.xml file is used the property "NonDefaultMappingAllowed=true" is
         //needed for this test.  This is needed since Order uses an @JoinColumn; something
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Inner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Inner.java
index ea5ebd202..6bd1dd70a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Inner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/Inner.java
@@ -41,7 +41,7 @@ public class Inner {
     private String name = null;
 
     @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "inners")
-    private Collection<Outer> outers = new ArrayList<Outer>();
+    private Collection<Outer> outers = new ArrayList<>();
 
     public String getName() {
         return name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ToyBox.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ToyBox.java
index fac8e3f93..184d5de08 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ToyBox.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/model/ToyBox.java
@@ -43,12 +43,12 @@ public class ToyBox {
     private long version;
 
     public ToyBox() {
-        toyList = new ArrayList<Toy>();
+        toyList = new ArrayList<>();
     }
 
     public ToyBox(int id) {
         this.id = id;
-        toyList = new ArrayList<Toy>();
+        toyList = new ArrayList<>();
     }
 
     public int getId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java
index e1406cde6..eee4a2418 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessMappedSuperclass_.java
@@ -24,6 +24,7 @@
 package org.apache.openjpa.persistence.meta;
 
 import java.util.Date;
+
 import javax.persistence.metamodel.SingularAttribute;
 
 @javax.persistence.metamodel.StaticMetamodel
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestClassMetaData.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestClassMetaData.java
index 282dee6c3..8343700f6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestClassMetaData.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestClassMetaData.java
@@ -19,15 +19,9 @@
 package org.apache.openjpa.persistence.meta;
 
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.persistence.meta.common.apps.MetaTest1;
-import org.apache.openjpa.persistence.meta.common.apps.MetaTest2;
-import org.apache.openjpa.persistence.meta.common.apps.MetaTest3;
-import org.apache.openjpa.persistence.meta.common.apps.MetaTest5;
-import org.apache.openjpa.persistence.meta.common.apps.MetaTest6;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.meta.ClassMetaData;
@@ -35,6 +29,12 @@ import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.meta.common.apps.MetaTest1;
+import org.apache.openjpa.persistence.meta.common.apps.MetaTest2;
+import org.apache.openjpa.persistence.meta.common.apps.MetaTest3;
+import org.apache.openjpa.persistence.meta.common.apps.MetaTest5;
+import org.apache.openjpa.persistence.meta.common.apps.MetaTest6;
 
 /**
  * <p>Tests the {@link ClassMetaData} type, and in so doing tests parts of
@@ -57,6 +57,7 @@ public class TestClassMetaData
         super(test, "metacactusapp");
     }
 
+    @Override
     public void setUp()
         throws Exception {
         _repos = getRepository();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestExternalValues.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestExternalValues.java
index 52f6b2ff0..085f832c5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestExternalValues.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestExternalValues.java
@@ -25,10 +25,10 @@ import java.util.UUID;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import org.apache.openjpa.persistence.meta.common.apps.ExternalValues;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.ArgumentException;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.meta.common.apps.ExternalValues;
 
 /**
  * <p>Tests the {@link ExternalValuesFieldMapping}.</p>
@@ -43,6 +43,7 @@ public class TestExternalValues
         super(test, "metacactusapp");
     }
 
+    @Override
     public void setUp()
         throws Exception {
         deleteAll(ExternalValues.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFactoryMethod.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFactoryMethod.java
index 304ce2e76..f6fa29c33 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFactoryMethod.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFactoryMethod.java
@@ -46,6 +46,7 @@ public class TestFactoryMethod extends AbstractTestCase {
         super(test, "metacactusapp");
     }
 
+    @Override
     public void setUp() throws Exception {
         _repos = getRepository();
         _metaTest7 = _repos.getMetaData(MetaTest7.class, null, true);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFieldDeclarationOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFieldDeclarationOrder.java
index 9f248cfc0..ca9e22acf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFieldDeclarationOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestFieldDeclarationOrder.java
@@ -19,12 +19,12 @@
 package org.apache.openjpa.persistence.meta;
 
 
-import org.apache.openjpa.persistence.meta.common.apps.FieldOrderPC;
-import org.apache.openjpa.persistence.meta.common.apps.FieldOrderPCSubclass;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.meta.common.apps.FieldOrderPC;
+import org.apache.openjpa.persistence.meta.common.apps.FieldOrderPCSubclass;
 
 public class TestFieldDeclarationOrder
     extends AbstractTestCase {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java
index 54f7ada6f..5d4b3c2a6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java
@@ -25,16 +25,16 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
 import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.Attribute.PersistentAttributeType;
+import javax.persistence.metamodel.Bindable.BindableType;
 import javax.persistence.metamodel.CollectionAttribute;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.IdentifiableType;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.ManagedType;
+import javax.persistence.metamodel.PluralAttribute.CollectionType;
 import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Attribute.PersistentAttributeType;
-import javax.persistence.metamodel.Bindable.BindableType;
-import javax.persistence.metamodel.PluralAttribute.CollectionType;
 import javax.persistence.metamodel.Type.PersistenceType;
 
 import org.apache.openjpa.meta.ClassMetaData;
@@ -57,6 +57,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestMetamodel extends SingleEMFTestCase {
     private static MetamodelImpl model;
 
+    @Override
     public void setUp() {
         if (model == null) {
     	super.setUp(
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestNonPersistentFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestNonPersistentFields.java
index 5f7701a0a..c39d1f601 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestNonPersistentFields.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestNonPersistentFields.java
@@ -19,12 +19,12 @@
 package org.apache.openjpa.persistence.meta;
 
 
-import org.apache.openjpa.persistence.meta.common.apps.NonPersistentFieldsPC;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.MetaDataRepository;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.meta.common.apps.NonPersistentFieldsPC;
 
 /**
  * <p>Tests that fields that should not be persistent actually aren't.</p>
@@ -40,6 +40,7 @@ public class TestNonPersistentFields
         super(test, "metacactusapp");
     }
 
+    @Override
     public void setUp() {
         MetaDataRepository repos = new OpenJPAConfigurationImpl().
             newMetaDataRepositoryInstance();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestOrderBy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestOrderBy.java
index fd730e224..39d939ab3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestOrderBy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestOrderBy.java
@@ -21,14 +21,13 @@ package org.apache.openjpa.persistence.meta;
 import java.util.Arrays;
 import java.util.List;
 
-
-import org.apache.openjpa.persistence.meta.common.apps.OrderByPC;
-import org.apache.openjpa.persistence.meta.common.apps.OrderByPCRel;
-import org.apache.openjpa.persistence.meta.common.apps.OrderByPCRelSub;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.FetchPlan;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.meta.common.apps.OrderByPC;
+import org.apache.openjpa.persistence.meta.common.apps.OrderByPCRel;
+import org.apache.openjpa.persistence.meta.common.apps.OrderByPCRelSub;
 
 /**
  * <p>Test the <code>order-by</code> field extension.</p>
@@ -42,6 +41,7 @@ public class TestOrderBy
         super(test, "metacactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(OrderByPCRel.class);
         deleteAll(OrderByPC.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestPersistentClasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestPersistentClasses.java
index fede1233b..44bce4d05 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestPersistentClasses.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestPersistentClasses.java
@@ -22,13 +22,13 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.openjpa.persistence.meta.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.meta.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.meta.common.apps.RuntimeTest3;
-import org.apache.openjpa.persistence.common.utils.*;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.meta.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.meta.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.meta.common.apps.RuntimeTest3;
 
 public class TestPersistentClasses
     extends AbstractTestCase {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java
index f114c8e63..4f7d6c329 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestQueryTypeAliasRegistration.java
@@ -49,8 +49,8 @@ public class TestQueryTypeAliasRegistration extends SingleEMFTestCase {
      */
     public void testMultiThreadGetMetaDataAlias() throws Exception {
         try {
-            List<Worker> workers = new ArrayList<Worker>();
-            Set<Exception> exceptions = new HashSet<Exception>();
+            List<Worker> workers = new ArrayList<>();
+            Set<Exception> exceptions = new HashSet<>();
             for (int i = 0; i < threads; i++) {
                 Worker w = new Worker(emf);
                 workers.add(w);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestSequenceAssigned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestSequenceAssigned.java
index beb3ff5e2..9115a2b4f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestSequenceAssigned.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestSequenceAssigned.java
@@ -19,11 +19,11 @@
 package org.apache.openjpa.persistence.meta;
 
 
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.meta.common.apps.SequenceAssigned;
 import org.apache.openjpa.persistence.meta.common.apps.SequenceAssigned2;
 import org.apache.openjpa.persistence.meta.common.apps.SequenceAssigned3;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 public class TestSequenceAssigned
     extends AbstractTestCase {
@@ -32,6 +32,7 @@ public class TestSequenceAssigned
         super(testName, "metacactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(SequenceAssigned.class);
         deleteAll(SequenceAssigned3.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java
index f5ac8e040..8e42057cc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestValueStrategies.java
@@ -20,13 +20,13 @@ package org.apache.openjpa.persistence.meta;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.EntityManagerFactory;
 
-
-import org.apache.openjpa.persistence.meta.common.apps.ValueStrategyPC;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.meta.common.apps.ValueStrategyPC;
 import org.apache.openjpa.util.OpenJPAException;
 
 /**
@@ -42,6 +42,7 @@ public class TestValueStrategies
         super(test, "metacactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(ValueStrategyPC.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java
index cfb250a9d..08f2eddda 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java
@@ -23,17 +23,17 @@ import java.io.ByteArrayOutputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 
-
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
+import org.apache.openjpa.lib.meta.MetaDataSerializer;
+import org.apache.openjpa.meta.MetaDataRepository;
+import org.apache.openjpa.persistence.XMLPersistenceMetaDataParser;
+import org.apache.openjpa.persistence.XMLPersistenceMetaDataSerializer;
 import org.apache.openjpa.persistence.meta.common.apps.MetaTest1;
 import org.apache.openjpa.persistence.meta.common.apps.MetaTest2;
 import org.apache.openjpa.persistence.meta.common.apps.MetaTest3;
 import org.apache.openjpa.persistence.meta.common.apps.MetaTest5;
 import org.apache.openjpa.persistence.meta.common.apps.MetaTest6;
-import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
-import org.apache.openjpa.meta.MetaDataRepository;
-import org.apache.openjpa.persistence.XMLPersistenceMetaDataParser;
-import org.apache.openjpa.persistence.XMLPersistenceMetaDataSerializer;
 
 /**
  * <p>Tests the {@link MetaDataSerializer} by parsing all the metadata
@@ -49,6 +49,7 @@ public class TestXMLPersistenceMetaDataSerializer
         super(test);
     }
 
+    @Override
     protected MetaDataRepository getRepository()
         throws Exception {
         OpenJPAConfiguration conf = new OpenJPAConfigurationImpl();
@@ -63,7 +64,7 @@ public class TestXMLPersistenceMetaDataSerializer
             new XMLPersistenceMetaDataSerializer(conf);
         ser.addAll(repos);
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ser.serialize(new OutputStreamWriter(out), ser.PRETTY);
+        ser.serialize(new OutputStreamWriter(out), MetaDataSerializer.PRETTY);
         byte[] bytes = out.toByteArray();
 
         XMLPersistenceMetaDataParser parser =
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest2.java
index 851ce274d..d95a8e06c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest2.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.meta.common.apps;
 
 import java.util.Collection;
 import java.util.Map;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.ManyToOne;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest3.java
index f59e50fbf..e0d49458a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest3.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.meta.common.apps;
 
 import java.util.Map;
+
 import javax.persistence.Entity;
 
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest5.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest5.java
index 1745aea50..121fd2055 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest5.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/MetaTest5.java
@@ -41,15 +41,18 @@ public abstract class MetaTest5 {
             id = Long.parseLong(str);
         }
 
+        @Override
         public String toString() {
             return String.valueOf(id);
         }
 
+        @Override
         public boolean equals(Object other) {
             return other instanceof MetaTest5Id
                 && ((MetaTest5Id) other).id == id;
         }
 
+        @Override
         public int hashCode() {
             return (int) (id % Integer.MAX_VALUE);
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/NonPersistentFieldsPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/NonPersistentFieldsPC.java
index 87e857548..a8b82ad62 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/NonPersistentFieldsPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/NonPersistentFieldsPC.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.meta.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 
 import org.apache.openjpa.meta.ClassMetaData;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPC.java
index 6e5f4fb7b..1d78393f4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/OrderByPC.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.meta.common.apps;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.persistence.Entity;
 
 import org.apache.openjpa.persistence.PersistentCollection;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest1.java
index ec6c359f8..0bff77a48 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest1.java
@@ -25,12 +25,16 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+
 import javax.persistence.Entity;
 
 @Entity
 public class RuntimeTest1
     implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String someStaticField = "someField";
 
     private byte byteField;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest2.java
index 6e25c902c..92c812fe5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest2.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class RuntimeTest2
     extends RuntimeTest1 {
 
+    
+    private static final long serialVersionUID = 1L;
     private int intField2;
 
     public RuntimeTest2() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest3.java
index 63803f177..7626b124c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/RuntimeTest3.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class RuntimeTest3
     extends RuntimeTest2 {
 
+    
+    private static final long serialVersionUID = 1L;
     private int intField3;
 
     public RuntimeTest3() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned.java
index 5f0a9c310..3a9085f0d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned.java
@@ -44,6 +44,8 @@ public class SequenceAssigned {
 
     public static class Id implements java.io.Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public long pk;
 
         public Id() {
@@ -53,14 +55,17 @@ public class SequenceAssigned {
             pk = Long.parseLong(str);
         }
 
+        @Override
         public int hashCode() {
             return (int) (pk % (long) Integer.MAX_VALUE);
         }
 
+        @Override
         public String toString() {
             return pk + "";
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == null || !(o instanceof Id))
                 return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned3.java
index 5962e40b7..920ba41cc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/common/apps/SequenceAssigned3.java
@@ -35,6 +35,8 @@ public class SequenceAssigned3 {
 
     public static class Id implements java.io.Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public Long pk;
 
         public Id() {
@@ -44,15 +46,18 @@ public class SequenceAssigned3 {
             pk = Long.valueOf(str);
         }
 
+        @Override
         public int hashCode() {
             return (int) (pk == null ? 0 : pk.longValue()
                 % (long) Integer.MAX_VALUE);
         }
 
+        @Override
         public String toString() {
             return pk + "";
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == null || !(o instanceof Id))
                 return false;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/CompanyModelTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/CompanyModelTest.java
index 7706334ac..ea5e51e2f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/CompanyModelTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/CompanyModelTest.java
@@ -18,11 +18,22 @@
  */
 package org.apache.openjpa.persistence.models.company;
 
-import java.beans.*;
-import java.util.*;
+import java.beans.ExceptionListener;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.beans.XMLDecoder;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 
-import junit.framework.*;
-import org.apache.openjpa.persistence.test.*;
+import org.apache.openjpa.persistence.test.SingleEMTestCase;
+
+import junit.framework.AssertionFailedError;
 
 /**
  * Generic test case that will be extended by a concrete company
@@ -40,7 +51,7 @@ public abstract class CompanyModelTest
     public void setUp() {
         // make a map of the implementations based on the class names in
         // the current package of the test subclass
-        impls = new HashMap<Class,Class>();
+        impls = new HashMap<>();
         impls.put(IAddress.class, localClass("Address"));
         impls.put(ICompany.class, localClass("Company"));
         impls.put(ICustomer.class, localClass("Customer"));
@@ -87,7 +98,7 @@ public abstract class CompanyModelTest
                 if (pd.getWriteMethod() == null) // ignore read-only
                     continue;
 
-                Set<String> queries = new TreeSet<String>();
+                Set<String> queries = new TreeSet<>();
                 getBasicQueries(queries, pd, "x.");
 
                 StringBuilder str = new StringBuilder();
@@ -183,10 +194,11 @@ public abstract class CompanyModelTest
             // the classes statically
             factoryClasses = impls;
             try {
-                final List<Exception> exceptions = new LinkedList<Exception>();
+                final List<Exception> exceptions = new LinkedList<>();
                 XMLDecoder decoder = new XMLDecoder(CompanyModelTest.class.
                     getResourceAsStream("companies.xml"));
                 decoder.setExceptionListener(new ExceptionListener() {
+                    @Override
                     public void exceptionThrown(Exception e) {
                         exceptions.add(e);
                     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IAddress.java
index 09e846638..d5e770e87 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IAddress.java
@@ -20,18 +20,18 @@ package org.apache.openjpa.persistence.models.company;
 
 public interface IAddress {
 
-    public void setStreetAddress(String streetAddress);
-    public String getStreetAddress();
+    void setStreetAddress(String streetAddress);
+    String getStreetAddress();
 
-    public void setCity(String city);
-    public String getCity();
+    void setCity(String city);
+    String getCity();
 
-    public void setState(String state);
-    public String getState();
+    void setState(String state);
+    String getState();
 
-    public void setPostalCode(String postalCode);
-    public String getPostalCode();
+    void setPostalCode(String postalCode);
+    String getPostalCode();
 
-    public void setPhoneNumber(String phoneNumber);
-    public String getPhoneNumber();
+    void setPhoneNumber(String phoneNumber);
+    String getPhoneNumber();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICompany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICompany.java
index 7ef191ef1..581a2841e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICompany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICompany.java
@@ -18,19 +18,19 @@
  */
 package org.apache.openjpa.persistence.models.company;
 
-import java.util.*;
+import java.util.Set;
 
 public interface ICompany {
 
-    public void setName(String name);
-    public String getName();
+    void setName(String name);
+    String getName();
 
-    public void setAddress(IAddress address);
-    public IAddress getAddress();
+    void setAddress(IAddress address);
+    IAddress getAddress();
 
-    public void setEmployees(Set<? extends IEmployee> employees);
-    public Set<? extends IEmployee> getEmployees();
+    void setEmployees(Set<? extends IEmployee> employees);
+    Set<? extends IEmployee> getEmployees();
 
-    public void setProducts(Set<? extends IProduct> products);
-    public Set<? extends IProduct> getProducts();
+    void setProducts(Set<? extends IProduct> products);
+    Set<? extends IProduct> getProducts();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICustomer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICustomer.java
index 9a5d459a9..a9ba59098 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICustomer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICustomer.java
@@ -18,16 +18,16 @@
  */
 package org.apache.openjpa.persistence.models.company;
 
-import java.util.*;
+import java.util.Collection;
 
 public interface ICustomer extends IPerson {
 
-    public void setOrders(Collection<? extends IProductOrder> orders);
-    public Collection<? extends IProductOrder> getOrders();
+    void setOrders(Collection<? extends IProductOrder> orders);
+    Collection<? extends IProductOrder> getOrders();
 
-    public void setShippingAddress(IAddress shippingAddress);
-    public IAddress getShippingAddress();
+    void setShippingAddress(IAddress shippingAddress);
+    IAddress getShippingAddress();
 
-    public void setBillingAddress(IAddress billingAddress);
-    public IAddress getBillingAddress();
+    void setBillingAddress(IAddress billingAddress);
+    IAddress getBillingAddress();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IEmployee.java
index 1588e588d..06768e35a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IEmployee.java
@@ -18,19 +18,19 @@
  */
 package org.apache.openjpa.persistence.models.company;
 
-import java.util.*;
+import java.util.Date;
 
 public interface IEmployee extends IPerson {
 
-    public void setManager(IFullTimeEmployee manager);
-    public IFullTimeEmployee getManager();
+    void setManager(IFullTimeEmployee manager);
+    IFullTimeEmployee getManager();
 
-    public void setCompany(ICompany company);
-    public ICompany getCompany();
+    void setCompany(ICompany company);
+    ICompany getCompany();
 
-    public void setTitle(String title);
-    public String getTitle();
+    void setTitle(String title);
+    String getTitle();
 
-    public void setHireDate(Date hireDate);
-    public Date getHireDate();
+    void setHireDate(Date hireDate);
+    Date getHireDate();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IFullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IFullTimeEmployee.java
index 617fb516b..d0a90de8d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IFullTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IFullTimeEmployee.java
@@ -20,6 +20,6 @@ package org.apache.openjpa.persistence.models.company;
 
 public interface IFullTimeEmployee extends IEmployee {
 
-    public void setSalary(float salary);
-    public float getSalary();
+    void setSalary(float salary);
+    float getSalary();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ILineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ILineItem.java
index bbf9f2216..31a7a3030 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ILineItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ILineItem.java
@@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.models.company;
 
 public interface ILineItem {
 
-    public void setQuantity(int quantity);
-    public int getQuantity();
+    void setQuantity(int quantity);
+    int getQuantity();
 
-    public void setProduct(IProduct product);
-    public IProduct getProduct();
+    void setProduct(IProduct product);
+    IProduct getProduct();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPartTimeEmployee.java
index fe9008129..198b89022 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPartTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPartTimeEmployee.java
@@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.models.company;
 
 public interface IPartTimeEmployee extends IEmployee {
 
-    public void setWage(float wage);
-    public float getWage();
+    void setWage(float wage);
+    float getWage();
 
-    public void setWeeklyHours(int weeklyHours);
-    public int getWeeklyHours();
+    void setWeeklyHours(int weeklyHours);
+    int getWeeklyHours();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPerson.java
index e31f9d178..87521eed8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPerson.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPerson.java
@@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.models.company;
 
 public interface IPerson {
 
-    public void setFirstName(String firstName);
-    public String getFirstName();
+    void setFirstName(String firstName);
+    String getFirstName();
 
-    public void setLastName(String lastName);
-    public String getLastName();
+    void setLastName(String lastName);
+    String getLastName();
 
-    public void setHomeAddress(IAddress homeAddress);
-    public IAddress getHomeAddress();
+    void setHomeAddress(IAddress homeAddress);
+    IAddress getHomeAddress();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProduct.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProduct.java
index 6d1dab87e..69277ed45 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProduct.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProduct.java
@@ -18,19 +18,19 @@
  */
 package org.apache.openjpa.persistence.models.company;
 
-import java.util.*;
+import java.util.Set;
 
 public interface IProduct {
 
-    public void setName(String name);
-    public String getName();
+    void setName(String name);
+    String getName();
 
-    public void setImage(byte[] image);
-    public byte[] getImage();
+    void setImage(byte[] image);
+    byte[] getImage();
 
-    public void setPrice(float price);
-    public float getPrice();
+    void setPrice(float price);
+    float getPrice();
 
-    public void setDistributors(Set<? extends ICompany> distributors);
-    public Set<? extends ICompany> getDistributors();
+    void setDistributors(Set<? extends ICompany> distributors);
+    Set<? extends ICompany> getDistributors();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProductOrder.java
index 9107a7517..c685d64d4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProductOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProductOrder.java
@@ -18,19 +18,20 @@
  */
 package org.apache.openjpa.persistence.models.company;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 public interface IProductOrder {
 
-    public void setItems(List<? extends ILineItem> items);
-    public List<? extends ILineItem> getItems();
+    void setItems(List<? extends ILineItem> items);
+    List<? extends ILineItem> getItems();
 
-    public void setOrderDate(Date orderDate);
-    public Date getOrderDate();
+    void setOrderDate(Date orderDate);
+    Date getOrderDate();
 
-    public void setShippedDate(Date shippedDate);
-    public Date getShippedDate();
+    void setShippedDate(Date shippedDate);
+    Date getShippedDate();
 
-    public void setCustomer(ICustomer customer);
-    public ICustomer getCustomer();
+    void setCustomer(ICustomer customer);
+    ICustomer getCustomer();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java
index 1cdbd70cb..4f7fc52e8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java
@@ -18,8 +18,11 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
 
 @Entity(name="BAS_Address")
 public class Address implements IAddress {
@@ -43,46 +46,56 @@ public class Address implements IAddress {
     @Basic
     private String phoneNumber;
 
+    @Override
     public void setStreetAddress(String streetAddress) {
         this.streetAddress = streetAddress;
     }
 
+    @Override
     public String getStreetAddress() {
         return this.streetAddress;
     }
 
 
+    @Override
     public void setCity(String city) {
         this.city = city;
     }
 
+    @Override
     public String getCity() {
         return this.city;
     }
 
 
+    @Override
     public void setState(String state) {
         this.state = state;
     }
 
+    @Override
     public String getState() {
         return this.state;
     }
 
 
+    @Override
     public void setPostalCode(String postalCode) {
         this.postalCode = postalCode;
     }
 
+    @Override
     public String getPostalCode() {
         return this.postalCode;
     }
 
 
+    @Override
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
 
+    @Override
     public String getPhoneNumber() {
         return this.phoneNumber;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java
index df7c1b602..2e4f641e9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java
@@ -18,9 +18,20 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IEmployee;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="BAS_Company")
 public class Company implements ICompany {
@@ -36,42 +47,50 @@ public class Company implements ICompany {
     private Address address;
 
     @OneToMany(mappedBy="company")
-    private Set<Employee> employees = new HashSet<Employee>();
+    private Set<Employee> employees = new HashSet<>();
 
     @ManyToMany(mappedBy="distributors")
-    private Set<Product> products = new HashSet<Product>();
+    private Set<Product> products = new HashSet<>();
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
 
+    @Override
     public void setAddress(IAddress address) {
         this.address = (Address) address;
     }
 
+    @Override
     public IAddress getAddress() {
         return this.address;
     }
 
 
+    @Override
     public void setEmployees(Set<? extends IEmployee> employees) {
         this.employees = (Set<Employee>) employees;
     }
 
+    @Override
     public Set<Employee> getEmployees() {
         return this.employees;
     }
 
 
+    @Override
     public void setProducts(Set<? extends IProduct> products) {
         this.products = (Set<Product>) products;
     }
 
+    @Override
     public Set<Product> getProducts() {
         return this.products;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java
index 7563800a6..741b9f98c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java
@@ -18,14 +18,21 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.ICustomer;
+import org.apache.openjpa.persistence.models.company.IProductOrder;
 
 @Entity(name="BAS_Customer")
 public class Customer extends Person implements ICustomer {
     @OneToMany(mappedBy="customer")
-    private Collection<ProductOrder> orders = new ArrayList<ProductOrder>();
+    private Collection<ProductOrder> orders = new ArrayList<>();
 
     @OneToOne
     private Address shippingAddress;
@@ -33,28 +40,34 @@ public class Customer extends Person implements ICustomer {
     @OneToOne
     private Address billingAddress;
 
+    @Override
     public void setOrders(Collection<? extends IProductOrder> orders) {
         this.orders = (Collection<ProductOrder>) orders;
     }
 
+    @Override
     public Collection<ProductOrder> getOrders() {
         return this.orders;
     }
 
 
+    @Override
     public void setShippingAddress(IAddress shippingAddress) {
         this.shippingAddress = (Address) shippingAddress;
     }
 
+    @Override
     public IAddress getShippingAddress() {
         return this.shippingAddress;
     }
 
 
+    @Override
     public void setBillingAddress(IAddress billingAddress) {
         this.billingAddress = (Address) billingAddress;
     }
 
+    @Override
     public IAddress getBillingAddress() {
         return this.billingAddress;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java
index 2016f43bd..90139e464 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java
@@ -18,9 +18,15 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IEmployee;
+import org.apache.openjpa.persistence.models.company.IFullTimeEmployee;
 
 @Entity(name="BAS_Employee")
 public abstract class Employee extends Person implements IEmployee {
@@ -36,37 +42,45 @@ public abstract class Employee extends Person implements IEmployee {
     @Basic
     private Date hireDate;
 
+    @Override
     public void setManager(IFullTimeEmployee manager) {
         this.manager = (FullTimeEmployee) manager;
     }
 
+    @Override
     public IFullTimeEmployee getManager() {
         return this.manager;
     }
 
 
+    @Override
     public void setCompany(ICompany company) {
         this.company = (Company) company;
     }
 
+    @Override
     public ICompany getCompany() {
         return this.company;
     }
 
 
+    @Override
     public void setTitle(String title) {
         this.title = title;
     }
 
+    @Override
     public String getTitle() {
         return this.title;
     }
 
 
+    @Override
     public void setHireDate(Date hireDate) {
         this.hireDate = hireDate;
     }
 
+    @Override
     public Date getHireDate() {
         return this.hireDate;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java
index b3fcdfc58..efec92f6d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+
+import org.apache.openjpa.persistence.models.company.IFullTimeEmployee;
 
 @Entity(name="BAS_FullTimeEmployee")
 public class FullTimeEmployee extends Employee
@@ -27,10 +29,12 @@ public class FullTimeEmployee extends Employee
     @Basic
     private float salary;
 
+    @Override
     public void setSalary(float salary) {
         this.salary = salary;
     }
 
+    @Override
     public float getSalary() {
         return this.salary;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java
index 102ffe969..772b50611 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ILineItem;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="BAS_LineItem")
 public class LineItem implements ILineItem {
@@ -34,19 +39,23 @@ public class LineItem implements ILineItem {
     @OneToOne
     private Product product;
 
+    @Override
     public void setQuantity(int quantity) {
         this.quantity = quantity;
     }
 
+    @Override
     public int getQuantity() {
         return this.quantity;
     }
 
 
+    @Override
     public void setProduct(IProduct product) {
         this.product = (Product) product;
     }
 
+    @Override
     public IProduct getProduct() {
         return this.product;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java
index c3b2d130e..bbc638948 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+
+import org.apache.openjpa.persistence.models.company.IPartTimeEmployee;
 
 @Entity(name="BAS_PartTimeEmployee")
 public class PartTimeEmployee extends Employee
@@ -30,19 +32,23 @@ public class PartTimeEmployee extends Employee
     @Basic
     private int weeklyHours;
 
+    @Override
     public void setWage(float wage) {
         this.wage = wage;
     }
 
+    @Override
     public float getWage() {
         return this.wage;
     }
 
 
+    @Override
     public void setWeeklyHours(int weeklyHours) {
         this.weeklyHours = weeklyHours;
     }
 
+    @Override
     public int getWeeklyHours() {
         return this.weeklyHours;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java
index 2bbb061f2..5430efa90 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java
@@ -18,8 +18,15 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.IPerson;
 
 @Entity(name="BAS_Person")
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
@@ -38,28 +45,34 @@ public abstract class Person implements IPerson {
     @OneToOne
     private Address homeAddress;
 
+    @Override
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
+    @Override
     public String getFirstName() {
         return this.firstName;
     }
 
 
+    @Override
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
+    @Override
     public String getLastName() {
         return this.lastName;
     }
 
 
+    @Override
     public void setHomeAddress(IAddress homeAddress) {
         this.homeAddress = (Address) homeAddress;
     }
 
+    @Override
     public IAddress getHomeAddress() {
         return this.homeAddress;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java
index e62951e44..1e64154ef 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java
@@ -18,9 +18,16 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="BAS_Product")
 public class Product implements IProduct {
@@ -39,39 +46,47 @@ public class Product implements IProduct {
     private float price;
 
     @ManyToMany
-    private Set<Company> distributors = new HashSet<Company>();
+    private Set<Company> distributors = new HashSet<>();
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
 
+    @Override
     public void setImage(byte[] image) {
         this.image = image;
     }
 
+    @Override
     public byte[] getImage() {
         return this.image;
     }
 
 
+    @Override
     public void setPrice(float price) {
         this.price = price;
     }
 
+    @Override
     public float getPrice() {
         return this.price;
     }
 
 
+    @Override
     public void setDistributors(Set<? extends ICompany> distributors) {
         this.distributors = (Set<Company>) distributors;
     }
 
+    @Override
     public Set<Company> getDistributors() {
         return this.distributors;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java
index ed8cac487..94ce4f8a0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java
@@ -18,9 +18,19 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ICustomer;
+import org.apache.openjpa.persistence.models.company.ILineItem;
+import org.apache.openjpa.persistence.models.company.IProductOrder;
 
 @Entity(name="BAS_ProductOrder")
 public class ProductOrder implements IProductOrder {
@@ -30,7 +40,7 @@ public class ProductOrder implements IProductOrder {
     private long id = idCounter++;
 
     @OneToMany
-    private List<LineItem> items = new LinkedList<LineItem>();
+    private List<LineItem> items = new LinkedList<>();
 
     @Basic
     private Date orderDate;
@@ -41,37 +51,45 @@ public class ProductOrder implements IProductOrder {
     @OneToOne
     private Customer customer;
 
+    @Override
     public void setItems(List<? extends ILineItem> items) {
         this.items = (List<LineItem>) items;
     }
 
+    @Override
     public List<LineItem> getItems() {
         return this.items;
     }
 
 
+    @Override
     public void setOrderDate(Date orderDate) {
         this.orderDate = orderDate;
     }
 
+    @Override
     public Date getOrderDate() {
         return this.orderDate;
     }
 
 
+    @Override
     public void setShippedDate(Date shippedDate) {
         this.shippedDate = shippedDate;
     }
 
+    @Override
     public Date getShippedDate() {
         return this.shippedDate;
     }
 
 
+    @Override
     public void setCustomer(ICustomer customer) {
         this.customer = (Customer) customer;
     }
 
+    @Override
     public ICustomer getCustomer() {
         return this.customer;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/TestBasicCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/TestBasicCompanyModel.java
index 15999d1bb..38c62aeea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/TestBasicCompanyModel.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/TestBasicCompanyModel.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.models.company.basic;
 
-import org.apache.openjpa.persistence.models.company.*;
+import org.apache.openjpa.persistence.models.company.CompanyModelTest;
 
 public class TestBasicCompanyModel extends CompanyModelTest {
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java
index f856b0160..1fb6c7e3d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java
@@ -18,8 +18,12 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
 
 @Entity(name="LAZ_Address")
 public class Address implements IAddress {
@@ -43,46 +47,56 @@ public class Address implements IAddress {
     @Basic(fetch=FetchType.LAZY)
     private String phoneNumber;
 
+    @Override
     public void setStreetAddress(String streetAddress) {
         this.streetAddress = streetAddress;
     }
 
+    @Override
     public String getStreetAddress() {
         return this.streetAddress;
     }
 
 
+    @Override
     public void setCity(String city) {
         this.city = city;
     }
 
+    @Override
     public String getCity() {
         return this.city;
     }
 
 
+    @Override
     public void setState(String state) {
         this.state = state;
     }
 
+    @Override
     public String getState() {
         return this.state;
     }
 
 
+    @Override
     public void setPostalCode(String postalCode) {
         this.postalCode = postalCode;
     }
 
+    @Override
     public String getPostalCode() {
         return this.postalCode;
     }
 
 
+    @Override
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
 
+    @Override
     public String getPhoneNumber() {
         return this.phoneNumber;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java
index 82849763e..96a7bc318 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java
@@ -18,9 +18,21 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IEmployee;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="LAZ_Company")
 public class Company implements ICompany {
@@ -36,42 +48,50 @@ public class Company implements ICompany {
     private Address address;
 
     @OneToMany(mappedBy="company", fetch=FetchType.LAZY)
-    private Set<Employee> employees = new HashSet<Employee>();
+    private Set<Employee> employees = new HashSet<>();
 
     @ManyToMany(mappedBy="distributors", fetch=FetchType.LAZY)
-    private Set<Product> products = new HashSet<Product>();
+    private Set<Product> products = new HashSet<>();
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
 
+    @Override
     public void setAddress(IAddress address) {
         this.address = (Address) address;
     }
 
+    @Override
     public IAddress getAddress() {
         return this.address;
     }
 
 
+    @Override
     public void setEmployees(Set<? extends IEmployee> employees) {
         this.employees = (Set<Employee>) employees;
     }
 
+    @Override
     public Set<Employee> getEmployees() {
         return this.employees;
     }
 
 
+    @Override
     public void setProducts(Set<? extends IProduct> products) {
         this.products = (Set<Product>) products;
     }
 
+    @Override
     public Set<Product> getProducts() {
         return this.products;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java
index 845d8696f..d328e613f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java
@@ -18,14 +18,22 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.ICustomer;
+import org.apache.openjpa.persistence.models.company.IProductOrder;
 
 @Entity(name="LAZ_Customer")
 public class Customer extends Person implements ICustomer {
     @OneToMany(mappedBy="customer",fetch=FetchType.LAZY)
-    private Collection<ProductOrder> orders = new ArrayList<ProductOrder>();
+    private Collection<ProductOrder> orders = new ArrayList<>();
 
     @OneToOne(fetch=FetchType.LAZY)
     private Address shippingAddress;
@@ -33,28 +41,34 @@ public class Customer extends Person implements ICustomer {
     @OneToOne(fetch=FetchType.LAZY)
     private Address billingAddress;
 
+    @Override
     public void setOrders(Collection<? extends IProductOrder> orders) {
         this.orders = (Collection<ProductOrder>) orders;
     }
 
+    @Override
     public Collection<ProductOrder> getOrders() {
         return this.orders;
     }
 
 
+    @Override
     public void setShippingAddress(IAddress shippingAddress) {
         this.shippingAddress = (Address) shippingAddress;
     }
 
+    @Override
     public IAddress getShippingAddress() {
         return this.shippingAddress;
     }
 
 
+    @Override
     public void setBillingAddress(IAddress billingAddress) {
         this.billingAddress = (Address) billingAddress;
     }
 
+    @Override
     public IAddress getBillingAddress() {
         return this.billingAddress;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java
index 162675a70..5e79e4ac9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java
@@ -18,9 +18,16 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IEmployee;
+import org.apache.openjpa.persistence.models.company.IFullTimeEmployee;
 
 @Entity(name="LAZ_Employee")
 public abstract class Employee extends Person implements IEmployee {
@@ -36,37 +43,45 @@ public abstract class Employee extends Person implements IEmployee {
     @Basic(fetch=FetchType.LAZY)
     private Date hireDate;
 
+    @Override
     public void setManager(IFullTimeEmployee manager) {
         this.manager = (FullTimeEmployee) manager;
     }
 
+    @Override
     public IFullTimeEmployee getManager() {
         return this.manager;
     }
 
 
+    @Override
     public void setCompany(ICompany company) {
         this.company = (Company) company;
     }
 
+    @Override
     public ICompany getCompany() {
         return this.company;
     }
 
 
+    @Override
     public void setTitle(String title) {
         this.title = title;
     }
 
+    @Override
     public String getTitle() {
         return this.title;
     }
 
 
+    @Override
     public void setHireDate(Date hireDate) {
         this.hireDate = hireDate;
     }
 
+    @Override
     public Date getHireDate() {
         return this.hireDate;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java
index 1012a8173..2c437e83f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java
@@ -18,8 +18,11 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+
+import org.apache.openjpa.persistence.models.company.IFullTimeEmployee;
 
 @Entity(name="LAZ_FullTimeEmployee")
 public class FullTimeEmployee extends Employee
@@ -27,10 +30,12 @@ public class FullTimeEmployee extends Employee
     @Basic(fetch=FetchType.LAZY)
     private float salary;
 
+    @Override
     public void setSalary(float salary) {
         this.salary = salary;
     }
 
+    @Override
     public float getSalary() {
         return this.salary;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java
index 27eb8bc5e..b6787616f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java
@@ -18,8 +18,14 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ILineItem;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="LAZ_LineItem")
 public class LineItem implements ILineItem {
@@ -34,19 +40,23 @@ public class LineItem implements ILineItem {
     @OneToOne(fetch=FetchType.LAZY)
     private Product product;
 
+    @Override
     public void setQuantity(int quantity) {
         this.quantity = quantity;
     }
 
+    @Override
     public int getQuantity() {
         return this.quantity;
     }
 
 
+    @Override
     public void setProduct(IProduct product) {
         this.product = (Product) product;
     }
 
+    @Override
     public IProduct getProduct() {
         return this.product;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java
index cd4e113a2..09cede065 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java
@@ -18,8 +18,11 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+
+import org.apache.openjpa.persistence.models.company.IPartTimeEmployee;
 
 @Entity(name="LAZ_PartTimeEmployee")
 public class PartTimeEmployee extends Employee
@@ -30,19 +33,23 @@ public class PartTimeEmployee extends Employee
     @Basic(fetch=FetchType.LAZY)
     private int weeklyHours;
 
+    @Override
     public void setWage(float wage) {
         this.wage = wage;
     }
 
+    @Override
     public float getWage() {
         return this.wage;
     }
 
 
+    @Override
     public void setWeeklyHours(int weeklyHours) {
         this.weeklyHours = weeklyHours;
     }
 
+    @Override
     public int getWeeklyHours() {
         return this.weeklyHours;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java
index 5088a27e1..af4304d3a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java
@@ -18,8 +18,16 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.IPerson;
 
 @Entity(name="LAZ_Person")
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
@@ -38,28 +46,34 @@ public abstract class Person implements IPerson {
     @OneToOne(fetch=FetchType.LAZY)
     private Address homeAddress;
 
+    @Override
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
+    @Override
     public String getFirstName() {
         return this.firstName;
     }
 
 
+    @Override
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
+    @Override
     public String getLastName() {
         return this.lastName;
     }
 
 
+    @Override
     public void setHomeAddress(IAddress homeAddress) {
         this.homeAddress = (Address) homeAddress;
     }
 
+    @Override
     public IAddress getHomeAddress() {
         return this.homeAddress;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java
index a1524b06c..0fafb29a3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java
@@ -18,9 +18,17 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="LAZ_Product")
 public class Product implements IProduct {
@@ -39,39 +47,47 @@ public class Product implements IProduct {
     private float price;
 
     @ManyToMany(fetch=FetchType.LAZY)
-    private Set<Company> distributors = new HashSet<Company>();
+    private Set<Company> distributors = new HashSet<>();
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
 
+    @Override
     public void setImage(byte[] image) {
         this.image = image;
     }
 
+    @Override
     public byte[] getImage() {
         return this.image;
     }
 
 
+    @Override
     public void setPrice(float price) {
         this.price = price;
     }
 
+    @Override
     public float getPrice() {
         return this.price;
     }
 
 
+    @Override
     public void setDistributors(Set<? extends ICompany> distributors) {
         this.distributors = (Set<Company>) distributors;
     }
 
+    @Override
     public Set<Company> getDistributors() {
         return this.distributors;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java
index 1cea0e3d3..8bdc7d615 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java
@@ -18,9 +18,20 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ICustomer;
+import org.apache.openjpa.persistence.models.company.ILineItem;
+import org.apache.openjpa.persistence.models.company.IProductOrder;
 
 @Entity(name="LAZ_ProductOrder")
 public class ProductOrder implements IProductOrder {
@@ -30,7 +41,7 @@ public class ProductOrder implements IProductOrder {
     private long id = idCounter++;
 
     @OneToMany(fetch=FetchType.LAZY)
-    private List<LineItem> items = new LinkedList<LineItem>();
+    private List<LineItem> items = new LinkedList<>();
 
     @Basic(fetch=FetchType.LAZY)
     private Date orderDate;
@@ -41,37 +52,45 @@ public class ProductOrder implements IProductOrder {
     @OneToOne(fetch=FetchType.LAZY)
     private Customer customer;
 
+    @Override
     public void setItems(List<? extends ILineItem> items) {
         this.items = (List<LineItem>) items;
     }
 
+    @Override
     public List<LineItem> getItems() {
         return this.items;
     }
 
 
+    @Override
     public void setOrderDate(Date orderDate) {
         this.orderDate = orderDate;
     }
 
+    @Override
     public Date getOrderDate() {
         return this.orderDate;
     }
 
 
+    @Override
     public void setShippedDate(Date shippedDate) {
         this.shippedDate = shippedDate;
     }
 
+    @Override
     public Date getShippedDate() {
         return this.shippedDate;
     }
 
 
+    @Override
     public void setCustomer(ICustomer customer) {
         this.customer = (Customer) customer;
     }
 
+    @Override
     public ICustomer getCustomer() {
         return this.customer;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/TestLazyCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/TestLazyCompanyModel.java
index 833d08eba..c053149a8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/TestLazyCompanyModel.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/TestLazyCompanyModel.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.models.company.fetchlazy;
 
-import org.apache.openjpa.persistence.models.company.*;
+import org.apache.openjpa.persistence.models.company.CompanyModelTest;
 
 public class TestLazyCompanyModel extends CompanyModelTest {
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java
index 612b99623..13fd7c68b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java
@@ -18,8 +18,11 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
 
 @Entity(name="IDC_Address")
 public class Address implements IAddress {
@@ -43,46 +46,56 @@ public class Address implements IAddress {
     @Basic
     private String phoneNumber;
 
+    @Override
     public void setStreetAddress(String streetAddress) {
         this.streetAddress = streetAddress;
     }
 
+    @Override
     public String getStreetAddress() {
         return this.streetAddress;
     }
 
 
+    @Override
     public void setCity(String city) {
         this.city = city;
     }
 
+    @Override
     public String getCity() {
         return this.city;
     }
 
 
+    @Override
     public void setState(String state) {
         this.state = state;
     }
 
+    @Override
     public String getState() {
         return this.state;
     }
 
 
+    @Override
     public void setPostalCode(String postalCode) {
         this.postalCode = postalCode;
     }
 
+    @Override
     public String getPostalCode() {
         return this.postalCode;
     }
 
 
+    @Override
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
 
+    @Override
     public String getPhoneNumber() {
         return this.phoneNumber;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java
index eb17d36e0..7a6a4518b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java
@@ -18,9 +18,20 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IEmployee;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="IDC_Company")
 public class Company implements ICompany {
@@ -36,42 +47,50 @@ public class Company implements ICompany {
     private Address address;
 
     @OneToMany(mappedBy="company")
-    private Set<Employee> employees = new HashSet<Employee>();
+    private Set<Employee> employees = new HashSet<>();
 
     @ManyToMany(mappedBy="distributors")
-    private Set<Product> products = new HashSet<Product>();
+    private Set<Product> products = new HashSet<>();
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
 
+    @Override
     public void setAddress(IAddress address) {
         this.address = (Address) address;
     }
 
+    @Override
     public IAddress getAddress() {
         return this.address;
     }
 
 
+    @Override
     public void setEmployees(Set<? extends IEmployee> employees) {
         this.employees = (Set<Employee>) employees;
     }
 
+    @Override
     public Set<Employee> getEmployees() {
         return this.employees;
     }
 
 
+    @Override
     public void setProducts(Set<? extends IProduct> products) {
         this.products = (Set<Product>) products;
     }
 
+    @Override
     public Set<Product> getProducts() {
         return this.products;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java
index 3a18ca43f..aef5ce0eb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java
@@ -18,15 +18,22 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.ICustomer;
+import org.apache.openjpa.persistence.models.company.IProductOrder;
 
 @Entity(name="IDC_Customer")
 public class Customer extends Person implements ICustomer {
 
     @OneToMany(mappedBy="customer")
-    private Collection<ProductOrder> orders = new ArrayList<ProductOrder>();
+    private Collection<ProductOrder> orders = new ArrayList<>();
 
     @OneToOne
     private Address shippingAddress;
@@ -34,28 +41,34 @@ public class Customer extends Person implements ICustomer {
     @OneToOne
     private Address billingAddress;
 
+    @Override
     public void setOrders(Collection<? extends IProductOrder> orders) {
         this.orders = (Collection<ProductOrder>) orders;
     }
 
+    @Override
     public Collection<ProductOrder> getOrders() {
         return this.orders;
     }
 
 
+    @Override
     public void setShippingAddress(IAddress shippingAddress) {
         this.shippingAddress = (Address) shippingAddress;
     }
 
+    @Override
     public IAddress getShippingAddress() {
         return this.shippingAddress;
     }
 
 
+    @Override
     public void setBillingAddress(IAddress billingAddress) {
         this.billingAddress = (Address) billingAddress;
     }
 
+    @Override
     public IAddress getBillingAddress() {
         return this.billingAddress;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java
index 7f4ab3ab7..61c95242d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java
@@ -18,9 +18,15 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IEmployee;
+import org.apache.openjpa.persistence.models.company.IFullTimeEmployee;
 
 @Entity(name="IDC_Employee")
 public abstract class Employee extends Person implements IEmployee {
@@ -37,37 +43,45 @@ public abstract class Employee extends Person implements IEmployee {
     @Basic
     private Date hireDate;
 
+    @Override
     public void setManager(IFullTimeEmployee manager) {
         this.manager = (FullTimeEmployee) manager;
     }
 
+    @Override
     public IFullTimeEmployee getManager() {
         return this.manager;
     }
 
 
+    @Override
     public void setCompany(ICompany company) {
         this.company = (Company) company;
     }
 
+    @Override
     public ICompany getCompany() {
         return this.company;
     }
 
 
+    @Override
     public void setTitle(String title) {
         this.title = title;
     }
 
+    @Override
     public String getTitle() {
         return this.title;
     }
 
 
+    @Override
     public void setHireDate(Date hireDate) {
         this.hireDate = hireDate;
     }
 
+    @Override
     public Date getHireDate() {
         return this.hireDate;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java
index d2726d586..89445c76c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+
+import org.apache.openjpa.persistence.models.company.IFullTimeEmployee;
 
 @Entity(name="IDC_FullTimeEmployee")
 public class FullTimeEmployee extends Employee
@@ -28,10 +30,12 @@ public class FullTimeEmployee extends Employee
     @Basic
     private float salary;
 
+    @Override
     public void setSalary(float salary) {
         this.salary = salary;
     }
 
+    @Override
     public float getSalary() {
         return this.salary;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java
index 2414e5de2..73da4d748 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ILineItem;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="IDC_LineItem")
 public class LineItem implements ILineItem {
@@ -34,19 +39,23 @@ public class LineItem implements ILineItem {
     @OneToOne
     private Product product;
 
+    @Override
     public void setQuantity(int quantity) {
         this.quantity = quantity;
     }
 
+    @Override
     public int getQuantity() {
         return this.quantity;
     }
 
 
+    @Override
     public void setProduct(IProduct product) {
         this.product = (Product) product;
     }
 
+    @Override
     public IProduct getProduct() {
         return this.product;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java
index 79998fec9..2213f82dd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java
@@ -18,8 +18,10 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+
+import org.apache.openjpa.persistence.models.company.IPartTimeEmployee;
 
 @Entity(name="IDC_PartTimeEmployee")
 public class PartTimeEmployee extends Employee
@@ -30,19 +32,23 @@ public class PartTimeEmployee extends Employee
     @Basic
     private int weeklyHours;
 
+    @Override
     public void setWage(float wage) {
         this.wage = wage;
     }
 
+    @Override
     public float getWage() {
         return this.wage;
     }
 
 
+    @Override
     public void setWeeklyHours(int weeklyHours) {
         this.weeklyHours = weeklyHours;
     }
 
+    @Override
     public int getWeeklyHours() {
         return this.weeklyHours;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java
index 725553e9d..570daf9e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java
@@ -18,8 +18,15 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.IPerson;
 
 @Entity(name="IDC_Person")
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
@@ -38,28 +45,34 @@ public abstract class Person implements IPerson {
     @OneToOne
     private Address homeAddress;
 
+    @Override
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
+    @Override
     public String getFirstName() {
         return this.firstName;
     }
 
 
+    @Override
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
+    @Override
     public String getLastName() {
         return this.lastName;
     }
 
 
+    @Override
     public void setHomeAddress(IAddress homeAddress) {
         this.homeAddress = (Address) homeAddress;
     }
 
+    @Override
     public IAddress getHomeAddress() {
         return this.homeAddress;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java
index d91cb5509..5d033ca79 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java
@@ -18,9 +18,16 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="IDC_Product")
 public class Product implements IProduct {
@@ -39,39 +46,47 @@ public class Product implements IProduct {
     private float price;
 
     @ManyToMany
-    private Set<Company> distributors = new HashSet<Company>();
+    private Set<Company> distributors = new HashSet<>();
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
 
+    @Override
     public void setImage(byte[] image) {
         this.image = image;
     }
 
+    @Override
     public byte[] getImage() {
         return this.image;
     }
 
 
+    @Override
     public void setPrice(float price) {
         this.price = price;
     }
 
+    @Override
     public float getPrice() {
         return this.price;
     }
 
 
+    @Override
     public void setDistributors(Set<? extends ICompany> distributors) {
         this.distributors = (Set<Company>) distributors;
     }
 
+    @Override
     public Set<Company> getDistributors() {
         return this.distributors;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java
index f19fd916b..4537a6a6d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java
@@ -18,9 +18,19 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ICustomer;
+import org.apache.openjpa.persistence.models.company.ILineItem;
+import org.apache.openjpa.persistence.models.company.IProductOrder;
 
 @Entity(name="IDC_ProductOrder")
 public class ProductOrder implements IProductOrder {
@@ -30,7 +40,7 @@ public class ProductOrder implements IProductOrder {
     private int id = ++ids;
 
     @OneToMany
-    private List<LineItem> items = new LinkedList<LineItem>();
+    private List<LineItem> items = new LinkedList<>();
 
     @Basic
     private Date orderDate;
@@ -41,37 +51,45 @@ public class ProductOrder implements IProductOrder {
     @OneToOne
     private Customer customer;
 
+    @Override
     public void setItems(List<? extends ILineItem> items) {
         this.items = (List<LineItem>) items;
     }
 
+    @Override
     public List<LineItem> getItems() {
         return this.items;
     }
 
 
+    @Override
     public void setOrderDate(Date orderDate) {
         this.orderDate = orderDate;
     }
 
+    @Override
     public Date getOrderDate() {
         return this.orderDate;
     }
 
 
+    @Override
     public void setShippedDate(Date shippedDate) {
         this.shippedDate = shippedDate;
     }
 
+    @Override
     public Date getShippedDate() {
         return this.shippedDate;
     }
 
 
+    @Override
     public void setCustomer(ICustomer customer) {
         this.customer = (Customer) customer;
     }
 
+    @Override
     public ICustomer getCustomer() {
         return this.customer;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/TestIdClassCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/TestIdClassCompanyModel.java
index 887b56d6c..c6cd36438 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/TestIdClassCompanyModel.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/TestIdClassCompanyModel.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.models.company.idclass;
 
-import org.apache.openjpa.persistence.models.company.*;
+import org.apache.openjpa.persistence.models.company.CompanyModelTest;
 
 public class TestIdClassCompanyModel extends CompanyModelTest {
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java
index cdfbe3ed7..6ef36ff24 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java
@@ -18,8 +18,11 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
 
 @Entity(name="JI_Address")
 public class Address implements IAddress {
@@ -43,46 +46,56 @@ public class Address implements IAddress {
     @Basic
     private String phoneNumber;
 
+    @Override
     public void setStreetAddress(String streetAddress) {
         this.streetAddress = streetAddress;
     }
 
+    @Override
     public String getStreetAddress() {
         return this.streetAddress;
     }
 
 
+    @Override
     public void setCity(String city) {
         this.city = city;
     }
 
+    @Override
     public String getCity() {
         return this.city;
     }
 
 
+    @Override
     public void setState(String state) {
         this.state = state;
     }
 
+    @Override
     public String getState() {
         return this.state;
     }
 
 
+    @Override
     public void setPostalCode(String postalCode) {
         this.postalCode = postalCode;
     }
 
+    @Override
     public String getPostalCode() {
         return this.postalCode;
     }
 
 
+    @Override
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
 
+    @Override
     public String getPhoneNumber() {
         return this.phoneNumber;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java
index 71bded986..d62f3c8f2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java
@@ -18,9 +18,20 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IEmployee;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="JI_Company")
 public class Company implements ICompany {
@@ -36,42 +47,50 @@ public class Company implements ICompany {
     private Address address;
 
     @OneToMany(mappedBy="company")
-    private Set<Employee> employees = new HashSet<Employee>();
+    private Set<Employee> employees = new HashSet<>();
 
     @ManyToMany(mappedBy="distributors")
-    private Set<Product> products = new HashSet<Product>();
+    private Set<Product> products = new HashSet<>();
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
 
+    @Override
     public void setAddress(IAddress address) {
         this.address = (Address) address;
     }
 
+    @Override
     public IAddress getAddress() {
         return this.address;
     }
 
 
+    @Override
     public void setEmployees(Set<? extends IEmployee> employees) {
         this.employees = (Set<Employee>) employees;
     }
 
+    @Override
     public Set<Employee> getEmployees() {
         return this.employees;
     }
 
 
+    @Override
     public void setProducts(Set<? extends IProduct> products) {
         this.products = (Set<Product>) products;
     }
 
+    @Override
     public Set<Product> getProducts() {
         return this.products;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java
index f5f330555..3ff9efa41 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java
@@ -18,15 +18,24 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.ICustomer;
+import org.apache.openjpa.persistence.models.company.IProductOrder;
 
 @Entity(name="JI_Customer")
 @Inheritance(strategy=InheritanceType.JOINED)
 public class Customer extends Person implements ICustomer {
     @OneToMany(mappedBy="customer")
-    private Collection<ProductOrder> orders = new ArrayList<ProductOrder>();
+    private Collection<ProductOrder> orders = new ArrayList<>();
 
     @OneToOne
     private Address shippingAddress;
@@ -34,28 +43,34 @@ public class Customer extends Person implements ICustomer {
     @OneToOne
     private Address billingAddress;
 
+    @Override
     public void setOrders(Collection<? extends IProductOrder> orders) {
         this.orders = (Collection<ProductOrder>) orders;
     }
 
+    @Override
     public Collection<ProductOrder> getOrders() {
         return this.orders;
     }
 
 
+    @Override
     public void setShippingAddress(IAddress shippingAddress) {
         this.shippingAddress = (Address) shippingAddress;
     }
 
+    @Override
     public IAddress getShippingAddress() {
         return this.shippingAddress;
     }
 
 
+    @Override
     public void setBillingAddress(IAddress billingAddress) {
         this.billingAddress = (Address) billingAddress;
     }
 
+    @Override
     public IAddress getBillingAddress() {
         return this.billingAddress;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java
index 23c69b7f4..ae1608462 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java
@@ -18,9 +18,17 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IEmployee;
+import org.apache.openjpa.persistence.models.company.IFullTimeEmployee;
 
 @Entity(name="JI_Employee")
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -37,37 +45,45 @@ public abstract class Employee extends Person implements IEmployee {
     @Basic
     private Date hireDate;
 
+    @Override
     public void setManager(IFullTimeEmployee manager) {
         this.manager = (FullTimeEmployee) manager;
     }
 
+    @Override
     public IFullTimeEmployee getManager() {
         return this.manager;
     }
 
 
+    @Override
     public void setCompany(ICompany company) {
         this.company = (Company) company;
     }
 
+    @Override
     public ICompany getCompany() {
         return this.company;
     }
 
 
+    @Override
     public void setTitle(String title) {
         this.title = title;
     }
 
+    @Override
     public String getTitle() {
         return this.title;
     }
 
 
+    @Override
     public void setHireDate(Date hireDate) {
         this.hireDate = hireDate;
     }
 
+    @Override
     public Date getHireDate() {
         return this.hireDate;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java
index e122b0e55..82abfc463 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java
@@ -18,8 +18,12 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+
+import org.apache.openjpa.persistence.models.company.IFullTimeEmployee;
 
 @Entity(name="JI_FullTimeEmployee")
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -28,10 +32,12 @@ public class FullTimeEmployee extends Employee
     @Basic
     private float salary;
 
+    @Override
     public void setSalary(float salary) {
         this.salary = salary;
     }
 
+    @Override
     public float getSalary() {
         return this.salary;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java
index 09c1eacff..5f523acd3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java
@@ -18,8 +18,13 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ILineItem;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="JI_LineItem")
 public class LineItem implements ILineItem {
@@ -34,19 +39,23 @@ public class LineItem implements ILineItem {
     @OneToOne
     private Product product;
 
+    @Override
     public void setQuantity(int quantity) {
         this.quantity = quantity;
     }
 
+    @Override
     public int getQuantity() {
         return this.quantity;
     }
 
 
+    @Override
     public void setProduct(IProduct product) {
         this.product = (Product) product;
     }
 
+    @Override
     public IProduct getProduct() {
         return this.product;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java
index 14466b364..53a637948 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java
@@ -18,8 +18,12 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+
+import org.apache.openjpa.persistence.models.company.IPartTimeEmployee;
 
 @Entity(name="JI_PartTimeEmployee")
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -31,19 +35,23 @@ public class PartTimeEmployee extends Employee
     @Basic
     private int weeklyHours;
 
+    @Override
     public void setWage(float wage) {
         this.wage = wage;
     }
 
+    @Override
     public float getWage() {
         return this.wage;
     }
 
 
+    @Override
     public void setWeeklyHours(int weeklyHours) {
         this.weeklyHours = weeklyHours;
     }
 
+    @Override
     public int getWeeklyHours() {
         return this.weeklyHours;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java
index 157f68408..6c52af699 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java
@@ -18,8 +18,15 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.IAddress;
+import org.apache.openjpa.persistence.models.company.IPerson;
 
 @Entity(name="JI_Person")
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -38,28 +45,34 @@ public abstract class Person implements IPerson {
     @OneToOne
     private Address homeAddress;
 
+    @Override
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
+    @Override
     public String getFirstName() {
         return this.firstName;
     }
 
 
+    @Override
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
+    @Override
     public String getLastName() {
         return this.lastName;
     }
 
 
+    @Override
     public void setHomeAddress(IAddress homeAddress) {
         this.homeAddress = (Address) homeAddress;
     }
 
+    @Override
     public IAddress getHomeAddress() {
         return this.homeAddress;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java
index 4ff2142f4..a219c135f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java
@@ -18,9 +18,16 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+
+import org.apache.openjpa.persistence.models.company.ICompany;
+import org.apache.openjpa.persistence.models.company.IProduct;
 
 @Entity(name="JI_Product")
 public class Product implements IProduct {
@@ -39,39 +46,47 @@ public class Product implements IProduct {
     private float price;
 
     @ManyToMany
-    private Set<Company> distributors = new HashSet<Company>();
+    private Set<Company> distributors = new HashSet<>();
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
 
+    @Override
     public void setImage(byte[] image) {
         this.image = image;
     }
 
+    @Override
     public byte[] getImage() {
         return this.image;
     }
 
 
+    @Override
     public void setPrice(float price) {
         this.price = price;
     }
 
+    @Override
     public float getPrice() {
         return this.price;
     }
 
 
+    @Override
     public void setDistributors(Set<? extends ICompany> distributors) {
         this.distributors = (Set<Company>) distributors;
     }
 
+    @Override
     public Set<Company> getDistributors() {
         return this.distributors;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java
index 07c037388..caf10cc2d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java
@@ -18,9 +18,19 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import java.util.*;
-import javax.persistence.*;
-import org.apache.openjpa.persistence.models.company.*;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+
+import org.apache.openjpa.persistence.models.company.ICustomer;
+import org.apache.openjpa.persistence.models.company.ILineItem;
+import org.apache.openjpa.persistence.models.company.IProductOrder;
 
 @Entity(name="JI_ProductOrder")
 public class ProductOrder implements IProductOrder {
@@ -30,7 +40,7 @@ public class ProductOrder implements IProductOrder {
     private long id = idCounter++;
 
     @OneToMany
-    private List<LineItem> items = new LinkedList<LineItem>();
+    private List<LineItem> items = new LinkedList<>();
 
     @Basic
     private Date orderDate;
@@ -41,37 +51,45 @@ public class ProductOrder implements IProductOrder {
     @OneToOne
     private Customer customer;
 
+    @Override
     public void setItems(List<? extends ILineItem> items) {
         this.items = (List<LineItem>) items;
     }
 
+    @Override
     public List<LineItem> getItems() {
         return this.items;
     }
 
 
+    @Override
     public void setOrderDate(Date orderDate) {
         this.orderDate = orderDate;
     }
 
+    @Override
     public Date getOrderDate() {
         return this.orderDate;
     }
 
 
+    @Override
     public void setShippedDate(Date shippedDate) {
         this.shippedDate = shippedDate;
     }
 
+    @Override
     public Date getShippedDate() {
         return this.shippedDate;
     }
 
 
+    @Override
     public void setCustomer(ICustomer customer) {
         this.customer = (Customer) customer;
     }
 
+    @Override
     public ICustomer getCustomer() {
         return this.customer;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/TestJoinedCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/TestJoinedCompanyModel.java
index 2458c6c8d..e1f09bf14 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/TestJoinedCompanyModel.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/TestJoinedCompanyModel.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.models.company.joined;
 
-import org.apache.openjpa.persistence.models.company.*;
+import org.apache.openjpa.persistence.models.company.CompanyModelTest;
 
 public class TestJoinedCompanyModel extends CompanyModelTest {
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Book.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Book.java
index 69d1a32f7..390f9dfcb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Book.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Book.java
@@ -18,9 +18,22 @@
  */
 package org.apache.openjpa.persistence.models.library;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 
 @Entity
 @Table(name="LIBBOOK")
@@ -57,7 +70,7 @@ public class Book {
             throw new IllegalArgumentException("Title cannot be empty or null");
 
         this.title = title;
-        subjects = new HashSet<Subject>();
+        subjects = new HashSet<>();
     }
 
     public String getTitle() {
@@ -111,14 +124,16 @@ public class Book {
     public List<Subject> getSubjects() {
         if (subjects == null)
             return null;
-        return new ArrayList<Subject>(subjects);
+        return new ArrayList<>(subjects);
     }
 
+    @Override
     public String toString() {
         return "book [" + oid + "] \"" + title + "\""
                 + ((dueDate == null) ? "" : (" due back: " + dueDate));
     }
 
+    @Override
     public int hashCode() {
         return oid;
     }
@@ -126,6 +141,7 @@ public class Book {
     /**
      * Uses the object's persistent identity value to determine equivalence.
      */
+    @Override
     public boolean equals(Object other) {
         // standard fare
         if (other == this)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Borrower.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Borrower.java
index 11674f5b4..9b8cb9c80 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Borrower.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Borrower.java
@@ -18,9 +18,20 @@
  */
 package org.apache.openjpa.persistence.models.library;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="LIBBORROWER")
@@ -52,7 +63,7 @@ public class Borrower {
             throw new IllegalArgumentException("name cannot be empty or null");
 
         this.name = name;
-        books = new HashSet<Book>();
+        books = new HashSet<>();
     }
 
     public String getName() {
@@ -62,7 +73,7 @@ public class Borrower {
     public List<Book> getBooks() {
         if (books == null)
             return null;
-        return new ArrayList<Book>(books);
+        return new ArrayList<>(books);
     }
 
     public void borrowBook(Book book) {
@@ -89,10 +100,12 @@ public class Borrower {
         return volunteer;
     }
 
+    @Override
     public String toString() {
         return "borrower [" + oid + "] " + name;
     }
 
+    @Override
     public int hashCode() {
         return oid;
     }
@@ -100,6 +113,7 @@ public class Borrower {
     /**
      * Uses the object's persistent identity value to determine equivalence.
      */
+    @Override
     public boolean equals(Object other) {
         // standard fare
         if (other == this)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Subject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Subject.java
index 96375ac58..74e60c531 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Subject.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Subject.java
@@ -18,9 +18,17 @@
  */
 package org.apache.openjpa.persistence.models.library;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="LIBSUBJECT")
@@ -48,7 +56,7 @@ public class Subject {
             throw new IllegalArgumentException("name cannot be empty or null");
 
         this.name = name;
-        books = new HashSet<Book>();
+        books = new HashSet<>();
     }
 
     public String getName() {
@@ -56,7 +64,7 @@ public class Subject {
     }
 
     public List<Book> getBooks() {
-        return new ArrayList<Book>(books);
+        return new ArrayList<>(books);
     }
 
     boolean addBook(Book book) {
@@ -73,10 +81,12 @@ public class Subject {
         return false;
     }
 
+    @Override
     public String toString() {
         return "category [" + oid + "] \"" + name + "\"";
     }
 
+    @Override
     public int hashCode() {
         return oid;
     }
@@ -84,6 +94,7 @@ public class Subject {
     /**
      * Uses the object's persistent identity value to determine equivalence.
      */
+    @Override
     public boolean equals(Object other) {
         // standard fare
         if (other == this)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Volunteer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Volunteer.java
index 216607223..c520785dd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Volunteer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/library/Volunteer.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.persistence.models.library;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 @Entity
 @Table(name="LIBVOLUNTEER")
@@ -64,10 +69,12 @@ public class Volunteer {
             throw new IllegalArgumentException("hours must be >= 0");
     }
 
+    @Override
     public String toString() {
         return "volunteer [" + oid + "] \"" + borrower.getName() + "\"";
     }
 
+    @Override
     public int hashCode() {
         return oid;
     }
@@ -75,6 +82,7 @@ public class Volunteer {
     /**
      * Uses the object's persistent identity value to determine equivalence.
      */
+    @Override
     public boolean equals(Object other) {
         // standard fare
         if (other == this)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java
index 8f0397dc2..3a89b76d5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestBasicFieldNullity.java
@@ -42,6 +42,7 @@ import org.apache.openjpa.persistence.OpenJPAPersistence;
 public class TestBasicFieldNullity extends AbstractNullityTestCase {
 
     private DBDictionary dict = null;
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, RETAIN_DATA, NullValues.class);
         dict = ((JDBCConfiguration)emf.getConfiguration()).getDBDictionaryInstance();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestReadOnlyNullity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestReadOnlyNullity.java
index 2446287b1..e40a1b29e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestReadOnlyNullity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/nullity/TestReadOnlyNullity.java
@@ -33,6 +33,7 @@ public class TestReadOnlyNullity extends AbstractNullityTestCase {
 
     private boolean skip = false;
 
+    @Override
     public void setUp() {
         OpenJPAEntityManagerFactorySPI emf = createEMF(new Object[] {});
         if (((JDBCConfiguration) emf.getConfiguration())
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EmbeddableAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EmbeddableAddress.java
index eac750077..11fd78f6a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EmbeddableAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EmbeddableAddress.java
@@ -30,48 +30,61 @@ public class EmbeddableAddress implements IAddress {
     private String zipCode;
     private String country;
 
+    @Override
     public String getLine1() {
         return line1;
     }
+    @Override
     public void setLine1(String line1) {
         this.line1 = line1;
     }
 
+    @Override
     public String getLine2() {
         return line2;
     }
+    @Override
     public void setLine2(String line2) {
         this.line2 = line2;
     }
 
+    @Override
     public String getCity() {
         return city;
     }
+    @Override
     public void setCity(String city) {
         this.city = city;
     }
 
+    @Override
     public String getState() {
         return state;
     }
+    @Override
     public void setState(String state) {
         this.state = state;
     }
 
+    @Override
     public String getZipCode() {
         return zipCode;
     }
+    @Override
     public void setZipCode(String zipCode) {
         this.zipCode = zipCode;
     }
 
+    @Override
     public String getCountry() {
         return country;
     }
+    @Override
     public void setCountry(String country) {
         this.country = country;
     }
 
+    @Override
     public String toString() {
         return( "org.apache.openjpa.persistence.compatible.EmbeddableAddress: " +
                 " line1: " + getLine1() +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EntityContact.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EntityContact.java
index 0a2f03854..4a5dea299 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EntityContact.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/EntityContact.java
@@ -33,10 +33,12 @@ public class EntityContact implements IContact {
     private String type;
     private EmbeddableAddress theAddress;
 
+    @Override
     @Transient
     public IAddress getAddress() {
         return(IAddress) this.getTheAddress();
     }
+    @Override
     public void setAddress(IAddress address) {
         if (address instanceof EmbeddableAddress) {
             this.setTheAddress((EmbeddableAddress)address);
@@ -58,23 +60,29 @@ public class EntityContact implements IContact {
         this.id = id;
     }
 
+    @Override
     public String getEmail() {
         return email;
     }
+    @Override
     public void setEmail(String email) {
         this.email = email;
     }
 
+    @Override
     public String getPhone() {
         return phone;
     }
+    @Override
     public void setPhone(String phone) {
         this.phone = phone;
     }
 
+    @Override
     public String getType() {
         return type;
     }
+    @Override
     public void setType(String type) {
         this.type = type;
     }
@@ -87,6 +95,7 @@ public class EntityContact implements IContact {
         this.theAddress = address;
     }
 
+    @Override
     public String toString() {
         return( "org.apache.openjpa.persistence.compatible.EntityContact: " +
                 " id: " + getId() +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/IAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/IAddress.java
index 78c3fd85e..ac0acda70 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/IAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/IAddress.java
@@ -20,22 +20,22 @@ package org.apache.openjpa.persistence.property;
 
 public interface IAddress {
 
-    public String getCity();
-    public void setCity(String city);
+    String getCity();
+    void setCity(String city);
 
-    public String getCountry();
-    public void setCountry(String country);
+    String getCountry();
+    void setCountry(String country);
 
-    public String getLine1();
-    public void setLine1(String line1);
+    String getLine1();
+    void setLine1(String line1);
 
-    public String getLine2();
-    public void setLine2(String line2);
+    String getLine2();
+    void setLine2(String line2);
 
-    public String getState();
-    public void setState(String state);
+    String getState();
+    void setState(String state);
 
-    public String getZipCode();
-    public void setZipCode(String zipCode);
+    String getZipCode();
+    void setZipCode(String zipCode);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/IContact.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/IContact.java
index e1766433f..acbef0f28 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/IContact.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/IContact.java
@@ -20,16 +20,16 @@ package org.apache.openjpa.persistence.property;
 
 public interface IContact {
 
-    public IAddress getAddress();
-    public void setAddress(IAddress address);
+    IAddress getAddress();
+    void setAddress(IAddress address);
 
-    public String getEmail();
-    public void setEmail(String email);
+    String getEmail();
+    void setEmail(String email);
 
-    public String getPhone();
-    public void setPhone(String phone);
+    String getPhone();
+    void setPhone(String phone);
 
-    public String getType();
-    public void setType(String type);
+    String getType();
+    void setType(String type);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestAccessMods.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestAccessMods.java
index 1d3c902a9..5913d7887 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestAccessMods.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestAccessMods.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestAccessMods
     extends SingleEMFTestCase {
 
+        @Override
         public void setUp() {
             setUp("openjpa.Compatibility", "PrivatePersistentProperties=false",
                 DROP_TABLES, AccessModsEntity.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatible.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatible.java
index f9c9c12ae..6856f30c5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatible.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/property/TestCompatible.java
@@ -40,6 +40,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestCompatible extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(EntityContact.class,
               EmbeddableAddress.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/AbstractEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/AbstractEntity.java
index 536fb6f82..07e74a609 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/AbstractEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/AbstractEntity.java
@@ -38,7 +38,7 @@ public abstract class AbstractEntity {
     int version;
 
     @OneToMany(cascade = CascadeType.ALL)
-    private Set<ConcreteEntity> items = new LinkedHashSet<ConcreteEntity>();
+    private Set<ConcreteEntity> items = new LinkedHashSet<>();
 
     public int getId() {
         return id;
@@ -50,7 +50,7 @@ public abstract class AbstractEntity {
 
     public void addItem(ConcreteEntity ce) {
         if (items == null)
-            items = new LinkedHashSet<ConcreteEntity>();
+            items = new LinkedHashSet<>();
         items.add(ce);
     }
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestDetachMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestDetachMerge.java
index 54b78a9f5..5d4ce10c0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestDetachMerge.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestDetachMerge.java
@@ -25,16 +25,21 @@ import java.util.List;
 import java.util.UUID;
 
 import javax.persistence.EntityManager;
+
 import org.apache.openjpa.conf.Compatibility;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-
 import org.apache.openjpa.persistence.proxy.entities.Address;
+import org.apache.openjpa.persistence.proxy.entities.Annuity;
+import org.apache.openjpa.persistence.proxy.entities.AnnuityHolder;
 import org.apache.openjpa.persistence.proxy.entities.AnnuityHolderCategory;
 import org.apache.openjpa.persistence.proxy.entities.AnnuityPersistebleObject;
+import org.apache.openjpa.persistence.proxy.entities.AnnuityType;
+import org.apache.openjpa.persistence.proxy.entities.Contact;
 import org.apache.openjpa.persistence.proxy.entities.ContactType;
+import org.apache.openjpa.persistence.proxy.entities.EquityAnnuity;
+import org.apache.openjpa.persistence.proxy.entities.FixedAnnuity;
 import org.apache.openjpa.persistence.proxy.entities.IAnnuity;
 import org.apache.openjpa.persistence.proxy.entities.IAnnuityHolder;
 import org.apache.openjpa.persistence.proxy.entities.IContact;
@@ -43,17 +48,12 @@ import org.apache.openjpa.persistence.proxy.entities.IFixedAnnuity;
 import org.apache.openjpa.persistence.proxy.entities.IPayor;
 import org.apache.openjpa.persistence.proxy.entities.IPayout;
 import org.apache.openjpa.persistence.proxy.entities.IRider;
-import org.apache.openjpa.persistence.proxy.entities.Person;
-import org.apache.openjpa.persistence.proxy.entities.RiderType;
-import org.apache.openjpa.persistence.proxy.entities.Annuity;
-import org.apache.openjpa.persistence.proxy.entities.AnnuityHolder;
-import org.apache.openjpa.persistence.proxy.entities.Contact;
-import org.apache.openjpa.persistence.proxy.entities.EquityAnnuity;
-import org.apache.openjpa.persistence.proxy.entities.FixedAnnuity;
 import org.apache.openjpa.persistence.proxy.entities.Payor;
 import org.apache.openjpa.persistence.proxy.entities.Payout;
+import org.apache.openjpa.persistence.proxy.entities.Person;
 import org.apache.openjpa.persistence.proxy.entities.Rider;
-import org.apache.openjpa.persistence.proxy.entities.AnnuityType;
+import org.apache.openjpa.persistence.proxy.entities.RiderType;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 
 /*
@@ -65,6 +65,7 @@ import org.apache.openjpa.persistence.proxy.entities.AnnuityType;
  */
 public class TestDetachMerge extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(DROP_TABLES, Address.class, Annuity.class, AnnuityHolder.class, AnnuityPersistebleObject.class,
             Contact.class, EquityAnnuity.class, FixedAnnuity.class, Payor.class, Payout.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestEntitySerialize.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestEntitySerialize.java
index f27726fd8..099d4a468 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestEntitySerialize.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestEntitySerialize.java
@@ -42,6 +42,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestEntitySerialize extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(DROP_TABLES, Address.class, Annuity.class, AnnuityHolder.class, AnnuityPersistebleObject.class,
             Contact.class, EquityAnnuity.class, FixedAnnuity.class, Payor.class, Payout.class, Person.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java
index 89d6fed9e..c27dc1afc 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java
@@ -37,7 +37,8 @@ import org.apache.openjpa.util.ProxyCollection;
  *
  */
 public class TestProxyCollection extends SingleEMFTestCase {
-	public void setUp() {
+	@Override
+    public void setUp() {
 		super.setUp(CLEAR_TABLES, TreeNode.class, ConcreteEntity.class, AbstractEntity.class);
 	}
 	/**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java
index 59ec2b49b..c199f6b41 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java
@@ -52,7 +52,10 @@ import org.apache.openjpa.persistence.jdbc.OrderColumn;
 @Entity
 @DetachedState
 public class TreeNode implements Serializable {
-	@Id
+	
+    private static final long serialVersionUID = 1L;
+
+    @Id
 	@GeneratedValue
 	private long id;
 
@@ -62,7 +65,7 @@ public class TreeNode implements Serializable {
 	@ElementJoinColumn(name = "ParentID")
 	@OrderColumn(name = "Sequence")
 	@ElementDependent
-	private List<TreeNode> childern = new ArrayList<TreeNode>();
+	private List<TreeNode> childern = new ArrayList<>();
 
 	@Version
 	private int version;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/DelayedProxyCollectionsTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/DelayedProxyCollectionsTestCase.java
index 22c7254e0..8cedd78a9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/DelayedProxyCollectionsTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/DelayedProxyCollectionsTestCase.java
@@ -46,8 +46,9 @@ public abstract class DelayedProxyCollectionsTestCase extends SQLListenerTestCas
     protected static Set<String> _delayMethods;
     protected static Set<Class<?>> _ignoreInterfaces;
 
+    @Override
     public void setUp(Object...props) {
-        List<Object> parms = new ArrayList<Object>();
+        List<Object> parms = new ArrayList<>();
         parms.addAll(Arrays.asList(
                 CLEAR_TABLES,
                 "openjpa.ProxyManager", "delayCollectionLoading=true",
@@ -77,7 +78,7 @@ public abstract class DelayedProxyCollectionsTestCase extends SQLListenerTestCas
 
     static {
         // non-indexed delay-capable methods
-        _delayMethods = new HashSet<String>();
+        _delayMethods = new HashSet<>();
         // generic collection
         _delayMethods.add(stringMethodName("add", new Class<?>[] {Object.class}));
         _delayMethods.add(stringMethodName("remove", new Class<?>[] {Object.class}));
@@ -90,7 +91,7 @@ public abstract class DelayedProxyCollectionsTestCase extends SQLListenerTestCas
         _delayMethods.add(stringMethodName("removeElement", new Class<?>[] {Object.class}));
 
         // non-trigger methods
-        _ignoreMethods = new HashSet<String>();
+        _ignoreMethods = new HashSet<>();
         _ignoreMethods.add(stringMethodName("trimToSize", null));
         _ignoreMethods.add(stringMethodName("ensureCapacity", new Class<?>[] {int.class}));
         _ignoreMethods.add(stringMethodName("comparator", null));
@@ -103,7 +104,7 @@ public abstract class DelayedProxyCollectionsTestCase extends SQLListenerTestCas
         _ignoreMethods.add(stringMethodName("notify", null));
         _ignoreMethods.add(stringMethodName("notifyAll", null));
 
-        _ignoreInterfaces = new HashSet<Class<?>>();
+        _ignoreInterfaces = new HashSet<>();
         _ignoreInterfaces.add(DelayedProxy.class);
         _ignoreInterfaces.add(Proxy.class);
         _ignoreInterfaces.add(ProxyCollection.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IAccount.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IAccount.java
index e66415f50..b08930d11 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IAccount.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IAccount.java
@@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.proxy.delayed;
 
 public interface IAccount {
 
-    public void setId(int id);
+    void setId(int id);
 
-    public int getId();
+    int getId();
 
-    public void setName(String name);
+    void setName(String name);
 
-    public String getName();
+    String getName();
 
-    public void setUserIdent(IUserIdentity userIdent);
+    void setUserIdent(IUserIdentity userIdent);
 
-    public IUserIdentity getUserIdent();
+    IUserIdentity getUserIdent();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IDepartment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IDepartment.java
index 1f05481f0..4ef223d27 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IDepartment.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IDepartment.java
@@ -22,27 +22,27 @@ import java.util.Collection;
 
 public interface IDepartment {
 
-    public void setEmployees(Collection<IEmployee> employees);
+    void setEmployees(Collection<IEmployee> employees);
 
-    public Collection<IEmployee> getEmployees();
+    Collection<IEmployee> getEmployees();
 
-    public void setId(int id);
+    void setId(int id);
 
-    public int getId();
+    int getId();
 
-    public void setLocations(Collection<Location> locations);
+    void setLocations(Collection<Location> locations);
 
-    public Collection<Location> getLocations();
+    Collection<Location> getLocations();
 
-    public void setProducts(Collection<Product> products);
+    void setProducts(Collection<Product> products);
 
-    public Collection<Product> getProducts();
+    Collection<Product> getProducts();
 
-    public void setCertifications(Collection<Certification> certifications);
+    void setCertifications(Collection<Certification> certifications);
 
-    public Collection<Certification> getCertifications();
+    Collection<Certification> getCertifications();
 
-    public void setAwards(Collection<Award> awards);
+    void setAwards(Collection<Award> awards);
 
-    public Collection<Award> getAwards();
+    Collection<Award> getAwards();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IEmployee.java
index a6b5ce44d..215535f7c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IEmployee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IEmployee.java
@@ -20,15 +20,15 @@ package org.apache.openjpa.persistence.proxy.delayed;
 
 public interface IEmployee {
 
-    public void setEmpName(String empName);
+    void setEmpName(String empName);
 
-    public String getEmpName();
+    String getEmpName();
 
-    public void setId(int id);
+    void setId(int id);
 
-    public int getId();
+    int getId();
 
-    public void setDept(IDepartment dept);
+    void setDept(IDepartment dept);
 
-    public IDepartment getDept();
+    IDepartment getDept();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IMember.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IMember.java
index 0de6214ea..1d9425fc0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IMember.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IMember.java
@@ -22,11 +22,11 @@ import java.util.Collection;
 
 public interface IMember {
 
-    public void setName(String name);
+    void setName(String name);
 
-    public String getName();
+    String getName();
 
-    public void setAccounts(Collection<IAccount> accounts);
+    void setAccounts(Collection<IAccount> accounts);
 
-    public Collection<IAccount> getAccounts();
+    Collection<IAccount> getAccounts();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IUserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IUserIdentity.java
index c88aaee30..a28860b92 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IUserIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/IUserIdentity.java
@@ -20,11 +20,11 @@ package org.apache.openjpa.persistence.proxy.delayed;
 
 public interface IUserIdentity {
 
-    public void setMember(IMember member);
+    void setMember(IMember member);
 
-    public IMember getMember();
+    IMember getMember();
 
-    public void setId(int id);
+    void setId(int id);
 
-    public int getId();
+    int getId();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Account.java
index 719c59f37..f91551fd6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Account.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Account.java
@@ -53,26 +53,32 @@ public class Account implements IAccount {
 
     private String name;
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setUserIdent(IUserIdentity userIdent) {
         this.userIdent = (UserIdentity)userIdent;
     }
 
+    @Override
     public IUserIdentity getUserIdent() {
         return userIdent;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Employee.java
index 199ec2be9..1f2966272 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Employee.java
@@ -46,34 +46,41 @@ public class Employee implements IEmployee, Serializable {
     @JoinColumn(name="DEPT_ID")
     private IDepartment dept;
 
+    @Override
     public void setEmpName(String empName) {
         this.empName = empName;
     }
 
+    @Override
     public String getEmpName() {
         return empName;
     }
 
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
 
+    @Override
     public int getId() {
         return id;
     }
 
 
+    @Override
     public void setDept(IDepartment dept) {
         this.dept = dept;
     }
 
 
+    @Override
     public IDepartment getDept() {
         return dept;
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Employee) {
             Employee e = (Employee)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Member.java
index 885d8799c..93a685677 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Member.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/Member.java
@@ -36,18 +36,22 @@ public class Member implements IMember {
     @OneToMany(fetch=FetchType.LAZY, mappedBy="userIdent", targetEntity=Account.class)
     private List<IAccount> accounts;
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setAccounts(Collection<IAccount> accounts) {
         this.accounts = (List<IAccount>)accounts;
     }
 
+    @Override
     public Collection<IAccount> getAccounts() {
         return accounts;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxy.java
index 23214261f..7a1e62ee7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/TestDelayedArrayListProxy.java
@@ -46,12 +46,14 @@ public class TestDelayedArrayListProxy extends DelayedProxyCollectionsTestCase {
         Account.class
     };
 
+    @Override
     public void setUp() {
         super.setUp(_pcList);
     }
 
+    @Override
     public void setUp(Object... props){
-        List<Object> parms = new ArrayList<Object>();
+        List<Object> parms = new ArrayList<>();
         // Add package-specific types
         parms.addAll(Arrays.asList(_pcList));
         // Add properties from super
@@ -59,29 +61,35 @@ public class TestDelayedArrayListProxy extends DelayedProxyCollectionsTestCase {
         super.setUp(parms.toArray());
     }
 
+    @Override
     public IUserIdentity findUserIdentity(EntityManager em, int id) {
         return em.find(UserIdentity.class, id);
     }
 
+    @Override
     public IDepartment findDepartment(EntityManager em, int id) {
         return em.find(Department.class, id);
     }
 
+    @Override
     public IUserIdentity createUserIdentity() {
         UserIdentity ui = new UserIdentity();
         return ui;
     }
 
+    @Override
     public IAccount createAccount(String name, IUserIdentity ui) {
         IAccount acct = new Account(name, ui);
         return acct;
     }
 
+    @Override
     public IDepartment createDepartment() {
         Department d = new Department();
         return d;
     }
 
+    @Override
     public IMember createMember(String name) {
         Member m = new Member();
         m.setName(name);
@@ -96,32 +104,32 @@ public class TestDelayedArrayListProxy extends DelayedProxyCollectionsTestCase {
 
     @Override
     public Collection<IEmployee> createEmployees() {
-        return new ArrayList<IEmployee>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<Product> createProducts() {
-        return new ArrayList<Product>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<Award> createAwards() {
-        return new ArrayList<Award>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<Location> createLocations() {
-        return new ArrayList<Location>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<Certification> createCertifications() {
-        return new ArrayList<Certification>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<IAccount> createAccounts() {
-        return new ArrayList<IAccount>();
+        return new ArrayList<>();
     }
 
     @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/UserIdentity.java
index ce47e5fcc..623d22388 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/UserIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/alist/UserIdentity.java
@@ -40,18 +40,22 @@ public class UserIdentity implements IUserIdentity {
     @Embedded
     private Member member;
 
+    @Override
     public void setMember(IMember member) {
         this.member = (Member)member;
     }
 
+    @Override
     public IMember getMember() {
         return member;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Account.java
index 01693c542..630b05609 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Account.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Account.java
@@ -53,26 +53,32 @@ public class Account implements IAccount {
 
     private String name;
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setUserIdent(IUserIdentity userIdent) {
         this.userIdent = (UserIdentity)userIdent;
     }
 
+    @Override
     public IUserIdentity getUserIdent() {
         return userIdent;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Employee.java
index 10be9f5cb..17a3f9583 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Employee.java
@@ -46,30 +46,36 @@ public class Employee implements IEmployee, Serializable {
     @JoinColumn(name="DEPT_ID")
     private IDepartment dept;
 
+    @Override
     public void setEmpName(String empName) {
         this.empName = empName;
     }
 
+    @Override
     public String getEmpName() {
         return empName;
     }
 
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
 
+    @Override
     public int getId() {
         return id;
     }
 
 
+    @Override
     public void setDept(IDepartment dept) {
         this.dept = dept;
     }
 
 
+    @Override
     public IDepartment getDept() {
         return dept;
     }
@@ -79,6 +85,7 @@ public class Employee implements IEmployee, Serializable {
         return getId();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Employee) {
             Employee e = (Employee)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Member.java
index f2e02f61c..8d6d91e23 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Member.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/Member.java
@@ -36,18 +36,22 @@ public class Member implements IMember {
     @OneToMany(fetch=FetchType.LAZY, mappedBy="userIdent", targetEntity=Account.class)
     private Set<IAccount> accounts;
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setAccounts(Collection<IAccount> accounts) {
         this.accounts = (Set<IAccount>)accounts;
     }
 
+    @Override
     public Collection<IAccount> getAccounts() {
         return accounts;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxy.java
index f22b10559..18114a769 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/TestDelayedHashSetProxy.java
@@ -47,12 +47,14 @@ public class TestDelayedHashSetProxy extends DelayedProxyCollectionsTestCase {
         Account.class
     };
 
+    @Override
     public void setUp() {
         super.setUp(_pcList);
     }
 
+    @Override
     public void setUp(Object... props){
-        List<Object> parms = new ArrayList<Object>();
+        List<Object> parms = new ArrayList<>();
         // Add package-specific types
         parms.addAll(Arrays.asList(_pcList));
         // Add properties from super
@@ -60,29 +62,35 @@ public class TestDelayedHashSetProxy extends DelayedProxyCollectionsTestCase {
         super.setUp(parms.toArray());
     }
 
+    @Override
     public IUserIdentity findUserIdentity(EntityManager em, int id) {
         return em.find(UserIdentity.class, id);
     }
 
+    @Override
     public IDepartment findDepartment(EntityManager em, int id) {
         return em.find(Department.class, id);
     }
 
+    @Override
     public IUserIdentity createUserIdentity() {
         UserIdentity ui = new UserIdentity();
         return ui;
     }
 
+    @Override
     public IAccount createAccount(String name, IUserIdentity ui) {
         IAccount acct = new Account(name, ui);
         return acct;
     }
 
+    @Override
     public IDepartment createDepartment() {
         Department d = new Department();
         return d;
     }
 
+    @Override
     public IMember createMember(String name) {
         Member m = new Member();
         m.setName(name);
@@ -97,32 +105,32 @@ public class TestDelayedHashSetProxy extends DelayedProxyCollectionsTestCase {
 
     @Override
     public Collection<IEmployee> createEmployees() {
-        return new HashSet<IEmployee>();
+        return new HashSet<>();
     }
 
     @Override
     public Collection<Product> createProducts() {
-        return new HashSet<Product>();
+        return new HashSet<>();
     }
 
     @Override
     public Collection<Award> createAwards() {
-        return new HashSet<Award>();
+        return new HashSet<>();
     }
 
     @Override
     public Collection<Location> createLocations() {
-        return new HashSet<Location>();
+        return new HashSet<>();
     }
 
     @Override
     public Collection<Certification> createCertifications() {
-        return new HashSet<Certification>();
+        return new HashSet<>();
     }
 
     @Override
     public Collection<IAccount> createAccounts() {
-        return new HashSet<IAccount>();
+        return new HashSet<>();
     }
 
     @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/UserIdentity.java
index ca8460af7..0d40bd59c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/UserIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/hset/UserIdentity.java
@@ -40,18 +40,22 @@ public class UserIdentity implements IUserIdentity {
     @Embedded
     private Member member;
 
+    @Override
     public void setMember(IMember member) {
         this.member = (Member)member;
     }
 
+    @Override
     public IMember getMember() {
         return member;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Account.java
index 3619d12e9..55e1ceaa4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Account.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Account.java
@@ -53,26 +53,32 @@ public class Account implements IAccount {
 
     private String name;
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setUserIdent(IUserIdentity userIdent) {
         this.userIdent = (UserIdentity)userIdent;
     }
 
+    @Override
     public IUserIdentity getUserIdent() {
         return userIdent;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Employee.java
index d43ce871a..466fc3c9e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Employee.java
@@ -46,30 +46,36 @@ public class Employee implements IEmployee, Serializable {
     @JoinColumn(name="DEPT_ID")
     private IDepartment dept;
 
+    @Override
     public void setEmpName(String empName) {
         this.empName = empName;
     }
 
+    @Override
     public String getEmpName() {
         return empName;
     }
 
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
 
+    @Override
     public int getId() {
         return id;
     }
 
 
+    @Override
     public void setDept(IDepartment dept) {
         this.dept = dept;
     }
 
 
+    @Override
     public IDepartment getDept() {
         return dept;
     }
@@ -79,6 +85,7 @@ public class Employee implements IEmployee, Serializable {
         return getId();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Employee) {
             Employee e = (Employee)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Member.java
index 6251ae16b..caf4502d0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Member.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/Member.java
@@ -36,18 +36,22 @@ public class Member implements IMember {
     @OneToMany(fetch=FetchType.LAZY, mappedBy="userIdent", targetEntity=Account.class)
     private LinkedHashSet<IAccount> accounts;
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setAccounts(Collection<IAccount> accounts) {
         this.accounts = (LinkedHashSet<IAccount>)accounts;
     }
 
+    @Override
     public Collection<IAccount> getAccounts() {
         return accounts;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxy.java
index d55dcd091..6c2fe8fdb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/TestDelayedLinkedHashSetProxy.java
@@ -47,12 +47,14 @@ public class TestDelayedLinkedHashSetProxy extends DelayedProxyCollectionsTestCa
         Account.class
     };
 
+    @Override
     public void setUp() {
         super.setUp(_pcList);
     }
 
+    @Override
     public void setUp(Object... props){
-        List<Object> parms = new ArrayList<Object>();
+        List<Object> parms = new ArrayList<>();
         // Add package-specific types
         parms.addAll(Arrays.asList(_pcList));
         // Add properties from super
@@ -60,29 +62,35 @@ public class TestDelayedLinkedHashSetProxy extends DelayedProxyCollectionsTestCa
         super.setUp(parms.toArray());
     }
 
+    @Override
     public IUserIdentity findUserIdentity(EntityManager em, int id) {
         return em.find(UserIdentity.class, id);
     }
 
+    @Override
     public IDepartment findDepartment(EntityManager em, int id) {
         return em.find(Department.class, id);
     }
 
+    @Override
     public IUserIdentity createUserIdentity() {
         UserIdentity ui = new UserIdentity();
         return ui;
     }
 
+    @Override
     public IAccount createAccount(String name, IUserIdentity ui) {
         IAccount acct = new Account(name, ui);
         return acct;
     }
 
+    @Override
     public IDepartment createDepartment() {
         Department d = new Department();
         return d;
     }
 
+    @Override
     public IMember createMember(String name) {
         Member m = new Member();
         m.setName(name);
@@ -97,32 +105,32 @@ public class TestDelayedLinkedHashSetProxy extends DelayedProxyCollectionsTestCa
 
     @Override
     public Collection<IEmployee> createEmployees() {
-        return new LinkedHashSet<IEmployee>();
+        return new LinkedHashSet<>();
     }
 
     @Override
     public Collection<Product> createProducts() {
-        return new LinkedHashSet<Product>();
+        return new LinkedHashSet<>();
     }
 
     @Override
     public Collection<Award> createAwards() {
-        return new LinkedHashSet<Award>();
+        return new LinkedHashSet<>();
     }
 
     @Override
     public Collection<Location> createLocations() {
-        return new LinkedHashSet<Location>();
+        return new LinkedHashSet<>();
     }
 
     @Override
     public Collection<Certification> createCertifications() {
-        return new LinkedHashSet<Certification>();
+        return new LinkedHashSet<>();
     }
 
     @Override
     public Collection<IAccount> createAccounts() {
-        return new LinkedHashSet<IAccount>();
+        return new LinkedHashSet<>();
     }
 
     @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/UserIdentity.java
index 31401102b..1b1d46240 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/UserIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/lhset/UserIdentity.java
@@ -40,18 +40,22 @@ public class UserIdentity implements IUserIdentity {
     @Embedded
     private Member member;
 
+    @Override
     public void setMember(IMember member) {
         this.member = (Member)member;
     }
 
+    @Override
     public IMember getMember() {
         return member;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Account.java
index 77f257589..84b16a560 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Account.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Account.java
@@ -53,26 +53,32 @@ public class Account implements IAccount {
 
     private String name;
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setUserIdent(IUserIdentity userIdent) {
         this.userIdent = (UserIdentity)userIdent;
     }
 
+    @Override
     public IUserIdentity getUserIdent() {
         return userIdent;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Employee.java
index 5264ff8cc..28a56a20c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Employee.java
@@ -46,30 +46,36 @@ public class Employee implements IEmployee, Serializable {
     @JoinColumn(name="DEPT_ID")
     private IDepartment dept;
 
+    @Override
     public void setEmpName(String empName) {
         this.empName = empName;
     }
 
+    @Override
     public String getEmpName() {
         return empName;
     }
 
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
 
+    @Override
     public int getId() {
         return id;
     }
 
 
+    @Override
     public void setDept(IDepartment dept) {
         this.dept = dept;
     }
 
 
+    @Override
     public IDepartment getDept() {
         return dept;
     }
@@ -79,6 +85,7 @@ public class Employee implements IEmployee, Serializable {
         return getId();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Employee) {
             Employee e = (Employee)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Member.java
index 894df6247..457ec14b7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Member.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/Member.java
@@ -36,18 +36,22 @@ public class Member implements IMember {
     @OneToMany(fetch=FetchType.LAZY, mappedBy="userIdent", targetEntity=Account.class)
     private Queue<IAccount> accounts;
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setAccounts(Collection<IAccount> accounts) {
         this.accounts = (Queue<IAccount>)accounts;
     }
 
+    @Override
     public Collection<IAccount> getAccounts() {
         return accounts;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxy.java
index 24e71a234..95d04fcbf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/TestDelayedLinkedListProxy.java
@@ -47,12 +47,14 @@ public class TestDelayedLinkedListProxy extends DelayedProxyCollectionsTestCase
         Account.class
     };
 
+    @Override
     public void setUp() {
         super.setUp(_pcList);
     }
 
+    @Override
     public void setUp(Object... props){
-        List<Object> parms = new ArrayList<Object>();
+        List<Object> parms = new ArrayList<>();
         // Add package-specific types
         parms.addAll(Arrays.asList(_pcList));
         // Add properties from super
@@ -60,29 +62,35 @@ public class TestDelayedLinkedListProxy extends DelayedProxyCollectionsTestCase
         super.setUp(parms.toArray());
     }
 
+    @Override
     public IUserIdentity findUserIdentity(EntityManager em, int id) {
         return em.find(UserIdentity.class, id);
     }
 
+    @Override
     public IDepartment findDepartment(EntityManager em, int id) {
         return em.find(Department.class, id);
     }
 
+    @Override
     public IUserIdentity createUserIdentity() {
         UserIdentity ui = new UserIdentity();
         return ui;
     }
 
+    @Override
     public IAccount createAccount(String name, IUserIdentity ui) {
         IAccount acct = new Account(name, ui);
         return acct;
     }
 
+    @Override
     public IDepartment createDepartment() {
         Department d = new Department();
         return d;
     }
 
+    @Override
     public IMember createMember(String name) {
         Member m = new Member();
         m.setName(name);
@@ -97,32 +105,32 @@ public class TestDelayedLinkedListProxy extends DelayedProxyCollectionsTestCase
 
     @Override
     public Collection<IEmployee> createEmployees() {
-        return new LinkedList<IEmployee>();
+        return new LinkedList<>();
     }
 
     @Override
     public Collection<Product> createProducts() {
-        return new LinkedList<Product>();
+        return new LinkedList<>();
     }
 
     @Override
     public Collection<Award> createAwards() {
-        return new LinkedList<Award>();
+        return new LinkedList<>();
     }
 
     @Override
     public Collection<Location> createLocations() {
-        return new LinkedList<Location>();
+        return new LinkedList<>();
     }
 
     @Override
     public Collection<Certification> createCertifications() {
-        return new LinkedList<Certification>();
+        return new LinkedList<>();
     }
 
     @Override
     public Collection<IAccount> createAccounts() {
-        return new LinkedList<IAccount>();
+        return new LinkedList<>();
     }
 
     @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/UserIdentity.java
index a16217c66..16f20832a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/UserIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/llist/UserIdentity.java
@@ -40,18 +40,22 @@ public class UserIdentity implements IUserIdentity {
     @Embedded
     private Member member;
 
+    @Override
     public void setMember(IMember member) {
         this.member = (Member)member;
     }
 
+    @Override
     public IMember getMember() {
         return member;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java
index 2b76c6f7c..30692a90c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java
@@ -53,26 +53,32 @@ public class Account implements IAccount, Comparable<Account> {
 
     private String name;
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setUserIdent(IUserIdentity userIdent) {
         this.userIdent = (UserIdentity)userIdent;
     }
 
+    @Override
     public IUserIdentity getUserIdent() {
         return userIdent;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Employee.java
index 6cec0b387..01d4e6fc8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Employee.java
@@ -46,30 +46,36 @@ public class Employee implements IEmployee, Serializable, Comparable<Employee> {
     @JoinColumn(name="DEPT_ID")
     private IDepartment dept;
 
+    @Override
     public void setEmpName(String empName) {
         this.empName = empName;
     }
 
+    @Override
     public String getEmpName() {
         return empName;
     }
 
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
 
+    @Override
     public int getId() {
         return id;
     }
 
 
+    @Override
     public void setDept(IDepartment dept) {
         this.dept = dept;
     }
 
 
+    @Override
     public IDepartment getDept() {
         return dept;
     }
@@ -79,6 +85,7 @@ public class Employee implements IEmployee, Serializable, Comparable<Employee> {
         return getId();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Employee) {
             Employee e = (Employee)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Member.java
index 1f300909c..818180805 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Member.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Member.java
@@ -36,18 +36,22 @@ public class Member implements IMember {
     @OneToMany(fetch=FetchType.LAZY, mappedBy="userIdent", targetEntity=Account.class)
     private Set<IAccount> accounts;
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setAccounts(Collection<IAccount> accounts) {
         this.accounts = (Set<IAccount>)accounts;
     }
 
+    @Override
     public Collection<IAccount> getAccounts() {
         return accounts;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxy.java
index 0f0b1c9c3..f65fb14ec 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/TestDelayedPriorityQueueProxy.java
@@ -21,8 +21,8 @@ package org.apache.openjpa.persistence.proxy.delayed.pqueue;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.PriorityQueue;
 import java.util.List;
+import java.util.PriorityQueue;
 
 import javax.persistence.EntityManager;
 
@@ -47,12 +47,14 @@ public class TestDelayedPriorityQueueProxy extends DelayedProxyCollectionsTestCa
         Account.class
     };
 
+    @Override
     public void setUp() {
         super.setUp(_pcList);
     }
 
+    @Override
     public void setUp(Object... props){
-        List<Object> parms = new ArrayList<Object>();
+        List<Object> parms = new ArrayList<>();
         // Add package-specific types
         parms.addAll(Arrays.asList(_pcList));
         // Add properties from super
@@ -60,29 +62,35 @@ public class TestDelayedPriorityQueueProxy extends DelayedProxyCollectionsTestCa
         super.setUp(parms.toArray());
     }
 
+    @Override
     public IUserIdentity findUserIdentity(EntityManager em, int id) {
         return em.find(UserIdentity.class, id);
     }
 
+    @Override
     public IDepartment findDepartment(EntityManager em, int id) {
         return em.find(Department.class, id);
     }
 
+    @Override
     public IUserIdentity createUserIdentity() {
         UserIdentity ui = new UserIdentity();
         return ui;
     }
 
+    @Override
     public IAccount createAccount(String name, IUserIdentity ui) {
         IAccount acct = new Account(name, ui);
         return acct;
     }
 
+    @Override
     public IDepartment createDepartment() {
         Department d = new Department();
         return d;
     }
 
+    @Override
     public IMember createMember(String name) {
         Member m = new Member();
         m.setName(name);
@@ -97,32 +105,32 @@ public class TestDelayedPriorityQueueProxy extends DelayedProxyCollectionsTestCa
 
     @Override
     public Collection<IEmployee> createEmployees() {
-        return new PriorityQueue<IEmployee>();
+        return new PriorityQueue<>();
     }
 
     @Override
     public Collection<Product> createProducts() {
-        return new PriorityQueue<Product>();
+        return new PriorityQueue<>();
     }
 
     @Override
     public Collection<Award> createAwards() {
-        return new PriorityQueue<Award>();
+        return new PriorityQueue<>();
     }
 
     @Override
     public Collection<Location> createLocations() {
-        return new PriorityQueue<Location>();
+        return new PriorityQueue<>();
     }
 
     @Override
     public Collection<Certification> createCertifications() {
-        return new PriorityQueue<Certification>();
+        return new PriorityQueue<>();
     }
 
     @Override
     public Collection<IAccount> createAccounts() {
-        return new PriorityQueue<IAccount>();
+        return new PriorityQueue<>();
     }
 
     @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/UserIdentity.java
index 1c4bc9122..9d3af4a01 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/UserIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/UserIdentity.java
@@ -40,18 +40,22 @@ public class UserIdentity implements IUserIdentity {
     @Embedded
     private Member member;
 
+    @Override
     public void setMember(IMember member) {
         this.member = (Member)member;
     }
 
+    @Override
     public IMember getMember() {
         return member;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java
index 0ec8ac668..5d111c544 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java
@@ -53,26 +53,32 @@ public class Account implements IAccount, Comparable<Account> {
 
     private String name;
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setUserIdent(IUserIdentity userIdent) {
         this.userIdent = (UserIdentity)userIdent;
     }
 
+    @Override
     public IUserIdentity getUserIdent() {
         return userIdent;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Employee.java
index 994d164c6..4b006c30a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Employee.java
@@ -46,30 +46,36 @@ public class Employee implements IEmployee, Serializable, Comparable<Employee> {
     @JoinColumn(name="DEPT_ID")
     private IDepartment dept;
 
+    @Override
     public void setEmpName(String empName) {
         this.empName = empName;
     }
 
+    @Override
     public String getEmpName() {
         return empName;
     }
 
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
 
+    @Override
     public int getId() {
         return id;
     }
 
 
+    @Override
     public void setDept(IDepartment dept) {
         this.dept = dept;
     }
 
 
+    @Override
     public IDepartment getDept() {
         return dept;
     }
@@ -79,6 +85,7 @@ public class Employee implements IEmployee, Serializable, Comparable<Employee> {
         return getId();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Employee) {
             Employee e = (Employee)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Member.java
index cc487f9fd..4ec136b9c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Member.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Member.java
@@ -36,18 +36,22 @@ public class Member implements IMember {
     @OneToMany(fetch=FetchType.LAZY, mappedBy="userIdent", targetEntity=Account.class)
     private PriorityQueue<IAccount> accounts;
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setAccounts(Collection<IAccount> accounts) {
         this.accounts = (PriorityQueue<IAccount>)accounts;
     }
 
+    @Override
     public Collection<IAccount> getAccounts() {
         return accounts;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxy.java
index 3a00b2ceb..cbed3d42f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/TestDelayedTreeSetProxy.java
@@ -47,12 +47,14 @@ public class TestDelayedTreeSetProxy extends DelayedProxyCollectionsTestCase {
         Account.class
     };
 
+    @Override
     public void setUp() {
         super.setUp(_pcList);
     }
 
+    @Override
     public void setUp(Object... props){
-        List<Object> parms = new ArrayList<Object>();
+        List<Object> parms = new ArrayList<>();
         // Add package-specific types
         parms.addAll(Arrays.asList(_pcList));
         // Add properties from super
@@ -60,29 +62,35 @@ public class TestDelayedTreeSetProxy extends DelayedProxyCollectionsTestCase {
         super.setUp(parms.toArray());
     }
 
+    @Override
     public IUserIdentity findUserIdentity(EntityManager em, int id) {
         return em.find(UserIdentity.class, id);
     }
 
+    @Override
     public IDepartment findDepartment(EntityManager em, int id) {
         return em.find(Department.class, id);
     }
 
+    @Override
     public IUserIdentity createUserIdentity() {
         UserIdentity ui = new UserIdentity();
         return ui;
     }
 
+    @Override
     public IAccount createAccount(String name, IUserIdentity ui) {
         IAccount acct = new Account(name, ui);
         return acct;
     }
 
+    @Override
     public IDepartment createDepartment() {
         Department d = new Department();
         return d;
     }
 
+    @Override
     public IMember createMember(String name) {
         Member m = new Member();
         m.setName(name);
@@ -97,32 +105,32 @@ public class TestDelayedTreeSetProxy extends DelayedProxyCollectionsTestCase {
 
     @Override
     public Collection<IEmployee> createEmployees() {
-        return new TreeSet<IEmployee>();
+        return new TreeSet<>();
     }
 
     @Override
     public Collection<Product> createProducts() {
-        return new TreeSet<Product>();
+        return new TreeSet<>();
     }
 
     @Override
     public Collection<Award> createAwards() {
-        return new TreeSet<Award>();
+        return new TreeSet<>();
     }
 
     @Override
     public Collection<Location> createLocations() {
-        return new TreeSet<Location>();
+        return new TreeSet<>();
     }
 
     @Override
     public Collection<Certification> createCertifications() {
-        return new TreeSet<Certification>();
+        return new TreeSet<>();
     }
 
     @Override
     public Collection<IAccount> createAccounts() {
-        return new TreeSet<IAccount>();
+        return new TreeSet<>();
     }
 
     @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/UserIdentity.java
index 6080c442b..df5a1eb92 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/UserIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/UserIdentity.java
@@ -40,18 +40,22 @@ public class UserIdentity implements IUserIdentity {
     @Embedded
     private Member member;
 
+    @Override
     public void setMember(IMember member) {
         this.member = (Member)member;
     }
 
+    @Override
     public IMember getMember() {
         return member;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Account.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Account.java
index 3732d4474..2dd8d34aa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Account.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Account.java
@@ -53,26 +53,32 @@ public class Account implements IAccount {
 
     private String name;
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setUserIdent(IUserIdentity userIdent) {
         this.userIdent = (UserIdentity)userIdent;
     }
 
+    @Override
     public IUserIdentity getUserIdent() {
         return userIdent;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Employee.java
index 8e5942f74..53ca0c8c6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Employee.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Employee.java
@@ -46,30 +46,36 @@ public class Employee implements IEmployee, Serializable {
     @JoinColumn(name="DEPT_ID")
     private IDepartment dept;
 
+    @Override
     public void setEmpName(String empName) {
         this.empName = empName;
     }
 
+    @Override
     public String getEmpName() {
         return empName;
     }
 
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
 
+    @Override
     public int getId() {
         return id;
     }
 
 
+    @Override
     public void setDept(IDepartment dept) {
         this.dept = dept;
     }
 
 
+    @Override
     public IDepartment getDept() {
         return dept;
     }
@@ -79,6 +85,7 @@ public class Employee implements IEmployee, Serializable {
         return getId();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof Employee) {
             Employee e = (Employee)obj;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Member.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Member.java
index 11afc356c..25c40fdea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Member.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/Member.java
@@ -36,18 +36,22 @@ public class Member implements IMember {
     @OneToMany(fetch=FetchType.LAZY, mappedBy="userIdent", targetEntity=Account.class)
     private Vector<IAccount> accounts;
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setAccounts(Collection<IAccount> accounts) {
         this.accounts = (Vector<IAccount>)accounts;
     }
 
+    @Override
     public Collection<IAccount> getAccounts() {
         return accounts;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxy.java
index 85897cb11..997d1eab7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/TestDelayedVectorProxy.java
@@ -47,12 +47,14 @@ public class TestDelayedVectorProxy extends DelayedProxyCollectionsTestCase {
         Account.class
     };
 
+    @Override
     public void setUp() {
         super.setUp(_pcList);
     }
 
+    @Override
     public void setUp(Object... props){
-        List<Object> parms = new ArrayList<Object>();
+        List<Object> parms = new ArrayList<>();
         // Add package-specific types
         parms.addAll(Arrays.asList(_pcList));
         // Add properties from super
@@ -60,29 +62,35 @@ public class TestDelayedVectorProxy extends DelayedProxyCollectionsTestCase {
         super.setUp(parms.toArray());
     }
 
+    @Override
     public IUserIdentity findUserIdentity(EntityManager em, int id) {
         return em.find(UserIdentity.class, id);
     }
 
+    @Override
     public IDepartment findDepartment(EntityManager em, int id) {
         return em.find(Department.class, id);
     }
 
+    @Override
     public IUserIdentity createUserIdentity() {
         UserIdentity ui = new UserIdentity();
         return ui;
     }
 
+    @Override
     public IAccount createAccount(String name, IUserIdentity ui) {
         IAccount acct = new Account(name, ui);
         return acct;
     }
 
+    @Override
     public IDepartment createDepartment() {
         Department d = new Department();
         return d;
     }
 
+    @Override
     public IMember createMember(String name) {
         Member m = new Member();
         m.setName(name);
@@ -97,32 +105,32 @@ public class TestDelayedVectorProxy extends DelayedProxyCollectionsTestCase {
 
     @Override
     public Collection<IEmployee> createEmployees() {
-        return new Vector<IEmployee>();
+        return new Vector<>();
     }
 
     @Override
     public Collection<Product> createProducts() {
-        return new Vector<Product>();
+        return new Vector<>();
     }
 
     @Override
     public Collection<Award> createAwards() {
-        return new Vector<Award>();
+        return new Vector<>();
     }
 
     @Override
     public Collection<Location> createLocations() {
-        return new Vector<Location>();
+        return new Vector<>();
     }
 
     @Override
     public Collection<Certification> createCertifications() {
-        return new Vector<Certification>();
+        return new Vector<>();
     }
 
     @Override
     public Collection<IAccount> createAccounts() {
-        return new Vector<IAccount>();
+        return new Vector<>();
     }
 
     @Override
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/UserIdentity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/UserIdentity.java
index 991e022cb..d7d6ca0ac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/UserIdentity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/vec/UserIdentity.java
@@ -40,18 +40,22 @@ public class UserIdentity implements IUserIdentity {
     @Embedded
     private Member member;
 
+    @Override
     public void setMember(IMember member) {
         this.member = (Member)member;
     }
 
+    @Override
     public IMember getMember() {
         return member;
     }
 
+    @Override
     public void setId(int id) {
         this.id = id;
     }
 
+    @Override
     public int getId() {
         return id;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Address.java
index 7b70dddb8..1439adae2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Address.java
@@ -35,46 +35,58 @@ public class Address implements IAddress {
 	private String zipCode;
 	private String country;
 
-	@Column(name="CITY")
+	@Override
+    @Column(name="CITY")
 	public String getCity() {
 		return city;
 	}
-	public void setCity(String city) {
+	@Override
+    public void setCity(String city) {
 		this.city = city;
 	}
-	@Column(name="COUNTRY")
+	@Override
+    @Column(name="COUNTRY")
 	public String getCountry() {
 		return country;
 	}
-	public void setCountry(String country) {
+	@Override
+    public void setCountry(String country) {
 		this.country = country;
 	}
-	@Column(name="LINE1")
+	@Override
+    @Column(name="LINE1")
 	public String getLine1() {
 		return line1;
 	}
-	public void setLine1(String line1) {
+	@Override
+    public void setLine1(String line1) {
 		this.line1 = line1;
 	}
-	@Column(name="LINE2")
+	@Override
+    @Column(name="LINE2")
 	public String getLine2() {
 		return line2;
 	}
-	public void setLine2(String line2) {
+	@Override
+    public void setLine2(String line2) {
 		this.line2 = line2;
 	}
-	@Column(name="STATE")
+	@Override
+    @Column(name="STATE")
 	public String getState() {
 		return state;
 	}
-	public void setState(String state) {
+	@Override
+    public void setState(String state) {
 		this.state = state;
 	}
-	@Column(name="ZIP_CODE")
+	@Override
+    @Column(name="ZIP_CODE")
 	public String getZipCode() {
 		return zipCode;
 	}
-	public void setZipCode(String zipCode) {
+	@Override
+    public void setZipCode(String zipCode) {
 		this.zipCode = zipCode;
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java
index 4b50aaae4..38d32ee4a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java
@@ -43,21 +43,20 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 
-@SuppressWarnings("serial")
 @Entity
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
 @DiscriminatorColumn(name="DTYPE", discriminatorType=DiscriminatorType.STRING)
 @DiscriminatorValue(value="ANNUITY")
 @AttributeOverride(name="lastUpdateDate", column=@Column(name="LAST_UPDATE_TS"))
 public class Annuity extends AnnuityPersistebleObject implements IAnnuity {
-
+    private static final long serialVersionUID = 1L;
     private Double lastPaidAmt;
     private String AccountNumber;
     private Double amount;
     private String annuityHolderId;
-    private List<IPayout> payouts = new ArrayList<IPayout>();
-    private List<IRider> riders = new ArrayList<IRider>();
-    private List<IPayor> payors = new ArrayList<IPayor>();
+    private List<IPayout> payouts = new ArrayList<>();
+    private List<IRider> riders = new ArrayList<>();
+    private List<IPayor> payors = new ArrayList<>();
     private List<String> comments;
     private Date approvedAt;
 
@@ -65,10 +64,12 @@ public class Annuity extends AnnuityPersistebleObject implements IAnnuity {
     public Annuity(){
     }
 
+    @Override
     @Column(name="LAST_PAID_AMT")
     public Double getLastPaidAmt() {
         return lastPaidAmt;
     }
+    @Override
     public void setLastPaidAmt(Double lastPaidAmt) {
         this.lastPaidAmt = lastPaidAmt;
         if (this.lastPaidAmt != null) {
@@ -77,18 +78,22 @@ public class Annuity extends AnnuityPersistebleObject implements IAnnuity {
         }
     }
 
+    @Override
     @Column(name="ACCOUNT_NUMBER")
     public String getAccountNumber() {
         return AccountNumber;
     }
+    @Override
     public void setAccountNumber(String accountNumber) {
         AccountNumber = accountNumber;
     }
 
+    @Override
     @Column(name="AMOUNT")
     public Double getAmount() {
         return amount;
     }
+    @Override
     public void setAmount(Double amount) {
         this.amount = amount;
         if (this.amount != null) {
@@ -97,15 +102,18 @@ public class Annuity extends AnnuityPersistebleObject implements IAnnuity {
         }
     }
 
+    @Override
     @Column(name="FK_ANNUITY_HOLDER_ID")
     public String getAnnuityHolderId() {
         return this.annuityHolderId;
     }
+    @Override
     public void setAnnuityHolderId(String annuityHolderId) {
         this.annuityHolderId = annuityHolderId;
 
     }
 
+    @Override
     @ManyToMany(targetEntity=Payor.class,
             fetch=FetchType.EAGER)
     @JoinTable(name="ANNUITY_PAYOR",
@@ -114,21 +122,25 @@ public class Annuity extends AnnuityPersistebleObject implements IAnnuity {
     public List<IPayor> getPayors() {
         return this.payors;
     }
+    @Override
     public void setPayors(List<IPayor> payors) {
         this.payors = payors;
 
     }
 
+    @Override
     @OneToMany(targetEntity=Payout.class,
             mappedBy="annuity",
             fetch=FetchType.EAGER)
     public List<IPayout> getPayouts() {
         return this.payouts;
     }
+    @Override
     public void setPayouts(List<IPayout> payouts) {
         this.payouts = payouts;
     }
 
+    @Override
     @OneToMany(cascade={CascadeType.ALL},
             targetEntity=Rider.class,
             fetch=FetchType.EAGER)
@@ -138,30 +150,37 @@ public class Annuity extends AnnuityPersistebleObject implements IAnnuity {
     public List<IRider> getRiders() {
         return this.riders;
     }
+    @Override
     public void setRiders(List<IRider> riders) {
         this.riders = riders;
     }
 
+    @Override
     @ElementCollection
     public List<String> getComments() {
         return comments;
     }
+    @Override
     public void setComments(List<String> comments) {
         this.comments = comments;
     }
 
+    @Override
     @Temporal(TemporalType.DATE)
     public Date getApprovedAt() {
         return approvedAt;
     }
+    @Override
     public void setApprovedAt(Date approvedAt) {
         this.approvedAt = approvedAt;
     }
 
+    @Override
     @OneToOne
     public Annuity getPreviousAnnuity() {
         return previousAnnuity;
     }
+    @Override
     public void setPreviousAnnuity(Annuity previousAnnuity) {
         this.previousAnnuity = previousAnnuity;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityHolder.java
index 779df1219..7c13200d5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityHolder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityHolder.java
@@ -34,13 +34,15 @@ public class AnnuityHolder extends Person implements IAnnuityHolder{
 	private static final long serialVersionUID = 3307367871936336517L;
 	private AnnuityHolderCategory category;
 
-	@Column(name="CATEGORY")
+	@Override
+    @Column(name="CATEGORY")
 	@Enumerated(EnumType.ORDINAL)
 	public AnnuityHolderCategory getCategory() {
 		return this.category;
 	}
 
-	public void setCategory(AnnuityHolderCategory category) {
+	@Override
+    public void setCategory(AnnuityHolderCategory category) {
 		this.category = category;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityPersistebleObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityPersistebleObject.java
index 63fbc9232..620d4b7c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityPersistebleObject.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/AnnuityPersistebleObject.java
@@ -43,12 +43,14 @@ public class AnnuityPersistebleObject implements JPAPersisteble {
 		this.version = version;
 	}
 
-	@javax.persistence.Id
+	@Override
+    @javax.persistence.Id
 	public String getId() {
 		return id;
 	}
 
-	public void setId(String id) {
+	@Override
+    public void setId(String id) {
 		this.id = id;
 	}
 
@@ -60,11 +62,13 @@ public class AnnuityPersistebleObject implements JPAPersisteble {
 		this.lastUpdateDate = lastUpdateDate;
 	}
 
-	@Transient
+	@Override
+    @Transient
 	public Parameterizable<String, String> getConfiguration() {
 		return this.config;
 	}
-	@Transient
+	@Override
+    @Transient
 	public void setConfiguration(Parameterizable<String, String> config) {
 		this.config = config;
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Configrable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Configrable.java
index 6539994e8..ee2d69bf8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Configrable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Configrable.java
@@ -21,6 +21,6 @@ package org.apache.openjpa.persistence.proxy.entities;
 import java.io.Serializable;
 
 public interface Configrable<K, V> extends Serializable{
-	public Parameterizable<K, V> getConfiguration();
-	public void setConfiguration(Parameterizable<K, V> config);
+	Parameterizable<K, V> getConfiguration();
+	void setConfiguration(Parameterizable<K, V> config);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Contact.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Contact.java
index 3fdcd5be6..aefcb6133 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Contact.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Contact.java
@@ -37,11 +37,13 @@ public class Contact extends AnnuityPersistebleObject implements IContact {
 	private String phone;
 	private ContactType contactType;
 
-	@Transient
+	@Override
+    @Transient
 	public IAddress getAddress() {
 		return (IAddress) this.getTheAddress();
 	}
-	public void setAddress(IAddress address) {
+	@Override
+    public void setAddress(IAddress address) {
 		if (address instanceof Address){
 			this.setTheAddress((Address)address);
 		}else if(address == null) {
@@ -61,26 +63,32 @@ public class Contact extends AnnuityPersistebleObject implements IContact {
 		this.theAddress = address;
 	}
 
-	@Column(name="EMAIL")
+	@Override
+    @Column(name="EMAIL")
 	public String getEmail() {
 		return email;
 	}
-	public void setEmail(String email) {
+	@Override
+    public void setEmail(String email) {
 		this.email = email;
 	}
-	@Column(name="PHONE")
+	@Override
+    @Column(name="PHONE")
 	public String getPhone() {
 		return phone;
 	}
-	public void setPhone(String phone) {
+	@Override
+    public void setPhone(String phone) {
 		this.phone = phone;
 	}
-	@Column(name="TYPE")
+	@Override
+    @Column(name="TYPE")
 	@Enumerated(EnumType.STRING)
 	public ContactType getContactType() {
 		return contactType;
 	}
-	public void setContactType(ContactType contactType) {
+	@Override
+    public void setContactType(ContactType contactType) {
 		this.contactType = contactType;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/EquityAnnuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/EquityAnnuity.java
index a9c825a8e..804389cc6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/EquityAnnuity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/EquityAnnuity.java
@@ -35,20 +35,24 @@ public class EquityAnnuity extends Annuity implements IEquityAnnuity {
 
 	private Double indexRate;
 
-	@Column(name="FUND_NAMES")
+	@Override
+    @Column(name="FUND_NAMES")
 	public String getFundNames() {
 		return fundNames;
 	}
 
-	public void setFundNames(String fundNames) {
+	@Override
+    public void setFundNames(String fundNames) {
 		this.fundNames = fundNames;
 	}
 
-	@Column(name="INDEX_RATE")
+	@Override
+    @Column(name="INDEX_RATE")
 	public Double getIndexRate() {
 		return indexRate;
 	}
 
+    @Override
     public void setIndexRate(Double indexRate) {
         if (indexRate != null) {
             DecimalFormat df = new DecimalFormat("#.##");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java
index c9e123d37..4cdc6d25f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java
@@ -32,12 +32,14 @@ public class FixedAnnuity extends Annuity implements IFixedAnnuity {
 
 	private Double rate;
 
-	@Column(name="FIXED_RATE")
+	@Override
+    @Column(name="FIXED_RATE")
 	public Double getRate() {
 		return rate;
 	}
 
-	public void setRate(Double rate) {
+	@Override
+    public void setRate(Double rate) {
 		this.rate = rate;
 		if (this.rate != null) {
 			DecimalFormat df = new DecimalFormat("#.##");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAddress.java
index 028ae3e29..3628dbb85 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAddress.java
@@ -22,28 +22,28 @@ import java.io.Serializable;
 
 public interface IAddress extends Serializable {
 
-	public String getCity();
+	String getCity();
 
-	public void setCity(String city);
+	void setCity(String city);
 
-	public String getCountry();
+	String getCountry();
 
-	public void setCountry(String country);
+	void setCountry(String country);
 
-	public String getLine1();
+	String getLine1();
 
-	public void setLine1(String line1);
+	void setLine1(String line1);
 
-	public String getLine2();
+	String getLine2();
 
-	public void setLine2(String line2);
+	void setLine2(String line2);
 
-	public String getState();
+	String getState();
 
-	public void setState(String state);
+	void setState(String state);
 
-	public String getZipCode();
+	String getZipCode();
 
-	public void setZipCode(String zipCode);
+	void setZipCode(String zipCode);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuity.java
index 083d76ae8..60f2acd82 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuity.java
@@ -23,36 +23,36 @@ import java.util.List;
 
 public interface IAnnuity extends IAnnuityObject {
 
-	public abstract Double getLastPaidAmt();
+	Double getLastPaidAmt();
 
-	public abstract void setLastPaidAmt(Double lastPaidAmt);
+	void setLastPaidAmt(Double lastPaidAmt);
 
-	public abstract String getAccountNumber();
+	String getAccountNumber();
 
-	public abstract void setAccountNumber(String accountNumber);
+	void setAccountNumber(String accountNumber);
 
-	public abstract Double getAmount();
+	Double getAmount();
 
-	public abstract void setAmount(Double amount);
+	void setAmount(Double amount);
 
-	public abstract List<IPayout> getPayouts();
-	public abstract void setPayouts(List<IPayout> payout);
+	List<IPayout> getPayouts();
+	void setPayouts(List<IPayout> payout);
 
-	public abstract List<IRider> getRiders();
-	public abstract void setRiders(List<IRider> riders);
+	List<IRider> getRiders();
+	void setRiders(List<IRider> riders);
 
-	public abstract String getAnnuityHolderId();
-	public abstract void setAnnuityHolderId(String annuityHolderId);
+	String getAnnuityHolderId();
+	void setAnnuityHolderId(String annuityHolderId);
 
-	public abstract List<IPayor> getPayors();
-	public abstract void setPayors(List<IPayor> payors);
+	List<IPayor> getPayors();
+	void setPayors(List<IPayor> payors);
 
-    public abstract List<String> getComments();
-    public abstract void setComments(List<String> comments);
+    List<String> getComments();
+    void setComments(List<String> comments);
 
-    public abstract Date getApprovedAt();
-    public void setApprovedAt(Date approvedAt);
+    Date getApprovedAt();
+    void setApprovedAt(Date approvedAt);
 
-    public Annuity getPreviousAnnuity();
-    public void setPreviousAnnuity(Annuity previousAnnuity);
+    Annuity getPreviousAnnuity();
+    void setPreviousAnnuity(Annuity previousAnnuity);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuityHolder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuityHolder.java
index 15b2e1e19..3dcffbe9c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuityHolder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuityHolder.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.proxy.entities;
 
 public interface IAnnuityHolder extends IPerson {
 
-	public AnnuityHolderCategory getCategory();
-	public void setCategory(AnnuityHolderCategory category);
+	AnnuityHolderCategory getCategory();
+	void setCategory(AnnuityHolderCategory category);
 
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuityObject.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuityObject.java
index 98894a2c2..b810e4fca 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuityObject.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IAnnuityObject.java
@@ -21,6 +21,6 @@ package org.apache.openjpa.persistence.proxy.entities;
 import java.util.Date;
 
 public interface IAnnuityObject extends Identifiable {
-	public void setLastUpdateDate(Date date);
-	public Date getLastUpdateDate();
+	void setLastUpdateDate(Date date);
+	Date getLastUpdateDate();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IContact.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IContact.java
index e1b7cf9a3..35e975a35 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IContact.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IContact.java
@@ -20,20 +20,20 @@ package org.apache.openjpa.persistence.proxy.entities;
 
 public interface IContact extends IAnnuityObject {
 
-	public IAddress getAddress();
+	IAddress getAddress();
 
-	public void setAddress(IAddress address);
+	void setAddress(IAddress address);
 
-	public String getEmail();
+	String getEmail();
 
-	public void setEmail(String email);
+	void setEmail(String email);
 
-	public String getPhone();
+	String getPhone();
 
-	public void setPhone(String phone);
+	void setPhone(String phone);
 
-	public ContactType getContactType();
+	ContactType getContactType();
 
-	public void setContactType(ContactType type);
+	void setContactType(ContactType type);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IEquityAnnuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IEquityAnnuity.java
index e8fd30e57..9118443ed 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IEquityAnnuity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IEquityAnnuity.java
@@ -20,12 +20,12 @@ package org.apache.openjpa.persistence.proxy.entities;
 
 public interface IEquityAnnuity extends IAnnuity{
 
-	public String getFundNames();
+	String getFundNames();
 
-	public void setFundNames(String fundNames);
+	void setFundNames(String fundNames);
 
-	public Double getIndexRate();
+	Double getIndexRate();
 
-	public void setIndexRate(Double indexRate);
+	void setIndexRate(Double indexRate);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IFixedAnnuity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IFixedAnnuity.java
index 53524653a..cc45a4561 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IFixedAnnuity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IFixedAnnuity.java
@@ -20,8 +20,8 @@ package org.apache.openjpa.persistence.proxy.entities;
 
 public interface IFixedAnnuity extends IAnnuity {
 
-	public Double getRate();
+	Double getRate();
 
-	public void setRate(Double rate);
+	void setRate(Double rate);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPayor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPayor.java
index 01ea65da7..ce6431b43 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPayor.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPayor.java
@@ -19,7 +19,7 @@
 package org.apache.openjpa.persistence.proxy.entities;
 
 public interface IPayor extends IAnnuityObject{
-	public String getName();
-	public void setName(String name);
+	String getName();
+	void setName(String name);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPayout.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPayout.java
index a59012be2..32f49fe68 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPayout.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPayout.java
@@ -23,13 +23,13 @@ import java.util.Calendar;
 
 public interface IPayout extends IAnnuityObject{
 
-	public void setTaxableAmount(BigDecimal taxableAmount);
-	public BigDecimal getTaxableAmount();
-	public void setStartDate(Calendar startDate);
-	public Calendar getStartDate();
-	public void setEndDate(Calendar payoutEndDate);
-	public Calendar getEndDate();
-	public IAnnuity getAnnuity();
-	public void setAnnuity(IAnnuity annuity);
+	void setTaxableAmount(BigDecimal taxableAmount);
+	BigDecimal getTaxableAmount();
+	void setStartDate(Calendar startDate);
+	Calendar getStartDate();
+	void setEndDate(Calendar payoutEndDate);
+	Calendar getEndDate();
+	IAnnuity getAnnuity();
+	void setAnnuity(IAnnuity annuity);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPerson.java
index c208cd570..a90a835bd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPerson.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IPerson.java
@@ -22,32 +22,32 @@ import java.util.Date;
 
 public interface IPerson extends IAnnuityObject {
 
-	public Date getDateOfBirth();
+	Date getDateOfBirth();
 
-	public void setDateOfBirth(Date dateOfBirth);
+	void setDateOfBirth(Date dateOfBirth);
 
-	public String getFirstName();
+	String getFirstName();
 
-	public void setFirstName(String firstName);
+	void setFirstName(String firstName);
 
-	public String getGovernmentId();
+	String getGovernmentId();
 
-	public void setGovernmentId(String governmentId);
+	void setGovernmentId(String governmentId);
 
-	public String getLastName();
+	String getLastName();
 
-	public void setLastName(String lastName);
+	void setLastName(String lastName);
 
-	public Byte[] getPicture();
+	Byte[] getPicture();
 
-	public void setPicture(Byte[] picture);
+	void setPicture(Byte[] picture);
 
-	public Date getTimeOfBirth();
+	Date getTimeOfBirth();
 
-	public void setTimeOfBirth(Date timeOfBirth);
+	void setTimeOfBirth(Date timeOfBirth);
 
-	public IContact getContact();
+	IContact getContact();
 
-	public void setContact(IContact contact);
+	void setContact(IContact contact);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IRider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IRider.java
index 613b1d4cd..5c17ad6c7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IRider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/IRider.java
@@ -22,16 +22,16 @@ import java.util.Date;
 
 public interface IRider extends IAnnuityObject {
 
-	public Date getEffectiveDate();
+	Date getEffectiveDate();
 
-	public void setEffectiveDate(Date date);
+	void setEffectiveDate(Date date);
 
-	public String getRule();
+	String getRule();
 
-	public void setRule(String rule);
+	void setRule(String rule);
 
-	public RiderType getType();
+	RiderType getType();
 
-	public void setType(RiderType type);
+	void setType(RiderType type);
 
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Identifiable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Identifiable.java
index ad0f5df8c..4e9d79554 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Identifiable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Identifiable.java
@@ -21,6 +21,6 @@ package org.apache.openjpa.persistence.proxy.entities;
 import java.io.Serializable;
 
 public interface Identifiable extends Configrable<String, String>, Serializable{
-	public String getId();
-	public void setId(String id);
+	String getId();
+	void setId(String id);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Parameterizable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Parameterizable.java
index f159fc4f0..d4b54d7b1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Parameterizable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Parameterizable.java
@@ -22,10 +22,10 @@ import java.io.Serializable;
 import java.util.Map;
 
 public interface Parameterizable <K,V> extends Serializable{
-	public void addParameter(K key, V value);
-	public void removeParameter(K key);
-	public void clearAllParameters();
-	public Map<K, V> getParameters();
-	public V getParameterValue(K key);
-	public void addAllParams(Map<K,V> newParams);
+	void addParameter(K key, V value);
+	void removeParameter(K key);
+	void clearAllParameters();
+	Map<K, V> getParameters();
+	V getParameterValue(K key);
+	void addAllParams(Map<K,V> newParams);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payor.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payor.java
index 7b778f81d..b86f93def 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payor.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payor.java
@@ -28,12 +28,14 @@ public class Payor extends AnnuityPersistebleObject implements IPayor {
 	private static final long serialVersionUID = 3462390122289537362L;
 	private String name;
 
-	@Column(name="NAME")
+	@Override
+    @Column(name="NAME")
 	public String getName() {
 		return this.name;
 	}
 
-	public void setName(String name) {
+	@Override
+    public void setName(String name) {
 		this.name = name;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payout.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payout.java
index f6f031e05..69791e70e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payout.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Payout.java
@@ -38,11 +38,13 @@ public class Payout extends AnnuityPersistebleObject implements IPayout {
 	private Calendar endDate;
 	private IAnnuity annuity;
 
-	@Column(name="TAXABLE_AMOUNT")
+	@Override
+    @Column(name="TAXABLE_AMOUNT")
 	public BigDecimal getTaxableAmount() {
 		return this.taxableAmount;
 	}
-	public void setTaxableAmount(BigDecimal payoutTaxableAmt) {
+	@Override
+    public void setTaxableAmount(BigDecimal payoutTaxableAmt) {
 		this.taxableAmount = payoutTaxableAmt;
 		if (payoutTaxableAmt != null) {
 			DecimalFormat df = new DecimalFormat("#.##");
@@ -50,30 +52,36 @@ public class Payout extends AnnuityPersistebleObject implements IPayout {
 		}
 
 	}
-	@Column(name="START_DATE")
+	@Override
+    @Column(name="START_DATE")
 	public Calendar getStartDate() {
 		return startDate;
 	}
-	public void setStartDate(Calendar startDate) {
+	@Override
+    public void setStartDate(Calendar startDate) {
 		this.startDate = startDate;
 	}
 
-	@Column(name="END_DATE")
+	@Override
+    @Column(name="END_DATE")
 	public Calendar getEndDate() {
 		return endDate;
 	}
 
-	public void setEndDate(Calendar payoutEndDate) {
+	@Override
+    public void setEndDate(Calendar payoutEndDate) {
 		this.endDate = payoutEndDate;
 	}
 
-	@ManyToOne(targetEntity=Annuity.class,
+	@Override
+    @ManyToOne(targetEntity=Annuity.class,
 			fetch=FetchType.EAGER)
 	@JoinColumn(name="FK_ANNUITY_ID")
 	public IAnnuity getAnnuity() {
 		return this.annuity;
 	}
-	public void setAnnuity(IAnnuity annuity) {
+	@Override
+    public void setAnnuity(IAnnuity annuity) {
 		this.annuity = annuity;
 
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Person.java
index eb7a94b28..3130cfd17 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Person.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Person.java
@@ -49,60 +49,74 @@ public class Person extends AnnuityPersistebleObject implements IPerson {
 	private IContact contact;
 
 
-	@Column(name="DATE_OF_BIRTH")
+	@Override
+    @Column(name="DATE_OF_BIRTH")
 	@Temporal(TemporalType.DATE)
 	public Date getDateOfBirth() {
 		return dateOfBirth;
 	}
-	public void setDateOfBirth(Date dateOfBirth) {
+	@Override
+    public void setDateOfBirth(Date dateOfBirth) {
 		this.dateOfBirth = dateOfBirth;
 	}
-	@Column(name="FIRST_NAME")
+	@Override
+    @Column(name="FIRST_NAME")
 	public String getFirstName() {
 		return firstName;
 	}
-	public void setFirstName(String firstName) {
+	@Override
+    public void setFirstName(String firstName) {
 		this.firstName = firstName;
 	}
-	@Column(name="GOVERNMENT_ID")
+	@Override
+    @Column(name="GOVERNMENT_ID")
 	public String getGovernmentId() {
 		return governmentId;
 	}
-	public void setGovernmentId(String governmentId) {
+	@Override
+    public void setGovernmentId(String governmentId) {
 		this.governmentId = governmentId;
 	}
-	@Column(name="LAST_NAME")
+	@Override
+    @Column(name="LAST_NAME")
 	public String getLastName() {
 		return lastName;
 	}
-	public void setLastName(String lastName) {
+	@Override
+    public void setLastName(String lastName) {
 		this.lastName = lastName;
 	}
-	@Column(name="PICTURE")
+	@Override
+    @Column(name="PICTURE")
 	@Lob
 	public Byte[] getPicture() {
 		return picture;
 	}
-	public void setPicture(Byte[] picture) {
+	@Override
+    public void setPicture(Byte[] picture) {
 		this.picture = picture;
 	}
-	@Column(name="TIME_OF_BIRTH")
+	@Override
+    @Column(name="TIME_OF_BIRTH")
 	@Temporal(TemporalType.TIME)
 	public Date getTimeOfBirth() {
 		return timeOfBirth;
 	}
-	public void setTimeOfBirth(Date timeOfBirth) {
+	@Override
+    public void setTimeOfBirth(Date timeOfBirth) {
 		this.timeOfBirth = timeOfBirth;
 	}
 
-	@OneToOne(
+	@Override
+    @OneToOne(
 			cascade={CascadeType.REFRESH, CascadeType.MERGE},
 			targetEntity=Contact.class)
 	@JoinColumn(name="FK_CONTACT_ID")
 	public IContact getContact() {
 		return this.contact;
 	}
-	public void setContact(IContact contact) {
+	@Override
+    public void setContact(IContact contact) {
 		this.contact = contact;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java
index 2a521ad8e..811201397 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Rider.java
@@ -37,27 +37,33 @@ public class Rider extends AnnuityPersistebleObject implements IRider {
 	private Date effectiveDate;
 	private RiderType type;
 
-	@Column(name="EFFECTIVE_DATE")
+	@Override
+    @Column(name="EFFECTIVE_DATE")
 	public Date getEffectiveDate() {
 		return effectiveDate;
 	}
-	public void setEffectiveDate(Date effectiveDate) {
+	@Override
+    public void setEffectiveDate(Date effectiveDate) {
 		this.effectiveDate = effectiveDate;
 	}
 
-	@Column(name="RIDER_RULE")
+	@Override
+    @Column(name="RIDER_RULE")
 	public String getRule() {
 		return rule;
 	}
-	public void setRule(String rule) {
+	@Override
+    public void setRule(String rule) {
 		this.rule = rule;
 	}
 
-	@Enumerated(EnumType.STRING)
+	@Override
+    @Enumerated(EnumType.STRING)
 	public RiderType getType() {
 		return type;
 	}
-	public void setType(RiderType type) {
+	@Override
+    public void setType(RiderType type) {
 		this.type = type;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/StringParameterizable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/StringParameterizable.java
index d670b69b6..d50d4fc36 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/StringParameterizable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/StringParameterizable.java
@@ -23,29 +23,35 @@ import java.util.Map;
 
 public class StringParameterizable implements Parameterizable<String, String> {
 	private static final long serialVersionUID = -4289064323865338447L;
-	private Map<String, String> params = new HashMap<String, String>();
+	private Map<String, String> params = new HashMap<>();
 
-	public void addParameter(String key, String value) {
+	@Override
+    public void addParameter(String key, String value) {
 		this.params.put(key, value);
 	}
 
-	public Map<String, String> getParameters() {
+	@Override
+    public Map<String, String> getParameters() {
 		return this.params;
 	}
 
-	public void removeParameter(String key) {
+	@Override
+    public void removeParameter(String key) {
 		this.params.remove(key);
 	}
 
-	public void clearAllParameters() {
+	@Override
+    public void clearAllParameters() {
 		this.params.clear();
 	}
 
-	public String getParameterValue(String key) {
+	@Override
+    public String getParameterValue(String key) {
 		return this.params.get(key);
 	}
 
-	public void addAllParams(Map<String, String> newParams) {
+	@Override
+    public void addAllParams(Map<String, String> newParams) {
 		if (newParams != null) {
 			params.putAll(newParams);
 		}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java
index 92cbb6649..7042528d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestOpenJPASchemaPUDefault.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  */
 public class TestOpenJPASchemaPUDefault extends SQLListenerTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(PUDefaultSchemaEntity.class, PUSchemaInSequenceAnnotationEntity.class,
             PUSchemaInTableAnnotationEntity.class, PUSchemaInTableMappingEntity.class,
@@ -37,6 +38,7 @@ public class TestOpenJPASchemaPUDefault extends SQLListenerTestCase {
         setSupportedDatabases(org.apache.openjpa.jdbc.sql.DB2Dictionary.class);
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestSchemaPUDefault.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestSchemaPUDefault.java
index aec7c8d9f..db162301a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestSchemaPUDefault.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/pudefaults/TestSchemaPUDefault.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  */
 public class TestSchemaPUDefault extends SQLListenerTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(PUDefaultSchemaEntity.class, PUSchemaInSequenceAnnotationEntity.class,
             PUSchemaInTableAnnotationEntity.class, PUSchemaInTableMappingEntity.class,
@@ -37,6 +38,7 @@ public class TestSchemaPUDefault extends SQLListenerTestCase {
         setSupportedDatabases(org.apache.openjpa.jdbc.sql.DB2Dictionary.class);
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/BaseQueryTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/BaseQueryTest.java
index 101345748..4d4454c2f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/BaseQueryTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/BaseQueryTest.java
@@ -32,7 +32,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.lib.conf.ConfigurationProvider;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Customer.java
index c5e52173e..b25538be4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Customer.java
@@ -18,20 +18,32 @@
  */
 package org.apache.openjpa.persistence.query;
 
-import javax.persistence.*;
-
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
 @Entity
 @Table(name="TCUS")
 public class Customer {
 
     @Embeddable
 	public static class CustomerKey implements Serializable {
-		public String cyCode;
+		
+        private static final long serialVersionUID = 1L;
+        public String cyCode;
 		public int id;
 
 		public CustomerKey(){}
@@ -41,7 +53,8 @@ public class Customer {
 			this.id=id;
 		}
 
-		public String toString() {
+		@Override
+        public String toString() {
 			return cyCode+"/"+id;
 		}
 		@Override
@@ -75,10 +88,10 @@ public class Customer {
 	 long version;
 
     @OneToMany(fetch=FetchType.EAGER, mappedBy="customer")
-    private Collection<Order> orders = new ArrayList<Order>();
+    private Collection<Order> orders = new ArrayList<>();
 
     @OneToMany(mappedBy="cust")
-    private List<Account> accounts = new ArrayList<Account>();
+    private List<Account> accounts = new ArrayList<>();
 
 	public Customer() {}
 
@@ -117,7 +130,8 @@ public class Customer {
         this.accounts = accounts;
     }
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return "Customer:"+cid+" name:"+name;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java
index b73813db7..a5af35f24 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/GroupingTestCase.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.query;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -27,8 +28,8 @@ import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.DerbyDictionary;
 import org.apache.openjpa.jdbc.sql.SolidDBDictionary;
-import org.apache.openjpa.persistence.test.SingleEMTestCase;
 import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 /**
  * <p>Tests grouping and having capabilities.</p>
@@ -40,6 +41,7 @@ public abstract class GroupingTestCase
 
     protected abstract void prepareQuery(Query q);
 
+    @Override
     public void setUp() {
         super.setUp(AllFieldTypes.class, CLEAR_TABLES,
             "openjpa.Compatibility", "JPQL=warn");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Magazine.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Magazine.java
index 73016d030..027e2c9b4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Magazine.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Magazine.java
@@ -19,15 +19,16 @@
 package org.apache.openjpa.persistence.query;
 
 import java.io.Serializable;
+import java.sql.Date;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.FetchType;
-import java.sql.Date;
 
 @Entity
 public class Magazine implements Serializable {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntity.java
index 049bc95e9..0dd9be6dd 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntity.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.query;
 
 import java.io.Serializable;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -32,6 +33,9 @@ import javax.persistence.Version;
 @Inheritance(strategy=InheritanceType.SINGLE_TABLE)
 public class ManyOneEntity implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private long id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntitySub.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntitySub.java
index d7cd72ba5..ff89a9971 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntitySub.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/ManyOneEntitySub.java
@@ -24,6 +24,8 @@ import javax.persistence.Entity;
 public class ManyOneEntitySub
     extends ManyOneEntity {
 
+    
+    private static final long serialVersionUID = 1L;
     private int subInt;
 
     public int getSubInt() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java
index 5be59d60c..ecce1f505 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java
@@ -18,11 +18,19 @@
  */
 package org.apache.openjpa.persistence.query;
 
-import javax.persistence.*;
-
 import java.sql.Timestamp;
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 @Entity
 @Table(name="TODR")
@@ -38,7 +46,7 @@ public class Order {
 	 Customer customer;
 
 	@OneToMany (fetch=FetchType.EAGER , mappedBy="order")
-	 Collection<OrderItem> lineitems = new ArrayList<OrderItem>();
+	 Collection<OrderItem> lineitems = new ArrayList<>();
 	@Version
 	long version;
 
@@ -75,7 +83,8 @@ public class Order {
 		return oid;
 	}
 
-	public String toString(){
+	@Override
+    public String toString(){
         return "Order:" + oid + " amount:" + amount
             + " delivered:" + delivered
             + " customer:" + ( customer != null ? customer.getCid() : -1 );
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/OrderItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/OrderItem.java
index 9aa15cffb..dbf364bd6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/OrderItem.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/OrderItem.java
@@ -17,7 +17,14 @@
  * under the License.
  */
 package org.apache.openjpa.persistence.query;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
 @Entity
 @Table(name="TODREITM")
 public class OrderItem {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Publisher.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Publisher.java
index 1cb94ba66..9be016039 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Publisher.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Publisher.java
@@ -19,14 +19,15 @@
 package org.apache.openjpa.persistence.query;
 
 import java.io.Serializable;
+import java.util.Set;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.OneToMany;
-import java.util.Set;
 
 @Entity
 public class Publisher implements Serializable {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java
index 2fe2ed6ff..e0e9a111b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.query;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -63,6 +64,8 @@ import javax.persistence.Table;
 @Entity(name = "simple")
 @Table(name = "SIMPLE_ENTITY")
 public class SimpleEntity implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
     public static final String NAMED_QUERY_WITH_POSITIONAL_PARAMS = "SelectWithPositionalParameter";
     public static final String NAMED_QUERY_WITH_NAMED_PARAMS = "SelectWithNamedParameter";
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Test1x1OrderByResultCollection.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Test1x1OrderByResultCollection.java
index b47015d6f..4fddedbb2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Test1x1OrderByResultCollection.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Test1x1OrderByResultCollection.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class Test1x1OrderByResultCollection extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(Hardware.class, Person.class, CLEAR_TABLES
             , "openjpa.jdbc.DBDictionary", "fullResultCollectionInOrderByRelation=true"
@@ -70,7 +71,7 @@ public class Test1x1OrderByResultCollection extends SingleEMTestCase {
        assertEquals(4, results.size());
 
        // remove null techOwner or techOwner.name entries in collection first
-       List<Hardware> nonNullResults = new ArrayList<Hardware>(results.size());
+       List<Hardware> nonNullResults = new ArrayList<>(results.size());
        for (Hardware hw : results) {
            if (hw.getTechOwner() != null
                    && hw.getTechOwner().getName() != null) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAbstractSchemaName.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAbstractSchemaName.java
index a9f8de801..8f1465ba2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAbstractSchemaName.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAbstractSchemaName.java
@@ -21,10 +21,11 @@ package org.apache.openjpa.persistence.query;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.simple.NamedEntity;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that we can query by an entity's abstract schema name.
  *
@@ -33,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestAbstractSchemaName
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(NamedEntity.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java
index f03d7ee73..9703606bd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java
@@ -30,14 +30,13 @@ package org.apache.openjpa.persistence.query;
 import java.util.Arrays;
 import java.util.Collection;
 
-
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest4;
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest5;
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.Query;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest4;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest5;
 
 public class TestAccessPathsOfSubqueries extends BaseQueryTest {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestComplexQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestComplexQueries.java
index 36c4a8a75..433efa8a8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestComplexQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestComplexQueries.java
@@ -30,6 +30,8 @@ package org.apache.openjpa.persistence.query;
 
 import java.util.List;
 
+import org.apache.openjpa.kernel.Broker;
+import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.persistence.query.common.apps.ComplexA;
 import org.apache.openjpa.persistence.query.common.apps.ComplexB;
 import org.apache.openjpa.persistence.query.common.apps.ComplexC;
@@ -37,8 +39,6 @@ import org.apache.openjpa.persistence.query.common.apps.ComplexD;
 import org.apache.openjpa.persistence.query.common.apps.ComplexE;
 import org.apache.openjpa.persistence.query.common.apps.ComplexF;
 import org.apache.openjpa.persistence.query.common.apps.ComplexG;
-import org.apache.openjpa.kernel.Broker;
-import org.apache.openjpa.kernel.jpql.JPQLParser;
 
 public class TestComplexQueries extends BaseQueryTest {
 
@@ -50,6 +50,7 @@ public class TestComplexQueries extends BaseQueryTest {
         super(test);
     }
 
+    @Override
     public void setUp() {
         clear();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDataStoreActions.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDataStoreActions.java
index 43b22bf89..9e36f9e1f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDataStoreActions.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDataStoreActions.java
@@ -18,9 +18,9 @@
  */
 package org.apache.openjpa.persistence.query;
 
-import org.apache.openjpa.persistence.test.SingleEMTestCase;
 import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestDataStoreActions
     extends SingleEMTestCase {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDistinctQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDistinctQueries.java
index 8fb0a383c..e5a35df26 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDistinctQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDistinctQueries.java
@@ -20,20 +20,21 @@ package org.apache.openjpa.persistence.query;
 
 import java.util.List;
 
-import org.apache.openjpa.persistence.test.SingleEMTestCase;
-import org.apache.openjpa.persistence.models.company.fetchlazy.ProductOrder;
-import org.apache.openjpa.persistence.models.company.fetchlazy.LineItem;
-import org.apache.openjpa.persistence.models.company.fetchlazy.Product;
-import org.apache.openjpa.persistence.models.company.fetchlazy.Customer;
 import org.apache.openjpa.persistence.models.company.fetchlazy.Address;
 import org.apache.openjpa.persistence.models.company.fetchlazy.Company;
+import org.apache.openjpa.persistence.models.company.fetchlazy.Customer;
 import org.apache.openjpa.persistence.models.company.fetchlazy.Employee;
-import org.apache.openjpa.persistence.models.company.fetchlazy.PartTimeEmployee;
 import org.apache.openjpa.persistence.models.company.fetchlazy.FullTimeEmployee;
+import org.apache.openjpa.persistence.models.company.fetchlazy.LineItem;
+import org.apache.openjpa.persistence.models.company.fetchlazy.PartTimeEmployee;
 import org.apache.openjpa.persistence.models.company.fetchlazy.Person;
+import org.apache.openjpa.persistence.models.company.fetchlazy.Product;
+import org.apache.openjpa.persistence.models.company.fetchlazy.ProductOrder;
+import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestDistinctQueries extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(Address.class, Company.class, Customer.class, Employee.class,
             FullTimeEmployee.class, LineItem.class, PartTimeEmployee.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java
index 818e599a5..0824ac13e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestDoubleQuotedStringLiteralInJPQL
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java
index a862b0ed1..319888694 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDupNamedQuery.java
@@ -20,13 +20,16 @@ package org.apache.openjpa.persistence.query;
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 public class TestDupNamedQuery extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SimpleEntity.class, SimpleEntity2.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java
index 9d46a83bb..38ee94a1f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java
@@ -20,11 +20,10 @@ package org.apache.openjpa.persistence.query;
 
 import javax.persistence.Query;
 
-
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.query.common.apps.Entity1;
 import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.query.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 public class TestEJBDeleteUpdateImpl extends BaseQueryTest {
 
@@ -36,6 +35,7 @@ public class TestEJBDeleteUpdateImpl extends BaseQueryTest {
         super(test);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
         deleteAll(RuntimeTest2.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java
index 0f9766be8..feb8a0535 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java
@@ -19,10 +19,9 @@
 package org.apache.openjpa.persistence.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-
-
 import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.query.common.apps.RuntimeTest2;
 
@@ -32,6 +31,7 @@ public class TestEJBPolymorphicQuery extends BaseQueryTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
         deleteAll(RuntimeTest2.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java
index 26c2e1b5c..621a08194 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBQueryInterface.java
@@ -19,10 +19,9 @@
 package org.apache.openjpa.persistence.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-
-
 import org.apache.openjpa.persistence.query.common.apps.Entity1;
 import org.apache.openjpa.persistence.query.common.apps.Entity2;
 
@@ -32,6 +31,7 @@ public class TestEJBQueryInterface extends BaseQueryTest {
         super(name);
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(Entity1.class, Entity2.class, Order.class, OrderItem.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEscapedSingleQuotesInJPQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEscapedSingleQuotesInJPQL.java
index 46a7bbad0..185350406 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEscapedSingleQuotesInJPQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEscapedSingleQuotesInJPQL.java
@@ -19,16 +19,18 @@
 package org.apache.openjpa.persistence.query;
 
 import java.util.Collection;
+
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import org.apache.openjpa.persistence.simple.AllFieldTypes;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestEscapedSingleQuotesInJPQL
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestInMemoryQueryMatchEscapes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestInMemoryQueryMatchEscapes.java
index e8bbde75d..706d4da0a 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestInMemoryQueryMatchEscapes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestInMemoryQueryMatchEscapes.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.query;
 
-import javax.persistence.FlushModeType;
 import javax.persistence.EntityManager;
+import javax.persistence.FlushModeType;
 
 import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.simple.AllFieldTypes;
@@ -28,6 +28,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestInMemoryQueryMatchEscapes
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java
index c608038a8..d7016f04e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJDBCEscapeDate.java
@@ -25,8 +25,6 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Query;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.jdbc.sql.HSQLDictionary;
@@ -35,11 +33,14 @@ import org.apache.openjpa.jdbc.sql.SQLServerDictionary;
 import org.apache.openjpa.jdbc.sql.SybaseDictionary;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.framework.Assert;
+
 /**
  * Test JDBC escape syntax for date, time, and timestamp literals
  */
 public class TestJDBCEscapeDate extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Employee.class, DROP_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJPAQuerySubclassFunc.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJPAQuerySubclassFunc.java
index f3297c0f7..223475709 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJPAQuerySubclassFunc.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJPAQuerySubclassFunc.java
@@ -20,11 +20,10 @@ package org.apache.openjpa.persistence.query;
 
 import java.util.List;
 
-
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest3;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest3;
 
 public class TestJPAQuerySubclassFunc extends BaseQueryTest {
 
@@ -32,6 +31,7 @@ public class TestJPAQuerySubclassFunc extends BaseQueryTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJPQLWithoutIdentificationVariable.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJPQLWithoutIdentificationVariable.java
index b4eed5301..de879904f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJPQLWithoutIdentificationVariable.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestJPQLWithoutIdentificationVariable.java
@@ -22,6 +22,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestJPQLWithoutIdentificationVariable extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(ManyOneEntity.class, ManyOneEntitySub.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestLocate.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestLocate.java
index c9fbcbf1c..1f641a909 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestLocate.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestLocate.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
  */
 public class TestLocate extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(SimpleEntity.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestMathQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestMathQueries.java
index 996010c05..6bba1d22b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestMathQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestMathQueries.java
@@ -28,11 +28,10 @@ package org.apache.openjpa.persistence.query;
 
 import java.util.List;
 
-
-import org.apache.openjpa.persistence.query.common.apps.QueryTest1;
-import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
+import org.apache.openjpa.persistence.query.common.apps.QueryTest1;
 
 public class TestMathQueries extends BaseQueryTest {
 
@@ -44,6 +43,7 @@ public class TestMathQueries extends BaseQueryTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(QueryTest1.class);
         OpenJPAEntityManager pm = getEM();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNamedQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNamedQueries.java
index 8645548d6..42edd347d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNamedQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNamedQueries.java
@@ -30,15 +30,12 @@ import java.util.Collection;
 
 import javax.persistence.TypedQuery;
 
-
-
-import org.apache.openjpa.persistence.query.common.apps.EntityInterface;
-import org.apache.openjpa.persistence.query.common.apps.QueryTest1;
-
 import org.apache.openjpa.meta.QueryMetaData;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.query.common.apps.EntityInterface;
+import org.apache.openjpa.persistence.query.common.apps.QueryTest1;
 
 public class TestNamedQueries extends BaseQueryTest {
 
@@ -50,6 +47,7 @@ public class TestNamedQueries extends BaseQueryTest {
         super(test);
     }
 
+    @Override
     public void setUp() {
         deleteAll(QueryTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java
index 33b6c77e7..965ae78d5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java
@@ -46,7 +46,8 @@ public class TestNewEntityAsQueryParameter extends SingleEMFTestCase {
 	public static final int MEMBER_COUNT_PROJEKT2 = 4;
 	public static final int MEMBER_COUNT_TOTAL    = 8;
 
-	public void setUp() throws Exception {
+	@Override
+    public void setUp() throws Exception {
 		super.setUp(CLEAR_TABLES, Osoba.class, Projekt.class);
 		createData();
 	}
@@ -76,7 +77,8 @@ public class TestNewEntityAsQueryParameter extends SingleEMFTestCase {
 		em.clear();
 	}
 
-	public void tearDown() throws Exception {
+	@Override
+    public void tearDown() throws Exception {
 		super.tearDown();
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewlinesInQueries.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewlinesInQueries.java
index 349db43c2..f730d5a7a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewlinesInQueries.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewlinesInQueries.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestNewlinesInQueries
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SimpleEntity.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestOutOfBoundsEx.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestOutOfBoundsEx.java
index 403d64bac..45c414cd9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestOutOfBoundsEx.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestOutOfBoundsEx.java
@@ -33,7 +33,8 @@ public class TestOutOfBoundsEx extends SingleEMFTestCase {
 	private EntityManager em = null;
 	private Lookup lookup;
 
-	public void setUp() throws Exception {
+	@Override
+    public void setUp() throws Exception {
 		super.setUp(Lookup.class, Case.class, Role.class, ScheduledAssignment.class, ScheduleDay.class,
         DROP_TABLES);
 		em = emf.createEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java
index 9a9280939..6717b8955 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java
@@ -42,6 +42,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestProjectionQueryWithIdenticalResult extends SingleEMFTestCase {
 	private static boolean USE_TXN = true;
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES,
         	  UnidirectionalOneToOneOwned.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryEscapeCharacters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryEscapeCharacters.java
index 357a146ee..74747f932 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryEscapeCharacters.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryEscapeCharacters.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestQueryEscapeCharacters
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Employee.class, CLEAR_TABLES);
 
@@ -59,6 +60,7 @@ public class TestQueryEscapeCharacters
         em.close();
     }
 
+    @Override
     public void tearDown() throws Exception {
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java
index baaf4b96d..afae439ba 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExcludingSubclasses.java
@@ -19,13 +19,15 @@
 package org.apache.openjpa.persistence.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that we can exclude subclass instances from query results.
  *
@@ -34,6 +36,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestQueryExcludingSubclasses
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(ManyOneEntity.class, ManyOneEntitySub.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExpressionSplit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExpressionSplit.java
index 29653d17f..3b78c08c1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExpressionSplit.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryExpressionSplit.java
@@ -29,9 +29,6 @@ package org.apache.openjpa.persistence.query;
 import java.util.Arrays;
 import java.util.List;
 
-
-
-
 import org.apache.openjpa.kernel.Filters;
 
 public class TestQueryExpressionSplit extends BaseQueryTest {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryIdOfRelationDoesNotJoin.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryIdOfRelationDoesNotJoin.java
index 65d67a776..e305ea120 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryIdOfRelationDoesNotJoin.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryIdOfRelationDoesNotJoin.java
@@ -19,12 +19,14 @@
 package org.apache.openjpa.persistence.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that querying the id of a related many-one (or one-one) does not create
  * a join across the tables.
@@ -36,6 +38,7 @@ public class TestQueryIdOfRelationDoesNotJoin
 
     private long e3Id;
 
+    @Override
     public void setUp() {
         setUp(ManyOneEntity.class, ManyOneEntitySub.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryLock.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryLock.java
index 6863a01eb..03670a4a7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryLock.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryLock.java
@@ -34,6 +34,7 @@ public class TestQueryLock extends BaseQueryTest {
         super(test);
     }
 
+    @Override
     public void setUp() {
         deleteAll(Entity1.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java
index eeae94b49..1798d8672 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryPagination.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
@@ -32,6 +33,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 public class TestQueryPagination
     extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(SimpleEntity.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java
index 399d5db8b..52e141f9c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryParameters.java
@@ -21,10 +21,10 @@ package org.apache.openjpa.persistence.query;
 import javax.persistence.EntityManager;
 import javax.persistence.Parameter;
 import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Root;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResultClassAPI.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResultClassAPI.java
index 839d39b6c..bf2adf69a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResultClassAPI.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResultClassAPI.java
@@ -23,8 +23,6 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-
-
 import org.apache.openjpa.kernel.PreparedQuery;
 import org.apache.openjpa.kernel.PreparedQueryCache;
 import org.apache.openjpa.persistence.query.common.apps.QueryTest1;
@@ -34,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestQueryResultClassAPI extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(QueryTest1.class, QueryTest2.class, QueryTest4.class,
             "openjpa.jdbc.QuerySQLCache", "true",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java
index f99e1dbfe..80936ed30 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryResults.java
@@ -24,15 +24,14 @@ import java.util.List;
 
 import javax.persistence.NoResultException;
 
-
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest2;
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest3;
 import org.apache.openjpa.persistence.Extent;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.jdbc.FetchMode;
 import org.apache.openjpa.persistence.jdbc.JDBCFetchPlan;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest2;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest3;
 
 /**
  * Test that ResultList objects behaver correctly.
@@ -45,6 +44,7 @@ public class TestQueryResults extends BaseQueryTest {
         super(test);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
index 3acbac5be..a83f87520 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
@@ -248,7 +248,7 @@ public class TestQueryTimeout extends SQLListenerTestCase {
         OpenJPAEntityManager em = null;
         Integer setTime = new Integer(0);
         // create the Map to test overrides
-        Map<String,String >props = new HashMap<String,String>();
+        Map<String,String >props = new HashMap<>();
         props.put("javax.persistence.query.timeout", "0");
 
         try {
@@ -498,7 +498,7 @@ public class TestQueryTimeout extends SQLListenerTestCase {
         Integer setTime = new Integer(0);
 
         // create the Map to test overrides
-        Map<String,String> props = new HashMap<String,String>();
+        Map<String,String> props = new HashMap<>();
         props.put("javax.persistence.query.timeout", "0");
 
         try {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java
index eeb61b260..7b4246651 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java
@@ -29,12 +29,12 @@ package org.apache.openjpa.persistence.query;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.Query;
 
-
-import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
+import org.apache.openjpa.persistence.query.common.apps.RuntimeTest1;
 
 public class TestQuotedNumbersInFilters2 extends BaseQueryTest {
 
@@ -42,6 +42,7 @@ public class TestQuotedNumbersInFilters2 extends BaseQueryTest {
         super(name);
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
         OpenJPAEntityManager pm = getEM();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestResultSetMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestResultSetMapping.java
index d8941a942..8a323dcbd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestResultSetMapping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestResultSetMapping.java
@@ -20,15 +20,18 @@ package org.apache.openjpa.persistence.query;
 
 import java.util.Iterator;
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 public class TestResultSetMapping
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SimpleEntity.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSimple.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSimple.java
index 6feedeb0a..e157daacb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSimple.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSimple.java
@@ -19,10 +19,10 @@
 package org.apache.openjpa.persistence.query;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-
 import org.apache.openjpa.persistence.query.common.apps.Entity1;
 
 public class TestSimple extends BaseQueryTest {
@@ -33,6 +33,7 @@ public class TestSimple extends BaseQueryTest {
         super(test);
     }
 
+    @Override
     public void setUp() {
         deleteAll(Entity1.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java
index ddc89b4c0..99aafda68 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubquery.java
@@ -37,6 +37,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestSubquery
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(Customer.class, Customer.CustomerKey.class, Order.class,
             OrderItem.class, Magazine.class, Publisher.class, Employee.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubstring.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubstring.java
index e8074c0f8..622338920 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubstring.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestSubstring.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestSubstring extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(SimpleEntity.class, CLEAR_TABLES,
             "openjpa.Compatibility", "JPQL=extended");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java
index 1094db1ef..79564556e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestTimeoutException.java
@@ -41,6 +41,7 @@ import org.apache.openjpa.util.OpenJPAException;
 public class TestTimeoutException extends SingleEMFTestCase {
     private final Class<?> entityClass = PObject.class;
 
+    @Override
     public void setUp() {
         // Disable tests for any DB that has supportsSelectForUpdate==false, like HSQLDictionary
         OpenJPAEntityManagerFactorySPI tempEMF = emf;
@@ -113,7 +114,7 @@ public class TestTimeoutException extends SingleEMFTestCase {
         final Object entity2 = em2.find(entityClass, oid);
         final long timeout = 1000;
         try {
-            Map<String,Object> hint = new HashMap<String, Object>();
+            Map<String,Object> hint = new HashMap<>();
             hint.put("javax.persistence.lock.timeout", timeout);
             em2.lock(entity2, LockModeType.PESSIMISTIC_WRITE, hint);
             fail("Expected " + PessimisticLockException.class.getName());
@@ -145,7 +146,7 @@ public class TestTimeoutException extends SingleEMFTestCase {
 
         em2.getTransaction().begin();
         try {
-            Map<String,Object> hint = new HashMap<String, Object>();
+            Map<String,Object> hint = new HashMap<>();
             hint.put("javax.persistence.lock.timeout", timeout);
             //em2.setProperty("javax.persistence.lock.timeout", timeout);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestWildCardCount.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestWildCardCount.java
index 19b79b677..5292c3e6f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestWildCardCount.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestWildCardCount.java
@@ -44,6 +44,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
  */
 public class TestWildCardCount extends SQLListenerTestCase {
     private EntityManager em;
+    @Override
     public void setUp() throws Exception {
         super.setUp(RuntimeTest1.class, "openjpa.jdbc.QuerySQLCache", "false");
         em = emf.createEntityManager();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TupleQueryTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TupleQueryTest.java
index 99036ab98..79a4f3622 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TupleQueryTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TupleQueryTest.java
@@ -18,17 +18,19 @@
  */
 package org.apache.openjpa.persistence.query;
 
-import junit.textui.TestRunner;
-import org.apache.openjpa.persistence.simple.NamedEntity;
-import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceException;
 import javax.persistence.Tuple;
 
+import org.apache.openjpa.persistence.simple.NamedEntity;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+import junit.textui.TestRunner;
+
 public class TupleQueryTest
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(NamedEntity.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexA.java
index 35b11a071..d84bfab40 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexA.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedList;
+
 import javax.persistence.Entity;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexB.java
index 550e2efbf..fc5b22d35 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexB.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToOne;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexC.java
index 8509c3a72..6615b44d1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexC.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToOne;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexD.java
index da90ccfcf..f609a3a5d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexD.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Set;
 import java.util.TreeSet;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToOne;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexE.java
index 301f43ad6..1b801466e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexE.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedList;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToOne;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexF.java
index 350424bb1..e7724dd94 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexF.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToOne;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexG.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexG.java
index a42141b5d..395a0babd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexG.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ComplexG.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.query.common.apps;
 
 import java.util.Date;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToOne;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CompoundAppIdPC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CompoundAppIdPC.java
index 9e7932d9c..ee3454f0b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CompoundAppIdPC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/CompoundAppIdPC.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.query.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.IdClass;
@@ -67,6 +68,8 @@ public class CompoundAppIdPC {
 
     public static class Idkey implements Serializable {
 
+        
+        private static final long serialVersionUID = 1L;
         public String pk1;
         public int pk2;
 
@@ -81,6 +84,7 @@ public class CompoundAppIdPC {
             }
         }
 
+        @Override
         public String toString() {
             return pk2 + "/" + pk1;
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java
index 34102abd3..a2828c696 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity1.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.query.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -97,6 +98,7 @@ public class Entity1 implements Serializable {
         return entity2Field;
     }
 
+    @Override
     public String toString() {
         return ("PK: " + pk + " StringField: " + stringField + " IntField: " +
             intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity2.java
index cd0d26d3f..dbdf3c68f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Entity2.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.query.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -35,9 +36,7 @@ import javax.persistence.Id;
 @Entity
 public class Entity2 implements Serializable {
 
-    /**
-     *
-     */
+    
     private static final long serialVersionUID = 4723739219953167343L;
 
     @Id
@@ -79,6 +78,7 @@ public class Entity2 implements Serializable {
         return intField;
     }
 
+    @Override
     public String toString() {
         return ("PK: " + pk + " StringField: " + stringField + " IntField: " +
             intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest1.java
index dab94bcfd..ff07711fa 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest1.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -110,6 +111,7 @@ public class ModRuntimeTest1 implements Serializable {
         this.selfOneMany = selfOneMany;
     }
 
+    @Override
     public String toString() {
         return "IntField: " + intField + ", StringField: " + stringField + " .";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest2.java
index afcea3736..891e77553 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/ModRuntimeTest2.java
@@ -49,6 +49,7 @@ public class ModRuntimeTest2 extends ModRuntimeTest1 {
         this.intField2 = intField2;
     }
 
+    @Override
     public String toString() {
         return "IntField: " + intField2 + ", StringField: " +
             super.getStringField() + " .";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Osoba.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Osoba.java
index 1db2a2b02..023d9bebd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Osoba.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Osoba.java
@@ -62,7 +62,7 @@ public class Osoba {
 
 	public void addProjekty(Projekt projekt) {
 		if (projekty == null)
-			projekty = new ArrayList<Projekt>();
+			projekty = new ArrayList<>();
 		projekty.add(projekt);
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Projekt.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Projekt.java
index b9fc1877b..2db584f7e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Projekt.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/Projekt.java
@@ -56,7 +56,7 @@ public class Projekt {
 
 	public void addOsoba(Osoba osoba) {
 		if (osoby ==null)
-			osoby = new ArrayList<Osoba>();
+			osoby = new ArrayList<>();
 		osoby.add(osoba);
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest1.java
index 917ee1663..628d08030 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest1.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.query.common.apps;
 
 import java.util.Date;
 import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest2.java
index c4d0b08d3..b790e7e88 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest2.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.query.common.apps;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest4.java
index b657a42a8..9dee8b5c8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/QueryTest4.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.query.common.apps;
 
 import java.util.Collection;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.ManyToMany;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest1.java
index 6e11e4d20..e8b1bd4d8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest1.java
@@ -25,6 +25,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
@@ -41,6 +42,9 @@ import org.apache.openjpa.persistence.PersistentCollection;
 @DiscriminatorValue("RT1")
 public class RuntimeTest1 implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String someStaticField = "someField";
 
     private byte byteField;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest2.java
index 2a9b86d4b..f0cea3f03 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest2.java
@@ -52,6 +52,7 @@ public class RuntimeTest2 extends RuntimeTest1 {
         this.intField2 = intField2;
     }
 
+    @Override
     public String toString() {
         return "IntField: " + intField2 + ", StringField: " +
             super.getStringField() + " .";
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest3.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest3.java
index c9be2dd6b..a20b29277 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest3.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest3.java
@@ -30,6 +30,8 @@ import javax.persistence.Entity;
 @DiscriminatorValue("RT3")
 public class RuntimeTest3 extends RuntimeTest2 {
 
+    
+    private static final long serialVersionUID = 1L;
     private int intField3;
 
     public RuntimeTest3() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest4.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest4.java
index f28b32e48..9781534ee 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest4.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/common/apps/RuntimeTest4.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.query.common.apps;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
 import javax.persistence.Entity;
 
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestJPQLMultiSelectTypedResults.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestJPQLMultiSelectTypedResults.java
index 9a69a7bec..03a7d0bf4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestJPQLMultiSelectTypedResults.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestJPQLMultiSelectTypedResults.java
@@ -49,6 +49,7 @@ public class TestJPQLMultiSelectTypedResults extends SingleEMFTestCase {
 
     DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.US);
 
+    @Override
     public void setUp() throws Exception {
         setUp(CLEAR_TABLES, Order.class, Item.class, Shop.class, Producer.class,
               Person.class, Foo.class, Bar.class,
@@ -99,6 +100,7 @@ public class TestJPQLMultiSelectTypedResults extends SingleEMFTestCase {
         em.close();
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java
index af7f394f3..913e02fac 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestListResultSerialization.java
@@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.query.results;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.openjpa.lib.rop.ListResultList;
-import org.apache.openjpa.lib.rop.ResultList;
 
 import org.apache.openjpa.kernel.DistinctResultList;
+import org.apache.openjpa.lib.rop.ListResultList;
+import org.apache.openjpa.lib.rop.ResultList;
 import org.apache.openjpa.persistence.EntityManagerImpl;
 import org.apache.openjpa.persistence.PersistenceExceptions;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
@@ -36,13 +36,14 @@ import org.apache.openjpa.util.RuntimeExceptionTranslator;
  * @since 2.1.0
  */
 public class TestListResultSerialization extends SQLListenerTestCase {
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         assertNotNull(emf);
     }
 
     public void testRoundtrip() {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("xxx");
         list.add("yyy");
         ResultList resultList = new ListResultList(list);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestResultSetMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestResultSetMapping.java
index 72129be44..bf0a42b67 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestResultSetMapping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/results/TestResultSetMapping.java
@@ -31,6 +31,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestResultSetMapping extends SQLListenerTestCase{
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, ShipRate.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java
index e77334e55..97cfd62be 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoChequePersEntity.java
@@ -22,7 +22,6 @@ import javax.persistence.Entity;
 import javax.persistence.EntityResult;
 import javax.persistence.FieldResult;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
 import javax.persistence.SqlResultSetMapping;
 
 @javax.persistence.Table(name = "CRT_REQUISICAO_CHEQUE_PERS")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoEntity.java
index fa818234c..0c32f0ad6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/CrtRequisicaoEntity.java
@@ -20,11 +20,9 @@ package org.apache.openjpa.persistence.query.sqlresultmapping;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
-import javax.persistence.OneToOne;
 
 @javax.persistence.Table(name = "CRT_REQUISICAO")
 @Entity
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java
index 497914445..397b3185f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/sqlresultmapping/TestSQLResultSetMapping.java
@@ -20,14 +20,10 @@ package org.apache.openjpa.persistence.query.sqlresultmapping;
 
 import java.sql.Timestamp;
 import java.util.List;
-import java.util.Properties;
 
 import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
 import javax.persistence.Query;
 
-import org.apache.openjpa.persistence.querycache.QCEntity;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 /*
@@ -35,6 +31,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestSQLResultSetMapping extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES, CrtOperacaoEntity.class,
             CrtRequisicaoEntity.class, CrtRequisicaoChequePersEntity.class);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntityM2O.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntityM2O.java
index b64971a31..77c34f481 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntityM2O.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/QCEntityM2O.java
@@ -23,8 +23,6 @@ import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
 
 @Entity
 public class QCEntityM2O {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCache.java
index ef5c91f38..394c944cd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCache.java
@@ -34,6 +34,7 @@ public class TestQueryCache extends SQLListenerTestCase {
 
     EntityManager em;
     private static final String CACHE_NAME = "QueryCacheName";
+    @Override
     public void setUp() {
         super.setUp(
             DROP_TABLES,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java
index c2938e852..3fc0d6cfd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQueryCacheWithDataCache.java
@@ -25,12 +25,11 @@ import javax.persistence.Query;
 
 import org.apache.openjpa.persistence.FetchPlan;
 import org.apache.openjpa.persistence.OpenJPAQuery;
-import org.apache.openjpa.persistence.querycache.QCEntityM2O;
-import org.apache.openjpa.persistence.querycache.QCEntity;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestQueryCacheWithDataCache extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(DROP_TABLES, QCEntityM2O.class, QCEntity.class, "openjpa.DataCache", "true",
             "openjpa.RemoteCommitProvider", "sjvm", "openjpa.QueryCache", "true");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQuerySQLCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQuerySQLCache.java
index d4f126bf3..443c9da43 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQuerySQLCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/TestQuerySQLCache.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 public class TestQuerySQLCache extends SQLListenerTestCase {
     EntityManager em;
 
+    @Override
     public void setUp() {
         super.setUp(
             DROP_TABLES,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwned.java
index 5e22abd58..c0fde4969 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwned.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwned.java
@@ -1,6 +1,5 @@
 package org.apache.openjpa.persistence.querycache.common.apps;
 
-import javax.persistence.*;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,6 +18,12 @@ import javax.persistence.*;
  * specific language governing permissions and limitations
  * under the License.
  */
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+import org.apache.openjpa.persistence.datacache.TestDataCacheBehavesIdentical;
 
 /**
  * A persistent entity that is owned by unidirectional single-valued
@@ -82,7 +87,8 @@ public class BidirectionalOne2OneOwned {
 		return version;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return this.getClass().getSimpleName() + ":" + id + ":" + name;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwner.java
index 2e28c93b7..759328e7b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/BidirectionalOne2OneOwner.java
@@ -19,7 +19,10 @@
 
 package org.apache.openjpa.persistence.querycache.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
 
 /**
  * A persistent entity that owns bidirectional single-valued relationship.
@@ -79,7 +82,8 @@ public class BidirectionalOne2OneOwner {
 		return version;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return this.getClass().getSimpleName() + ":" + id + ":" + name;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java
index c3141b2f4..7a083b807 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity1.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.querycache.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -94,6 +95,7 @@ public class Entity1 implements Serializable {
         return entity2Field;
     }
 
+    @Override
     public String toString() {
         return ("PK: " + pk + " StringField: " + stringField + " IntField: " +
             intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity2.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity2.java
index 9ddd09fa7..5173804be 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity2.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/Entity2.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence.querycache.common.apps;
 
 import java.io.Serializable;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -31,9 +32,7 @@ import javax.persistence.InheritanceType;
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 public class Entity2 implements Serializable {
 
-    /**
-     *
-     */
+    
     private static final long serialVersionUID = 4723739219953167343L;
 
     @Id
@@ -75,6 +74,7 @@ public class Entity2 implements Serializable {
         return intField;
     }
 
+    @Override
     public String toString() {
         return ("PK: " + pk + " StringField: " + stringField + " IntField: " +
             intField);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwned.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwned.java
index a60cde32d..a82bde152 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwned.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwned.java
@@ -19,7 +19,11 @@
 
 package org.apache.openjpa.persistence.querycache.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+import org.apache.openjpa.persistence.datacache.TestDataCacheBehavesIdentical;
 /**
  * A persistent entity that is owned by unidirectional single-valued
  * relationship.
@@ -71,7 +75,8 @@ public class UnidirectionalOne2OneOwned {
 		return version;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return this.getClass().getSimpleName() + ":" + id + ":" + name;
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwner.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwner.java
index a43902ca6..e0c6f7e2a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwner.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/querycache/common/apps/UnidirectionalOne2OneOwner.java
@@ -19,7 +19,12 @@
 
 package org.apache.openjpa.persistence.querycache.common.apps;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
+
+import org.apache.openjpa.persistence.datacache.TestDataCacheBehavesIdentical;
 
 /**
  * A persistent entity that owns unidirectional single-valued relationship.
@@ -81,7 +86,8 @@ public class UnidirectionalOne2OneOwner {
 		return version;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return this.getClass().getSimpleName() + ":" + id + ":" + name;
 	}
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/Node.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/Node.java
index 022d73b16..9d82db2f8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/Node.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/Node.java
@@ -37,7 +37,7 @@ public class Node {
     private int version;
 
     @OneToMany
-    private List<Node> nodes = new ArrayList<Node>();
+    private List<Node> nodes = new ArrayList<>();
 
     public int getId() {
         return id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/TestRecursiveRelationships.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/TestRecursiveRelationships.java
index 129011d1f..c5d0a6875 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/TestRecursiveRelationships.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/recursive/TestRecursiveRelationships.java
@@ -26,6 +26,7 @@ public class TestRecursiveRelationships extends SingleEMFTestCase {
     private int _l1Nodes = 3;
     private int _l2Nodes = 3;
 
+    @Override
     public void setUp() {
         setUp(DROP_TABLES, Node.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AText.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AText.java
index 592139e3e..d1da252c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AText.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/AText.java
@@ -67,7 +67,7 @@ public class AText {
 	}
 
 
-	private Set<AEvident> aEvidents = new HashSet<AEvident>();
+	private Set<AEvident> aEvidents = new HashSet<>();
 	@OneToMany(targetEntity=AEvident.class, mappedBy="aText", cascade=CascadeType.MERGE)
 	public Set<AEvident> getAEvidents() {
 		return aEvidents;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiChild.java
index ca5e4a6ce..168d6a6f2 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiChild.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiChild.java
@@ -30,6 +30,9 @@ import javax.persistence.OneToOne;
 @Entity
 public class BidiChild implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private long id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiParent.java
index ccff7f836..5881076ad 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/BidiParent.java
@@ -33,6 +33,9 @@ import javax.persistence.OrderBy;
 @Entity
 public class BidiParent implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private long id;
@@ -41,7 +44,7 @@ public class BidiParent implements Serializable {
 
     @OneToMany(mappedBy="oneToManyParent")
     @OrderBy("name ASC")
-    private List<BidiChild> oneToManyChildren = new ArrayList<BidiChild>();
+    private List<BidiChild> oneToManyChildren = new ArrayList<>();
 
     @OneToOne(fetch=FetchType.LAZY, mappedBy="oneToOneParent")
     private BidiChild oneToOneChild;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/C.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/C.java
index 2bb13af7f..c01175d8d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/C.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/C.java
@@ -44,7 +44,7 @@ public class C {
     private CM cm;
 
 	@OneToMany(mappedBy="c")
-	private Set<D> ds = new HashSet<D>();
+	private Set<D> ds = new HashSet<>();
 
     public C() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CM.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CM.java
index cc1ac8996..4379c47d1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CM.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CM.java
@@ -41,7 +41,7 @@ public class CM {
     private String cmId;
 
     @OneToMany(cascade=CascadeType.ALL, fetch=FetchType.LAZY, mappedBy="cm")
-    private Set<C> cs = new HashSet<C>();
+    private Set<C> cs = new HashSet<>();
 
     @ManyToOne
     @ForeignKey
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java
index f2952e2ee..1abc4cabc 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/CascadingOneManyParent.java
@@ -41,7 +41,7 @@ public class CascadingOneManyParent {
     @OneToMany(mappedBy="parent", cascade=CascadeType.ALL)
     @OrderBy("name ASC")
     private List<CascadingOneManyChild> children =
-        new ArrayList<CascadingOneManyChild>();
+        new ArrayList<>();
 
     @Version
     private Integer optLock;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityA.java
index 40d8cc6e3..6bdb2eabb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityA.java
@@ -49,13 +49,13 @@ public class ChainEntityA {
 
 	public void addChildEntityB (ChainEntityB bean) {
 		if (null == chainEntityBSet)
-			chainEntityBSet = new LinkedHashSet<ChainEntityB> ();
+			chainEntityBSet = new LinkedHashSet<> ();
 		chainEntityBSet.add (bean);
 	}
 
 	public Collection<ChainEntityB> getChildren () {
 		if (null == chainEntityBSet)
-			chainEntityBSet = new LinkedHashSet<ChainEntityB> ();
+			chainEntityBSet = new LinkedHashSet<> ();
 		return chainEntityBSet;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityB.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityB.java
index d0444c347..935f7a143 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityB.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChainEntityB.java
@@ -47,14 +47,14 @@ public class ChainEntityB {
 
 	public void addChainEntityC (ChainEntityC bean) {
 		if (null == chainEntityCSet)
-			chainEntityCSet = new LinkedHashSet<ChainEntityC> ();
+			chainEntityCSet = new LinkedHashSet<> ();
 		chainEntityCSet.add (bean);
 		bean.setChainEntityB (this);
 	}
 
 	public Collection<ChainEntityC> getChainEntityCSet () {
 		if (null == chainEntityCSet)
-			chainEntityCSet = new LinkedHashSet<ChainEntityC> ();
+			chainEntityCSet = new LinkedHashSet<> ();
 		return chainEntityCSet;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java
index 2fc441688..e08af2c8d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildChildClass.java
@@ -19,7 +19,11 @@
 
 package org.apache.openjpa.persistence.relations;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java
index 82c0f23e7..fc4a13cc7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ChildClass.java
@@ -19,7 +19,11 @@
 
 package org.apache.openjpa.persistence.relations;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityRight.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityRight.java
index c28cd0934..60fbed315 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityRight.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ConcurrentEntityRight.java
@@ -39,7 +39,7 @@ public class ConcurrentEntityRight {
 	private Map<String, ConcurrentEntityLeft> leftEntityMap;
 
 	public ConcurrentEntityRight() {
-		leftEntityMap = new ConcurrentHashMap<String, ConcurrentEntityLeft>();
+		leftEntityMap = new ConcurrentHashMap<>();
 	}
 
 	public int getId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Customer.java
index 385be7d4a..a6bde33e3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Customer.java
@@ -18,16 +18,26 @@
  */
 package org.apache.openjpa.persistence.relations;
 
-import javax.persistence.*;
-
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
 @Entity
 public class Customer {
 
     @Embeddable
     public static class CustomerKey implements Serializable {
+        
+        private static final long serialVersionUID = 1L;
         public String countryCode;
         public int id;
 
@@ -38,6 +48,7 @@ public class Customer {
             this.id=id;
         }
 
+        @Override
         public String toString() {
             return countryCode+"/"+id;
         }
@@ -73,7 +84,7 @@ public class Customer {
     long version;
 
     @OneToMany(fetch=FetchType.LAZY, mappedBy="customer", orphanRemoval=true)
-    private Collection<Order> orders = new ArrayList<Order>();
+    private Collection<Order> orders = new ArrayList<>();
 
     public Customer() {}
 
@@ -107,6 +118,7 @@ public class Customer {
         this.orders = orders;
     }
 
+    @Override
     public String toString() {
         return "Customer:"+cid+" name:"+name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/E.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/E.java
index 953eae9e9..5a29868a9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/E.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/E.java
@@ -37,10 +37,10 @@ public class E {
 	private String name;
 
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "e")
-	private Set<VCS> vcss = new HashSet<VCS>();
+	private Set<VCS> vcss = new HashSet<>();
 
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "e")
-	private Set<CM> cms = new HashSet<CM>();
+	private Set<CM> cms = new HashSet<>();
 
 	public E() {
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EmbeddableWithRelation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EmbeddableWithRelation.java
index ac3f3670f..f6467f0df 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EmbeddableWithRelation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EmbeddableWithRelation.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.relations;
 
-import javax.persistence.Embeddable;
 import javax.persistence.CascadeType;
+import javax.persistence.Embeddable;
 import javax.persistence.ManyToOne;
 
 @Embeddable
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA1InverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA1InverseEager.java
index f008123c2..44e786a9f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA1InverseEager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA1InverseEager.java
@@ -32,7 +32,7 @@ public class EntityA1InverseEager extends EntityAInverseEager {
 
 	@OneToMany(fetch=FetchType.EAGER, mappedBy="entityA")
     private List<EntityBInverseEager> listB =
-        new ArrayList<EntityBInverseEager>();
+        new ArrayList<>();
 
 	public EntityA1InverseEager() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA2InverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA2InverseEager.java
index 7d201f9e5..71e61c5d9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA2InverseEager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityA2InverseEager.java
@@ -32,7 +32,7 @@ public class EntityA2InverseEager extends EntityAInverseEager {
 
 	@OneToMany(fetch=FetchType.EAGER, mappedBy="entityA")
     private List<EntityBInverseEager> listB =
-        new ArrayList<EntityBInverseEager>();
+        new ArrayList<>();
 
 	public EntityA2InverseEager() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityAInverseEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityAInverseEager.java
index 580dd80f6..feb310f91 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityAInverseEager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/EntityAInverseEager.java
@@ -40,7 +40,7 @@ public class EntityAInverseEager  {
 
 	@OneToMany(fetch=FetchType.EAGER, mappedBy="entityA")
     private List<EntityBInverseEager> listB =
-        new ArrayList<EntityBInverseEager>();
+        new ArrayList<>();
 
 	public EntityAInverseEager() {}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java
index 89cf8289a..28c2a96bd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/GrandChildClass.java
@@ -19,7 +19,11 @@
 
 package org.apache.openjpa.persistence.relations;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy=InheritanceType.JOINED)
@@ -32,6 +36,7 @@ public class GrandChildClass extends ChildChildClass {
         return someUnloadedField;
     }
 
+    @Override
     public String toString() {
         return super.toString() + "SomeUnloadedField: " + someUnloadedField + "\n";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerCollectionInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerCollectionInstance.java
index eada11c85..ffda06f9e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerCollectionInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerCollectionInstance.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.relations;
 
 import java.util.Collection;
 import java.util.HashSet;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -31,7 +32,7 @@ public class HandlerCollectionInstance {
     private int id;
 
     @PersistentCollection
-    private Collection<String> collection = new HashSet<String>();
+    private Collection<String> collection = new HashSet<>();
 
     public Collection<String> getCollection() {
         return collection;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToHandlerMapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToHandlerMapInstance.java
index cbeb954d5..6bff71f8f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToHandlerMapInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToHandlerMapInstance.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.relations;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -33,7 +34,7 @@ public class HandlerToHandlerMapInstance {
 
     @PersistentMap
     @ContainerTable(name="NONSTD_MAPPING_MAP")
-    private Map<String,String> map = new HashMap<String,String>();
+    private Map<String,String> map = new HashMap<>();
 
     public Map<String,String> getMap() {
         return map;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToRelationMapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToRelationMapInstance.java
index 1b673e542..e61515cd8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToRelationMapInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/HandlerToRelationMapInstance.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.relations;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -33,7 +34,7 @@ public class HandlerToRelationMapInstance {
     private int id;
 
     @PersistentMap(elementCascade = CascadeType.PERSIST)
-    private Map<String,AllFieldTypes> map = new HashMap<String,AllFieldTypes>();
+    private Map<String,AllFieldTypes> map = new HashMap<>();
 
     public Map<String,AllFieldTypes> getMap() {
         return map;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IFace.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IFace.java
index 3b47bafad..80ca13770 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IFace.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IFace.java
@@ -20,5 +20,5 @@ package org.apache.openjpa.persistence.relations;
 
 public interface IFace {
 
-    public String getName();
+    String getName();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyParent.java
index f331a2d1d..dcadd1d87 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/IdOrderedOneManyParent.java
@@ -40,12 +40,12 @@ public class IdOrderedOneManyParent {
     @OneToMany(mappedBy="explicitParent")
     @OrderBy("id ASC")
     private List<IdOrderedOneManyChild> explicitChildren =
-        new ArrayList<IdOrderedOneManyChild>();
+        new ArrayList<>();
 
     @OneToMany(mappedBy="implicitParent")
     @OrderBy
     private List<IdOrderedOneManyChild> implicitChildren =
-        new ArrayList<IdOrderedOneManyChild>();
+        new ArrayList<>();
 
     @Version
     private int optLock;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyAbstract.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyAbstract.java
index 59874e619..be8d55129 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyAbstract.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyAbstract.java
@@ -50,6 +50,9 @@ import org.apache.openjpa.persistence.FetchGroups;
 )
 public abstract class InheritanceHierarchyAbstract implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private long id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyConcrete.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyConcrete.java
index bf3774b9e..5806d04b7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyConcrete.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/InheritanceHierarchyConcrete.java
@@ -36,7 +36,9 @@ import org.apache.openjpa.persistence.FetchGroup;
 @FetchGroup(name="value", attributes={@FetchAttribute(name="value")})
 public class InheritanceHierarchyConcrete extends InheritanceHierarchyAbstract implements Serializable {
 
-	@Basic
+	
+    private static final long serialVersionUID = 1L;
+    @Basic
 	private int value;
 
 	public int getValue() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/LRSEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/LRSEntity.java
index de73837ad..1836b94d1 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/LRSEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/LRSEntity.java
@@ -20,9 +20,10 @@ package org.apache.openjpa.persistence.relations;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.OrderBy;
 
@@ -56,7 +57,7 @@ public class LRSEntity {
 
     public Collection<BasicEntity> getLRSList() {
         if (lrsList == null) {
-            lrsList = new ArrayList<BasicEntity>();
+            lrsList = new ArrayList<>();
         }
         return lrsList;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java
index 3d3f248f5..1981a693d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openjpa.persistence.relations;
 
-import java.io.*;
+import java.io.Serializable;
 
 /**
  * Application identity class for:
@@ -28,7 +28,10 @@ import java.io.*;
  * org.apache.openjpa.enhance.ApplicationIdTool
  */
 public class ManyOneCompoundIdOwnerId implements Serializable {
-	static {
+	
+    private static final long serialVersionUID = 1L;
+
+    static {
 		// register persistent class in JVM
         try {
             Class.forName(
@@ -46,19 +49,22 @@ public class ManyOneCompoundIdOwnerId implements Serializable {
 		fromString(str);
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return String.valueOf(entityId)
 			+ "::" + String.valueOf(longId);
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		int rs = 17;
 		rs = rs * 37 + (int) (entityId ^ (entityId >>> 32));
 		rs = rs * 37 + (int) (longId ^ (longId >>> 32));
 		return rs;
 	}
 
-	public boolean equals(Object obj) {
+	@Override
+    public boolean equals(Object obj) {
 		if(this == obj)
 			return true;
 		if(obj == null || obj.getClass() != getClass())
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java
index b5cceca49..fe81d3ca2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyChild.java
@@ -31,6 +31,9 @@ import javax.persistence.ManyToOne;
 @Entity
 public class MapKeyChild implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private long id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java
index 0af5652ad..be45fffe7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MapKeyParent.java
@@ -32,6 +32,9 @@ import javax.persistence.OneToMany;
 @Entity
 public class MapKeyParent implements Serializable {
 
+    
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue
     private long id;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MultipleSameTypedEmbedded.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MultipleSameTypedEmbedded.java
index e66e5e10d..180bee218 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MultipleSameTypedEmbedded.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/MultipleSameTypedEmbedded.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.relations;
 
-import javax.persistence.AttributeOverride;
 import javax.persistence.AssociationOverride;
+import javax.persistence.AttributeOverride;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerParent.java
index d5e486408..9f070fd16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/OneManyEagerParent.java
@@ -41,12 +41,12 @@ public class OneManyEagerParent {
     @OneToMany(mappedBy="parent", fetch=FetchType.EAGER)
     @OrderBy("name ASC")
     private List<OneManyLazyChild> lazychildren =
-        new ArrayList<OneManyLazyChild>();
+        new ArrayList<>();
 
     @OneToMany(mappedBy="parent", fetch=FetchType.EAGER)
     @OrderBy("name ASC")
     private List<OneManyEagerChild> eagerchildren =
-        new ArrayList<OneManyEagerChild>();
+        new ArrayList<>();
 
     @Version
     private Integer optLock;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Order.java
index e740176f2..db7afc60e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Order.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Order.java
@@ -79,6 +79,7 @@ public class Order {
         return oid;
     }
 
+    @Override
     public String toString(){
         return "Order:" + oid + " amount:" + amount + " delivered:" + delivered
             + " customer:" + ( customer != null ? customer.getCid() : -1 );
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java
index d0e3345c1..ecdb21808 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ParentClass.java
@@ -19,9 +19,9 @@
 
 package org.apache.openjpa.persistence.relations;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Collection;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -35,7 +35,7 @@ import org.apache.openjpa.persistence.PersistentCollection;
 public abstract class ParentClass {
 
     @PersistentCollection(fetch=FetchType.EAGER)
-    private Set<String> items = new HashSet<String>();
+    private Set<String> items = new HashSet<>();
 
     protected ParentClass() {
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToHandlerMapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToHandlerMapInstance.java
index be0efbc74..825a13301 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToHandlerMapInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToHandlerMapInstance.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.relations;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -35,7 +36,7 @@ public class RelationToHandlerMapInstance {
     @PersistentMap(keyCascade = CascadeType.PERSIST)
 
     private Map<AllFieldTypes,String> aftMap =
-        new HashMap<AllFieldTypes,String>();
+        new HashMap<>();
 
     public Map<AllFieldTypes,String> getMap() {
         return aftMap;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToRelationMapInstance.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToRelationMapInstance.java
index aba949dcc..cd9540f1f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToRelationMapInstance.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/RelationToRelationMapInstance.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.relations;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -35,7 +36,7 @@ public class RelationToRelationMapInstance {
     @PersistentMap(keyCascade = CascadeType.PERSIST,
         elementCascade = CascadeType.PERSIST)
     private Map<AllFieldTypes,AllFieldTypes> map =
-        new HashMap<AllFieldTypes,AllFieldTypes>();
+        new HashMap<>();
 
     public Map<AllFieldTypes,AllFieldTypes> getMap() {
         return map;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java
index 0990cf5ed..ab5ca869d 100755
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TargetedIFaceRelationParent.java
@@ -54,6 +54,7 @@ public class TargetedIFaceRelationParent
         this.iface = iface;
     }
 
+    @Override
     public String getName() {
         return name;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblChild.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblChild.java
index 9a164ea3e..542cd2f8b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblChild.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblChild.java
@@ -48,7 +48,7 @@ public class TblChild {
 	@OneToMany(mappedBy="tblChild",fetch = FetchType.EAGER,
 			cascade = {CascadeType.PERSIST,CascadeType.MERGE})
 	private Collection<TblGrandChild> tblGrandChildren =
-        new ArrayList<TblGrandChild>();
+        new ArrayList<>();
 
 	@ManyToOne(fetch = FetchType.LAZY,
 			cascade = {CascadeType.PERSIST,CascadeType.MERGE })
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblParent.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblParent.java
index c51280c97..720a87e53 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblParent.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TblParent.java
@@ -36,7 +36,7 @@ public class TblParent {
 
 	@OneToMany(mappedBy="tblParent",fetch = FetchType.LAZY,cascade = {
 		CascadeType.PERSIST,CascadeType.MERGE })
-	private Collection<TblChild> tblChildren = new ArrayList<TblChild>();
+	private Collection<TblChild> tblChildren = new ArrayList<>();
 
 	public Integer getParentId() {
 		return parentId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestBulkUpdatesAndEmbeddedFields.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestBulkUpdatesAndEmbeddedFields.java
index 68b6ac4ff..2058fdb97 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestBulkUpdatesAndEmbeddedFields.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestBulkUpdatesAndEmbeddedFields.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestBulkUpdatesAndEmbeddedFields
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(MultipleSameTypedEmbedded.class, EmbeddableWithRelation.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java
index 384e1de84..d4ec898f6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestCascadingOneManyWithForeignKey.java
@@ -19,13 +19,15 @@
 package org.apache.openjpa.persistence.relations;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Tests a cascading one-many backed by a foreign key.
  *
@@ -34,6 +36,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestCascadingOneManyWithForeignKey
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CascadingOneManyParent.class, CascadingOneManyChild.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
index e3eb661a2..f81bc73a3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestChainEntities.java
@@ -31,7 +31,8 @@ public class TestChainEntities extends SingleEMFTestCase {
 
 	long aid;
 
-	public void setUp () {
+	@Override
+    public void setUp () {
 		setUp (DROP_TABLES,
 		    ChainEntityA.class, ChainEntityB.class, ChainEntityC.class);
 		// Create A
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestConcurrentMap.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestConcurrentMap.java
index e958f73e6..277036837 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestConcurrentMap.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestConcurrentMap.java
@@ -21,7 +21,8 @@ package org.apache.openjpa.persistence.relations;
 import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestConcurrentMap extends SingleEMTestCase {
-	public void setUp() {
+	@Override
+    public void setUp() {
         setUp(ConcurrentEntityLeft.class, ConcurrentEntityRight.class,
               CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestEagerBidiSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestEagerBidiSQL.java
index 62b655355..124727fbb 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestEagerBidiSQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestEagerBidiSQL.java
@@ -19,9 +19,8 @@
 package org.apache.openjpa.persistence.relations;
 
 import java.util.List;
-import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
+import javax.persistence.EntityManager;
 
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
@@ -30,6 +29,8 @@ import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that when both sides of a mapped-by relation are eager fetched,
  * traversing from the mapped-by side to the mapping side cuts off -- that
@@ -44,6 +45,7 @@ public class TestEagerBidiSQL
     private long id1;
     private long id2;
 
+    @Override
     public void setUp() {
         setUp(BidiParent.class, BidiChild.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerCollections.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerCollections.java
index 280bb7beb..a3c05d5ef 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerCollections.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerCollections.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestHandlerCollections
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(HandlerCollectionInstance.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerToHandlerMaps.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerToHandlerMaps.java
index 5e65865e0..c6eb2df90 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerToHandlerMaps.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerToHandlerMaps.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestHandlerToHandlerMaps
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(HandlerToHandlerMapInstance.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerToRelationMaps.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerToRelationMaps.java
index a513b289b..588626a43 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerToRelationMaps.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestHandlerToRelationMaps.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestHandlerToRelationMaps
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(HandlerToRelationMapInstance.class, AllFieldTypes.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIdOrderedOneMany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIdOrderedOneMany.java
index d37362c03..c5d2c3d64 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIdOrderedOneMany.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIdOrderedOneMany.java
@@ -20,9 +20,10 @@ package org.apache.openjpa.persistence.relations;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test ordering a one-many field on the primary key of the related entity.
  *
@@ -33,6 +34,7 @@ public class TestIdOrderedOneMany
 
     private long id;
 
+    @Override
     public void setUp() {
         setUp(IdOrderedOneManyParent.class, IdOrderedOneManyChild.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIncompleteRelationship.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIncompleteRelationship.java
index a14299bf0..67325bfec 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIncompleteRelationship.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestIncompleteRelationship.java
@@ -19,11 +19,12 @@
 
 package org.apache.openjpa.persistence.relations;
 
+import javax.persistence.EntityManager;
+
 import org.apache.openjpa.persistence.relations.entity.IncompleteRelationshipChildEntity;
 import org.apache.openjpa.persistence.relations.entity.IncompleteRelationshipParentEntity;
 import org.apache.openjpa.persistence.relations.entity.IncompleteRelationshipSubclass;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
-import javax.persistence.EntityManager;
 
 /**
  * A test case that tests for incomplete foreign-key relationships and ensures
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseEagerSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseEagerSQL.java
index 3f454a69a..286975a5f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseEagerSQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseEagerSQL.java
@@ -27,8 +27,6 @@ import java.util.Set;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
-
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
@@ -36,6 +34,8 @@ import org.apache.openjpa.persistence.query.Magazine;
 import org.apache.openjpa.persistence.query.Publisher;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.textui.TestRunner;
+
 
 public class TestInverseEagerSQL
     extends SQLListenerTestCase {
@@ -46,6 +46,7 @@ public class TestInverseEagerSQL
     public int _nPeople = 3;
     public int _nPhones = 3;
 
+    @Override
     public void setUp() {
         setUp(Customer.class, Customer.CustomerKey.class, Order.class,
             EntityAInverseEager.class, EntityA1InverseEager.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java
index 3b4eca03a..8ec298d91 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestInverseManager.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.merge.model.ToyBox;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestInverseManager extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, Toy.class, ToyBox.class, "openjpa.InverseManager", "true(ManageLRS=true)");
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedInheritanceHierarchy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedInheritanceHierarchy.java
index 2569658b0..681576320 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedInheritanceHierarchy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedInheritanceHierarchy.java
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestJoinedInheritanceHierarchy
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
     	super.setUp(CLEAR_TABLES, InheritanceHierarchyConcrete.class,
     			InheritanceHierarchyAbstract.class);
@@ -40,7 +41,7 @@ public class TestJoinedInheritanceHierarchy
     	parent.setValue(42);
     	child.setValue(21);
 
-    	Set<InheritanceHierarchyAbstract> children = new HashSet<InheritanceHierarchyAbstract>();
+    	Set<InheritanceHierarchyAbstract> children = new HashSet<>();
     	children.add(child);
     	parent.setChildren(children);
     	child.setParent(parent);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedInheritanceHierarchyWithCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedInheritanceHierarchyWithCache.java
index 9a2f39477..7f2658dc0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedInheritanceHierarchyWithCache.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedInheritanceHierarchyWithCache.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestJoinedInheritanceHierarchyWithCache
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
     	super.setUp(CLEAR_TABLES, InheritanceHierarchyConcrete.class,
     			InheritanceHierarchyAbstract.class, FlushDataCacheObject.class,
@@ -43,7 +44,7 @@ public class TestJoinedInheritanceHierarchyWithCache
 		InheritanceHierarchyConcrete child = new InheritanceHierarchyConcrete();
 		parent.setValue(42);
 		child.setValue(21);
-		Set<InheritanceHierarchyAbstract> children = new HashSet<InheritanceHierarchyAbstract>();
+		Set<InheritanceHierarchyAbstract> children = new HashSet<>();
 		children.add(child);
 		parent.setChildren(children);
 		child.setParent(parent);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java
index 1e6e7b454..a922cc54f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestJoinedMultiInheritanceHierarchy.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestJoinedMultiInheritanceHierarchy
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp( CLEAR_TABLES, ChildChildClass.class, ChildClass.class,
                      GrandChildClass.class, ParentClass.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java
index 28d23a62c..a738aa484 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLRS.java
@@ -22,14 +22,14 @@ import java.util.Iterator;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.relations.entity.LrsEntityA;
 import org.apache.openjpa.persistence.relations.entity.LrsEntityB;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test LRS relations.
  *
@@ -40,6 +40,7 @@ public class TestLRS
 
     private long id;
 
+    @Override
     public void setUp() {
         setUp(LrsEntityA.class, LrsEntityB.class, LRSEntity.class, BasicEntity.class, CLEAR_TABLES,
             "openjpa.Compatibility", "default(copyOnDetach=true," +
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLazyManyToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLazyManyToOne.java
index 5b0acaded..6e2b8d854 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLazyManyToOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestLazyManyToOne.java
@@ -20,14 +20,15 @@ package org.apache.openjpa.persistence.relations;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.test.SQLListenerTestCase;
-import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.DynamicPersistenceCapable;
+import org.apache.openjpa.enhance.PersistenceCapable;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestLazyManyToOne extends SQLListenerTestCase {
 
     private int id;
 
+    @Override
     public void setUp() {
         setUp(BasicEntity.class, UnidirectionalManyToOne.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyEagerSQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyEagerSQL.java
index 6c14c1800..281eddbff 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyEagerSQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyEagerSQL.java
@@ -23,15 +23,16 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
+import junit.textui.TestRunner;
+
 
 public class TestManyEagerSQL
     extends SQLListenerTestCase {
 
+    @Override
     public void setUp() {
         setUp(DROP_TABLES,
             OneManyEagerParent.class, OneManyEagerChild.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java
index da9c1879c..fae774b67 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java
@@ -21,10 +21,11 @@ package org.apache.openjpa.persistence.relations;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Perform basic operations on an entity with a many-one relation as its id
  * field.
@@ -38,6 +39,7 @@ public class TestManyOneAsId
     private long dsid;
     private long cid;
 
+    @Override
     public void setUp() {
         setUp(BasicEntity.class, DataStoreBasicEntity.class,
             ManyOneIdOwner.class, DataStoreManyOneIdOwner.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMapCollectionToBlob.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMapCollectionToBlob.java
index 3a228f9b5..f9ea31b7d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMapCollectionToBlob.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMapCollectionToBlob.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestMapCollectionToBlob
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(HandlerToHandlerMapInstance.class, CLEAR_TABLES,
             "openjpa.Compatibility", "StoreMapCollectionInEntityAsBlob=true");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMultipleSameTypedEmbeddedWithEagerRelations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMultipleSameTypedEmbeddedWithEagerRelations.java
index bc6f0fd82..ce4bef0b9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMultipleSameTypedEmbeddedWithEagerRelations.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestMultipleSameTypedEmbeddedWithEagerRelations.java
@@ -19,12 +19,14 @@
 package org.apache.openjpa.persistence.relations;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that querying and retrieving entities with multiple same-typed embedded
  * relations, which themselves have eager relations, works.
@@ -34,6 +36,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestMultipleSameTypedEmbeddedWithEagerRelations
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(EmbeddableWithRelation.class, MultipleSameTypedEmbedded.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java
index ae48e5498..5d89aa501 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestO2ORefColumn.java
@@ -20,10 +20,10 @@ package org.apache.openjpa.persistence.relations;
 
 import javax.persistence.EntityManager;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.framework.Assert;
+
 /**
  * Unit test to verify the foreign key of a Join column in an association (aText), that is exposed as an
  * attribute, is updated after the entity is flushed or committed to the data store.
@@ -35,6 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestO2ORefColumn extends SingleEMFTestCase {
 
+    @Override
     public void setUp () {
         setUp(CLEAR_TABLES,
                 ACase.class, AText.class, AEvident.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneOneNulls.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneOneNulls.java
index 939502951..43c6febdf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneOneNulls.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneOneNulls.java
@@ -19,13 +19,15 @@
 package org.apache.openjpa.persistence.relations;
 
 import java.util.List;
+
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test that both sides of a mapped-by relation are null when not set
  * or when explicitly set to null.
@@ -38,6 +40,7 @@ public class TestOneOneNulls extends SingleEMFTestCase {
     private long cid1;
     private long cid2;
 
+    @Override
     public void setUp() {
         setUp(BidiParent.class, BidiChild.class, CLEAR_TABLES);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneToManyWithEagerLazyFetch.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneToManyWithEagerLazyFetch.java
index 022874a48..73c958dc7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneToManyWithEagerLazyFetch.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestOneToManyWithEagerLazyFetch.java
@@ -22,9 +22,10 @@ import java.util.Collection;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test Multi-OneToMany relationship with different fetch types.
  */
@@ -32,6 +33,7 @@ public class TestOneToManyWithEagerLazyFetch extends SingleEMFTestCase {
 
     final int TestUtil1xm_TestRow_Id = 100;
 
+    @Override
     public void setUp() {
         setUp(Util1xmLf.class, Util1xmRt.class);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java
index a0a672458..965eddca6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestParallelEagerMap.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestParallelEagerMap extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, MapKeyParent.class, MapKeyChild.class,
             "openjpa.jdbc.EagerFetchMode", "parallel");
@@ -36,7 +37,7 @@ public class TestParallelEagerMap extends SingleEMFTestCase {
         MapKeyParent[] parents = { new MapKeyParent(), new MapKeyParent() };
         for (MapKeyParent parent : parents) {
             Map<String, MapKeyChild> children =
-                new HashMap<String, MapKeyChild>();
+                new HashMap<>();
             for (String key : new String[] { "childA" }) {
                 MapKeyChild child = new MapKeyChild();
                 child.setParent(parent);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java
index 7bc0e4dcd..21d787ef2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationFieldAsPrimaryKeyAndForeignKey.java
@@ -22,15 +22,16 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import junit.framework.Assert;
-
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.framework.Assert;
+
 
 public class TestRelationFieldAsPrimaryKeyAndForeignKey
     extends SingleEMFTestCase {
 
-	public void setUp() {
+	@Override
+    public void setUp() {
 	    setUp(C.class, CM.class, D.class, E.class, VC.class,
 	        VCS.class, CLEAR_TABLES);
 
@@ -194,7 +195,8 @@ public class TestRelationFieldAsPrimaryKeyAndForeignKey
 	    Assert.assertEquals(1, es.size());
 	}
 
-	public void tearDown() throws Exception {
+	@Override
+    public void tearDown() throws Exception {
 	    EntityManager em = emf.createEntityManager();
 	    em.getTransaction().begin();
 	    List<E> es = (List<E>) em.createQuery(
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationOrphanRemoval.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationOrphanRemoval.java
index f79decd56..8d598b8f6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationOrphanRemoval.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationOrphanRemoval.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestRelationOrphanRemoval extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(Parent.class, Child.class, GrandChild.class, CLEAR_TABLES
              );
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationToHandlerMaps.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationToHandlerMaps.java
index 3f37d8062..7e050c20d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationToHandlerMaps.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationToHandlerMaps.java
@@ -29,6 +29,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestRelationToHandlerMaps
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(RelationToHandlerMapInstance.class, AllFieldTypes.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationToRelationMaps.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationToRelationMaps.java
index 1721347f5..1c6f57149 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationToRelationMaps.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestRelationToRelationMaps.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestRelationToRelationMaps
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(RelationToRelationMapInstance.class, AllFieldTypes.class,
             CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java
index bb02c47c3..4f9b3dde3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestTargetedIFaceRelations.java
@@ -20,9 +20,10 @@ package org.apache.openjpa.persistence.relations;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Perform basic operations on an entity with interface relations that use
  * the targetEntity attribute to set a concrete related type.
@@ -32,6 +33,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestTargetedIFaceRelations
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(TargetedIFaceRelationParent.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/UnidirectionalManyToOne.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/UnidirectionalManyToOne.java
index 4bec8e3f3..8a3d8364c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/UnidirectionalManyToOne.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/UnidirectionalManyToOne.java
@@ -18,12 +18,12 @@
  */
 package org.apache.openjpa.persistence.relations;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.FetchType;
-import javax.persistence.Entity;
-import javax.persistence.CascadeType;
 
 @Entity
 public class UnidirectionalManyToOne {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmLf.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmLf.java
index b299c1901..18bbc0a76 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmLf.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/Util1xmLf.java
@@ -36,9 +36,9 @@ public class Util1xmLf {
 
     private String firstName;
 
-    public Collection<Util1xmRt> uniRightLzy = new HashSet<Util1xmRt>();
+    public Collection<Util1xmRt> uniRightLzy = new HashSet<>();
 
-    public Collection<Util1xmRt> uniRightEgr = new HashSet<Util1xmRt>();
+    public Collection<Util1xmRt> uniRightEgr = new HashSet<>();
 
     @Id
     public int getId() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VC.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VC.java
index 9ee765242..8ae79a7f6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VC.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VC.java
@@ -30,9 +30,8 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.apache.openjpa.persistence.relations.VCS.VCSId;
-
 import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openjpa.persistence.relations.VCS.VCSId;
 
 @Entity
 @Table(name="VC4_REL")
@@ -54,7 +53,7 @@ public class VC {
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY,
             mappedBy = "vc")
-	private Set<D> ds = new HashSet<D>();
+	private Set<D> ds = new HashSet<>();
 
 	public VC() {
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VCS.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VCS.java
index 841138c86..64651ec0e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VCS.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/VCS.java
@@ -50,7 +50,7 @@ public class VCS {
 	private String name;
 
     @OneToMany(cascade=CascadeType.ALL, fetch=FetchType.LAZY, mappedBy = "vcs")
-	private Set<VC> vcs = new HashSet<VC>();
+	private Set<VC> vcs = new HashSet<>();
 
 	public VCS() {
 	}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipChildEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipChildEntity.java
index c6faf8d4a..0950b7fcf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipChildEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/IncompleteRelationshipChildEntity.java
@@ -20,6 +20,7 @@
 package org.apache.openjpa.persistence.relations.entity;
 
 import java.io.Serializable;
+
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.EmbeddedId;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityA.java
index 6a4c97149..d94610880 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/entity/LrsEntityA.java
@@ -55,19 +55,19 @@ public class LrsEntityA implements Serializable {
 
     public LrsEntityA() {
         this.name = "none";
-        this.entitybs = new ArrayList<LrsEntityB>();
+        this.entitybs = new ArrayList<>();
     }
 
     public LrsEntityA(String nam) {
         this.name = nam;
-        entitybs = new ArrayList<LrsEntityB>();
+        entitybs = new ArrayList<>();
     }
 
     public LrsEntityA(int id, String nam, int age) {
         this.id = id;
         this.name = nam;
         this.age = age;
-        entitybs = new ArrayList<LrsEntityB>();
+        entitybs = new ArrayList<>();
     }
 
     public Collection<LrsEntityB> getEntitybs() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsAnnotation.java
index 5a03b7a22..4d5026774 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsAnnotation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsAnnotation.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestResultClsAnnotation extends SQLListenerTestCase {
+    @Override
     public void setUp() {
         setUp(ResultClsAnnotation.class, DROP_TABLES);
         assertNotNull(emf);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsXml.java
index e2b9c510d..ab562845a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsXml.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/results/cls/TestResultClsXml.java
@@ -28,6 +28,7 @@ import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestResultClsXml extends SQLListenerTestCase {
+    @Override
     public void setUp() {
         setUp(ResultClsXml.class, DROP_TABLES);
         assertNotNull(emf);
@@ -60,6 +61,7 @@ public class TestResultClsXml extends SQLListenerTestCase {
         }
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "query-result";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequence.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequence.java
index 15492a755..538057c63 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequence.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequence.java
@@ -41,6 +41,7 @@ public class TestSequence extends SingleEMFTestCase {
     private String multiThreadExecuting = null;
     private static final int NUMBER_ENTITIES = 5000;
 
+    @Override
     public void setUp() {
         setUp(EntityPerson.class, EntityEmployee.class, CLEAR_TABLES,
             "openjpa.Multithreaded", "true");
@@ -328,6 +329,7 @@ public class TestSequence extends SingleEMFTestCase {
 
             mttest("reflection invocation: (" + method + ")", serialCount,
                 threads, iterations, new VolatileRunnable() {
+                    @Override
                     public void run() throws Exception {
                         meth.invoke(thiz, args);
                     }
@@ -378,6 +380,7 @@ public class TestSequence extends SingleEMFTestCase {
 
             runners[i - 1] = new Thread(title + " [" + i + " of " + threads
                 + "]") {
+                @Override
                 public void run() {
                     // do our best to have all threads start at the exact
                     // same time. This is imperfect, but the closer we
@@ -448,9 +451,9 @@ public class TestSequence extends SingleEMFTestCase {
     /**
      * A Runnable that can throw an Exception: used to test cases.
      */
-    public static interface VolatileRunnable {
+    public interface VolatileRunnable {
 
-        public void run() throws Exception;
+        void run() throws Exception;
     }
 
     /**
@@ -477,14 +480,17 @@ public class TestSequence extends SingleEMFTestCase {
                 _nested = nested;
         }
 
+        @Override
         public void printStackTrace() {
             printStackTrace(System.out);
         }
 
+        @Override
         public void printStackTrace(PrintStream out) {
             printStackTrace(new PrintWriter(out));
         }
 
+        @Override
         public void printStackTrace(PrintWriter out) {
             super.printStackTrace(out);
             for (int i = 0; i < _nested.length; i++) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequenceGenerationOnMT.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequenceGenerationOnMT.java
index a852c89e6..4308d7456 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequenceGenerationOnMT.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/TestSequenceGenerationOnMT.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 
 public class TestSequenceGenerationOnMT extends SingleEMFTestCase {
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, GeneratedIdObject.class,
           "openjpa.Multithreaded", "true");
@@ -40,7 +41,7 @@ public class TestSequenceGenerationOnMT extends SingleEMFTestCase {
     public void testIdGenerationInMultithreadedEnvironment() {
         int nThreads = 5;
         ExecutorService threads = Executors.newFixedThreadPool(nThreads);
-        List<Callable<Boolean>> tasks = new ArrayList<Callable<Boolean>>();
+        List<Callable<Boolean>> tasks = new ArrayList<>();
         for (int i = 0; i < nThreads; i++) {
             Loader loader = new Loader(emf.createEntityManager());
             tasks.add(loader);
@@ -67,6 +68,7 @@ public class TestSequenceGenerationOnMT extends SingleEMFTestCase {
         Loader(EntityManager em) {
             this.em = em;
         }
+        @Override
         public Boolean call() throws Exception {
             GeneratedIdObject pc = new GeneratedIdObject();
             em.getTransaction().begin();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/TestHSQLSequence.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/TestHSQLSequence.java
index 3b0e49ee2..7c8a39410 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/TestHSQLSequence.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/sequence/hsql/TestHSQLSequence.java
@@ -49,6 +49,7 @@ public class TestHSQLSequence extends SQLListenerTestCase {
     JDBCConfiguration conf;
     DBDictionary dict;
 
+    @Override
     public void setUp() throws Exception {
         setSupportedDatabases(org.apache.openjpa.jdbc.sql.HSQLDictionary.class);
         if (isTestsDisabled()) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AllFieldTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AllFieldTypes.java
index 0d032da7e..b9c3e4705 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AllFieldTypes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/AllFieldTypes.java
@@ -21,15 +21,16 @@ package org.apache.openjpa.persistence.simple;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Set;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Set;
+
 import javax.persistence.Entity;
-import javax.persistence.OneToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 
 import org.apache.openjpa.persistence.PersistentCollection;
 
@@ -71,7 +72,7 @@ public class AllFieldTypes {
     private Serializable serializableField;
 
     // Additional types
-    private Set<String> setOfStrings = new HashSet<String>();
+    private Set<String> setOfStrings = new HashSet<>();
     private String[] arrayOfStrings;
 
     @PersistentCollection
@@ -81,7 +82,7 @@ public class AllFieldTypes {
     @OneToOne
     private AllFieldTypes selfOneOne;
     @OneToMany
-    private List<AllFieldTypes> selfOneMany = new ArrayList<AllFieldTypes>();
+    private List<AllFieldTypes> selfOneMany = new ArrayList<>();
 
     public void setShortField(short shortField) {
         this.shortField = shortField;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/SubclassPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/SubclassPerson.java
index 8c79278a7..5933df48f 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/SubclassPerson.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/SubclassPerson.java
@@ -18,11 +18,11 @@
  */
 package org.apache.openjpa.persistence.simple;
 
+import javax.persistence.Basic;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Basic;
-import javax.persistence.Column;
 
 @Entity
 @Table(name="PERSON_SIMPLE2")
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TemporalFieldTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TemporalFieldTypes.java
index 7cd089f96..b06a6b00a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TemporalFieldTypes.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TemporalFieldTypes.java
@@ -21,6 +21,7 @@ package org.apache.openjpa.persistence.simple;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
+
 import javax.persistence.Entity;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestBasicAnnotation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestBasicAnnotation.java
index 2755cae49..12114f380 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestBasicAnnotation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestBasicAnnotation.java
@@ -24,9 +24,10 @@ import java.util.Date;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Simple test case to test the default values associated with the @Basic
  * annotation.
@@ -36,6 +37,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestBasicAnnotation
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, AllFieldTypes.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestCaseInsensitiveKeywordsInJPQL.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestCaseInsensitiveKeywordsInJPQL.java
index d2061b783..23fb51232 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestCaseInsensitiveKeywordsInJPQL.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestCaseInsensitiveKeywordsInJPQL.java
@@ -18,14 +18,15 @@
  */
 package org.apache.openjpa.persistence.simple;
 
-import javax.persistence.Query;
 import javax.persistence.EntityManager;
+import javax.persistence.Query;
 
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestCaseInsensitiveKeywordsInJPQL
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         // expecting only data that is inserted in this test case
         setUp(AllFieldTypes.class, CLEAR_TABLES);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerClear.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerClear.java
index c18b5fa58..54be753f5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerClear.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerClear.java
@@ -18,10 +18,12 @@
  */
 package org.apache.openjpa.persistence.simple;
 
-import junit.textui.TestRunner;
-import org.apache.openjpa.persistence.test.SingleEMTestCase;
 import java.math.BigDecimal;
 
+import org.apache.openjpa.persistence.test.SingleEMTestCase;
+
+import junit.textui.TestRunner;
+
 /**
  * Test case to ensure that the proper JPA clear semantics are processed.
  *
@@ -30,6 +32,7 @@ import java.math.BigDecimal;
 public class TestEntityManagerClear
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class, Item.class,CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMerge.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMerge.java
index 4aff22366..d71414f0b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMerge.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMerge.java
@@ -20,9 +20,10 @@ package org.apache.openjpa.persistence.simple;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test case to ensure that the proper JPA merge semantics are processed.
  *
@@ -31,6 +32,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestEntityManagerMerge
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class, Person.class, DROP_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMethodsThrowAfterClose.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMethodsThrowAfterClose.java
index ace695267..648df4a0d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMethodsThrowAfterClose.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerMethodsThrowAfterClose.java
@@ -21,9 +21,10 @@ package org.apache.openjpa.persistence.simple;
 import javax.persistence.FlushModeType;
 import javax.persistence.LockModeType;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Negative test case to verify that EntityManager throws required exceptions
  * after close.
@@ -35,6 +36,7 @@ public class TestEntityManagerMethodsThrowAfterClose
 
     private AllFieldTypes aft = new AllFieldTypes();
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class);
         close();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
index 4ec2361fa..3386332b7 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestFlushBeforeDetach.java
@@ -34,6 +34,7 @@ public class TestFlushBeforeDetach extends SQLListenerTestCase {
 
     private int _id;
 
+    @Override
     public void setUp() {
       setUp(Item.class,"openjpa.Compatibility",
                 "default(flushBeforeDetach=false,copyOnDetach=true)");
@@ -101,7 +102,7 @@ public class TestFlushBeforeDetach extends SQLListenerTestCase {
 
         i.setItemData("MNOP");
 
-        Collection<Item> c = new ArrayList<Item>();
+        Collection<Item> c = new ArrayList<>();
         c.add(i);
         OpenJPAPersistence.cast(em).detachAll(c);
         em.getTransaction().rollback();
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJoin.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJoin.java
index afbdf9a36..66b34cd46 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJoin.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJoin.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestJoin extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(Item.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java
index 12391367f..89568deae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestMissingMetaData.java
@@ -21,21 +21,22 @@ package org.apache.openjpa.persistence.simple;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
-
 import org.apache.openjpa.persistence.ArgumentException;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
 // This test case extends TestCase directly instead of SingleEMTestCase with the
 // corresponding setup() method because that scheme goes down a different code
 // path and doesn't test the intended code change.
 public class TestMissingMetaData extends TestCase {
     private OpenJPAEntityManagerFactory emf;
 
+    @Override
     public void setUp() {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put("openjpa.RuntimeUnenhancedClasses", "supported");
         // This test case uses a different persistence xml file because
         // modifying the current persistence.xml file with a bad class would
@@ -57,6 +58,7 @@ public class TestMissingMetaData extends TestCase {
         }
     }
 
+    @Override
     public void tearDown() {
         emf.close();
         emf = null;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java
index 5bc7aef9f..93994f91c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java
@@ -21,10 +21,11 @@ package org.apache.openjpa.persistence.simple;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Simple test case to get an EntityManager and perform some basic operations.
  *
@@ -33,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestPersistence
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class, Place.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
index 713b1b660..fc501bf46 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
@@ -47,6 +47,7 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase {
     private OpenJPAEntityManagerFactory emf;
     private OpenJPAEntityManager em;
 
+    @Override
     @SuppressWarnings("unchecked")
     public void setUp() throws Exception {
         super.setUp();
@@ -243,7 +244,7 @@ public class TestPropertiesMethods extends AbstractPersistenceTestCase {
         Boolean original = (Boolean)props.get("openjpa.IgnoreChanges");
         assertNotNull(original);
 
-        Map<String,Boolean> config = new HashMap<String, Boolean>();
+        Map<String,Boolean> config = new HashMap<>();
         Boolean invert = !original.booleanValue();
         config.put("openjpa.IgnoreChanges", invert);
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestRefresh.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestRefresh.java
index dc904415b..cbe15edda 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestRefresh.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestRefresh.java
@@ -30,6 +30,7 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 
 public class TestRefresh extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Item.class,
              "openjpa.AutoDetach", "commit",
@@ -156,7 +157,7 @@ public class TestRefresh extends SingleEMTestCase {
             System.err.println(properties);
             fail("Expected " + JPAProperties.CACHE_RETRIEVE_MODE + " properties be returned");
         }
-        Map<String, Object> paramProperties = new HashMap<String, Object>();
+        Map<String, Object> paramProperties = new HashMap<>();
         paramProperties.put(JPAProperties.CACHE_STORE_MODE, CacheStoreMode.BYPASS);
         paramProperties.put(JPAProperties.CACHE_RETRIEVE_MODE, CacheRetrieveMode.BYPASS);
         Item fItem = em.find(Item.class, id, paramProperties);
@@ -197,7 +198,7 @@ public class TestRefresh extends SingleEMTestCase {
             System.err.println(properties);
             fail("Expected " + JPAProperties.CACHE_RETRIEVE_MODE + " properties be returned");
         }
-        Map<String, Object> paramProperties = new HashMap<String, Object>();
+        Map<String, Object> paramProperties = new HashMap<>();
         paramProperties.put(JPAProperties.CACHE_STORE_MODE, CacheStoreMode.BYPASS);
         paramProperties.put(JPAProperties.CACHE_RETRIEVE_MODE, CacheRetrieveMode.BYPASS);
         Item fItem = em.find(Item.class, id, paramProperties);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
index cafc4065c..961f332e6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSerializedFactory.java
@@ -18,13 +18,19 @@
  */
 package org.apache.openjpa.persistence.simple;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import junit.textui.TestRunner;
+
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Tests that a EntityManagerFactory can be used after serialization.
  *
@@ -32,6 +38,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestSerializedFactory extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(AllFieldTypes.class, CLEAR_TABLES);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSubclassOfAbstractSuperclass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSubclassOfAbstractSuperclass.java
index 26d3731e4..1b9aba81e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSubclassOfAbstractSuperclass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestSubclassOfAbstractSuperclass.java
@@ -20,15 +20,17 @@ package org.apache.openjpa.persistence.simple;
 
 import javax.persistence.EntityManager;
 
-import junit.textui.TestRunner;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
+import junit.textui.TestRunner;
+
 /**
  * Test persisting a class which has an abstract superclass.
  */
 public class TestSubclassOfAbstractSuperclass
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(SubclassPerson.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestTableNamesDefaultToEntityNames.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestTableNamesDefaultToEntityNames.java
index 90c68e027..72e8460a3 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestTableNamesDefaultToEntityNames.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestTableNamesDefaultToEntityNames.java
@@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 public class TestTableNamesDefaultToEntityNames
     extends SingleEMFTestCase {
 
+    @Override
     public void setUp() {
         setUp(NamedEntity.class);
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibService.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibService.java
index a68c823bd..eebeca40c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibService.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibService.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.spring;
 
-import org.apache.openjpa.persistence.models.library.*;
+import org.apache.openjpa.persistence.models.library.Book;
+import org.apache.openjpa.persistence.models.library.Borrower;
 
 /**
  * The Spring library example is intended to mirror the behavior of an
@@ -81,14 +82,14 @@ import org.apache.openjpa.persistence.models.library.*;
  */
 
 public interface LibService {
-    public Borrower findBorrowerByName(String name);
+    Borrower findBorrowerByName(String name);
 
-    public Book findBookByTitle(String title);
+    Book findBookByTitle(String title);
 
-    public void borrowBook(Borrower borrower, Book book);
+    void borrowBook(Borrower borrower, Book book);
 
-    public void returnBook(Book book);
+    void returnBook(Book book);
 
-    public void setTransactionalEntityManagerFactory(
+    void setTransactionalEntityManagerFactory(
             TransactionalEntityManagerFactory txEMF);
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
index 1c852b7d5..f0433cc08 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibServiceImpl.java
@@ -18,9 +18,12 @@
  */
 package org.apache.openjpa.persistence.spring;
 
-import javax.persistence.*;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import javax.persistence.Query;
 
-import org.apache.openjpa.persistence.models.library.*;
+import org.apache.openjpa.persistence.models.library.Book;
+import org.apache.openjpa.persistence.models.library.Borrower;
 
 /**
  * This service uses a transactionally scoped entity manager. It grabs the EM at
@@ -53,11 +56,13 @@ public class LibServiceImpl implements LibService {
         }
     }
 
+    @Override
     public void setTransactionalEntityManagerFactory(
             TransactionalEntityManagerFactory txEMF) {
         this.txEMF = txEMF;
     }
 
+    @Override
     public Book findBookByTitle(String title) {
         EntityManager em = null;
 
@@ -85,6 +90,7 @@ public class LibServiceImpl implements LibService {
         }
     }
 
+    @Override
     public Borrower findBorrowerByName(String name) {
         EntityManager em = null;
 
@@ -112,6 +118,7 @@ public class LibServiceImpl implements LibService {
         }
     }
 
+    @Override
     public void borrowBook(Borrower borrower, Book book) {
         EntityManager em = null;
         EntityTransaction tx = null;
@@ -138,6 +145,7 @@ public class LibServiceImpl implements LibService {
         }
     }
 
+    @Override
     public void returnBook(Book book) {
         EntityManager em = null;
         EntityTransaction tx = null;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibTestingService.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibTestingService.java
index 530645e57..3d03c8209 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibTestingService.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/LibTestingService.java
@@ -18,9 +18,13 @@
  */
 package org.apache.openjpa.persistence.spring;
 
-import javax.persistence.*;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
 
-import org.apache.openjpa.persistence.models.library.*;
+import org.apache.openjpa.persistence.models.library.Book;
+import org.apache.openjpa.persistence.models.library.Borrower;
+import org.apache.openjpa.persistence.models.library.Subject;
+import org.apache.openjpa.persistence.models.library.Volunteer;
 
 public class LibTestingService {
     private EntityManager em;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
index cf0eb12d5..85eebb674 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TestLibService.java
@@ -18,12 +18,17 @@
  */
 package org.apache.openjpa.persistence.spring;
 
-import java.util.*;
+import java.util.EnumSet;
+import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import org.apache.openjpa.persistence.*;
-import org.apache.openjpa.persistence.models.library.*;
+import org.apache.openjpa.persistence.AutoDetachType;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.models.library.Book;
+import org.apache.openjpa.persistence.models.library.Borrower;
+import org.apache.openjpa.persistence.models.library.Subject;
+import org.apache.openjpa.persistence.models.library.Volunteer;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestLibService extends SingleEMFTestCase
@@ -34,6 +39,7 @@ public class TestLibService extends SingleEMFTestCase
 
     private LibService service;
 
+    @Override
     public EntityManager getTransactionalEntityManager() {
         // return a transactionally scoped entity manager
         OpenJPAEntityManager em = emf.createEntityManager();
@@ -42,6 +48,7 @@ public class TestLibService extends SingleEMFTestCase
         return em;
     }
 
+    @Override
     public void setUp() {
         // declare the library model classes
         super.setUp(DROP_TABLES, Book.class, Borrower.class, Subject.class,
@@ -58,6 +65,7 @@ public class TestLibService extends SingleEMFTestCase
         service.setTransactionalEntityManagerFactory(this);
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         service = null;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TransactionalEntityManagerFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TransactionalEntityManagerFactory.java
index ab2d6f57f..02cb3e5c6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TransactionalEntityManagerFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/spring/TransactionalEntityManagerFactory.java
@@ -21,5 +21,5 @@ package org.apache.openjpa.persistence.spring;
 import javax.persistence.EntityManager;
 
 public interface TransactionalEntityManagerFactory {
-    public EntityManager getTransactionalEntityManager();
+    EntityManager getTransactionalEntityManager();
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/PrincipalValueStrategyHandler.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/PrincipalValueStrategyHandler.java
index 75c27aba0..6d1332e96 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/PrincipalValueStrategyHandler.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/PrincipalValueStrategyHandler.java
@@ -54,6 +54,7 @@ public class PrincipalValueStrategyHandler extends AbstractValueHandler {
         return new Column[]{col};
     }
 
+    @Override
     public Object toDataStoreValue(ValueMapping vm, Object val, JDBCStore store) {
 
         if (val instanceof Principal) {
@@ -63,6 +64,7 @@ public class PrincipalValueStrategyHandler extends AbstractValueHandler {
         return null;
     }
 
+    @Override
     public Object toObjectValue(ValueMapping vm, final Object val) {
         if (val == null || !(val instanceof String)) {
             return null;
@@ -73,6 +75,8 @@ public class PrincipalValueStrategyHandler extends AbstractValueHandler {
 
 
     public static class TestPrincipal implements Principal, Serializable {
+        
+        private static final long serialVersionUID = 1L;
         private final String name;
 
         public TestPrincipal(String name) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java
index 7558ebc87..7c44ff338 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestImplicitValueStrategy.java
@@ -18,13 +18,12 @@
  */
 package org.apache.openjpa.persistence.strategy.value;
 
-import java.security.Principal;
-
 import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestImplicitValueStrategy extends SQLListenerTestCase {
+    @Override
     public void setUp(){
         setUp(ImplicitValueStrategyEntity.class, DROP_TABLES,
                 "openjpa.jdbc.MappingDefaults",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java
index 4da519b04..f5769a2d8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/TestValueStrategy.java
@@ -23,6 +23,7 @@ import javax.persistence.EntityManager;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 
 public class TestValueStrategy extends SQLListenerTestCase {
+    @Override
     public void setUp(){
         setUp(ValueStrategyEntity.class, DROP_TABLES,
                 "openjpa.RuntimeUnenhancedClasses", "supported");
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyHandler.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyHandler.java
index dfe61de0d..26d2ea190 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyHandler.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/strategy/value/ValueStrategyHandler.java
@@ -46,7 +46,8 @@ public class ValueStrategyHandler extends AbstractValueHandler {
 		return new Column[]{col};
 	}
 
-	public Object toDataStoreValue(ValueMapping vm, Object val, JDBCStore store){
+	@Override
+    public Object toDataStoreValue(ValueMapping vm, Object val, JDBCStore store){
 
 		if(val == null){
 			return null;
@@ -55,7 +56,8 @@ public class ValueStrategyHandler extends AbstractValueHandler {
 		return val.toString();
 	}
 
-	public Object toObjectValue(ValueMapping vm, Object val){
+	@Override
+    public Object toObjectValue(ValueMapping vm, Object val){
 		if(val == null){
 			return null;
 		}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java
index 9ee08b420..2fb86fa4c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java
@@ -35,6 +35,7 @@ public class TestTemporalTimestamp extends SQLListenerTestCase {
     private OpenJPAEntityManager em;
     final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 
+    @Override
     public void setUp() {
         setSupportedDatabases(
             org.apache.openjpa.jdbc.sql.DerbyDictionary.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java
index e8059dc74..ad8024313 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java
@@ -36,7 +36,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
  */
 public abstract class AbstractCachedEMFTestCase extends AbstractPersistenceTestCase {
     private static FixedMap<EMFKey, OpenJPAEntityManagerFactorySPI> _emfs =
-        new FixedMap<EMFKey, OpenJPAEntityManagerFactorySPI>();
+        new FixedMap<>();
 
     /**
      * Create an entity manager factory for persistence unit <code>pu</code>. Put {@link #CLEAR_TABLES} in this list to
@@ -119,10 +119,12 @@ public abstract class AbstractCachedEMFTestCase extends AbstractPersistenceTestC
             this.config = config;
         }
 
+        @Override
         public int hashCode() {
             return (unit != null ? unit.hashCode() : 0) + config.hashCode();
         }
 
+        @Override
         public boolean equals(Object other) {
             EMFKey that = (EMFKey) other;
             return (unit != null ? unit.equals(that.unit) : that.unit == null) && config.equals(that.config);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
index cba6046cd..f7ef20ec8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
@@ -38,9 +38,6 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-
 import org.apache.openjpa.kernel.AbstractBrokerFactory;
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.meta.ClassMetaData;
@@ -48,6 +45,9 @@ import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+
 /**
  * Base class for Persistence TestCases. This class contains utility methods but does not maintain an EntityManager or
  * EntityManagerFactory - these tasks are left for subclasses to handle.  Extends junit.framework.TestCase and
@@ -113,7 +113,7 @@ public abstract class AbstractPersistenceTestCase extends TestCase {
     protected OpenJPAEntityManagerFactorySPI createNamedEMF(final String pu, Object... props) {
         Map<String, Object> map = getPropertiesMap(props);
         OpenJPAEntityManagerFactorySPI oemf = null;
-        Map<Object, Object> config = new HashMap<Object, Object>(System.getProperties());
+        Map<Object, Object> config = new HashMap<>(System.getProperties());
         config.putAll(map);
         oemf = (OpenJPAEntityManagerFactorySPI) Persistence.createEntityManagerFactory(pu, config);
         if (oemf == null) {
@@ -135,7 +135,7 @@ public abstract class AbstractPersistenceTestCase extends TestCase {
     protected OpenJPAEntityManagerFactorySPI createNamedOpenJPAEMF(final String pu,
             String res, Map<String,Object> props) {
         OpenJPAEntityManagerFactorySPI oemf = null;
-        Map<Object, Object> config = new HashMap<Object, Object>(System.getProperties());
+        Map<Object, Object> config = new HashMap<>(System.getProperties());
         if (props != null)
             config.putAll(props);
         oemf = (OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.createEntityManagerFactory(pu, res, props);
@@ -147,9 +147,9 @@ public abstract class AbstractPersistenceTestCase extends TestCase {
     }
 
     protected Map<String, Object> getPropertiesMap(Object... props) {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("openjpa.DynamicEnhancementAgent", "false");
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        List<Class<?>> types = new ArrayList<>();
         boolean prop = false;
 
         for (int i = 0; props != null && i < props.length; i++) {
@@ -289,7 +289,7 @@ public abstract class AbstractPersistenceTestCase extends TestCase {
             return;
         }
 
-        List<ClassMetaData> metas = new ArrayList<ClassMetaData>(types.length);
+        List<ClassMetaData> metas = new ArrayList<>(types.length);
         for (Class<?> c : types) {
             ClassMetaData meta = JPAFacadeHelper.getMetaData(emf, c);
             if (meta != null) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AllowFailure.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AllowFailure.java
index 228d29c0a..26adf4623 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AllowFailure.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AllowFailure.java
@@ -18,12 +18,13 @@
  */
 package org.apache.openjpa.persistence.test;
 
-import java.lang.annotation.Target;
-import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Signals to the harness to ignore if the annotated test case/method fail.
  *
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/ClassSelector.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/ClassSelector.java
index 547d00d38..51b343e96 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/ClassSelector.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/ClassSelector.java
@@ -39,9 +39,9 @@ import serp.bytecode.Project;
  *
  */
 public class ClassSelector {
-	private List<String> _supers = new ArrayList<String>();
-	private List<String> _interfaces = new ArrayList<String>();
-	private List<String> _annotations = new ArrayList<String>();
+	private List<String> _supers = new ArrayList<>();
+	private List<String> _interfaces = new ArrayList<>();
+	private List<String> _annotations = new ArrayList<>();
 
 	/**
 	 * Prints the class names that satisfy the following criteria
@@ -82,7 +82,7 @@ public class ClassSelector {
 	 * @return list of class names that match the selection.
 	 */
 	public List<String> list(File file, boolean recursive) {
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 		list(file, recursive, names);
 		return names;
 	}
@@ -91,6 +91,7 @@ public class ClassSelector {
 		if (file.isDirectory()) {
 			if (recursive) {
                 String[] children = file.list(new FilenameFilter() {
+                    @Override
                     public boolean accept(File dir, String name) {
 						return name.endsWith(".class");
 					}
@@ -98,6 +99,7 @@ public class ClassSelector {
 				for (String name : children)
                     list(new File(file, name), recursive, names);
 				String[] dirs = file.list(new FilenameFilter() {
+                    @Override
                     public boolean accept(File dir, String name) {
                         return new File(dir, name).isDirectory();
 					}
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/CombinatorialPersistenceTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/CombinatorialPersistenceTestCase.java
index 024498765..32cf6e2a6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/CombinatorialPersistenceTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/CombinatorialPersistenceTestCase.java
@@ -36,7 +36,8 @@ public abstract class CombinatorialPersistenceTestCase
 
 	protected static CombinatorialTestHelper helper;
 
-	public void setUp(Object...props) {
+	@Override
+    public void setUp(Object...props) {
 		super.setUp(getHelper().setCombinatorialOption(props));
 	}
 
@@ -47,9 +48,9 @@ public abstract class CombinatorialPersistenceTestCase
 
     @Override
     public void runBare() throws Throwable {
-    	Map<String, Throwable> errors = new HashMap<String, Throwable>();
+    	Map<String, Throwable> errors = new HashMap<>();
         Map<String, AssertionFailedError> failures =
-            new HashMap<String, AssertionFailedError>();
+            new HashMap<>();
     	do  {
     		try {
     			super.runBare();
@@ -94,6 +95,7 @@ public abstract class CombinatorialPersistenceTestCase
 		return helper;
     }
 
+    @Override
     public void assertSQL(String sqlExp) {
     	try {
     		super.assertSQL(sqlExp);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/CombinatorialTestHelper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/CombinatorialTestHelper.java
index 170830f18..ff030e596 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/CombinatorialTestHelper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/CombinatorialTestHelper.java
@@ -53,7 +53,7 @@ public class CombinatorialTestHelper {
 
 	public CombinatorialTestHelper() {
 		geneartor = new CombinationGenerator();
-		propertyKeys = new ArrayList<String>();
+		propertyKeys = new ArrayList<>();
 		currentOption = null;
 		runtimeKeys = new BitSet();
 		combos = null;
@@ -131,7 +131,7 @@ public class CombinatorialTestHelper {
 			geneartor = new CombinationGenerator();
 		}
 		if (propertyKeys == null) {
-			propertyKeys = new ArrayList<String>();
+			propertyKeys = new ArrayList<>();
 		}
 		if (!propertyKeys.contains(property)) {
 			geneartor.addDimension(options);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/DatabasePlatform.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/DatabasePlatform.java
index 0ad6aab40..03d876abf 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/DatabasePlatform.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/DatabasePlatform.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openjpa.persistence.test;
 
-import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Retention;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/FilteringJDBCListener.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/FilteringJDBCListener.java
index 9b0e39265..6ccde2e20 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/FilteringJDBCListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/FilteringJDBCListener.java
@@ -38,7 +38,7 @@ public class FilteringJDBCListener extends AbstractJDBCListener {
     /**
      * Set of SQL statements which will be filtered out by this listener.
      */
-    private Set<String> _ignoredSQL = new HashSet<String>();
+    private Set<String> _ignoredSQL = new HashSet<>();
 
     private List<String> _sqlStatements;
 
@@ -63,6 +63,6 @@ public class FilteringJDBCListener extends AbstractJDBCListener {
     }
 
     public List<String> getCopy() {
-        return new ArrayList<String>(_sqlStatements);
+        return new ArrayList<>(_sqlStatements);
     }
 }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/JPAEntityClassEnum.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/JPAEntityClassEnum.java
index 4ce402e24..41afd06f6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/JPAEntityClassEnum.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/JPAEntityClassEnum.java
@@ -19,7 +19,7 @@
 package org.apache.openjpa.persistence.test;
 
 public interface JPAEntityClassEnum {
-    public String getEntityClassName();
-    public String getEntityName();
+    String getEntityClassName();
+    String getEntityName();
 }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java
index 054ae090b..161458b69 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/PersistenceTestCase.java
@@ -37,15 +37,15 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-
 import org.apache.openjpa.kernel.AbstractBrokerFactory;
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+
 /**
  * Base test class providing persistence utilities.
  *
@@ -57,6 +57,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
  *
  * @deprecated use AbstractEMFCacheTestCase or AbstractPersistenceTestCase instead
  */
+@Deprecated
 public abstract class PersistenceTestCase
     extends TestCase {
     private static FixedMap _emfs = new FixedMap();
@@ -139,8 +140,8 @@ public abstract class PersistenceTestCase
     }
 
     protected Map<String,Object> getPropertiesMap(Object ... props) {
-        Map<String, Object> map = new HashMap<String, Object>();
-        List<Class<?>> types = new ArrayList<Class<?>>();
+        Map<String, Object> map = new HashMap<>();
+        List<Class<?>> types = new ArrayList<>();
         boolean prop = false;
 
         for (int i = 0; props != null && i < props.length; i++) {
@@ -247,7 +248,7 @@ public abstract class PersistenceTestCase
         if (emf == null || types.length == 0)
             return;
 
-        List<ClassMetaData> metas = new ArrayList<ClassMetaData>(types.length);
+        List<ClassMetaData> metas = new ArrayList<>(types.length);
         for (Class c : types) {
             ClassMetaData meta = JPAFacadeHelper.getMetaData(emf, c);
             if (meta != null)
@@ -574,6 +575,10 @@ public abstract class PersistenceTestCase
 
     private static class FixedMap extends LinkedHashMap<EMFKey,
             OpenJPAEntityManagerFactorySPI> {
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         public boolean removeEldestEntry(Map.Entry<EMFKey,
                 OpenJPAEntityManagerFactorySPI> entry) {
             return this.size() > 2;
@@ -588,10 +593,12 @@ public abstract class PersistenceTestCase
             this.config = config;
         }
 
+        @Override
         public int hashCode() {
             return (unit != null ? unit.hashCode() : 0) + config.hashCode();
         }
 
+        @Override
         public boolean equals(Object other) {
             EMFKey that = (EMFKey)other;
             return (unit != null ? unit.equals(that.unit) : that.unit == null)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java
index 4b5050c4f..335195cae 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SQLListenerTestCase.java
@@ -34,7 +34,7 @@ import org.apache.openjpa.lib.jdbc.JDBCListener;
 public abstract class SQLListenerTestCase
     extends SingleEMFTestCase {
     private static String _nl = System.getProperty("line.separator");
-    protected List<String> sql = new ArrayList<String>();
+    protected List<String> sql = new ArrayList<>();
 
     @Override
     public void setUp(Object... props) {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
index 7649ffa71..840392fc4 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
@@ -51,6 +51,7 @@ public abstract class SingleEMFTestCase
      * set-up happens even if <code>setUp()</code> is not called from the
      * subclass.
      */
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         setUp(new Object[0]);
@@ -73,6 +74,7 @@ public abstract class SingleEMFTestCase
     /**
      * Closes the entity manager factory.
      */
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
index f0d549985..e572f9dec 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence.test;
 
 import java.util.Collections;
 import java.util.List;
+
 import javax.persistence.EntityTransaction;
 
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestJPAFacadeHelper.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestJPAFacadeHelper.java
index 3af0a5fd1..10fbe04b2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestJPAFacadeHelper.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestJPAFacadeHelper.java
@@ -68,6 +68,7 @@ import org.apache.openjpa.util.UserException;
 public class TestJPAFacadeHelper extends SingleEMFTestCase {
     MetaDataRepository repo = null;
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, EmbeddedIdEntity.class, EmbeddedIdClass.class, EBigDecimalID.class, EDBigDecimalID.class,
             EBigIntegerID.class, EDBigIntegerID.class, EDateID.class, EDDateID.class, ESQLDateID.class,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java
index 71d11ad12..d520aa908 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java
@@ -34,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestPersistenceUnitUtil extends SingleEMFTestCase{
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, EagerEntity.class, LazyEmbed.class,
             LazyEntity.class, EagerEmbed.class, RelEntity.class,
@@ -272,7 +273,7 @@ public class TestPersistenceUnitUtil extends SingleEMFTestCase{
         mve.setMapEntity(me);
 
         HashMap<MapKeyEmbed, MapValEntity> hm =
-            new HashMap<MapKeyEmbed, MapValEntity>();
+            new HashMap<>();
 
         hm.put(mke, mve);
         me.setMapEntities(hm);
@@ -328,7 +329,7 @@ public class TestPersistenceUnitUtil extends SingleEMFTestCase{
             assertFalse(puu.isLoaded(ote2, "toManyLazy"));
 
             // Load by application
-            List<ToManyLazy> tmes = new ArrayList<ToManyLazy>();
+            List<ToManyLazy> tmes = new ArrayList<>();
             for (int i = 0; i < 5; i++) {
                 tmes.add(new ToManyLazy("ToMany" + i));
             }
@@ -388,7 +389,7 @@ public class TestPersistenceUnitUtil extends SingleEMFTestCase{
             assertTrue(puu.isLoaded(ote2, "toManyEager"));
 
             // Load by application
-            List<ToManyEager> tmes = new ArrayList<ToManyEager>();
+            List<ToManyEager> tmes = new ArrayList<>();
             for (int i = 0; i < 5; i++) {
                 tmes.add(new ToManyEager("ToMany" + i));
             }
@@ -463,7 +464,7 @@ public class TestPersistenceUnitUtil extends SingleEMFTestCase{
         le.setLazyEmbed(emb);
         RelEntity re = new RelEntity();
         re.setName("My ent");
-        ArrayList<RelEntity> rel = new ArrayList<RelEntity>();
+        ArrayList<RelEntity> rel = new ArrayList<>();
         rel.add(new RelEntity());
         return le;
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUtil.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUtil.java
index 3a0b5a374..6dc394d16 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUtil.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUtil.java
@@ -34,6 +34,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
  */
 public class TestPersistenceUtil extends SingleEMFTestCase{
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, EagerEntity.class, LazyEmbed.class,
             LazyEntity.class, EagerEmbed.class, EagerEmbedRel.class,
@@ -210,7 +211,7 @@ public class TestPersistenceUtil extends SingleEMFTestCase{
         le.setLazyEmbed(emb);
         RelEntity re = new RelEntity();
         re.setName("My ent");
-        ArrayList<RelEntity> rel = new ArrayList<RelEntity>();
+        ArrayList<RelEntity> rel = new ArrayList<>();
         rel.add(new RelEntity());
         le.setRelEntities(rel);
         return le;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestProviderUtil.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestProviderUtil.java
index 330ec3bfc..642e78c43 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestProviderUtil.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestProviderUtil.java
@@ -35,6 +35,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestProviderUtil extends SingleEMFTestCase{
 
+    @Override
     public void setUp() {
         setUp(CLEAR_TABLES, EagerEntity.class, LazyEmbed.class,
             LazyEntity.class, EagerEmbed.class, EagerEmbedRel.class,
@@ -233,7 +234,7 @@ public class TestProviderUtil extends SingleEMFTestCase{
     }
 
     private List<EagerEmbed> createEagerEmbedColl() {
-        ArrayList<EagerEmbed> al = new ArrayList<EagerEmbed>();
+        ArrayList<EagerEmbed> al = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
             al.add(createEagerEmbed());
         }
@@ -249,13 +250,13 @@ public class TestProviderUtil extends SingleEMFTestCase{
 
     private EagerEmbedRel createEagerEmbedRel(boolean createRels) {
         EagerEmbedRel emb = new EagerEmbedRel();
-        Set<EagerEntity> ee = new HashSet<EagerEntity>();
+        Set<EagerEntity> ee = new HashSet<>();
         if (createRels) {
             ee.add(createEagerEntity(false));
             ee.add(createEagerEntity(false));
             ee.add(createEagerEntity(false));
         }
-        Set<Integer> ints = new HashSet<Integer>();
+        Set<Integer> ints = new HashSet<>();
         for (int i = 0; i < 12; i++) {
             ints.add(new Integer(i));
         }
@@ -283,7 +284,7 @@ public class TestProviderUtil extends SingleEMFTestCase{
     }
 
     private List<LazyEmbed> createLazyEmbedColl() {
-        ArrayList<LazyEmbed> al = new ArrayList<LazyEmbed>();
+        ArrayList<LazyEmbed> al = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
             al.add(createLazyEmbed());
         }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyEager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyEager.java
index 5a0be6e0b..7dab2adbe 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyEager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/ToManyEager.java
@@ -19,9 +19,9 @@
 
 package org.apache.openjpa.persistence.util;
 
-import javax.persistence.Id;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 @Entity
 public class ToManyEager {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
index 9e51b8aab..c04eb380c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationFactory.java
@@ -75,7 +75,7 @@ public class TestValidationFactory extends SingleEMFTestCase {
 
         // create the Map to test overrides
         //   Just use current class object, as we have no provider to test with
-        Map<String,Object> props = new HashMap<String,Object>();
+        Map<String,Object> props = new HashMap<>();
         props.put("javax.persistence.validation.factory",
             this.getClass());
 
@@ -105,7 +105,7 @@ public class TestValidationFactory extends SingleEMFTestCase {
 
         // create the Map to test overrides
         //   Just use current class object, as we have no provider to test with
-        Map<String,Object> props = new HashMap<String,Object>();
+        Map<String,Object> props = new HashMap<>();
         props.put("javax.persistence.validation.factory",
             this.getClass());
 
@@ -135,7 +135,7 @@ public class TestValidationFactory extends SingleEMFTestCase {
 
         // create the Map to test overrides
         //   Just use current class object, as we have no provider to test with
-        Map<String,Object> props = new HashMap<String,Object>();
+        Map<String,Object> props = new HashMap<>();
         props.put("javax.persistence.validation.factory",
             this.getClass());
         props.put("javax.persistence.validation.mode",
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java
index 45da8877a..c22b2818c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/validation/TestValidationMode.java
@@ -162,7 +162,7 @@ public class TestValidationMode extends SingleEMFTestCase {
         getLog().trace("testValidationMode5() - Map(NONE) overrides default");
 
         // create the Map to test overrides
-        Map<String,String> props = new HashMap<String,String>();
+        Map<String,String> props = new HashMap<>();
         props.put("javax.persistence.validation.mode",
             String.valueOf(ValidationMode.NONE));
 
@@ -194,7 +194,7 @@ public class TestValidationMode extends SingleEMFTestCase {
             "provided mode=callback");
 
         // create the Map to test overrides
-        Map<String,String> props = new HashMap<String,String>();
+        Map<String,String> props = new HashMap<>();
         props.put("javax.persistence.validation.mode",
             String.valueOf(ValidationMode.NONE));
 
@@ -226,7 +226,7 @@ public class TestValidationMode extends SingleEMFTestCase {
             "overrides PU provided mode=callback");
 
         // create the Map to test overrides
-        Map<String,Object> props = new HashMap<String,Object>();
+        Map<String,Object> props = new HashMap<>();
         props.put("javax.persistence.validation.mode",
             ValidationMode.NONE);
 
@@ -256,7 +256,7 @@ public class TestValidationMode extends SingleEMFTestCase {
     public void testUniqueLifecycleManager() {
         getLog().trace("testUniqueLifecycleManager() - Life cycle event tests");
         // create our EMF
-        Map<String,String> prop = new HashMap<String,String>();
+        Map<String,String> prop = new HashMap<>();
         prop.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
 //        prop.put("openjpa.Compatibility", "SingletonLifecycleEventManager=true");
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestPersistenceUnitWithoutXSD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestPersistenceUnitWithoutXSD.java
index 8fcb6d13f..eedfbc833 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestPersistenceUnitWithoutXSD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestPersistenceUnitWithoutXSD.java
@@ -20,9 +20,9 @@ package org.apache.openjpa.persistence.xml;
 
 import javax.persistence.EntityManagerFactory;
 
-import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.enhance.PCEnhancer;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
 
 public class TestPersistenceUnitWithoutXSD extends AbstractCachedEMFTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSchemaVersionValidation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSchemaVersionValidation.java
index 5f5d73fd5..8357f5bc0 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSchemaVersionValidation.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSchemaVersionValidation.java
@@ -18,12 +18,12 @@
  */
 package org.apache.openjpa.persistence.xml;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 
+import junit.framework.TestCase;
+
 public class TestSchemaVersionValidation extends TestCase {
 
     /**
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSimpleXmlEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSimpleXmlEntity.java
index 7e140ae9e..163ee56b5 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSimpleXmlEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSimpleXmlEntity.java
@@ -24,12 +24,14 @@ import org.apache.openjpa.persistence.test.SingleEMTestCase;
 public class TestSimpleXmlEntity
     extends SingleEMTestCase {
 
+    @Override
     public void setUp() {
         setUp(
         org.apache.openjpa.persistence.embed.attrOverrides.AnnoOverEmbed.class,
         CLEAR_TABLES);
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "xml-persistence-unit";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestXmlOverrideEntity.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestXmlOverrideEntity.java
index 64698f812..ebc6d4841 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestXmlOverrideEntity.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestXmlOverrideEntity.java
@@ -33,6 +33,7 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 public class TestXmlOverrideEntity extends SingleEMFTestCase {
 
+    @Override
     public void setUp() throws ClassNotFoundException {
         setUp(
         org.apache.openjpa.persistence.embed.attrOverrides.AnnoOverEmbed.class,
@@ -43,6 +44,7 @@ public class TestXmlOverrideEntity extends SingleEMFTestCase {
             XmlOverrideEntity.class.getClassLoader());
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "xml-persistence-unit";
     }
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Customer.java
index 05c0b060b..e7d8f93cd 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Customer.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Customer.java
@@ -18,9 +18,19 @@
  */
 package org.apache.openjpa.persistence.xmlmapping.entities;
 
-import javax.persistence.*;
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 @Entity
 @Table(name="TCUSTOMER")
@@ -38,7 +48,8 @@ public class Customer {
 			this.id=id;
 		}
 
-		public String toString() {
+		@Override
+        public String toString() {
 			return countryCode+"/"+id;
 		}
 		@Override
@@ -75,7 +86,7 @@ public class Customer {
 	long version;
 
 	@OneToMany(fetch=FetchType.LAZY, mappedBy="customer")
-	private Collection<Order> orders = new ArrayList<Order>();
+	private Collection<Order> orders = new ArrayList<>();
 
 	public Customer() {
     }
@@ -109,7 +120,8 @@ public class Customer {
 		this.orders = orders;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return "Customer:" + cid + " name:" + name;
 	}
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/EAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/EAddress.java
index ce27492d0..ea9bfbe82 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/EAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/EAddress.java
@@ -17,7 +17,8 @@
  * under the License.
  */
 package org.apache.openjpa.persistence.xmlmapping.entities;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 
 /*
  * example of an JPA embeddable class.
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Order.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Order.java
index fd0976ce6..b06d71920 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Order.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/entities/Order.java
@@ -18,12 +18,16 @@
  */
 package org.apache.openjpa.persistence.xmlmapping.entities;
 
-import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.Address;
-
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
 
 import org.apache.openjpa.persistence.Persistent;
 import org.apache.openjpa.persistence.jdbc.Strategy;
+import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.Address;
 
 @Entity
 @Table(name="TORDERXML")
@@ -83,6 +87,7 @@ public class Order {
         return oid;
     }
 
+    @Override
     public String toString(){
         return "Order:" + oid + " amount:" + amount + " delivered:" + delivered
         + " customer:" + ((customer != null) ? customer.getCid() : -1);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java
index 1d66e0bc9..38e2baf6b 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java
@@ -24,22 +24,22 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
-import junit.textui.TestRunner;
-
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.persistence.xmlmapping.entities.Customer;
+import org.apache.openjpa.persistence.xmlmapping.entities.Customer.CreditRating;
 import org.apache.openjpa.persistence.xmlmapping.entities.EAddress;
 import org.apache.openjpa.persistence.xmlmapping.entities.Order;
-import org.apache.openjpa.persistence.xmlmapping.entities.Customer.CreditRating;
 import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.Address;
 import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.CANAddress;
 import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.ObjectFactory;
 import org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress.USAAddress;
 
+import junit.textui.TestRunner;
+
 /**
  * Test query with predicates on persistent field mapped to XML column.
  * Samples of platform specific sqls are under resources in
@@ -66,6 +66,7 @@ public class TestXMLCustomerOrder
 
     private static boolean firstTestExecuted;
 
+    @Override
     public void setUp() {
         Object clearOrDropTables = (firstTestExecuted) ? CLEAR_TABLES : DROP_TABLES;
         firstTestExecuted = true;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java
index f902b1714..aba0fddd1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/Address.java
@@ -12,6 +12,7 @@ package org.apache.openjpa.persistence.xmlmapping.xmlbindings.myaddress;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -108,7 +109,7 @@ public class Address {
      */
     public List<String> getStreet() {
         if (street == null) {
-            street = new ArrayList<String>();
+            street = new ArrayList<>();
         }
         return this.street;
     }
@@ -145,6 +146,7 @@ public class Address {
         this.city = value;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append(this.name);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java
index 8039df845..3c6e13d3c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/CANAddress.java
@@ -101,6 +101,7 @@ public class CANAddress
         this.postalCode = value;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append(super.toString())
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java
index b2bc462a7..10befa57e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/GBRAddress.java
@@ -101,6 +101,7 @@ public class GBRAddress
         this.postcode = value;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append(super.toString())
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java
index 20d212ca4..b22aec8c9 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/ObjectFactory.java
@@ -94,7 +94,7 @@ public class ObjectFactory {
             substitutionHeadNamespace = "",
             substitutionHeadName = "MailAddress")
     public JAXBElement<USAAddress> createAddrUSA(USAAddress value) {
-        return new JAXBElement<USAAddress>(_AddrUSA_QNAME, USAAddress.class,
+        return new JAXBElement<>(_AddrUSA_QNAME, USAAddress.class,
                 null, value);
     }
 
@@ -107,7 +107,7 @@ public class ObjectFactory {
             substitutionHeadNamespace = "",
             substitutionHeadName = "MailAddress")
     public JAXBElement<CANAddress> createAddrCAN(CANAddress value) {
-        return new JAXBElement<CANAddress>(_AddrCAN_QNAME, CANAddress.class,
+        return new JAXBElement<>(_AddrCAN_QNAME, CANAddress.class,
                 null, value);
     }
 
@@ -117,7 +117,7 @@ public class ObjectFactory {
      */
     @XmlElementDecl(namespace = "", name = "MailAddress")
     public JAXBElement<Address> createMailAddress(Address value) {
-        return new JAXBElement<Address>(_MailAddress_QNAME, Address.class, null,
+        return new JAXBElement<>(_MailAddress_QNAME, Address.class, null,
                 value);
     }
 
@@ -129,7 +129,7 @@ public class ObjectFactory {
             substitutionHeadNamespace = "",
             substitutionHeadName = "MailAddress")
     public JAXBElement<GBRAddress> createAddrGBR(GBRAddress value) {
-        return new JAXBElement<GBRAddress>(_AddrGBR_QNAME, GBRAddress.class,
+        return new JAXBElement<>(_AddrGBR_QNAME, GBRAddress.class,
                 null, value);
     }
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java
index 6b14caadd..4c0791b66 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/xmlbindings/myaddress/USAAddress.java
@@ -93,6 +93,7 @@ public class USAAddress
         this.zip = value;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append(super.toString())
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchy.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchy.java
index 20c5c247e..42f796bd8 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchy.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchy.java
@@ -40,7 +40,7 @@ public class AccountingHierarchy implements Serializable {
     private String code;
     private String shortDesc;
 
-    private List<AccountingHierarchyRate> accRateList = new ArrayList<AccountingHierarchyRate>(0);
+    private List<AccountingHierarchyRate> accRateList = new ArrayList<>(0);
 
     private Long version;
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchyRateOpenJPAKey.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchyRateOpenJPAKey.java
index 3f3517ada..513407d8c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchyRateOpenJPAKey.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xs/AccountingHierarchyRateOpenJPAKey.java
@@ -26,9 +26,7 @@ import java.io.Serializable;
  * org.apache.openjpa.enhance.ApplicationIdTool
  */
 public class AccountingHierarchyRateOpenJPAKey implements Serializable {
-	/**
-	 *
-	 */
+	
 	private static final long serialVersionUID = -2345673847908844341L;
 
 	static {
@@ -63,19 +61,22 @@ public class AccountingHierarchyRateOpenJPAKey implements Serializable {
 		this.id = id;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return accountingHierarchy
 			+ "::" + id;
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 		int rs = 17;
 		rs = rs * 37 + ((accountingHierarchy == null) ? 0 : accountingHierarchy.hashCode());
 		rs = rs * 37 + ((id == null) ? 0 : id.hashCode());
 		return rs;
 	}
 
-	public boolean equals(Object obj) {
+	@Override
+    public boolean equals(Object obj) {
 		if(this == obj)
 			return true;
 		if(obj == null || obj.getClass() != getClass())
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Lf.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Lf.java
index 11382477c..baa9b8ddf 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Lf.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Lf.java
@@ -89,6 +89,7 @@ public class LSE1x1Lf implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + "[id=" + getId()
                 + ", ver=" + getVersion() + ", firstName=" + firstName + "]"
@@ -96,6 +97,7 @@ public class LSE1x1Lf implements Externalizable {
                 ;
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -104,6 +106,7 @@ public class LSE1x1Lf implements Externalizable {
         uniRight = (LSE1x1Rt) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJT.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJT.java
index db013b27b..57f0c67ff 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJT.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJT.java
@@ -91,6 +91,7 @@ public class LSE1x1LfJT implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + "[id=" + getId()
                 + ", ver=" + getVersion() + ", firstName=" + firstName + "]"
@@ -98,6 +99,7 @@ public class LSE1x1LfJT implements Externalizable {
                 ;
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -106,6 +108,7 @@ public class LSE1x1LfJT implements Externalizable {
         uniRightJT = (LSE1x1Rt) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJTLzy.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJTLzy.java
index 9232d2145..29179427c 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJTLzy.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfJTLzy.java
@@ -92,6 +92,7 @@ public class LSE1x1LfJTLzy implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + "[id=" + getId()
                 + ", ver=" + getVersion() + ", firstName=" + firstName + "]"
@@ -99,6 +100,7 @@ public class LSE1x1LfJTLzy implements Externalizable {
                 ;
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -107,6 +109,7 @@ public class LSE1x1LfJTLzy implements Externalizable {
         uniRightJT = (LSE1x1Rt) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfLzy.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfLzy.java
index 45fef717a..164cbf6db 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfLzy.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1LfLzy.java
@@ -90,6 +90,7 @@ public class LSE1x1LfLzy implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + "[id=" + getId()
                 + ", ver=" + getVersion() + ", firstName=" + firstName + "]"
@@ -97,6 +98,7 @@ public class LSE1x1LfLzy implements Externalizable {
                 ;
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -105,6 +107,7 @@ public class LSE1x1LfLzy implements Externalizable {
         uniRight = (LSE1x1Rt) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Rt.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Rt.java
index f43eb4fdc..fc5f9af57 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Rt.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1x1Rt.java
@@ -58,12 +58,14 @@ public class LSE1x1Rt implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + ", lastName=" + lastName + "]";
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -71,6 +73,7 @@ public class LSE1x1Rt implements Externalizable {
         lastName = in.readUTF();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLf.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLf.java
index b6a3dde4f..d6e892286 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLf.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLf.java
@@ -61,7 +61,7 @@ public class LSE1xmLf implements Externalizable {
     private String firstName;
 
     @OneToMany // (cascade=CascadeType.ALL) (mappedBy="ownerOne")
-    private Collection<LSE1xmRt> uniRight = new HashSet<LSE1xmRt>();
+    private Collection<LSE1xmRt> uniRight = new HashSet<>();
 
     public int getId() {
         return id;
@@ -95,12 +95,14 @@ public class LSE1xmLf implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + ", firstName=" + firstName + "] ownedMany=" + getUniRight();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -109,6 +111,7 @@ public class LSE1xmLf implements Externalizable {
         uniRight = (Collection<LSE1xmRt>) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfEgr.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfEgr.java
index fb4db9740..ea77fc809 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfEgr.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfEgr.java
@@ -62,7 +62,7 @@ public class LSE1xmLfEgr implements Externalizable {
     private String firstName;
 
     @OneToMany(fetch=FetchType.EAGER) //(mappedBy="ownerOne")
-    private Collection<LSE1xmRt> uniRight = new HashSet<LSE1xmRt>();
+    private Collection<LSE1xmRt> uniRight = new HashSet<>();
 
     public int getId() {
         return id;
@@ -96,12 +96,14 @@ public class LSE1xmLfEgr implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + ", firstName=" + firstName + "] ownedMany=" + getUniRight();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -110,6 +112,7 @@ public class LSE1xmLfEgr implements Externalizable {
         uniRight = (Collection<LSE1xmRt>) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJT.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJT.java
index 4b6e54337..7bb120a4e 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJT.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJT.java
@@ -63,7 +63,7 @@ public class LSE1xmLfJT implements Externalizable {
 
     @JoinTable
     @OneToMany //(mappedBy="ownerOne")
-    private Collection<LSE1xmRt> uniRight = new HashSet<LSE1xmRt>();
+    private Collection<LSE1xmRt> uniRight = new HashSet<>();
 
     public int getId() {
         return id;
@@ -97,12 +97,14 @@ public class LSE1xmLfJT implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + ", firstName=" + firstName + "] ownedMany=" + getUniRight();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -111,6 +113,7 @@ public class LSE1xmLfJT implements Externalizable {
         uniRight = (Collection<LSE1xmRt>) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJTEgr.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJTEgr.java
index 80c525e15..d5d642dcf 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJTEgr.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmLfJTEgr.java
@@ -62,7 +62,7 @@ public class LSE1xmLfJTEgr implements Externalizable {
     private String firstName;
 
     @OneToMany(fetch=FetchType.EAGER)//(mappedBy="ownerOne")
-    private Collection<LSE1xmRt> uniRight = new HashSet<LSE1xmRt>();
+    private Collection<LSE1xmRt> uniRight = new HashSet<>();
 
     public int getId() {
         return id;
@@ -96,12 +96,14 @@ public class LSE1xmLfJTEgr implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + ", firstName=" + firstName + "] ownedMany=" + getUniRight();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -110,6 +112,7 @@ public class LSE1xmLfJTEgr implements Externalizable {
         uniRight = (Collection<LSE1xmRt>) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmRt.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmRt.java
index fcf8480f8..7767ed448 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmRt.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSE1xmRt.java
@@ -58,12 +58,14 @@ public class LSE1xmRt implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + ", lastName=" + lastName + "]";
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -71,6 +73,7 @@ public class LSE1xmRt implements Externalizable {
         lastName = in.readUTF();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEBase.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEBase.java
index e14b2c951..12e315493 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEBase.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEBase.java
@@ -86,6 +86,7 @@ public class LSEBase implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
@@ -93,6 +94,7 @@ public class LSEBase implements Externalizable {
             + ", last=" + getLastName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -101,6 +103,7 @@ public class LSEBase implements Externalizable {
         lastName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleCol.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleCol.java
index 649c93fc0..a8cb3e6a9 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleCol.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleCol.java
@@ -61,7 +61,7 @@ public class LSEEleCol implements Externalizable {
     private String firstName;
 
     @ElementCollection
-    protected Set<String> collection = new HashSet<String>();
+    protected Set<String> collection = new HashSet<>();
 
     public int getId() {
         return id;
@@ -95,12 +95,14 @@ public class LSEEleCol implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + ", firstName=" + getFirstName() + "] one=" + getCollection();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -109,6 +111,7 @@ public class LSEEleCol implements Externalizable {
         collection = (Set<String>) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleColEgr.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleColEgr.java
index cefd7905d..275873bf2 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleColEgr.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEEleColEgr.java
@@ -62,7 +62,7 @@ public class LSEEleColEgr implements Externalizable {
     private String firstName;
 
     @ElementCollection(fetch=FetchType.EAGER)
-    protected Set<String> collection = new HashSet<String>();
+    protected Set<String> collection = new HashSet<>();
 
     public int getId() {
         return id;
@@ -96,12 +96,14 @@ public class LSEEleColEgr implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + ", firstName=" + getFirstName() + "] one=" + getCollection();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -110,6 +112,7 @@ public class LSEEleColEgr implements Externalizable {
         collection = (Set<String>) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinAbs.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinAbs.java
index 9df09c15c..47e03db2e 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinAbs.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinAbs.java
@@ -60,12 +60,14 @@ public abstract class LSEJoinAbs implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + "] first=" + getFirstName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -73,6 +75,7 @@ public abstract class LSEJoinAbs implements Externalizable {
         firstName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinCon.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinCon.java
index 8e6bbcd4d..fa68cbd8b 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinCon.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSEJoinCon.java
@@ -57,18 +57,21 @@ public class LSEJoinCon extends LSEJoinAbs implements Externalizable {
         this.lastName = lastName;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + super.toString()
             + ", last=" + getLastName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         super.readExternal(in);
         lastName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         super.writeExternal(out);
         out.writeObject(lastName);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESecTbl.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESecTbl.java
index 399031a3a..cf3dcf8f1 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESecTbl.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESecTbl.java
@@ -90,11 +90,13 @@ public class LSESecTbl implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(this)) + "[id=" + getId()
                 + ", ver=" + getVersion() + "] first=" + getFirstName() + ", last=" + getLastName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -103,6 +105,7 @@ public class LSESecTbl implements Externalizable {
         lastName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblAbs.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblAbs.java
index 71d9408ac..81b49d109 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblAbs.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblAbs.java
@@ -79,12 +79,14 @@ public abstract class LSESngTblAbs implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + ", ver=" + getVersion() + "] first=" + getFirstName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -92,6 +94,7 @@ public abstract class LSESngTblAbs implements Externalizable {
         firstName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblCon.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblCon.java
index 216673c5f..7917a54de 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblCon.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LSESngTblCon.java
@@ -57,18 +57,21 @@ public class LSESngTblCon extends LSESngTblAbs implements Externalizable {
         this.lastName = lastName;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + super.toString()
             + ", last=" + getLastName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         super.readExternal(in);
         lastName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         super.writeExternal(out);
         out.writeObject(lastName);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java
index 05c0ff6ca..97c597560 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/LockScopeTestCase.java
@@ -81,7 +81,7 @@ public abstract class LockScopeTestCase extends SQLListenerTestCase {
     protected final String DB2Lock          = DB2LockClause + "{1}";
     protected final String NoDB2Lock        = DB2LockClause + "{0}";
 
-    protected List<String> empTableName = new ArrayList<String>();;
+    protected List<String> empTableName = new ArrayList<>();;
 
     protected Map<String, Object> normalProps;
     protected Map<String, Object> extendedProps;
@@ -92,8 +92,8 @@ public abstract class LockScopeTestCase extends SQLListenerTestCase {
     }
 
     protected void commonSetUp(Class<?>... eClasses ) {
-        normalProps = new HashMap<String, Object>();
-        extendedProps = new HashMap<String, Object>();
+        normalProps = new HashMap<>();
+        extendedProps = new HashMap<>();
         extendedProps.put("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED);
 
         for( Class<?> eClazz : eClasses) {
@@ -137,6 +137,7 @@ public abstract class LockScopeTestCase extends SQLListenerTestCase {
         return ((JDBCConfiguration) ((OpenJPAEntityManager) em).getConfiguration());
     }
 
+    @Override
     protected Log getLog() {
         return emf.getConfiguration().getLog("Tests");
     }
@@ -327,16 +328,16 @@ public abstract class LockScopeTestCase extends SQLListenerTestCase {
     }
 
     protected interface AssertCallback {
-        public void findNoLockDbSQL(EntityManager em);
+        void findNoLockDbSQL(EntityManager em);
 
-        public void findPessimisticForcIncDbSQL(EntityManager em);
+        void findPessimisticForcIncDbSQL(EntityManager em);
 
-        public void queryPessimisticReadDbSQL(EntityManager em);
+        void queryPessimisticReadDbSQL(EntityManager em);
 
-        public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em);
+        void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em);
 
-        public void namedQueryPessimisticWriteDbSql(EntityManager em);
+        void namedQueryPessimisticWriteDbSql(EntityManager em);
 
-        public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em);
+        void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em);
     }
 }
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1x1LockScope.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1x1LockScope.java
index c8be4bedb..07f185b8e 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1x1LockScope.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1x1LockScope.java
@@ -29,6 +29,7 @@ import javax.persistence.EntityManager;
  */
 public class Test1x1LockScope extends LockScopeTestCase {
 
+    @Override
     public void setUp() {
         setSupportedDatabases(
                 org.apache.openjpa.jdbc.sql.DerbyDictionary.class,
@@ -109,6 +110,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
         commonLockTest(testName, LSE1x1Lf.class, idLf0, extended,
                 "SELECT c FROM LSE1x1Lf c WHERE c.firstName LIKE :firstName", "findLSE1x1Lf" + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -133,6 +135,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -186,6 +189,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -236,6 +240,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -260,6 +265,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -310,6 +316,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -390,6 +397,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
         commonLockTest(testName, LSE1x1LfLzy.class, idLf0, extended,
                 "SELECT c FROM LSE1x1LfLzy c WHERE c.firstName LIKE :firstName", "findLSE1x1LfLzy" + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -408,6 +416,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -432,6 +441,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -455,6 +465,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -473,6 +484,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -496,6 +508,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -573,6 +586,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
         commonLockTest(testName, LSE1x1LfJT.class, idLf0, extended,
                 "SELECT c FROM LSE1x1LfJT c WHERE c.firstName LIKE :firstName", "findLSE1x1LfJT" + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -600,6 +614,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -657,6 +672,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -710,6 +726,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -737,6 +754,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {
                         case db2:
@@ -790,6 +808,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -873,6 +892,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
         commonLockTest(testName, LSE1x1LfJTLzy.class, idLf0, extended,
                 "SELECT c FROM LSE1x1LfJTLzy c WHERE c.firstName LIKE :firstName", "findLSE1x1LfJTLzy" + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {
                         case db2:
@@ -891,6 +911,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -915,6 +936,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -938,6 +960,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -956,6 +979,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -979,6 +1003,7 @@ public class Test1x1LockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1xmLockScope.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1xmLockScope.java
index a0a03b05c..447fc72ee 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1xmLockScope.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/Test1xmLockScope.java
@@ -29,6 +29,7 @@ import javax.persistence.EntityManager;
  */
 public class Test1xmLockScope extends LockScopeTestCase {
 
+    @Override
     public void setUp() {
         setSupportedDatabases(
                 org.apache.openjpa.jdbc.sql.DerbyDictionary.class,
@@ -121,6 +122,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
         commonLockTest(testName, LSE1xmLf.class, idLf0, extended,
                 "SELECT c FROM LSE1xmLf c WHERE c.firstName LIKE :firstName", "findLSE1xmLf" + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -137,6 +139,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -161,6 +164,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -184,6 +188,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -200,6 +205,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -223,6 +229,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -310,6 +317,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                 "SELECT c FROM LSE1xmLfEgr c WHERE c.firstName LIKE :firstName", "findLSE1xmLfEgr"
                         + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -337,6 +345,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -396,6 +405,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:       //TODO: **Non-atomic lock. if jpa2, DO NOT lock LSE1xmRt
@@ -466,6 +476,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -493,6 +504,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:   //TODO: **Non-atomic lock. if jpa2, DO NOT lock LSE1xmRt
@@ -563,6 +575,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -659,6 +672,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
         commonLockTest(testName, LSE1xmLfJT.class, idLf0, extended,
                 "SELECT c FROM LSE1xmLfJT c WHERE c.firstName LIKE :firstName", "findLSE1xmLfJT" + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -675,6 +689,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -699,6 +714,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -722,6 +738,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -738,6 +755,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -761,6 +779,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -848,6 +867,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                 "SELECT c FROM LSE1xmLfJTEgr c WHERE c.firstName LIKE :firstName", "findLSE1xmLfJTEgr"
                         + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -875,6 +895,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -934,6 +955,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:       //TODO: **Non-atomic lock. if jpa2, DO NOT lock LSE1xmRt
@@ -1005,6 +1027,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -1032,6 +1055,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:   //TODO: **Non-atomic lock. if jpa2, DO NOT lock LSE1xmRt
@@ -1103,6 +1127,7 @@ public class Test1xmLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/TestBasicLockScope.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/TestBasicLockScope.java
index adf95b558..1dc594d72 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/TestBasicLockScope.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lock/extended/TestBasicLockScope.java
@@ -31,6 +31,7 @@ import javax.persistence.EntityManager;
  */
 public class TestBasicLockScope extends LockScopeTestCase {
 
+    @Override
     public void setUp() {
         setSupportedDatabases(
                 org.apache.openjpa.jdbc.sql.DerbyDictionary.class,
@@ -104,6 +105,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
         commonLockTest(testName, LSEBase.class, id0, extended,
                 "SELECT c FROM LSEBase c WHERE c.firstName LIKE :firstName", "findLSEBase" + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -122,6 +124,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -143,6 +146,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -164,6 +168,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -182,6 +187,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -203,6 +209,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -266,6 +273,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
         commonLockTest(testName, LSESecTbl.class, id0, extended,
                 "SELECT c FROM LSESecTbl c WHERE c.firstName LIKE :firstName", "findLSESecTbl" + scope,
                 new AssertCallback() {
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -288,6 +296,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -323,6 +332,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -359,6 +369,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -381,6 +392,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -417,6 +429,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -484,6 +497,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                 "SELECT c FROM LSESngTblAbs c WHERE c.firstName LIKE :firstName",
                 "findLSESngTblCon" + scope, new AssertCallback() {
 
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -503,6 +517,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -530,6 +545,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -553,6 +569,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -572,6 +589,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -596,6 +614,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -662,6 +681,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                 "SELECT c FROM LSEJoinCon c WHERE c.firstName LIKE :firstName", "findLSEJoinCon"
                         + scope, new AssertCallback() {
 
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -683,6 +703,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -717,6 +738,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -752,6 +774,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -773,6 +796,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -808,6 +832,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -876,6 +901,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                 "SELECT c FROM LSEEleCol c WHERE c.firstName LIKE :firstName", "findLSEEleCol" + scope,
                 new AssertCallback() {
 
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -892,6 +918,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -915,6 +942,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -937,6 +965,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -953,6 +982,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -975,6 +1005,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -1041,6 +1072,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                 "SELECT c FROM LSEEleColEgr c WHERE c.firstName LIKE :firstName",
                 "findLSEEleColEgr" + scope, new AssertCallback() {
 
+                    @Override
                     public void findNoLockDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -1065,6 +1097,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findPessimisticForcIncDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -1103,6 +1136,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void queryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:     // **Non-atomic lock, No need to lock LSEEleColEgr_collection *********
@@ -1146,6 +1180,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterQueryPessimisticReadDbSQL(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
@@ -1170,6 +1205,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void namedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {
                         case db2:     // **Non-atomic lock, No need to lock LSEEleColEgr_collection *********
@@ -1213,6 +1249,7 @@ public class TestBasicLockScope extends LockScopeTestCase {
                         }
                     }
 
+                    @Override
                     public void findNoLockAfterNamedQueryPessimisticWriteDbSql(EntityManager em) {
                         switch (getDBType(em)) {    // **Check
                         case db2:
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java
index a1fab2d2f..57941263d 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Department.java
@@ -60,18 +60,21 @@ public class Department implements Externalizable {
         this.name = name;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
             + getId() + "] first=" + getName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
         name = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeObject(name);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java
index e3b10f514..476e012b6 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Employee.java
@@ -72,6 +72,7 @@ public class Employee implements Externalizable {
         this.department = department;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
@@ -79,6 +80,7 @@ public class Employee implements Externalizable {
             + ", last=" + getLastName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -86,6 +88,7 @@ public class Employee implements Externalizable {
         lastName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeObject(firstName);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployee.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployee.java
index 9bb7d910d..f3e12a45a 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployee.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployee.java
@@ -79,6 +79,7 @@ public class LockEmployee implements Externalizable {
         return version;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
@@ -86,6 +87,7 @@ public class LockEmployee implements Externalizable {
             + ", last=" + getLastName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -94,6 +96,7 @@ public class LockEmployee implements Externalizable {
         lastName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeInt(version);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployeeNonVersion.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployeeNonVersion.java
index e64cd4b36..78b0c89a0 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployeeNonVersion.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/LockEmployeeNonVersion.java
@@ -59,6 +59,7 @@ public class LockEmployeeNonVersion implements Externalizable {
         this.lastName = lastName;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
@@ -66,6 +67,7 @@ public class LockEmployeeNonVersion implements Externalizable {
             + ", last=" + getLastName();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -73,6 +75,7 @@ public class LockEmployeeNonVersion implements Externalizable {
         lastName = (String) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeObject(firstName);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java
index 039d3f303..5bf2ea572 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/MixedLockManagerGenericTest.java
@@ -24,6 +24,7 @@ import javax.persistence.LockModeType;
  * Test JPA 2.0 em.lock(LockMode) behaviors with "mixed" lock manager.
  */
 public class MixedLockManagerGenericTest extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Person.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Person.java
index 1729b1934..0699260a9 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Person.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/Person.java
@@ -74,6 +74,7 @@ public class Person implements Externalizable {
         phoneNumbers = numbers;
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() + '@'
             + Integer.toHexString(System.identityHashCode(this)) + "[id="
@@ -81,6 +82,7 @@ public class Person implements Externalizable {
             + ", last=" + getLastName() + " phone numbers="+phoneNumbers.toString();
     }
 
+    @Override
     public void readExternal(ObjectInput in) throws IOException,
         ClassNotFoundException {
         id = in.readInt();
@@ -89,6 +91,7 @@ public class Person implements Externalizable {
         phoneNumbers = (List<PhoneNumber>) in.readObject();
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeInt(id);
         out.writeObject(firstName);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
index 295948350..7dd7818a3 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/SequencedActionsTest.java
@@ -171,6 +171,7 @@ public abstract class SequencedActionsTest extends SQLListenerTestCase {
         return e;
     }
 
+    @Override
     protected Log getLog() {
         return emf.getConfiguration().getLog("Tests");
     }
@@ -305,7 +306,7 @@ public abstract class SequencedActionsTest extends SQLListenerTestCase {
             }
         }
         int numThreads = actions.length;
-        threads = new ArrayList<TestThread>(numThreads);
+        threads = new ArrayList<>(numThreads);
         TestThread mainThread = new TestThread(0, actions);
         threads.add(mainThread);
         launchCommonSequence(mainThread);
@@ -671,7 +672,7 @@ public abstract class SequencedActionsTest extends SQLListenerTestCase {
                 case TestException:
                     List<Class<?>> expectedExceptions = null;
                     if (args.length > 2) {
-                        expectedExceptions = new ArrayList<Class<?>>();
+                        expectedExceptions = new ArrayList<>();
                         for (int i = 2; i < args.length; ++i) {
                             if (args[i] instanceof Object[]) {
                                 for (Object o : (Object[]) args[i]) {
@@ -784,7 +785,7 @@ public abstract class SequencedActionsTest extends SQLListenerTestCase {
                         (endTime-System.currentTimeMillis()) + "ms.");
                     int deadThreads = 0;
                     List<TestThread> proceedThread =
-                        new ArrayList<TestThread>(threads);
+                        new ArrayList<>(threads);
                     while (proceedThread.size() > 0
                         && System.currentTimeMillis() < endTime) {
                         for (TestThread thread : proceedThread) {
@@ -958,7 +959,7 @@ public abstract class SequencedActionsTest extends SQLListenerTestCase {
     private Map<String, Object> buildPropsMap(Object[] args, int startIdx) {
         Map<String, Object> props = null;
         if (args.length > startIdx) {
-            props = new HashMap<String, Object>();
+            props = new HashMap<>();
             while (startIdx < (args.length - 1)) {
                 props.put((String) args[startIdx], args[startIdx + 1]);
                 startIdx += 2;
@@ -1003,13 +1004,14 @@ public abstract class SequencedActionsTest extends SQLListenerTestCase {
             this.threadToRun = threadToRun;
             this.actions = actions;
 
-            this.employees = new HashMap<Integer, LockEmployee>();
+            this.employees = new HashMap<>();
         }
 
         public synchronized void notifyThread() {
             notify();
         }
 
+        @Override
         public synchronized void run() {
         	// sleep and let other threads has a chance to do stuffs,
         	// otherwise this new thread may perform a notify before
@@ -1030,6 +1032,7 @@ public abstract class SequencedActionsTest extends SQLListenerTestCase {
             return loopCnt;
         }
 
+        @Override
         public synchronized void run() {
             while (true) {
                 ++loopCnt;
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockMode.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockMode.java
index 2cdda4b00..f4ceab1b1 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockMode.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockMode.java
@@ -46,6 +46,7 @@ public class TestEmLockMode extends SequencedActionsTest {
     private static String DB2_PESSIMISTIC_RR_SQL =
         "SELECT .* FROM LockEmployee .* WITH RR USE .*";
 
+    @Override
     public void setUp() {
         setUp(LockEmployee.class, "openjpa.LockManager", "mixed");
         commonSetUp();
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockTimeout.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockTimeout.java
index 014fcccfe..ac08a59b4 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockTimeout.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestEmLockTimeout.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.persistence.test.AllowFailure;
  */
 public class TestEmLockTimeout extends SequencedActionsTest {
 
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
@@ -96,7 +97,7 @@ public class TestEmLockTimeout extends SequencedActionsTest {
 
         EntityManager em = emf.createEntityManager();
 
-        Map<String,Object> props2 = new HashMap<String,Object>();
+        Map<String,Object> props2 = new HashMap<>();
         props2.put("javax.persistence.lock.timeout", 3333);
         em.find(LockEmployee.class, 1, props2);
 
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestFetchHints.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestFetchHints.java
index 232619daf..b4a307fcc 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestFetchHints.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestFetchHints.java
@@ -32,6 +32,7 @@ import org.apache.openjpa.jdbc.kernel.JDBCFetchConfigurationImpl;
 import org.apache.openjpa.jdbc.kernel.LRSSizes;
 import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
 import org.apache.openjpa.kernel.FetchConfiguration;
+import org.apache.openjpa.kernel.LockLevels;
 import org.apache.openjpa.kernel.MixedLockLevels;
 import org.apache.openjpa.kernel.QueryFlushModes;
 import org.apache.openjpa.persistence.EntityManagerImpl;
@@ -83,6 +84,7 @@ import org.apache.openjpa.persistence.jdbc.ResultSetType;
  *   openjpa.jdbc.TransactionIsolation
  */
 public class TestFetchHints extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
@@ -1758,25 +1760,25 @@ public class TestFetchHints extends SequencedActionsTest {
         em.getTransaction().begin();
 
         readLockLevelHintTest(fPlan, fConfig, hintName, String
-            .valueOf(MixedLockLevels.LOCK_NONE), LockModeType.NONE,
-            MixedLockLevels.LOCK_NONE);
+            .valueOf(LockLevels.LOCK_NONE), LockModeType.NONE,
+            LockLevels.LOCK_NONE);
         readLockLevelHintTest(fPlan, fConfig, hintName,
-            MixedLockLevels.LOCK_NONE, LockModeType.NONE,
-            MixedLockLevels.LOCK_NONE);
+            LockLevels.LOCK_NONE, LockModeType.NONE,
+            LockLevels.LOCK_NONE);
 
         readLockLevelHintTest(fPlan, fConfig, hintName, String
-            .valueOf(MixedLockLevels.LOCK_READ), LockModeType.READ,
-            MixedLockLevels.LOCK_READ);
+            .valueOf(LockLevels.LOCK_READ), LockModeType.READ,
+            LockLevels.LOCK_READ);
         readLockLevelHintTest(fPlan, fConfig, hintName,
-            MixedLockLevels.LOCK_READ, LockModeType.READ,
-            MixedLockLevels.LOCK_READ);
+            LockLevels.LOCK_READ, LockModeType.READ,
+            LockLevels.LOCK_READ);
 
         readLockLevelHintTest(fPlan, fConfig, hintName, String
-            .valueOf(MixedLockLevels.LOCK_WRITE), LockModeType.WRITE,
-            MixedLockLevels.LOCK_WRITE);
+            .valueOf(LockLevels.LOCK_WRITE), LockModeType.WRITE,
+            LockLevels.LOCK_WRITE);
         readLockLevelHintTest(fPlan, fConfig, hintName,
-            MixedLockLevels.LOCK_WRITE, LockModeType.WRITE,
-            MixedLockLevels.LOCK_WRITE);
+            LockLevels.LOCK_WRITE, LockModeType.WRITE,
+            LockLevels.LOCK_WRITE);
 
         readLockLevelHintTest(fPlan, fConfig, hintName, String
             .valueOf(MixedLockLevels.LOCK_OPTIMISTIC), LockModeType.OPTIMISTIC,
@@ -1847,7 +1849,7 @@ public class TestFetchHints extends SequencedActionsTest {
         }
         try {
             fPlan.setHint(hintName, FetchConfiguration.DEFAULT);
-            assertEquals(MixedLockLevels.LOCK_READ, fConfig.getReadLockLevel());
+            assertEquals(LockLevels.LOCK_READ, fConfig.getReadLockLevel());
         } catch (Exception e) {
             fail("Unexpected " + e.getClass().getName());
         }
@@ -1880,25 +1882,25 @@ public class TestFetchHints extends SequencedActionsTest {
         em.getTransaction().begin();
 
         writeLockLevelHintTest(fPlan, fConfig, hintName, String
-            .valueOf(MixedLockLevels.LOCK_NONE), LockModeType.NONE,
-            MixedLockLevels.LOCK_NONE);
+            .valueOf(LockLevels.LOCK_NONE), LockModeType.NONE,
+            LockLevels.LOCK_NONE);
         writeLockLevelHintTest(fPlan, fConfig, hintName,
-            MixedLockLevels.LOCK_NONE, LockModeType.NONE,
-            MixedLockLevels.LOCK_NONE);
+            LockLevels.LOCK_NONE, LockModeType.NONE,
+            LockLevels.LOCK_NONE);
 
         writeLockLevelHintTest(fPlan, fConfig, hintName, String
-            .valueOf(MixedLockLevels.LOCK_READ), LockModeType.READ,
-            MixedLockLevels.LOCK_READ);
+            .valueOf(LockLevels.LOCK_READ), LockModeType.READ,
+            LockLevels.LOCK_READ);
         writeLockLevelHintTest(fPlan, fConfig, hintName,
-            MixedLockLevels.LOCK_READ, LockModeType.READ,
-            MixedLockLevels.LOCK_READ);
+            LockLevels.LOCK_READ, LockModeType.READ,
+            LockLevels.LOCK_READ);
 
         writeLockLevelHintTest(fPlan, fConfig, hintName, String
-            .valueOf(MixedLockLevels.LOCK_WRITE), LockModeType.WRITE,
-            MixedLockLevels.LOCK_WRITE);
+            .valueOf(LockLevels.LOCK_WRITE), LockModeType.WRITE,
+            LockLevels.LOCK_WRITE);
         writeLockLevelHintTest(fPlan, fConfig, hintName,
-            MixedLockLevels.LOCK_WRITE, LockModeType.WRITE,
-            MixedLockLevels.LOCK_WRITE);
+            LockLevels.LOCK_WRITE, LockModeType.WRITE,
+            LockLevels.LOCK_WRITE);
 
         writeLockLevelHintTest(fPlan, fConfig, hintName, String
             .valueOf(MixedLockLevels.LOCK_OPTIMISTIC), LockModeType.OPTIMISTIC,
@@ -1969,7 +1971,7 @@ public class TestFetchHints extends SequencedActionsTest {
         }
         try {
             fPlan.setHint(hintName, FetchConfiguration.DEFAULT);
-            assertEquals(MixedLockLevels.LOCK_WRITE, fConfig
+            assertEquals(LockLevels.LOCK_WRITE, fConfig
                 .getWriteLockLevel());
         } catch (Exception e) {
             fail("Unexpected " + e.getClass().getName());
@@ -2012,27 +2014,27 @@ public class TestFetchHints extends SequencedActionsTest {
             em.getTransaction().begin();
 
         readLockModeHintTest(fPlan, fConfig, hintName, "none",
-            LockModeType.NONE, MixedLockLevels.LOCK_NONE);
+            LockModeType.NONE, LockLevels.LOCK_NONE);
         readLockModeHintTest(fPlan, fConfig, hintName, LockModeType.NONE,
-            LockModeType.NONE, MixedLockLevels.LOCK_NONE);
+            LockModeType.NONE, LockLevels.LOCK_NONE);
         readLockModeHintTest(fPlan, fConfig, hintName,
             LockModeType.NONE.name(), LockModeType.NONE,
-            MixedLockLevels.LOCK_NONE);
+            LockLevels.LOCK_NONE);
 
         readLockModeHintTest(fPlan, fConfig, hintName, "read",
-            LockModeType.READ, MixedLockLevels.LOCK_READ);
+            LockModeType.READ, LockLevels.LOCK_READ);
         readLockModeHintTest(fPlan, fConfig, hintName, LockModeType.READ,
-            LockModeType.READ, MixedLockLevels.LOCK_READ);
+            LockModeType.READ, LockLevels.LOCK_READ);
         readLockModeHintTest(fPlan, fConfig, hintName,
             LockModeType.READ.name(), LockModeType.READ,
-            MixedLockLevels.LOCK_READ);
+            LockLevels.LOCK_READ);
 
         readLockModeHintTest(fPlan, fConfig, hintName, "write",
-            LockModeType.WRITE, MixedLockLevels.LOCK_WRITE);
+            LockModeType.WRITE, LockLevels.LOCK_WRITE);
         readLockModeHintTest(fPlan, fConfig, hintName, LockModeType.WRITE,
-            LockModeType.WRITE, MixedLockLevels.LOCK_WRITE);
+            LockModeType.WRITE, LockLevels.LOCK_WRITE);
         readLockModeHintTest(fPlan, fConfig, hintName, LockModeType.WRITE
-            .name(), LockModeType.WRITE, MixedLockLevels.LOCK_WRITE);
+            .name(), LockModeType.WRITE, LockLevels.LOCK_WRITE);
 
         readLockModeHintTest(fPlan, fConfig, hintName, "optimistic",
             LockModeType.OPTIMISTIC, MixedLockLevels.LOCK_OPTIMISTIC);
@@ -2152,25 +2154,25 @@ public class TestFetchHints extends SequencedActionsTest {
             em.getTransaction().begin();
 
         writeLockModeHintTest(fPlan, fConfig, hintName, "none",
-            LockModeType.NONE, MixedLockLevels.LOCK_NONE);
+            LockModeType.NONE, LockLevels.LOCK_NONE);
         writeLockModeHintTest(fPlan, fConfig, hintName, LockModeType.NONE,
-            LockModeType.NONE, MixedLockLevels.LOCK_NONE);
+            LockModeType.NONE, LockLevels.LOCK_NONE);
         writeLockModeHintTest(fPlan, fConfig, hintName, LockModeType.NONE
-            .name(), LockModeType.NONE, MixedLockLevels.LOCK_NONE);
+            .name(), LockModeType.NONE, LockLevels.LOCK_NONE);
 
         writeLockModeHintTest(fPlan, fConfig, hintName, "read",
-            LockModeType.READ, MixedLockLevels.LOCK_READ);
+            LockModeType.READ, LockLevels.LOCK_READ);
         writeLockModeHintTest(fPlan, fConfig, hintName, LockModeType.READ,
-            LockModeType.READ, MixedLockLevels.LOCK_READ);
+            LockModeType.READ, LockLevels.LOCK_READ);
         writeLockModeHintTest(fPlan, fConfig, hintName, LockModeType.READ
-            .name(), LockModeType.READ, MixedLockLevels.LOCK_READ);
+            .name(), LockModeType.READ, LockLevels.LOCK_READ);
 
         writeLockModeHintTest(fPlan, fConfig, hintName, "write",
-            LockModeType.WRITE, MixedLockLevels.LOCK_WRITE);
+            LockModeType.WRITE, LockLevels.LOCK_WRITE);
         writeLockModeHintTest(fPlan, fConfig, hintName, LockModeType.WRITE,
-            LockModeType.WRITE, MixedLockLevels.LOCK_WRITE);
+            LockModeType.WRITE, LockLevels.LOCK_WRITE);
         writeLockModeHintTest(fPlan, fConfig, hintName, LockModeType.WRITE
-            .name(), LockModeType.WRITE, MixedLockLevels.LOCK_WRITE);
+            .name(), LockModeType.WRITE, LockLevels.LOCK_WRITE);
 
         writeLockModeHintTest(fPlan, fConfig, hintName,
             "optimistic", LockModeType.OPTIMISTIC,
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java
index a14798dff..de188c79d 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestLocking.java
@@ -37,6 +37,7 @@ public class TestLocking extends SQLListenerTestCase {
         return "locking-test";
     }
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, Person.class, PhoneNumber.class
         // ,"openjpa.Log", "SQL=trace"
@@ -45,7 +46,7 @@ public class TestLocking extends SQLListenerTestCase {
     }
 
     public void testExtendedLockScope() throws Exception {
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED);
 
         OpenJPAEntityManagerSPI em1 = emf.createEntityManager();
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerDeadlock.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerDeadlock.java
index a07c525a2..9c117e1b3 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerDeadlock.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerDeadlock.java
@@ -34,6 +34,7 @@ public class TestMixedLockManagerDeadlock extends SequencedActionsTest {
     private DBType dbType;
     private HashMap<DBType,Class<?>[]> expWriteLockExClasses;
 
+    @Override
     public void setUp() {
         setSupportedDatabases(
                 org.apache.openjpa.jdbc.sql.DB2Dictionary.class,
@@ -58,7 +59,7 @@ public class TestMixedLockManagerDeadlock extends SequencedActionsTest {
 			if ((db2dict.getDB2MajorVersion() * 100 + db2dict.getDB2MinorVersion()) > 905)
 				expDB2ExClass = null;
 		}
-        expWriteLockExClasses = new HashMap<DBType,Class<?>[]>();
+        expWriteLockExClasses = new HashMap<>();
         expWriteLockExClasses.put(DBType.db2, expDB2ExClass);
         expWriteLockExClasses.put(DBType.derby, ExpectingOptimisticLockExClass);
         expWriteLockExClasses.put(DBType.oracle, null);
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindBasic.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindBasic.java
index 149dbd3b5..79d06244f 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindBasic.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindBasic.java
@@ -24,6 +24,7 @@ import javax.persistence.LockModeType;
  * Test JPA 2.0 em.find(LockMode) behaviors with "mixed" lock manager.
  */
 public class TestMixedLockManagerFindBasic extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindException.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindException.java
index 2ffbb04aa..c5e17ede9 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindException.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindException.java
@@ -27,6 +27,7 @@ import javax.persistence.TransactionRequiredException;
  * Test JPA 2.0 em.find(LockMode) exception behaviors with "mixed" lock manager.
  */
 public class TestMixedLockManagerFindException extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java
index 00d8c2ba5..28bce8c4f 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java
@@ -26,6 +26,7 @@ import javax.persistence.LockModeType;
  * Test JPA 2.0 LockMode type permutation behaviors with "mixed" lock manager.
  */
 public class TestMixedLockManagerFindPermutation extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java
index 9e35176d4..c8447db23 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockBasic.java
@@ -30,6 +30,7 @@ public class TestMixedLockManagerLockBasic extends SequencedActionsTest {
         return "locking-test";
     }
 
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockException.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockException.java
index 7db4d6242..6ccca21a8 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockException.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockException.java
@@ -26,6 +26,7 @@ import javax.persistence.TransactionRequiredException;
  * Test JPA 2.0 em.lock(LockMode) exception behaviors with "mixed" lock manager.
  */
 public class TestMixedLockManagerLockException extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java
index 98226d9d9..f834feb18 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java
@@ -32,6 +32,7 @@ public class TestMixedLockManagerLockPermutation extends SequencedActionsTest {
         return "locking-test";
     }
 
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java
index 201c5d76b..4361a6868 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerNonVersion.java
@@ -39,6 +39,7 @@ public class TestMixedLockManagerNonVersion extends SQLListenerTestCase {
         return "locking-test";
     }
 
+    @Override
     public void setUp() {
         setUp(LockEmployeeNonVersion.class
             , "openjpa.LockManager", "mixed"
@@ -228,6 +229,7 @@ public class TestMixedLockManagerNonVersion extends SQLListenerTestCase {
         return e;
     }
 
+    @Override
     protected Log getLog() {
         return emf.getConfiguration().getLog("Tests");
     }
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshBasic.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshBasic.java
index ef06c8a20..86e26a777 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshBasic.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshBasic.java
@@ -24,6 +24,7 @@ import javax.persistence.LockModeType;
  * Test JPA 2.0 em.refresh(LockMode) basic behaviors with "mixed" lock manager.
  */
 public class TestMixedLockManagerRefreshBasic extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java
index c06869c6f..326d7467c 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java
@@ -26,6 +26,7 @@ import javax.persistence.TransactionRequiredException;
  * lock manager.
  */
 public class TestMixedLockManagerRefreshException extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java
index f7b678801..ab0c7bce2 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java
@@ -27,6 +27,7 @@ import javax.persistence.LockModeType;
  */
 public class TestMixedLockManagerRefreshPermutation
     extends SequencedActionsTest {
+    @Override
     public void setUp() {
         setUp(LockEmployee.class
             , "openjpa.LockManager", "mixed"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java
index 9bd2d7a57..8074649ae 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestNamedQueryLockMode.java
@@ -45,6 +45,7 @@ public class TestNamedQueryLockMode extends SQLListenerTestCase {
         return "locking-test";
     }
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, LockEmployee.class,
             "openjpa.LockManager", "pessimistic",
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java
index d068a2f05..ece105c48 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestOptimisticNamedQueryLockMode.java
@@ -40,6 +40,7 @@ public class TestOptimisticNamedQueryLockMode extends SQLListenerTestCase {
         return "locking-test";
     }
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES, LockEmployee.class,
             "openjpa.LockManager", "pessimistic"
diff --git a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
index dc8a80d6f..181fe6f7f 100644
--- a/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
+++ b/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestPessimisticLocks.java
@@ -34,8 +34,6 @@ import javax.persistence.Query;
 import javax.persistence.QueryTimeoutException;
 import javax.persistence.TypedQuery;
 
-import junit.framework.AssertionFailedError;
-
 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.sql.DB2Dictionary;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
@@ -47,6 +45,8 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.test.SQLListenerTestCase;
 import org.apache.openjpa.util.OpenJPAException;
 
+import junit.framework.AssertionFailedError;
+
 /**
  * Test Pessimistic Lock and exception behavior against EntityManager and Query
  * interface methods.
@@ -61,6 +61,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
         return "locking-test";
     }
 
+    @Override
     public void setUp() {
         // Disable tests for any DB that has supportsQueryTimeout==false, like Postgres
         OpenJPAEntityManagerFactorySPI tempEMF = emf;
@@ -134,7 +135,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
                 || employees.get(0).getFirstName().equals("first.2"));
 
         em2.getTransaction().begin();
-        Map<String, Object> hints = new HashMap<String, Object>();
+        Map<String, Object> hints = new HashMap<>();
         hints.put("javax.persistence.lock.timeout", lockWaitTime);
         // find Employee(2) with a lock, should block and expected a
         // PessimisticLockException
@@ -163,7 +164,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
                 || depts.get(0).getName().equals("D20"));
 
         em2.getTransaction().begin();
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("javax.persistence.lock.timeout", lockWaitTime);
         // find Employee(2) with a lock, no block since only department was
         // locked
@@ -200,7 +201,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
         assertEquals("Test Employee first name = 'first.2'", q.get(0).getFirstName(), "first.2");
 
         em2.getTransaction().begin();
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("javax.persistence.lock.timeout", lockWaitTime);
         // find Employee(2) with a lock, should block and expected a
         // PessimisticLockException
@@ -259,7 +260,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
         EntityManager em2 = emf.createEntityManager();
         try {
             em2.getTransaction().begin();
-            Map<String, Object> map = new HashMap<String, Object>();
+            Map<String, Object> map = new HashMap<>();
             map.put("javax.persistence.lock.timeout", lockWaitTime);
             // Lock Emplyee(1), no department should be locked
             em2.find(Employee.class, 1, LockModeType.PESSIMISTIC_READ, map);
@@ -285,7 +286,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
 
         em2.getTransaction().begin();
 
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("javax.persistence.lock.timeout", lockWaitTime);
         // Lock Emplyee(2), no department should be locked
         em2.find(Employee.class, 2, LockModeType.PESSIMISTIC_READ, map);
@@ -318,7 +319,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
         EntityManager em1 = emf.createEntityManager();
         EntityManager em2 = emf.createEntityManager();
         em2.getTransaction().begin();
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("javax.persistence.lock.timeout", lockWaitTime);
         // Lock Emplyee(1), no department should be locked
         em2.find(Employee.class, 1, LockModeType.PESSIMISTIC_READ, map);
@@ -396,6 +397,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
         em.getTransaction().commit();
     }
 
+    @Override
     protected Log getLog() {
         return emf.getConfiguration().getLog("Tests");
     }
@@ -452,7 +454,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
                 wait(70000);
             }
             getLog().trace("Main: done waiting");
-            Map<String,Object> props = new HashMap<String,Object>();
+            Map<String,Object> props = new HashMap<>();
             // This property does not have any effect on Derby for the locking
             // condition produced by this test.  Instead, Derby uses the
             // lock timeout value specified in the config (pom.xml).  On Informix,
@@ -543,6 +545,7 @@ public class TestPessimisticLocks extends SQLListenerTestCase {
             _monitor = monitor;
         }
 
+        @Override
         public Boolean call() throws Exception {
             try {
                 EntityManager em = emf.createEntityManager();
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AbstractQuery.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AbstractQuery.java
index 0710b9d01..3a1b0fcb9 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AbstractQuery.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AbstractQuery.java
@@ -62,7 +62,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
         _qmd = qmd;
         _em = em;
 
-        _boundParams = new HashMap<Parameter<?>, Object>();
+        _boundParams = new HashMap<>();
     }
 
     /**
@@ -72,7 +72,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      *         is indistinguishable from the value being bound to null.
      */
     Map<Object, Object> getParameterValues() {
-        Map<Object, Object> result = new HashMap<Object, Object>();
+        Map<Object, Object> result = new HashMap<>();
         if (_boundParams == null)
             return result;
         for (Map.Entry<Object, Parameter<?>> entry : getDeclaredParameters().entrySet()) {
@@ -123,6 +123,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      *             if position does not correspond to a positional parameter of the query or if the argument is of
      *             incorrect type
      */
+    @Override
     public OpenJPAQuery<X> setParameter(int pos, Object value) {
         if (_convertPositionalParams == true) {
             return setParameter("_" + String.valueOf(pos), value);
@@ -137,7 +138,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
             }
             Parameter<?> param;
             if (isNative() || isProcedure()) {
-                param = new ParameterImpl<Object>(pos, Object.class);
+                param = new ParameterImpl<>(pos, Object.class);
                 declareParameter(pos, param);
             } else {
                 param = getParameter(pos);
@@ -153,6 +154,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
     /**
      * Sets the value of the given positional parameter after conversion of the given value to the given Temporal Type.
      */
+    @Override
     public OpenJPAQuery<X> setParameter(int position, Calendar value, TemporalType t) {
         return setParameter(position, convertTemporalType(value, t));
     }
@@ -160,6 +162,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
     /**
      * Sets the value of the given named parameter after conversion of the given value to the given Temporal Type.
      */
+    @Override
     public OpenJPAQuery<X> setParameter(int position, Date value, TemporalType type) {
         return setParameter(position, convertTemporalType(value, type));
     }
@@ -187,6 +190,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
     /**
      * Affirms if declared parameters use position identifier.
      */
+    @Override
     public boolean hasPositionalParameters() {
         return !getDeclaredParameterKeys(Integer.class).isEmpty();
     }
@@ -197,6 +201,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * from the value being actually null. If the parameter indexing is not contiguous then the unspecified parameters
      * are considered as null.
      */
+    @Override
     public Object[] getPositionalParameters() {
         lock();
         try {
@@ -228,6 +233,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * Binds the given values as positional parameters. The n-th array element value is set to a Parameter with (n+1)-th
      * positional identifier.
      */
+    @Override
     public OpenJPAQuery<X> setParameters(Object... params) {
         assertOpen();
         _em.assertNotCloseInvoked();
@@ -254,10 +260,11 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * If a parameter has been declared but not bound to a value then the value is null and hence is indistinguishable
      * from the value being actually null.
      */
+    @Override
     public Map<String, Object> getNamedParameters() {
         lock();
         try {
-            Map<String, Object> result = new HashMap<String, Object>();
+            Map<String, Object> result = new HashMap<>();
             Set<String> namedKeys = getDeclaredParameterKeys(String.class);
             for (String name : namedKeys) {
                 Parameter<?> param = getParameter(name);
@@ -273,6 +280,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * Sets the values of the parameters from the given Map. The keys of the given map designate the name of the
      * declared parameter.
      */
+    @Override
     public OpenJPAQuery<X> setParameters(Map params) {
         assertOpen();
         _em.assertNotCloseInvoked();
@@ -296,6 +304,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * @throws IllegalStateException
      *             if invoked on a native query
      */
+    @Override
     public <T> Parameter<T> getParameter(String name, Class<T> type) {
         Parameter<?> param = getParameter(name);
         if (param.getParameterType().isAssignableFrom(type))
@@ -311,6 +320,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * @throws IllegalStateException
      *             if invoked on a native query unless the same parameter position is bound already.
      */
+    @Override
     public <T> Parameter<T> getParameter(int pos, Class<T> type) {
         if (_convertPositionalParams == true) {
             return getParameter("_" + String.valueOf(pos), type);
@@ -332,6 +342,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * @throws IllegalArgumentException
      *             if the parameter does not belong to this query
      */
+    @Override
     public <T> T getParameterValue(Parameter<T> p) {
         if (!isBound(p)) {
             throw new IllegalArgumentException(_loc.get("param-missing", p, getQueryString(), getBoundParameterKeys())
@@ -343,12 +354,14 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
     /**
      * Gets the parameters declared in this query.
      */
+    @Override
     public Set<Parameter<?>> getParameters() {
-        Set<Parameter<?>> result = new HashSet<Parameter<?>>();
+        Set<Parameter<?>> result = new HashSet<>();
         result.addAll(getDeclaredParameters().values());
         return result;
     }
 
+    @Override
     public <T> OpenJPAQuery<X> setParameter(Parameter<T> p, T arg1) {
         bindValue(p, arg1);
         if (BindableParameter.class.isInstance(p)) {
@@ -357,10 +370,12 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
         return this;
     }
 
+    @Override
     public OpenJPAQuery<X> setParameter(Parameter<Date> p, Date date, TemporalType type) {
         return setParameter(p, (Date) convertTemporalType(date, type));
     }
 
+    @Override
     public TypedQuery<X> setParameter(Parameter<Calendar> p, Calendar cal, TemporalType type) {
         return setParameter(p, (Calendar) convertTemporalType(cal, type));
     }
@@ -374,6 +389,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * @throws IllegalStateException
      *             if invoked on a native query
      */
+    @Override
     public Parameter<?> getParameter(String name) {
         if (isNative()) {
             throw new IllegalStateException(_loc.get("param-named-non-native", name).getMessage());
@@ -401,6 +417,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * @throws IllegalArgumentException
      *             if the parameter with the given position does not exist
      */
+    @Override
     public Parameter<?> getParameter(int pos) {
         if (_convertPositionalParams == true) {
             return getParameter("_" + String.valueOf(pos));
@@ -422,6 +439,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * @throws IllegalStateException
      *             if this parameter has not been bound
      */
+    @Override
     public Object getParameterValue(String name) {
         return _boundParams.get(getParameter(name));
     }
@@ -436,6 +454,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      * @throws IllegalStateException
      *             if this parameter has not been bound
      */
+    @Override
     public Object getParameterValue(int pos) {
         Parameter<?> param = getParameter(pos);
         assertBound(param);
@@ -450,7 +469,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
         if (_boundParams == null)
             return Collections.EMPTY_SET;
         getDeclaredParameters();
-        Set<Object> result = new HashSet<Object>();
+        Set<Object> result = new HashSet<>();
         for (Map.Entry<Object, Parameter<?>> entry : _declaredParams.entrySet()) {
             if (isBound(entry.getValue())) {
                 result.add(entry.getKey());
@@ -470,7 +489,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
     }
 
     public <T> Set<T> getDeclaredParameterKeys(Class<T> keyType) {
-        Set<T> result = new HashSet<T>();
+        Set<T> result = new HashSet<>();
         for (Object key : getDeclaredParameterKeys()) {
             if (keyType.isInstance(key))
                 result.add((T) key);
@@ -494,7 +513,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      */
     public Map<Object, Parameter<?>> getDeclaredParameters() {
         if (_declaredParams == null) {
-            _declaredParams = new HashMap<Object, Parameter<?>>();
+            _declaredParams = new HashMap<>();
 
             OrderedMap<Object, Class<?>> paramTypes = null;
             // Check to see if we have a cached version of the paramTypes in QueryMetaData.
@@ -540,7 +559,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
      */
     public void declareParameter(Object key, Parameter<?> param) {
         if (_declaredParams == null) {
-            _declaredParams = new HashMap<Object, Parameter<?>>();
+            _declaredParams = new HashMap<>();
         }
         _declaredParams.put(key, param);
     }
@@ -548,6 +567,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
     /**
      * Affirms if the given parameter is bound to a value for this query.
      */
+    @Override
     public boolean isBound(Parameter<?> param) {
         return _boundParams != null && _boundParams.containsKey(param);
     }
@@ -567,10 +587,12 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
         _boundParams.put(param, bindVal);
     }
 
+    @Override
     public OpenJPAQuery<X> setParameter(String name, Calendar value, TemporalType type) {
         return setParameter(name, convertTemporalType(value, type));
     }
 
+    @Override
     public OpenJPAQuery<X> setParameter(String name, Date value, TemporalType type) {
         return setParameter(name, convertTemporalType(value, type));
     }
@@ -578,6 +600,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
     /**
      * Sets the parameter of the given name to the given value.
      */
+    @Override
     public OpenJPAQuery<X> setParameter(String name, Object value) {
         assertOpen();
         _em.assertNotCloseInvoked();
@@ -637,6 +660,7 @@ public abstract class AbstractQuery<X> implements OpenJPAQuerySPI<X> {
         return _relaxBindParameterTypeChecking;
     }
 
+    @Override
     public void setRelaxBindParameterTypeChecking(Object value) {
         if (value != null) {
             if (value instanceof String) {
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java
index 53a3d06d2..3a91b64dc 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java
@@ -18,15 +18,15 @@
  */
 package org.apache.openjpa.persistence;
 
-import org.apache.openjpa.lib.util.ClassUtil;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.EnumSet;
 import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Objects;
 
+import org.apache.openjpa.lib.util.ClassUtil;
+
 /**
  * Helper class to stringify annotation declarations.
  *
@@ -37,7 +37,7 @@ public class AnnotationBuilder {
 
     private Class<? extends Annotation> type;
     private List<AnnotationEntry> components =
-        new ArrayList<AnnotationEntry>();
+        new ArrayList<>();
 
     protected AnnotationBuilder(Class<? extends Annotation> type) {
         this.type = type;
@@ -83,7 +83,7 @@ public class AnnotationBuilder {
             if (ae.value instanceof List) {
                 list = (List<AnnotationBuilder>) ae.value;
             } else if (ae.value instanceof AnnotationBuilder) {
-                list = new ArrayList<AnnotationBuilder> ();
+                list = new ArrayList<> ();
                 list.add((AnnotationBuilder) ae.value);
                 ae.value = list;
             } else {
@@ -148,6 +148,7 @@ public class AnnotationBuilder {
         sb.append(")");
     }
 
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         toString(sb);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
index 574d67adf..7fb17c142 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
@@ -140,7 +140,6 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.StoredProcedureParameter;
 import javax.persistence.Version;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.event.BeanLifecycleCallbacks;
 import org.apache.openjpa.event.LifecycleCallbacks;
@@ -153,6 +152,7 @@ import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.DelegatingMetaDataFactory;
@@ -190,7 +190,7 @@ public class AnnotationPersistenceMetaDataParser
         (AnnotationPersistenceMetaDataParser.class);
 
     private static final Map<Class<?>, MetaDataTag> _tags =
-        new HashMap<Class<?>, MetaDataTag>();
+        new HashMap<>();
 
     static {
         _tags.put(Access.class, ACCESS);
@@ -252,11 +252,11 @@ public class AnnotationPersistenceMetaDataParser
     private int _mode = MODE_NONE;
 
     // packages and their parse modes
-    private final Map<Package, Integer> _pkgs = new HashMap<Package, Integer>();
+    private final Map<Package, Integer> _pkgs = new HashMap<>();
 
     // the class we were invoked to parse
     protected Class<?> _cls = null;
-    protected Stack<Class<?>> _stack = new Stack<Class<?>>();
+    protected Stack<Class<?>> _stack = new Stack<>();
     private File _file = null;
 
     /**
@@ -949,7 +949,7 @@ public class AnnotationPersistenceMetaDataParser
         for (Class<?> cls : classes) {
             if (!_conf.getCallbackOptionsInstance().getAllowsDuplicateListener()) {
                 if (listenerColl == null)
-                    listenerColl = new ArrayList<Class<?>>();
+                    listenerColl = new ArrayList<>();
                 if (listenerColl.contains(cls))
                     continue;
                 listenerColl.add(cls);
@@ -977,13 +977,13 @@ public class AnnotationPersistenceMetaDataParser
             throw new IllegalArgumentException("cls cannot be null");
 
         // first sort / filter based on inheritance
-        Set<Method> methods = new TreeSet<Method>(MethodComparator.
+        Set<Method> methods = new TreeSet<>(MethodComparator.
             getInstance());
 
         int mods;
         Class<?> sup = cls;
         MethodKey key;
-        Set<MethodKey> seen = new HashSet<MethodKey>();
+        Set<MethodKey> seen = new HashSet<>();
         do {
             for (Method m : (Method[]) AccessController.doPrivileged(
                 J2DoPrivHelper.getDeclaredMethodsAction(sup))) {
@@ -1020,7 +1020,7 @@ public class AnnotationPersistenceMetaDataParser
                 for (int i = 0; i < events.length; i++) {
                     int e = events[i];
                     if (callbacks[e] == null)
-                        callbacks[e] = new ArrayList<LifecycleCallbacks>(3);
+                        callbacks[e] = new ArrayList<>(3);
                     MetaDataParsers.validateMethodsForSameCallback(cls,
                         callbacks[e], m, tag, conf, repos.getLog());
                     if (listener) {
@@ -2009,6 +2009,7 @@ public class AnnotationPersistenceMetaDataParser
             _method = m;
         }
 
+        @Override
         public int hashCode() {
             int code = 46 * 12 + _method.getName().hashCode();
             for (Class<?> param : _method.getParameterTypes())
@@ -2016,6 +2017,7 @@ public class AnnotationPersistenceMetaDataParser
             return code;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof MethodKey))
                 return false;
@@ -2037,6 +2039,7 @@ public class AnnotationPersistenceMetaDataParser
             return INSTANCE;
         }
 
+        @Override
         public int compare(Method m1, Method m2) {
             Class<?> c1 = m1.getDeclaringClass();
             Class<?> c2 = m2.getDeclaringClass();
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java
index dc85955d2..ea2fcabf8 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java
@@ -38,10 +38,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Map.Entry;
 
 import javax.persistence.AttributeOverride;
 import javax.persistence.Basic;
@@ -174,6 +174,7 @@ public class AnnotationPersistenceMetaDataSerializer
      * The serialization mode according to the expected document type. The
      * mode constants act as bit flags, and therefore can be combined.
      */
+    @Override
     public void setMode(int mode) {
         _mode = mode;
     }
@@ -234,18 +235,20 @@ public class AnnotationPersistenceMetaDataSerializer
     /**
      * Add a class meta data to the set to be serialized.
      */
+    @Override
     public void addMetaData(ClassMetaData meta) {
         if (meta == null)
             return;
 
         if (_metas == null)
-            _metas = new HashMap<String, ClassMetaData>();
+            _metas = new HashMap<>();
         _metas.put(meta.getDescribedType().getName(), meta);
     }
 
     /**
      * Add a sequence meta data to the set to be serialized.
      */
+    @Override
     public void addSequenceMetaData(SequenceMetaData meta) {
         if (meta == null)
             return;
@@ -255,7 +258,7 @@ public class AnnotationPersistenceMetaDataSerializer
         if (meta.getSourceScope() instanceof Class)
             defName = ((Class) meta.getSourceScope()).getName();
         if (_seqs == null)
-            _seqs = new HashMap<String, List>();
+            _seqs = new HashMap<>();
         else
             seqs = _seqs.get(defName);
 
@@ -270,6 +273,7 @@ public class AnnotationPersistenceMetaDataSerializer
     /**
      * Add a query meta data to the set to be serialized.
      */
+    @Override
     public void addQueryMetaData(QueryMetaData meta) {
         if (meta == null)
             return;
@@ -279,7 +283,7 @@ public class AnnotationPersistenceMetaDataSerializer
         if (meta.getSourceScope() instanceof Class)
             defName = ((Class) meta.getSourceScope()).getName();
         if (_queries == null)
-            _queries = new HashMap<String, List>();
+            _queries = new HashMap<>();
         else
             queries = _queries.get(defName);
 
@@ -294,6 +298,7 @@ public class AnnotationPersistenceMetaDataSerializer
     /**
      * Add all components in the given repository to the set to be serialized.
      */
+    @Override
     public void addAll(MetaDataRepository repos) {
         if (repos == null)
             return;
@@ -311,6 +316,7 @@ public class AnnotationPersistenceMetaDataSerializer
      *
      * @return true if removed, false if not in set
      */
+    @Override
     public boolean removeMetaData(ClassMetaData meta) {
         return _metas != null && meta != null
             && _metas.remove(meta.getDescribedType().getName()) != null;
@@ -476,10 +482,10 @@ public class AnnotationPersistenceMetaDataSerializer
      */
     protected void addAnnotation(AnnotationBuilder ab, ClassMetaData meta) {
         if (_clsAnnos == null)
-            _clsAnnos = new HashMap<ClassMetaData, List<AnnotationBuilder>>();
+            _clsAnnos = new HashMap<>();
         List<AnnotationBuilder> list = _clsAnnos.get(meta);
         if (list == null) {
-            list = new ArrayList<AnnotationBuilder>();
+            list = new ArrayList<>();
             _clsAnnos.put(meta, list);
         }
         list.add(ab);
@@ -491,10 +497,10 @@ public class AnnotationPersistenceMetaDataSerializer
      */
     protected void addAnnotation(AnnotationBuilder ab, FieldMetaData meta) {
         if (_fldAnnos == null)
-            _fldAnnos = new HashMap<FieldMetaData, List<AnnotationBuilder>>();
+            _fldAnnos = new HashMap<>();
         List<AnnotationBuilder> list = _fldAnnos.get(meta);
         if (list == null) {
-            list = new ArrayList<AnnotationBuilder>();
+            list = new ArrayList<>();
             _fldAnnos.put(meta, list);
         }
         list.add(ab);
@@ -506,11 +512,10 @@ public class AnnotationPersistenceMetaDataSerializer
      */
     protected void addAnnotation(AnnotationBuilder ab, SequenceMetaData meta) {
         if (_seqAnnos == null)
-            _seqAnnos = new HashMap<SequenceMetaData,
-                    List<AnnotationBuilder>>();
+            _seqAnnos = new HashMap<>();
         List<AnnotationBuilder> list = _seqAnnos.get(meta);
         if (list == null) {
-            list = new ArrayList<AnnotationBuilder>();
+            list = new ArrayList<>();
             _seqAnnos.put(meta, list);
         }
         list.add(ab);
@@ -522,10 +527,10 @@ public class AnnotationPersistenceMetaDataSerializer
      */
     protected void addAnnotation(AnnotationBuilder ab, QueryMetaData meta) {
         if (_qryAnnos == null)
-            _qryAnnos = new HashMap<QueryMetaData, List<AnnotationBuilder>>();
+            _qryAnnos = new HashMap<>();
         List<AnnotationBuilder> list = _qryAnnos.get(meta);
         if (list == null) {
-            list = new ArrayList<AnnotationBuilder>();
+            list = new ArrayList<>();
             _qryAnnos.put(meta, list);
         }
         list.add(ab);
@@ -1051,7 +1056,7 @@ public class AnnotationPersistenceMetaDataSerializer
      * Return the serialized strategy name.
      */
     protected PersistenceStrategy getStrategy(FieldMetaData fmd) {
-        if (fmd.getManagement() == fmd.MANAGE_NONE)
+        if (fmd.getManagement() == FieldMetaData.MANAGE_NONE)
             return PersistenceStrategy.TRANSIENT;
 
         if (fmd.isSerialized()
@@ -1200,12 +1205,13 @@ public class AnnotationPersistenceMetaDataSerializer
 
     protected void writeAnnotations(Object meta,
         List<AnnotationBuilder> builders, Map output) {
-        List<String> annos = new ArrayList<String>();
+        List<String> annos = new ArrayList<>();
         for(AnnotationBuilder ab: builders)
             annos.add(ab.toString());
         output.put(meta, annos);
     }
 
+    @Override
     public void serialize(Map output, int flags) throws IOException {
         Collection all = getObjects();
         serialize(all);
@@ -1224,6 +1230,7 @@ public class AnnotationPersistenceMetaDataSerializer
                 writeAnnotations(meta, _qryAnnos.get(meta), output);
     }
 
+    @Override
     public void serialize(File file, int flags) throws IOException {
         try {
             FileWriter out = new FileWriter(AccessController
@@ -1236,6 +1243,7 @@ public class AnnotationPersistenceMetaDataSerializer
         }
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public void serialize(Writer out, int flags) throws IOException {
         Map output = new HashMap();
@@ -1256,6 +1264,7 @@ public class AnnotationPersistenceMetaDataSerializer
         }
     }
 
+    @Override
     public void serialize(int flags) throws IOException {
         throw new UnsupportedOperationException();
     }
@@ -1290,34 +1299,42 @@ public class AnnotationPersistenceMetaDataSerializer
         /**
          * Compare sequence metadata on name.
          */
+        @Override
         public int compare(SequenceMetaData o1, SequenceMetaData o2) {
             return o1.getName().compareTo(o2.getName());
         }
 
+        @Override
         public File getSourceFile() {
             return _seqs[0].getSourceFile();
         }
 
+        @Override
         public Object getSourceScope() {
             return _seqs[0].getSourceScope();
         }
 
+        @Override
         public int getSourceType() {
             return _seqs[0].getSourceType();
         }
 
+        @Override
         public String getResourceName() {
             return _seqs[0].getResourceName();
         }
 
+        @Override
         public int getLineNumber() {
             return _seqs[0].getLineNumber();
         }
 
+        @Override
         public int getColNumber() {
             return _seqs[0].getColNumber();
         }
 
+        @Override
         public int compareTo(ClassSeqs other) {
             if (other == this)
                 return 0;
@@ -1360,6 +1377,7 @@ public class AnnotationPersistenceMetaDataSerializer
          * If the given queries use same language, then their names are
          * compared.
          */
+        @Override
         public int compare(QueryMetaData o1, QueryMetaData o2) {
             // normal queries before native
             if (!Objects.equals(o1.getLanguage(), o2.getLanguage())) {
@@ -1371,30 +1389,37 @@ public class AnnotationPersistenceMetaDataSerializer
             return o1.getName().compareTo(o2.getName());
         }
 
+        @Override
         public File getSourceFile() {
             return _queries[0].getSourceFile();
         }
 
+        @Override
         public Object getSourceScope() {
             return _queries[0].getSourceScope();
         }
 
+        @Override
         public int getSourceType() {
             return _queries[0].getSourceType();
         }
 
+        @Override
         public String getResourceName() {
             return _queries[0].getResourceName();
         }
 
+        @Override
         public int getLineNumber() {
             return _queries[0].getLineNumber();
         }
 
+        @Override
         public int getColNumber() {
             return _queries[0].getColNumber();
         }
 
+        @Override
         public int compareTo(ClassQueries other) {
             if (other == this)
                 return 0;
@@ -1418,6 +1443,10 @@ public class AnnotationPersistenceMetaDataSerializer
     protected class SerializationComparator
         extends MetaDataInheritanceComparator {
 
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         public int compare(Object o1, Object o2) {
             if (o1 == o2)
                 return 0;
@@ -1510,6 +1539,7 @@ public class AnnotationPersistenceMetaDataSerializer
     private class FieldComparator
         implements Comparator {
 
+        @Override
         public int compare(Object o1, Object o2) {
             FieldMetaData fmd1 = (FieldMetaData) o1;
             FieldMetaData fmd2 = (FieldMetaData) o2;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
index dd4572cbc..7faf3e108 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
@@ -33,7 +33,6 @@ import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.DelegatingMetaDataFactory;
 import org.apache.openjpa.meta.MetaDataFactory;
 import org.apache.openjpa.meta.MetaDataRepository;
-import org.apache.openjpa.meta.XMLFieldMetaData;
 import org.apache.openjpa.meta.XMLMetaData;
 
 /**
@@ -256,7 +255,7 @@ public class AnnotationPersistenceXMLMetaDataParser {
                 else if (el.getAnnotation(xmlAttributeClass) != null) {
                     field = _repos.newXMLFieldMetaData(((Field) member)
                         .getType(), member.getName());
-                    field.setXmltype(XMLFieldMetaData.ATTRIBUTE);
+                    field.setXmltype(XMLMetaData.ATTRIBUTE);
                     String xmlname = (String) xmlAttributeName.invoke(
                         el.getAnnotation(xmlAttributeClass), new Object[]{});
                     // avoid JAXB XML bind default name
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ArgumentException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ArgumentException.java
index 93705b1c9..acd537889 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ArgumentException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ArgumentException.java
@@ -25,11 +25,10 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Serializable;
 
+import org.apache.openjpa.lib.util.Localizer.Message;
 import org.apache.openjpa.util.ExceptionInfo;
 import org.apache.openjpa.util.Exceptions;
 
-import org.apache.openjpa.lib.util.Localizer.Message;
-
 /**
  * Extended {@link IllegalArgumentException}.
  *
@@ -40,6 +39,8 @@ public class ArgumentException
     extends IllegalArgumentException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -57,43 +58,53 @@ public class ArgumentException
         this(msg.getMessage(), nested, failed, fatal);
     }
 
+    @Override
     public int getType() {
         return USER;
     }
 
+    @Override
     public int getSubtype() {
         return 0;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataCache.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataCache.java
index 9cea59b5a..7f52626f8 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataCache.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataCache.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java
index 0c6e237c4..e7aebc4d5 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DataStoreId.java
@@ -19,9 +19,11 @@
 package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import javax.persistence.GenerationType;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Dependent.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Dependent.java
index da6b3736f..968010156 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Dependent.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Dependent.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DetachedState.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DetachedState.java
index bd308283a..a60ef6ce0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DetachedState.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/DetachedState.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementDependent.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementDependent.java
index 9d655bf54..a129e8593 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementDependent.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementDependent.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementType.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementType.java
index c4f94b522..7d4d7783a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementType.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ElementType.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java
index 640df7d47..857491a42 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityExistsException.java
@@ -39,6 +39,8 @@ public class EntityExistsException
     extends javax.persistence.EntityExistsException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -51,43 +53,53 @@ public class EntityExistsException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return STORE;
     }
 
+    @Override
     public int getSubtype() {
         return StoreException.OBJECT_EXISTS;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
index 4e180d825..4dd97283d 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
@@ -25,10 +25,14 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.Cache;
+import javax.persistence.EntityGraph;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnitUtil;
+import javax.persistence.Query;
+import javax.persistence.SynchronizationType;
 import javax.persistence.spi.LoadState;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.kernel.AutoDetach;
 import org.apache.openjpa.kernel.Broker;
@@ -41,6 +45,8 @@ import org.apache.openjpa.lib.conf.Value;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Closeable;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
+import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.QueryMetaData;
 import org.apache.openjpa.persistence.criteria.CriteriaBuilderImpl;
@@ -55,11 +61,12 @@ import org.apache.openjpa.persistence.query.QueryBuilderImpl;
  *
  * @author Marc Prud'hommeaux
  */
-@SuppressWarnings("serial")
 public class EntityManagerFactoryImpl
     implements OpenJPAEntityManagerFactory, OpenJPAEntityManagerFactorySPI,
     Closeable, PersistenceUnitUtil {
 
+    private static final long serialVersionUID = 1L;
+
     private static final Localizer _loc = Localizer.forPackage
         (EntityManagerFactoryImpl.class);
 
@@ -97,10 +104,12 @@ public class EntityManagerFactoryImpl
             PersistenceExceptions.TRANSLATOR);
     }
 
+    @Override
     public OpenJPAConfiguration getConfiguration() {
         return _factory.getConfiguration();
     }
 
+    @Override
     public Map<String,Object> getProperties() {
         Map<String,Object> props = _factory.getProperties();
         // convert to user readable values
@@ -108,14 +117,17 @@ public class EntityManagerFactoryImpl
         return props;
     }
 
+    @Override
     public Object putUserObject(Object key, Object val) {
         return _factory.putUserObject(key, val);
     }
 
+    @Override
     public Object getUserObject(Object key) {
         return _factory.getUserObject(key);
     }
 
+    @Override
     public StoreCache getStoreCache() {
         _factory.lock();
         try {
@@ -130,11 +142,13 @@ public class EntityManagerFactoryImpl
         }
     }
 
+    @Override
     public StoreCache getStoreCache(String cacheName) {
         return new StoreCacheImpl(this, _factory.getConfiguration().
             getDataCacheManagerInstance().getDataCache(cacheName, true));
     }
 
+    @Override
     public QueryResultCache getQueryResultCache() {
         _factory.lock();
         try {
@@ -148,6 +162,7 @@ public class EntityManagerFactoryImpl
         }
     }
 
+    @Override
     public OpenJPAEntityManagerSPI createEntityManager() {
         return createEntityManager((Map) null);
     }
@@ -170,6 +185,7 @@ public class EntityManagerFactoryImpl
      *
      * @return list of exceptions raised or empty list.
      */
+    @Override
     public OpenJPAEntityManagerSPI createEntityManager(SynchronizationType synchronizationType, Map props) {
         if (synchronizationType == null) {
             throw new NullPointerException("SynchronizationType must not be null");
@@ -270,22 +286,27 @@ public class EntityManagerFactoryImpl
         return new EntityManagerImpl(this, broker);
     }
 
+    @Override
     public void addLifecycleListener(Object listener, Class... classes) {
         _factory.addLifecycleListener(listener, classes);
     }
 
+    @Override
     public void removeLifecycleListener(Object listener) {
         _factory.removeLifecycleListener(listener);
     }
 
+    @Override
     public void addTransactionListener(Object listener) {
         _factory.addTransactionListener(listener);
     }
 
+    @Override
     public void removeTransactionListener(Object listener) {
         _factory.removeTransactionListener(listener);
     }
 
+    @Override
     public void close() {
         Log log = _factory.getConfiguration().getLog(OpenJPAConfiguration.LOG_RUNTIME);
         if (log.isTraceEnabled()) {
@@ -294,14 +315,17 @@ public class EntityManagerFactoryImpl
         _factory.close();
     }
 
+    @Override
     public boolean isOpen() {
         return !_factory.isClosed();
     }
 
+    @Override
     public int hashCode() {
         return (_factory == null) ? 0 : _factory.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -343,33 +367,39 @@ public class EntityManagerFactoryImpl
         }
 	}
 
+    @Override
     public Cache getCache() {
         _factory.assertOpen();
         return getStoreCache();
     }
 
+    @Override
     public OpenJPACriteriaBuilder getCriteriaBuilder() {
         return new CriteriaBuilderImpl().setMetaModel(getMetamodel());
     }
 
+    @Override
     public OpenJPAQueryBuilder getDynamicQueryBuilder() {
         return new QueryBuilderImpl(this);
     }
 
+    @Override
     public Set<String> getSupportedProperties() {
         return _factory.getSupportedProperties();
     }
 
+    @Override
     public MetamodelImpl getMetamodel() {
         if (_metaModel == null) {
             MetaDataRepository mdr = getConfiguration().getMetaDataRepositoryInstance();
             mdr.setValidate(MetaDataRepository.VALIDATE_RUNTIME, true);
-            mdr.setResolve(MetaDataRepository.MODE_MAPPING_INIT, true);
+            mdr.setResolve(MetaDataModes.MODE_MAPPING_INIT, true);
             _metaModel = new MetamodelImpl(mdr);
         }
         return _metaModel;
     }
 
+    @Override
     public PersistenceUnitUtil getPersistenceUnitUtil() {
         return this;
     }
@@ -400,14 +430,17 @@ public class EntityManagerFactoryImpl
      * Get the identifier for the specified entity.  If not managed by any
      * of the em's in this PU or not persistence capable, return null.
      */
+    @Override
     public Object getIdentifier(Object entity) {
         return OpenJPAPersistenceUtil.getIdentifier(this, entity);
     }
 
+    @Override
     public boolean isLoaded(Object entity) {
         return isLoaded(entity, null);
     }
 
+    @Override
     public boolean isLoaded(Object entity, String attribute) {
         if (entity == null) {
             return false;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryValue.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryValue.java
index a05f055c8..5a25faa90 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryValue.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryValue.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openjpa.persistence;
 
+import javax.persistence.EntityManagerFactory;
+
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.kernel.BrokerFactory;
 import org.apache.openjpa.lib.conf.PluginValue;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
index d25133205..35606f0e1 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
@@ -88,7 +88,6 @@ import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.MultiQueryMetaData;
 import org.apache.openjpa.meta.QueryMetaData;
 import org.apache.openjpa.meta.SequenceMetaData;
-import org.apache.openjpa.persistence.criteria.CriteriaBuilderImpl;
 import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;
 import org.apache.openjpa.persistence.criteria.OpenJPACriteriaQuery;
 import org.apache.openjpa.persistence.validation.ValidationUtils;
@@ -119,7 +118,7 @@ public class EntityManagerImpl
 
     private DelegatingBroker _broker;
     private EntityManagerFactoryImpl _emf;
-    private Map<FetchConfiguration,FetchPlan> _plans = new IdentityHashMap<FetchConfiguration,FetchPlan>(1);
+    private Map<FetchConfiguration,FetchPlan> _plans = new IdentityHashMap<>(1);
     protected RuntimeExceptionTranslator _ret = PersistenceExceptions.getRollbackTranslator(this);
     private boolean _convertPositionalParams = false;
     private boolean _isJoinedToTransaction;
@@ -151,14 +150,17 @@ public class EntityManagerImpl
         return _broker.getDelegate();
     }
 
+    @Override
     public OpenJPAEntityManagerFactory getEntityManagerFactory() {
         return _emf;
     }
 
+    @Override
     public OpenJPAConfiguration getConfiguration() {
         return _broker.getConfiguration();
     }
 
+    @Override
     public FetchPlan getFetchPlan() {
         assertNotCloseInvoked();
         _broker.lock();
@@ -175,6 +177,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public FetchPlan pushFetchPlan() {
 		return pushFetchPlan(null);
     }
@@ -190,6 +193,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public void popFetchPlan() {
         assertNotCloseInvoked();
         _broker.lock();
@@ -201,284 +205,345 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public ConnectionRetainMode getConnectionRetainMode() {
         return ConnectionRetainMode.fromKernelConstant(
             _broker.getConnectionRetainMode());
     }
 
+    @Override
     public boolean isTransactionManaged() {
         return _broker.isManaged();
     }
 
+    @Override
     public boolean isManaged() {
         return _broker.isManaged();
     }
 
+    @Override
     public ManagedRuntime getManagedRuntime() {
         return _broker.getManagedRuntime();
     }
 
+    @Override
     public boolean getSyncWithManagedTransactions() {
         return _broker.getSyncWithManagedTransactions();
     }
 
+    @Override
     public void setSyncWithManagedTransactions(boolean sync) {
         assertNotCloseInvoked();
         _broker.setSyncWithManagedTransactions(sync);
     }
 
+    @Override
     public ClassLoader getClassLoader() {
         return _broker.getClassLoader();
     }
 
+    @Override
     public String getConnectionUserName() {
         return _broker.getConnectionUserName();
     }
 
+    @Override
     public String getConnectionPassword() {
         return _broker.getConnectionPassword();
     }
 
+    @Override
     public boolean getMultithreaded() {
         return _broker.getMultithreaded();
     }
 
+    @Override
     public void setMultithreaded(boolean multithreaded) {
         assertNotCloseInvoked();
         _broker.setMultithreaded(multithreaded);
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         return _broker.getIgnoreChanges();
     }
 
+    @Override
     public void setIgnoreChanges(boolean val) {
         assertNotCloseInvoked();
         _broker.setIgnoreChanges(val);
     }
 
+    @Override
     public boolean getNontransactionalRead() {
         return _broker.getNontransactionalRead();
     }
 
+    @Override
     public void setNontransactionalRead(boolean val) {
         assertNotCloseInvoked();
         _broker.setNontransactionalRead(val);
     }
 
+    @Override
     public boolean getNontransactionalWrite() {
         return _broker.getNontransactionalWrite();
     }
 
+    @Override
     public void setNontransactionalWrite(boolean val) {
         assertNotCloseInvoked();
         _broker.setNontransactionalWrite(val);
     }
 
+    @Override
     public boolean getOptimistic() {
         return _broker.getOptimistic();
     }
 
+    @Override
     public void setOptimistic(boolean val) {
         assertNotCloseInvoked();
         _broker.setOptimistic(val);
     }
 
+    @Override
     public RestoreStateType getRestoreState() {
         return RestoreStateType.fromKernelConstant(_broker.getRestoreState());
     }
 
+    @Override
     public void setRestoreState(RestoreStateType val) {
         assertNotCloseInvoked();
         _broker.setRestoreState(val.toKernelConstant());
     }
 
+    @Override
     public void setRestoreState(int restore) {
         assertNotCloseInvoked();
         _broker.setRestoreState(restore);
     }
 
+    @Override
     public boolean getRetainState() {
         return _broker.getRetainState();
     }
 
+    @Override
     public void setRetainState(boolean val) {
         assertNotCloseInvoked();
         _broker.setRetainState(val);
     }
 
+    @Override
     public AutoClearType getAutoClear() {
         return AutoClearType.fromKernelConstant(_broker.getAutoClear());
     }
 
+    @Override
     public void setAutoClear(AutoClearType val) {
         assertNotCloseInvoked();
         _broker.setAutoClear(val.toKernelConstant());
     }
 
+    @Override
     public void setAutoClear(int autoClear) {
         assertNotCloseInvoked();
         _broker.setAutoClear(autoClear);
     }
 
+    @Override
     public DetachStateType getDetachState() {
         return DetachStateType.fromKernelConstant(_broker.getDetachState());
     }
 
+    @Override
     public void setDetachState(DetachStateType type) {
         assertNotCloseInvoked();
         _broker.setDetachState(type.toKernelConstant());
     }
 
+    @Override
     public void setDetachState(int detach) {
         assertNotCloseInvoked();
         _broker.setDetachState(detach);
     }
 
+    @Override
     public EnumSet<AutoDetachType> getAutoDetach() {
         return AutoDetachType.toEnumSet(_broker.getAutoDetach());
     }
 
+    @Override
     public void setAutoDetach(AutoDetachType flag) {
         assertNotCloseInvoked();
         _broker.setAutoDetach(AutoDetachType.fromEnumSet(EnumSet.of(flag)));
     }
 
+    @Override
     public void setAutoDetach(EnumSet<AutoDetachType> flags) {
         assertNotCloseInvoked();
         _broker.setAutoDetach(AutoDetachType.fromEnumSet(flags));
     }
 
+    @Override
     public void setAutoDetach(int autoDetachFlags) {
         assertNotCloseInvoked();
         _broker.setAutoDetach(autoDetachFlags);
     }
 
+    @Override
     public void setAutoDetach(AutoDetachType value, boolean on) {
         assertNotCloseInvoked();
         _broker.setAutoDetach(AutoDetachType.fromEnumSet(EnumSet.of(value)),on);
     }
 
+    @Override
     public void setAutoDetach(int flag, boolean on) {
         assertNotCloseInvoked();
         _broker.setAutoDetach(flag, on);
     }
 
+    @Override
     public boolean getEvictFromStoreCache() {
         return _broker.getEvictFromDataCache();
     }
 
+    @Override
     public void setEvictFromStoreCache(boolean evict) {
         assertNotCloseInvoked();
         _broker.setEvictFromDataCache(evict);
     }
 
+    @Override
     public boolean getPopulateStoreCache() {
         return _broker.getPopulateDataCache();
     }
 
+    @Override
     public void setPopulateStoreCache(boolean cache) {
         assertNotCloseInvoked();
         _broker.setPopulateDataCache(cache);
     }
 
+    @Override
     public boolean isTrackChangesByType() {
         return _broker.isTrackChangesByType();
     }
 
+    @Override
     public void setTrackChangesByType(boolean trackByType) {
         assertNotCloseInvoked();
         _broker.setTrackChangesByType(trackByType);
     }
 
+    @Override
     public boolean isLargeTransaction() {
         return isTrackChangesByType();
     }
 
+    @Override
     public void setLargeTransaction(boolean value) {
         setTrackChangesByType(value);
     }
 
+    @Override
     public Object getUserObject(Object key) {
         return _broker.getUserObject(key);
     }
 
+    @Override
     public Object putUserObject(Object key, Object val) {
         assertNotCloseInvoked();
         return _broker.putUserObject(key, val);
     }
 
+    @Override
     public void addTransactionListener(Object listener) {
         assertNotCloseInvoked();
         _broker.addTransactionListener(listener);
     }
 
+    @Override
     public void removeTransactionListener(Object listener) {
         assertNotCloseInvoked();
         _broker.removeTransactionListener(listener);
     }
 
+    @Override
     public EnumSet<CallbackMode> getTransactionListenerCallbackModes() {
         return CallbackMode.toEnumSet(
             _broker.getTransactionListenerCallbackMode());
     }
 
+    @Override
     public void setTransactionListenerCallbackMode(CallbackMode mode) {
         assertNotCloseInvoked();
         _broker.setTransactionListenerCallbackMode(
             CallbackMode.fromEnumSet(EnumSet.of(mode)));
     }
 
+    @Override
     public void setTransactionListenerCallbackMode(EnumSet<CallbackMode> modes){
         assertNotCloseInvoked();
         _broker.setTransactionListenerCallbackMode(
             CallbackMode.fromEnumSet(modes));
     }
 
+    @Override
     public int getTransactionListenerCallbackMode() {
         return _broker.getTransactionListenerCallbackMode();
     }
 
+    @Override
     public void setTransactionListenerCallbackMode(int callbackMode) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void addLifecycleListener(Object listener, Class... classes) {
         assertNotCloseInvoked();
         _broker.addLifecycleListener(listener, classes);
     }
 
+    @Override
     public void removeLifecycleListener(Object listener) {
         assertNotCloseInvoked();
         _broker.removeLifecycleListener(listener);
     }
 
+    @Override
     public EnumSet<CallbackMode> getLifecycleListenerCallbackModes() {
         return CallbackMode.toEnumSet(
             _broker.getLifecycleListenerCallbackMode());
     }
 
+    @Override
     public void setLifecycleListenerCallbackMode(CallbackMode mode) {
         assertNotCloseInvoked();
         _broker.setLifecycleListenerCallbackMode(
             CallbackMode.fromEnumSet(EnumSet.of(mode)));
     }
 
+    @Override
     public void setLifecycleListenerCallbackMode(EnumSet<CallbackMode> modes) {
         assertNotCloseInvoked();
         _broker.setLifecycleListenerCallbackMode(
             CallbackMode.fromEnumSet(modes));
     }
 
+    @Override
     public int getLifecycleListenerCallbackMode() {
         return _broker.getLifecycleListenerCallbackMode();
     }
 
+    @Override
     public void setLifecycleListenerCallbackMode(int callbackMode) {
         assertNotCloseInvoked();
         _broker.setLifecycleListenerCallbackMode(callbackMode);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T getReference(Class<T> cls, Object oid) {
         assertNotCloseInvoked();
@@ -486,6 +551,7 @@ public class EntityManagerImpl
         return (T) _broker.find(oid, false, this);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T find(Class<T> cls, Object oid) {
         assertNotCloseInvoked();
@@ -495,15 +561,18 @@ public class EntityManagerImpl
         return (T) _broker.find(oid, true, this);
     }
 
+    @Override
     public <T> T find(Class<T> cls, Object oid, LockModeType mode) {
         return find(cls, oid, mode, null);
     }
 
+    @Override
     public <T> T find(Class<T> cls, Object oid,
         Map<String, Object> properties){
         return find(cls, oid, null, properties);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T find(Class<T> cls, Object oid, LockModeType mode, Map<String, Object> properties) {
         assertNotCloseInvoked();
@@ -518,6 +587,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T[] findAll(Class<T> cls, Object... oids) {
         if (oids.length == 0)
@@ -526,14 +596,17 @@ public class EntityManagerImpl
         return ret.toArray((T[]) Array.newInstance(cls, ret.size()));
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> Collection<T> findAll(final Class<T> cls, Collection oids) {
         assertNotCloseInvoked();
         Object[] objs = _broker.findAll(oids, true, new FindCallbacks() {
+            @Override
             public Object processArgument(Object oid) {
                 return _broker.newObjectId(cls, oid);
             }
 
+            @Override
             public Object processReturn(Object oid, OpenJPAStateManager sm) {
                 return EntityManagerImpl.this.processReturn(oid, sm);
             }
@@ -541,12 +614,14 @@ public class EntityManagerImpl
         return (Collection<T>) Arrays.asList(objs);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T findCached(Class<T> cls, Object oid) {
         assertNotCloseInvoked();
         return (T) _broker.findCached(_broker.newObjectId(cls, oid), this);
     }
 
+    @Override
     public Class getObjectIdClass(Class cls) {
         assertNotCloseInvoked();
         if (cls == null)
@@ -555,6 +630,7 @@ public class EntityManagerImpl
                 (_broker.getObjectIdType(cls));
     }
 
+    @Override
     public OpenJPAEntityTransaction getTransaction() {
         if (_broker.isManaged())
             throw new InvalidStateException(_loc.get("get-managed-trans"),
@@ -562,6 +638,7 @@ public class EntityManagerImpl
         return this;
     }
 
+    @Override
     public void joinTransaction() {
         if (!_broker.syncWithManagedTransaction()) {
             throw new TransactionRequiredException(_loc.get
@@ -581,10 +658,12 @@ public class EntityManagerImpl
         return isActive() && _isJoinedToTransaction;
     }
 
+    @Override
     public void begin() {
         _broker.begin();
     }
 
+    @Override
     public void commit() {
         try {
             _broker.commit();
@@ -615,18 +694,22 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public void rollback() {
         _broker.rollback();
     }
 
+    @Override
     public void commitAndResume() {
         _broker.commitAndResume();
     }
 
+    @Override
     public void rollbackAndResume() {
         _broker.rollbackAndResume();
     }
 
+    @Override
     public Throwable getRollbackCause() {
         if (!isActive())
             throw new IllegalStateException(_loc.get("no-transaction")
@@ -635,6 +718,7 @@ public class EntityManagerImpl
         return _broker.getRollbackCause();
     }
 
+    @Override
     public boolean getRollbackOnly() {
         if (!isActive())
             throw new IllegalStateException(_loc.get("no-transaction")
@@ -643,39 +727,47 @@ public class EntityManagerImpl
         return _broker.getRollbackOnly();
     }
 
+    @Override
     public void setRollbackOnly() {
         _broker.setRollbackOnly();
     }
 
+    @Override
     public void setRollbackOnly(Throwable cause) {
         _broker.setRollbackOnly(cause);
     }
 
+    @Override
     public void setSavepoint(String name) {
         assertNotCloseInvoked();
         _broker.setSavepoint(name);
     }
 
+    @Override
     public void rollbackToSavepoint() {
         assertNotCloseInvoked();
         _broker.rollbackToSavepoint();
     }
 
+    @Override
     public void rollbackToSavepoint(String name) {
         assertNotCloseInvoked();
         _broker.rollbackToSavepoint(name);
     }
 
+    @Override
     public void releaseSavepoint() {
         assertNotCloseInvoked();
         _broker.releaseSavepoint();
     }
 
+    @Override
     public void releaseSavepoint(String name) {
         assertNotCloseInvoked();
         _broker.releaseSavepoint(name);
     }
 
+    @Override
     public void flush() {
         assertNotCloseInvoked();
         _broker.assertOpen();
@@ -683,28 +775,34 @@ public class EntityManagerImpl
         _broker.flush();
     }
 
+    @Override
     public void preFlush() {
         assertNotCloseInvoked();
         _broker.preFlush();
     }
 
+    @Override
     public void validateChanges() {
         assertNotCloseInvoked();
         _broker.validateChanges();
     }
 
+    @Override
     public boolean isActive() {
         return isOpen() && _broker.isActive();
     }
 
+    @Override
     public boolean isStoreActive() {
         return _broker.isStoreActive();
     }
 
+    @Override
     public void beginStore() {
         _broker.beginStore();
     }
 
+    @Override
     public boolean contains(Object entity) {
         assertNotCloseInvoked();
         if (entity == null)
@@ -717,6 +815,7 @@ public class EntityManagerImpl
         return sm != null && !sm.isDeleted();
     }
 
+    @Override
     public boolean containsAll(Object... entities) {
         for (Object entity : entities)
             if (!contains(entity))
@@ -724,6 +823,7 @@ public class EntityManagerImpl
         return true;
     }
 
+    @Override
     public boolean containsAll(Collection entities) {
         for (Object entity : entities)
             if (!contains(entity))
@@ -731,60 +831,73 @@ public class EntityManagerImpl
         return true;
     }
 
+    @Override
     public void persist(Object entity) {
         assertNotCloseInvoked();
         _broker.persist(entity, this);
     }
 
+    @Override
     public void persistAll(Object... entities) {
         persistAll(Arrays.asList(entities));
     }
 
+    @Override
     public void persistAll(Collection entities) {
         assertNotCloseInvoked();
         _broker.persistAll(entities, this);
     }
 
+    @Override
     public void remove(Object entity) {
         assertNotCloseInvoked();
         _broker.delete(entity, this);
     }
 
+    @Override
     public void removeAll(Object... entities) {
         removeAll(Arrays.asList(entities));
     }
 
+    @Override
     public void removeAll(Collection entities) {
         assertNotCloseInvoked();
         _broker.deleteAll(entities, this);
     }
 
+    @Override
     public void release(Object entity) {
         assertNotCloseInvoked();
         _broker.release(entity, this);
     }
 
+    @Override
     public void releaseAll(Collection entities) {
         assertNotCloseInvoked();
         _broker.releaseAll(entities, this);
     }
 
+    @Override
     public void releaseAll(Object... entities) {
         releaseAll(Arrays.asList(entities));
     }
 
+    @Override
     public void refresh(Object entity) {
         refresh(entity, null, null);
     }
 
+    @Override
     public void refresh(Object entity, LockModeType mode) {
         refresh(entity, mode, null);
     }
 
+    @Override
     public void refresh(Object entity, Map<String, Object> properties) {
         refresh(entity, null, properties);
     }
 
+    @Override
     public void refresh(Object entity, LockModeType mode, Map<String, Object> properties) {
         assertNotCloseInvoked();
         assertValidAttchedEntity(REFRESH, entity);
@@ -803,65 +916,78 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public void refreshAll() {
         assertNotCloseInvoked();
         _broker.assertWriteOperation();
         _broker.refreshAll(_broker.getTransactionalObjects(), this);
     }
 
+    @Override
     public void refreshAll(Collection entities) {
         assertNotCloseInvoked();
         _broker.assertWriteOperation();
         _broker.refreshAll(entities, this);
     }
 
+    @Override
     public void refreshAll(Object... entities) {
         refreshAll(Arrays.asList(entities));
     }
 
+    @Override
     public void retrieve(Object entity) {
         assertNotCloseInvoked();
         _broker.retrieve(entity, true, this);
     }
 
+    @Override
     public void retrieveAll(Collection entities) {
         assertNotCloseInvoked();
         _broker.retrieveAll(entities, true, this);
     }
 
+    @Override
     public void retrieveAll(Object... entities) {
         retrieveAll(Arrays.asList(entities));
     }
 
+    @Override
     public void evict(Object entity) {
         assertNotCloseInvoked();
         _broker.evict(entity, this);
     }
 
+    @Override
     public void evictAll(Collection entities) {
         assertNotCloseInvoked();
         _broker.evictAll(entities, this);
     }
 
+    @Override
     public void evictAll(Object... entities) {
         evictAll(Arrays.asList(entities));
     }
 
+    @Override
     public void evictAll() {
         assertNotCloseInvoked();
         _broker.evictAll(this);
     }
 
+    @Override
     public void evictAll(Class cls) {
         assertNotCloseInvoked();
         _broker.evictAll(_broker.newExtent(cls, true), this);
     }
 
+    @Override
     public void evictAll(Extent extent) {
         assertNotCloseInvoked();
         _broker.evictAll(((ExtentImpl) extent).getDelegate(), this);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T detachCopy(T entity) {
         assertNotCloseInvoked();
@@ -882,63 +1008,75 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public Object[] detachAll(Object... entities) {
         assertNotCloseInvoked();
         return _broker.detachAll(Arrays.asList(entities), this);
     }
 
+    @Override
     public Collection detachAll(Collection entities) {
         assertNotCloseInvoked();
         return Arrays.asList(_broker.detachAll(entities, this));
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T merge(T entity) {
         assertNotCloseInvoked();
         return (T) _broker.attach(entity, true, this);
     }
 
+    @Override
     public Object[] mergeAll(Object... entities) {
         if (entities.length == 0)
             return EMPTY_OBJECTS;
         return mergeAll(Arrays.asList(entities)).toArray();
     }
 
+    @Override
     public Collection mergeAll(Collection entities) {
         assertNotCloseInvoked();
         return Arrays.asList(_broker.attachAll(entities, true, this));
     }
 
+    @Override
     public void transactional(Object entity, boolean updateVersion) {
         assertNotCloseInvoked();
         _broker.transactional(entity, updateVersion, this);
     }
 
+    @Override
     public void transactionalAll(Collection objs, boolean updateVersion) {
         assertNotCloseInvoked();
         _broker.transactionalAll(objs, updateVersion, this);
     }
 
+    @Override
     public void transactionalAll(Object[] objs, boolean updateVersion) {
         assertNotCloseInvoked();
         _broker.transactionalAll(Arrays.asList(objs), updateVersion, this);
     }
 
+    @Override
     public void nontransactional(Object entity) {
         assertNotCloseInvoked();
         _broker.nontransactional(entity, this);
     }
 
+    @Override
     public void nontransactionalAll(Collection objs) {
         assertNotCloseInvoked();
         _broker.nontransactionalAll(objs, this);
     }
 
+    @Override
     public void nontransactionalAll(Object[] objs) {
         assertNotCloseInvoked();
         _broker.nontransactionalAll(Arrays.asList(objs), this);
     }
 
+    @Override
     public Generator getNamedGenerator(String name) {
         assertNotCloseInvoked();
         try {
@@ -952,6 +1090,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public Generator getIdGenerator(Class forClass) {
         assertNotCloseInvoked();
         try {
@@ -966,6 +1105,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public Generator getFieldGenerator(Class forClass, String fieldName) {
         assertNotCloseInvoked();
         try {
@@ -985,11 +1125,13 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public <T> Extent<T> createExtent(Class<T> cls, boolean subclasses) {
         assertNotCloseInvoked();
         return new ExtentImpl<T>(this, _broker.newExtent(cls, subclasses));
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> TypedQuery<T> createQuery(String query, Class<T> resultClass) {
         checkTuple(resultClass);
@@ -1002,10 +1144,12 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public OpenJPAQuery createQuery(String query) {
         return createQuery(JPQLParser.LANG_JPQL, query);
     }
 
+    @Override
     public OpenJPAQuery createQuery(String language, String query) {
         assertNotCloseInvoked();
         try {
@@ -1031,6 +1175,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public OpenJPAQuery createQuery(Query query) {
         if (query == null)
             return createQuery((String) null);
@@ -1039,12 +1184,14 @@ public class EntityManagerImpl
         return newQueryImpl(_broker.newQuery(q.getLanguage(), q), null);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
         checkTuple(resultClass);
         return createNamedQuery(name).setResultClass(resultClass);
     }
 
+    @Override
     public OpenJPAQuery createNamedQuery(String name) {
         assertNotCloseInvoked();
         _broker.assertOpen();
@@ -1077,16 +1224,19 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public OpenJPAQuery createNativeQuery(String query) {
         validateSQL(query);
         return createQuery(QueryLanguages.LANG_SQL, query);
     }
 
+    @Override
     public OpenJPAQuery createNativeQuery(String query, Class cls) {
         checkTuple(cls);
         return createNativeQuery(query).setResultClass(cls);
     }
 
+    @Override
     public OpenJPAQuery createNativeQuery(String query, String mappingName) {
         assertNotCloseInvoked();
         validateSQL(query);
@@ -1155,7 +1305,7 @@ public class EntityManagerImpl
     }
 
     protected <T> QueryImpl<T> newQueryImpl(org.apache.openjpa.kernel.Query kernelQuery, QueryMetaData qmd) {
-        return new QueryImpl<T>(this, _ret, kernelQuery, qmd);
+        return new QueryImpl<>(this, _ret, kernelQuery, qmd);
     }
 
     /**
@@ -1166,7 +1316,7 @@ public class EntityManagerImpl
      *             query creation
      */
     protected <T> QueryImpl<T> newQueryImpl(org.apache.openjpa.kernel.Query kernelQuery) {
-        return new QueryImpl<T>(this, _ret, kernelQuery, null);
+        return new QueryImpl<>(this, _ret, kernelQuery, null);
     }
 
     /**
@@ -1192,6 +1342,7 @@ public class EntityManagerImpl
         return (cache == null) ? null : cache.get(id);
     }
 
+    @Override
     public void setFlushMode(FlushModeType flushMode) {
         assertNotCloseInvoked();
         _broker.assertOpen();
@@ -1199,6 +1350,7 @@ public class EntityManagerImpl
             (toFlushBeforeQueries(flushMode));
     }
 
+    @Override
     public FlushModeType getFlushMode() {
         assertNotCloseInvoked();
         _broker.assertOpen();
@@ -1257,18 +1409,21 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public void clear() {
         assertNotCloseInvoked();
         _broker.detachAll(this, false);
         _plans.clear();
     }
 
+    @Override
     public Object getDelegate() {
         _broker.assertOpen();
         assertNotCloseInvoked();
         return this;
     }
 
+    @Override
     public LockModeType getLockMode(Object entity) {
         assertNotCloseInvoked();
         _broker.assertActiveTransaction();
@@ -1277,16 +1432,19 @@ public class EntityManagerImpl
             _broker.getLockLevel(entity));
     }
 
+    @Override
     public void lock(Object entity, LockModeType mode) {
         lock(entity, mode, -1);
     }
 
+    @Override
     public void lock(Object entity) {
         assertNotCloseInvoked();
         assertValidAttchedEntity(LOCK, entity);
         _broker.lock(entity, this);
     }
 
+    @Override
     public void lock(Object entity, LockModeType mode, int timeout) {
         assertNotCloseInvoked();
         assertValidAttchedEntity(LOCK, entity);
@@ -1299,6 +1457,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public void lock(Object entity, LockModeType mode, Map<String, Object> properties) {
         assertNotCloseInvoked();
         assertValidAttchedEntity(LOCK, entity);
@@ -1314,83 +1473,101 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public void lockAll(Collection entities) {
         assertNotCloseInvoked();
         _broker.lockAll(entities, this);
     }
 
+    @Override
     public void lockAll(Collection entities, LockModeType mode, int timeout) {
         assertNotCloseInvoked();
         _broker.lockAll(entities, MixedLockLevelsHelper.toLockLevel(mode),
             timeout, this);
     }
 
+    @Override
     public void lockAll(Object... entities) {
         lockAll(Arrays.asList(entities));
     }
 
+    @Override
     public void lockAll(Object[] entities, LockModeType mode, int timeout) {
         lockAll(Arrays.asList(entities), mode, timeout);
     }
 
+    @Override
     public boolean cancelAll() {
         return _broker.cancelAll();
     }
 
+    @Override
     public Object getConnection() {
         return _broker.getConnection();
     }
 
+    @Override
     public Collection getManagedObjects() {
         return _broker.getManagedObjects();
     }
 
+    @Override
     public Collection getTransactionalObjects() {
         return _broker.getTransactionalObjects();
     }
 
+    @Override
     public Collection getPendingTransactionalObjects() {
         return _broker.getPendingTransactionalObjects();
     }
 
+    @Override
     public Collection getDirtyObjects() {
         return _broker.getDirtyObjects();
     }
 
+    @Override
     public boolean getOrderDirtyObjects() {
         return _broker.getOrderDirtyObjects();
     }
 
+    @Override
     public void setOrderDirtyObjects(boolean order) {
         assertNotCloseInvoked();
         _broker.setOrderDirtyObjects(order);
     }
 
+    @Override
     public void dirtyClass(Class cls) {
         assertNotCloseInvoked();
         _broker.dirtyType(cls);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public Collection<Class> getPersistedClasses() {
         return (Collection<Class>) _broker.getPersistedTypes();
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public Collection<Class> getUpdatedClasses() {
         return (Collection<Class>) _broker.getUpdatedTypes();
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public Collection<Class> getRemovedClasses() {
         return (Collection<Class>) _broker.getDeletedTypes();
     }
 
+    @Override
     public <T> T createInstance(Class<T> cls) {
         assertNotCloseInvoked();
         return (T) _broker.newInstance(cls);
     }
 
+    @Override
     public void close() {
         assertNotCloseInvoked();
         Log log = _emf.getConfiguration().getLog(OpenJPAConfiguration.LOG_RUNTIME);
@@ -1401,10 +1578,12 @@ public class EntityManagerImpl
         _plans.clear();
     }
 
+    @Override
     public boolean isOpen() {
         return !_broker.isCloseInvoked();
     }
 
+    @Override
     public void dirty(Object o, String field) {
         assertNotCloseInvoked();
         OpenJPAStateManager sm = _broker.getStateManager(o);
@@ -1416,41 +1595,49 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public Object getObjectId(Object o) {
         assertNotCloseInvoked();
         return JPAFacadeHelper.fromOpenJPAObjectId(_broker.getObjectId(o));
     }
 
+    @Override
     public boolean isDirty(Object o) {
         assertNotCloseInvoked();
         return _broker.isDirty(o);
     }
 
+    @Override
     public boolean isTransactional(Object o) {
         assertNotCloseInvoked();
         return _broker.isTransactional(o);
     }
 
+    @Override
     public boolean isPersistent(Object o) {
         assertNotCloseInvoked();
         return _broker.isPersistent(o);
     }
 
+    @Override
     public boolean isNewlyPersistent(Object o) {
         assertNotCloseInvoked();
         return _broker.isNew(o);
     }
 
+    @Override
     public boolean isRemoved(Object o) {
         assertNotCloseInvoked();
         return _broker.isDeleted(o);
     }
 
+    @Override
     public boolean isDetached(Object entity) {
         assertNotCloseInvoked();
         return _broker.isDetached(entity);
     }
 
+    @Override
     public Object getVersion(Object o) {
         assertNotCloseInvoked();
         return _broker.getVersion(o);
@@ -1484,10 +1671,12 @@ public class EntityManagerImpl
     // FindCallbacks implementation
     ////////////////////////////////
 
+    @Override
     public Object processArgument(Object arg) {
         return arg;
     }
 
+    @Override
     public Object processReturn(Object oid, OpenJPAStateManager sm) {
         return (sm == null || sm.isDeleted()) ? null : sm.getManagedInstance();
     }
@@ -1496,6 +1685,7 @@ public class EntityManagerImpl
     // OpCallbacks implementation
     //////////////////////////////
 
+    @Override
     public int processArgument(int op, Object obj, OpenJPAStateManager sm) {
         switch (op) {
             case OP_DELETE:
@@ -1531,10 +1721,12 @@ public class EntityManagerImpl
         return ACT_RUN | ACT_CASCADE;
     }
 
+    @Override
     public int hashCode() {
         return (_broker == null) ? 0 : _broker.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -1545,6 +1737,7 @@ public class EntityManagerImpl
         return _broker.equals(((EntityManagerImpl) other)._broker);
     }
 
+    @Override
     public void readExternal(ObjectInput in)
         throws IOException, ClassNotFoundException {
         try {
@@ -1575,6 +1768,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         try {
             // this requires that only AbstractBrokerFactory-sourced
@@ -1628,6 +1822,7 @@ public class EntityManagerImpl
             }
         }
 
+        @Override
         protected Class<?> resolveClass(ObjectStreamClass classDesc)
             throws IOException, ClassNotFoundException {
 
@@ -1686,6 +1881,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public void detach(Object entity) {
         if (entity == null)
             throw new IllegalArgumentException(_loc.get("null-detach").getMessage());
@@ -1697,10 +1893,11 @@ public class EntityManagerImpl
      * Create a query from the given CritriaQuery.
      * Compile to register the parameters in this query.
      */
+    @Override
     public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
         ((OpenJPACriteriaQuery<T>)criteriaQuery).compile();
 
-        org.apache.openjpa.kernel.Query kernelQuery =_broker.newQuery(CriteriaBuilderImpl.LANG_CRITERIA, criteriaQuery);
+        org.apache.openjpa.kernel.Query kernelQuery =_broker.newQuery(OpenJPACriteriaBuilder.LANG_CRITERIA, criteriaQuery);
 
         QueryImpl<T> facadeQuery = newQueryImpl(kernelQuery, null).setId(criteriaQuery.toString());
         Set<ParameterExpression<?>> params = criteriaQuery.getParameters();
@@ -1721,6 +1918,7 @@ public class EntityManagerImpl
         throw new UnsupportedOperationException("JPA 2.1");
     }
 
+    @Override
     public OpenJPAQuery createDynamicQuery(
         org.apache.openjpa.persistence.query.QueryDefinition qdef) {
         String jpql = _emf.getDynamicQueryBuilder().toJPQL(qdef);
@@ -1735,6 +1933,7 @@ public class EntityManagerImpl
      * are converted to the original keys/values that user used to set the properties.
      *
      */
+    @Override
     public Map<String, Object> getProperties() {
         Map<String,Object> props = _broker.getProperties();
         for (String s : _broker.getSupportedProperties()) {
@@ -1761,10 +1960,12 @@ public class EntityManagerImpl
         return props;
     }
 
+    @Override
     public OpenJPACriteriaBuilder getCriteriaBuilder() {
         return _emf.getCriteriaBuilder();
     }
 
+    @Override
     public Set<String> getSupportedProperties() {
         return _broker.getSupportedProperties();
     }
@@ -1775,6 +1976,7 @@ public class EntityManagerImpl
      * @exception if the given class is null, generic <code>Object.class</code> or a class
      * that is not wrapped by this receiver.
      */
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T unwrap(Class<T> cls) {
         if (cls != null && cls != Object.class) {
@@ -1803,10 +2005,12 @@ public class EntityManagerImpl
         throw ex;
     }
 
+    @Override
     public void setQuerySQLCache(boolean flag) {
         _broker.setCachePreparedQuery(flag);
     }
 
+    @Override
     public boolean getQuerySQLCache() {
         return _broker.getCachePreparedQuery();
     }
@@ -1873,6 +2077,7 @@ public class EntityManagerImpl
         }
     }
 
+    @Override
     public Metamodel getMetamodel() {
         return _emf.getMetamodel();
     }
@@ -1906,6 +2111,7 @@ public class EntityManagerImpl
      * on either this instance or its fetch plan by reflection,
      * then an warning message (not an exception as per JPA specification) is issued.
      */
+    @Override
     public void setProperty(String prop, Object value) {
         if (!setKernelProperty(this, prop, value)) {
             if (!setKernelProperty(this.getFetchPlan(), prop, value)) {
@@ -1995,7 +2201,7 @@ public class EntityManagerImpl
 
     private Map<String, Object> cloneProperties(Map<String, Object> properties) {
         if (properties != null) {
-            properties = new HashMap<String, Object>(properties);
+            properties = new HashMap<>(properties);
         }
         return properties;
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java
index 57414f1c1..6822f95d5 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityNotFoundException.java
@@ -39,6 +39,8 @@ public class EntityNotFoundException
     extends javax.persistence.EntityNotFoundException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -51,43 +53,53 @@ public class EntityNotFoundException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return STORE;
     }
 
+    @Override
     public int getSubtype() {
         return StoreException.OBJECT_NOT_FOUND;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.java
index 049885fdd..8753f047a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Extent.java
@@ -33,46 +33,46 @@ public interface Extent<T>
     /**
      * The extent's element type.
      */
-    public Class<T> getElementClass();
+    Class<T> getElementClass();
 
     /**
      * Whether the extent includes subclasses.
      */
-    public boolean hasSubclasses();
+    boolean hasSubclasses();
 
     /**
      * The owning entity manager.
      */
-    public OpenJPAEntityManager getEntityManager();
+    OpenJPAEntityManager getEntityManager();
 
     /**
      * Fetch configuration for controlling how iterated objects are loaded.
      */
-    public FetchPlan getFetchPlan();
+    FetchPlan getFetchPlan();
 
     /**
      * Whether the extent sees inserts and deletes in the current transaction.
      */
-    public boolean getIgnoreChanges();
+    boolean getIgnoreChanges();
 
     /**
      * Whether the extent sees inserts and deletes in the current transaction.
      */
-    public void setIgnoreChanges(boolean ignoreChanges);
+    void setIgnoreChanges(boolean ignoreChanges);
 
     /**
      * List the extent contents.
      */
-    public List<T> list();
+    List<T> list();
 
     /**
      * Close all open iterators that are consuming database resources.
      */
-    public void closeAll();
+    void closeAll();
 
     /**
      * @deprecated cast to {@link ExtentImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public org.apache.openjpa.kernel.Extent getDelegate();
+    @Deprecated org.apache.openjpa.kernel.Extent getDelegate();
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
index 5b938e3f9..2114a6a0f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExtentImpl.java
@@ -48,22 +48,27 @@ public class ExtentImpl<T>
     /**
      * Delegate.
      */
+    @Override
     public org.apache.openjpa.kernel.Extent<T> getDelegate() {
         return _extent.getDelegate();
     }
 
+    @Override
     public Class<T> getElementClass() {
         return _extent.getElementType();
     }
 
+    @Override
     public boolean hasSubclasses() {
         return _extent.hasSubclasses();
     }
 
+    @Override
     public OpenJPAEntityManager getEntityManager() {
         return _em;
     }
 
+    @Override
     public FetchPlan getFetchPlan() {
         _em.assertNotCloseInvoked();
         _extent.lock();
@@ -78,33 +83,40 @@ public class ExtentImpl<T>
         }
     }
 
+    @Override
     public boolean getIgnoreChanges() {
         return _extent.getIgnoreChanges();
     }
 
+    @Override
     public void setIgnoreChanges(boolean ignoreChanges) {
         _em.assertNotCloseInvoked();
         _extent.setIgnoreChanges(ignoreChanges);
     }
 
+    @Override
     public List<T> list() {
         _em.assertNotCloseInvoked();
         return _extent.list();
     }
 
+    @Override
     public Iterator<T> iterator() {
         _em.assertNotCloseInvoked();
         return _extent.iterator();
     }
 
+    @Override
     public void closeAll() {
         _extent.closeAll();
     }
 
+    @Override
     public int hashCode() {
         return ((_extent == null) ? 0  : _extent.hashCode());
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExternalValues.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExternalValues.java
index 17cfb0d9b..71f985687 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExternalValues.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ExternalValues.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Externalizer.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Externalizer.java
index 331a7f50b..e2fdbd02a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Externalizer.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Externalizer.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Factory.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Factory.java
index 9fb1bc22e..42e7226f5 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Factory.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Factory.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchAttribute.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchAttribute.java
index 33b00b4e2..726e75a8b 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchAttribute.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchAttribute.java
@@ -18,8 +18,9 @@
  */
 package org.apache.openjpa.persistence;
 
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java
index 3d38c7534..5b92b9560 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroups.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroups.java
index 2fb85ec9b..678f14717 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroups.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroups.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
index d27708959..03b8100b3 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlan.java
@@ -44,46 +44,46 @@ public interface FetchPlan {
     /**
      * Fetch group representing all fields.
      */
-    public static final String GROUP_ALL = FetchGroup.NAME_ALL;
+    String GROUP_ALL = FetchGroup.NAME_ALL;
 
     /**
      * The default fetch group.
      */
-    public static final String GROUP_DEFAULT = FetchGroup.NAME_DEFAULT;
+    String GROUP_DEFAULT = FetchGroup.NAME_DEFAULT;
 
     /**
      * Infinite fetch depth.
      */
-    public static final int DEPTH_INFINITE = FetchGroup.DEPTH_INFINITE;
+    int DEPTH_INFINITE = FetchGroup.DEPTH_INFINITE;
 
     /**
      * Constant to revert any setting to its default value.
      */
-    public static final int DEFAULT = FetchConfiguration.DEFAULT;
+    int DEFAULT = FetchConfiguration.DEFAULT;
 
     /**
      * The maximum fetch depth when loading an object.
      */
-    public int getMaxFetchDepth();
+    int getMaxFetchDepth();
 
     /**
      * The maximum fetch depth when loading an object.
      */
-    public FetchPlan setMaxFetchDepth(int depth);
+    FetchPlan setMaxFetchDepth(int depth);
 
     /**
      * Return the fetch batch size for large result set support.
      * Defaults to the	<code>openjpa.FetchBatchSize</code> setting. Note
      * that this property will be ignored under some data stores.
      */
-    public int getFetchBatchSize();
+    int getFetchBatchSize();
 
     /**
      * Set the fetch batch size for large result set support.
      * Defaults to the	<code>openjpa.FetchBatchSize</code> setting. Note
      * that this property will be ignored under some data stores.
      */
-    public FetchPlan setFetchBatchSize(int fetchBatchSize);
+    FetchPlan setFetchBatchSize(int fetchBatchSize);
 
     /**
      * Return whether or not query caching is enabled. If this returns
@@ -94,7 +94,7 @@ public interface FetchPlan {
      *
      * @since 1.0.0
      */
-    public boolean getQueryResultCacheEnabled();
+    boolean getQueryResultCacheEnabled();
 
     /**
      * Control whether or not query caching is enabled. This has no effect
@@ -103,17 +103,17 @@ public interface FetchPlan {
      *
      * @since 1.0.0
      */
-    public FetchPlan setQueryResultCacheEnabled(boolean cache);
+    FetchPlan setQueryResultCacheEnabled(boolean cache);
 
     /**
      * @deprecated use {@link #getQueryResultCacheEnabled()} instead.
      */
-    public boolean getQueryResultCache();
+    @Deprecated boolean getQueryResultCache();
 
     /**
      * @deprecated use {@link #setQueryResultCacheEnabled} instead.
      */
-    public FetchPlan setQueryResultCache(boolean cache);
+    @Deprecated FetchPlan setQueryResultCache(boolean cache);
 
 
     /**
@@ -121,42 +121,42 @@ public interface FetchPlan {
      * when loading objects. Defaults to the
      * <code>openjpa.FetchGroups</code> setting.
      */
-    public Collection<String> getFetchGroups();
+    Collection<String> getFetchGroups();
 
     /**
      * Adds <code>group</code> to the set of fetch group to
      * use when loading objects.
      */
-    public FetchPlan addFetchGroup(String group);
+    FetchPlan addFetchGroup(String group);
 
     /**
      * Adds <code>groups</code> to the set of fetch group names to
      * use when loading objects.
      */
-    public FetchPlan addFetchGroups(String... groups);
+    FetchPlan addFetchGroups(String... groups);
 
     /**
      * Adds <code>groups</code> to the set of fetch group names to
      * use when loading objects.
      */
-    public FetchPlan addFetchGroups(Collection groups);
+    FetchPlan addFetchGroups(Collection groups);
 
     /**
      * Remove the given fetch group.
      */
-    public FetchPlan removeFetchGroup(String group);
+    FetchPlan removeFetchGroup(String group);
 
     /**
      * Removes <code>groups</code> from the set of fetch group names
      * to use when loading objects.
      */
-    public FetchPlan removeFetchGroups(String... groups);
+    FetchPlan removeFetchGroups(String... groups);
 
     /**
      * Removes <code>groups</code> from the set of fetch group names
      * to use when loading objects.
      */
-    public FetchPlan removeFetchGroups(Collection groups);
+    FetchPlan removeFetchGroups(Collection groups);
 
     /**
      * Clears the set of fetch group names to use wen loading
@@ -164,208 +164,208 @@ public interface FetchPlan {
      * the default fetch group (and any requested field) will be
      * loaded when loading an object.
      */
-    public FetchPlan clearFetchGroups();
+    FetchPlan clearFetchGroups();
 
     /**
      * Resets the set of fetch groups to the list in the global configuration.
      */
-    public FetchPlan resetFetchGroups();
+    FetchPlan resetFetchGroups();
 
     /**
      * Returns the fully qualified names of the fields that this component
      * will use when loading objects. Defaults to the empty set.
      */
-    public Collection<String> getFields();
+    Collection<String> getFields();
 
     /**
      * Return true if the given field has been added.
      */
-    public boolean hasField(String field);
+    boolean hasField(String field);
 
     /**
      * Return true if the given field has been added.
      */
-    public boolean hasField(Class cls, String field);
+    boolean hasField(Class cls, String field);
 
     /**
      * Adds <code>field</code> to the set of fully-qualified field names to
      * use when loading objects.
      */
-    public FetchPlan addField(String field);
+    FetchPlan addField(String field);
 
     /**
      * Adds <code>field</code> to the set of field names to
      * use when loading objects.
      */
-    public FetchPlan addField(Class cls, String field);
+    FetchPlan addField(Class cls, String field);
 
     /**
      * Adds <code>fields</code> to the set of fully-qualified field names to
      * use when loading objects.
      */
-    public FetchPlan addFields(String... fields);
+    FetchPlan addFields(String... fields);
 
     /**
      * Adds <code>fields</code> to the set of field names to
      * use when loading objects.
      */
-    public FetchPlan addFields(Class cls, String... fields);
+    FetchPlan addFields(Class cls, String... fields);
 
     /**
      * Adds <code>fields</code> to the set of fully-qualified field names to
      * use when loading objects.
      */
-    public FetchPlan addFields(Collection fields);
+    FetchPlan addFields(Collection fields);
 
     /**
      * Adds <code>fields</code> to the set of field names to
      * use when loading objects.
      */
-    public FetchPlan addFields(Class cls, Collection fields);
+    FetchPlan addFields(Class cls, Collection fields);
 
     /**
      * Remove the given fully-qualified field.
      */
-    public FetchPlan removeField(String field);
+    FetchPlan removeField(String field);
 
     /**
      * Remove the given field.
      */
-    public FetchPlan removeField(Class cls, String field);
+    FetchPlan removeField(Class cls, String field);
 
     /**
      * Removes <code>fields</code> from the set of fully-qualified field names
      * to use when loading objects.
      */
-    public FetchPlan removeFields(String... fields);
+    FetchPlan removeFields(String... fields);
 
     /**
      * Removes <code>fields</code> from the set of field names
      * to use when loading objects.
      */
-    public FetchPlan removeFields(Class cls, String... fields);
+    FetchPlan removeFields(Class cls, String... fields);
 
     /**
      * Removes <code>fields</code> from the set of fully-qualified field names
      * to use when loading objects.
      */
-    public FetchPlan removeFields(Collection fields);
+    FetchPlan removeFields(Collection fields);
 
     /**
      * Removes <code>fields</code> from the set of field names
      * to use when loading objects.
      */
-    public FetchPlan removeFields(Class cls, Collection fields);
+    FetchPlan removeFields(Class cls, Collection fields);
 
     /**
      * Clears the set of field names to use wen loading
      * data. After this operation is invoked, only those fields in
      * the configured fetch groups will be loaded when loading an object.
      */
-    public FetchPlan clearFields();
+    FetchPlan clearFields();
 
     /**
      * The number of milliseconds to wait for an object lock, or -1 for no
      * limit.
      */
-    public int getLockTimeout();
+    int getLockTimeout();
 
     /**
      * The number of milliseconds to wait for an object lock, or -1 for no
      * limit.
      */
-    public FetchPlan setLockTimeout(int timeout);
+    FetchPlan setLockTimeout(int timeout);
 
     /**
      * The lock scope to use for locking loaded objects.
      */
-    public PessimisticLockScope getLockScope();
+    PessimisticLockScope getLockScope();
 
     /**
      * The lock scope to use for locking loaded objects.
      */
-    public FetchPlan setLockScope(PessimisticLockScope scope);
+    FetchPlan setLockScope(PessimisticLockScope scope);
 
     /**
      * The number of milliseconds to wait for a query, or -1 for no
      * limit.
      */
-    public int getQueryTimeout();
+    int getQueryTimeout();
 
     /**
      * The number of milliseconds to wait for a query, or -1 for no
      * limit.
      */
-    public FetchPlan setQueryTimeout(int timeout);
+    FetchPlan setQueryTimeout(int timeout);
 
     /**
      * The lock level to use for locking loaded objects.
      */
-    public LockModeType getReadLockMode();
+    LockModeType getReadLockMode();
 
     /**
      * The lock level to use for locking loaded objects.
      */
-    public FetchPlan setReadLockMode(LockModeType mode);
+    FetchPlan setReadLockMode(LockModeType mode);
 
     /**
      * The lock level to use for locking dirtied objects.
      */
-    public LockModeType getWriteLockMode();
+    LockModeType getWriteLockMode();
 
     /**
      * The lock level to use for locking dirtied objects.
      */
-    public FetchPlan setWriteLockMode(LockModeType mode);
+    FetchPlan setWriteLockMode(LockModeType mode);
 
     /**
      * @deprecated cast to {@link FetchPlanImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    @Reflectable(false)
-    public org.apache.openjpa.kernel.FetchConfiguration getDelegate();
+    @Deprecated
+    @Reflectable(false) org.apache.openjpa.kernel.FetchConfiguration getDelegate();
 
     /**
      * Affirms if extended path lookup feature is active.
      *
      * @since 2.0.0
      */
-    public boolean getExtendedPathLookup();
+    boolean getExtendedPathLookup();
 
     /**
      * Sets extended path lookup feature.
      *
      * @since 2.0.0
      */
-    public FetchPlan setExtendedPathLookup(boolean flag);
+    FetchPlan setExtendedPathLookup(boolean flag);
 
     /**
      * Gets the current storage mode for data cache.
      *
      * @since 2.0.0
      */
-    public DataCacheStoreMode getCacheStoreMode();
+    DataCacheStoreMode getCacheStoreMode();
 
     /**
      * Sets the current storage mode for data cache.
      *
      * @since 2.0.0
      */
-    public FetchPlan setCacheStoreMode(DataCacheStoreMode mode);
+    FetchPlan setCacheStoreMode(DataCacheStoreMode mode);
 
     /**
      * Gets the current retrieve mode for data cache.
      *
      * @since 2.0.0
      */
-    public DataCacheRetrieveMode getCacheRetrieveMode();
+    DataCacheRetrieveMode getCacheRetrieveMode();
 
     /**
      * Sets the current retrieve mode for data cache.
      *
      * @since 2.0.0
      */
-    public FetchPlan setCacheRetrieveMode(DataCacheRetrieveMode mode);
+    FetchPlan setCacheRetrieveMode(DataCacheRetrieveMode mode);
 
     /**
      * Set the hint for the given key to the given value.
@@ -375,7 +375,7 @@ public interface FetchPlan {
      *
      * @since 2.0.0
      */
-    public void setHint(String key, Object value);
+    void setHint(String key, Object value);
 
     /**
      * Get the hints and their values currently set on this receiver.
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java
index dc0a9c863..4211ca7b7 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchPlanImpl.java
@@ -51,12 +51,12 @@ public class FetchPlanImpl
      * Structure holds ranking of equivalent hint keys. Each entry value is a list of other keys that are higher rank
      * than the entry key.
      */
-    protected static Map<String, List<String>> _precedence = new HashMap<String, List<String>>();
+    protected static Map<String, List<String>> _precedence = new HashMap<>();
 
     /**
      * Structure holds one or more converters for a user-specified hint value.
      */
-    protected static Map<String,HintValueConverter[]> _hints = new HashMap<String,HintValueConverter[]>();
+    protected static Map<String,HintValueConverter[]> _hints = new HashMap<>();
 
     /**
      * Statically registers supported hint keys with their ranking and converters.
@@ -101,7 +101,7 @@ public class FetchPlanImpl
         }
         if (keys.length > 1) {
             for (int i = 0; i < keys.length-1; i++) {
-                List<String> list = new ArrayList<String>(keys.length-i-1);
+                List<String> list = new ArrayList<>(keys.length-i-1);
                 for (int j = i+1; j < keys.length; j++) {
                     list.add(keys[j]);
                 }
@@ -127,151 +127,185 @@ public class FetchPlanImpl
     /**
      * Delegate.
      */
+    @Override
     public FetchConfiguration getDelegate() {
         return _fetch.getDelegate();
     }
 
+    @Override
     public int getMaxFetchDepth() {
         return _fetch.getMaxFetchDepth();
     }
 
+    @Override
     public FetchPlan setMaxFetchDepth(int depth) {
         _fetch.setMaxFetchDepth(depth);
         return this;
     }
 
+    @Override
     public int getFetchBatchSize() {
         return _fetch.getFetchBatchSize();
     }
 
+    @Override
     public FetchPlan setFetchBatchSize(int fetchBatchSize) {
         _fetch.setFetchBatchSize(fetchBatchSize);
         return this;
     }
 
+    @Override
     public boolean getQueryResultCacheEnabled() {
         return _fetch.getQueryCacheEnabled();
     }
 
+    @Override
     public FetchPlan setQueryResultCacheEnabled(boolean cache) {
         _fetch.setQueryCacheEnabled(cache);
         return this;
     }
 
+    @Override
     public boolean getQueryResultCache() {
         return getQueryResultCacheEnabled();
     }
 
+    @Override
     public FetchPlan setQueryResultCache(boolean cache) {
         return setQueryResultCacheEnabled(cache);
     }
 
+    @Override
     public Collection<String> getFetchGroups() {
         return _fetch.getFetchGroups();
     }
 
+    @Override
     public FetchPlan addFetchGroup(String group) {
         _fetch.addFetchGroup(group);
         return this;
     }
 
+    @Override
     public FetchPlan addFetchGroups(String... groups) {
         return addFetchGroups(Arrays.asList(groups));
     }
 
+    @Override
     public FetchPlan addFetchGroups(Collection groups) {
         _fetch.addFetchGroups(groups);
         return this;
     }
 
+    @Override
     public FetchPlan removeFetchGroup(String group) {
         _fetch.removeFetchGroup(group);
         return this;
     }
 
+    @Override
     public FetchPlan removeFetchGroups(String... groups) {
         return removeFetchGroups(Arrays.asList(groups));
     }
 
+    @Override
     public FetchPlan removeFetchGroups(Collection groups) {
         _fetch.removeFetchGroups(groups);
         return this;
     }
 
+    @Override
     public FetchPlan clearFetchGroups() {
         _fetch.clearFetchGroups();
         return this;
     }
 
+    @Override
     public FetchPlan resetFetchGroups() {
         _fetch.resetFetchGroups();
         return this;
     }
 
+    @Override
     public Collection<String> getFields() {
         return (Collection<String>) _fetch.getFields();
     }
 
+    @Override
     public boolean hasField(String field) {
         return _fetch.hasField(field);
     }
 
+    @Override
     public boolean hasField(Class cls, String field) {
         return hasField(toFieldName(cls, field));
     }
 
+    @Override
     public FetchPlan addField(String field) {
         _fetch.addField(field);
         return this;
     }
 
+    @Override
     public FetchPlan addField(Class cls, String field) {
         return addField(toFieldName(cls, field));
     }
 
+    @Override
     public FetchPlan addFields(String... fields) {
         return addFields(Arrays.asList(fields));
     }
 
+    @Override
     public FetchPlan addFields(Class cls, String... fields) {
         return addFields(cls, Arrays.asList(fields));
     }
 
+    @Override
     public FetchPlan addFields(Collection fields) {
         _fetch.addFields(fields);
         return this;
     }
 
+    @Override
     public FetchPlan addFields(Class cls, Collection fields) {
         return addFields(toFieldNames(cls, fields));
     }
 
+    @Override
     public FetchPlan removeField(String field) {
         _fetch.removeField(field);
         return this;
     }
 
+    @Override
     public FetchPlan removeField(Class cls, String field) {
         return removeField(toFieldName(cls, field));
     }
 
+    @Override
     public FetchPlan removeFields(String... fields) {
         return removeFields(Arrays.asList(fields));
     }
 
+    @Override
     public FetchPlan removeFields(Class cls, String... fields) {
         return removeFields(cls, Arrays.asList(fields));
     }
 
+    @Override
     public FetchPlan removeFields(Collection fields) {
         _fetch.removeFields(fields);
         return this;
     }
 
+    @Override
     public FetchPlan removeFields(Class cls, Collection fields) {
         return removeFields(toFieldNames(cls, fields));
     }
 
+    @Override
     public FetchPlan clearFields() {
         _fetch.clearFields();
         return this;
@@ -290,60 +324,73 @@ public class FetchPlanImpl
         return names;
     }
 
+    @Override
     public int getLockTimeout() {
         return _fetch.getLockTimeout();
     }
 
+    @Override
     public FetchPlan setLockTimeout(int timeout) {
         _fetch.setLockTimeout(timeout);
         return this;
     }
 
+    @Override
     public PessimisticLockScope getLockScope() {
         return LockScopesHelper.fromLockScope(_fetch.getLockScope());
     }
 
+    @Override
     public FetchPlan setLockScope(PessimisticLockScope scope) {
         _fetch.setLockScope(LockScopesHelper.toLockScope(scope));
         return this;
     }
 
+    @Override
     public int getQueryTimeout() {
         return _fetch.getQueryTimeout();
     }
 
+    @Override
     public FetchPlan setQueryTimeout(int timeout) {
         _fetch.setQueryTimeout(timeout);
         return this;
     }
 
+    @Override
     public LockModeType getReadLockMode() {
         return MixedLockLevelsHelper.fromLockLevel(_fetch.getReadLockLevel());
     }
 
+    @Override
     public FetchPlan setReadLockMode(LockModeType mode) {
         _fetch.setReadLockLevel(MixedLockLevelsHelper.toLockLevel(mode));
         return this;
     }
 
+    @Override
     public LockModeType getWriteLockMode() {
         return MixedLockLevelsHelper.fromLockLevel(_fetch.getWriteLockLevel());
     }
 
+    @Override
     public FetchPlan setWriteLockMode(LockModeType mode) {
         _fetch.setWriteLockLevel(MixedLockLevelsHelper.toLockLevel(mode));
         return this;
     }
 
+    @Override
     public boolean getExtendedPathLookup() {
         return _fetch.getExtendedPathLookup();
     }
 
+    @Override
     public FetchPlan setExtendedPathLookup(boolean flag) {
         _fetch.setExtendedPathLookup(flag);
         return this;
     }
 
+    @Override
     public Object getHint(String key) {
         return _fetch.getHint(key);
     }
@@ -352,6 +399,7 @@ public class FetchPlanImpl
      * Sets the hint after converting the value appropriately.
      * If a higher ranking equivalent hint is already set, then bypasses this hint.
      */
+    @Override
     public void setHint(String key, Object value) {
         if (!isRecognizedHint(key))
             return;
@@ -375,14 +423,17 @@ public class FetchPlanImpl
         }
     }
 
+    @Override
     public Map<String, Object> getHints() {
         return _fetch.getHints();
     }
 
+    @Override
     public int hashCode() {
         return ((_fetch == null) ? 0  : _fetch.hashCode());
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -394,19 +445,23 @@ public class FetchPlanImpl
         return _fetch.equals(((FetchPlanImpl) other)._fetch);
     }
 
+    @Override
     public DataCacheRetrieveMode getCacheRetrieveMode() {
         return _fetch.getCacheRetrieveMode();
     }
 
+    @Override
     public DataCacheStoreMode getCacheStoreMode() {
         return _fetch.getCacheStoreMode();
     }
 
+    @Override
     public FetchPlan setCacheStoreMode(DataCacheStoreMode mode) {
         _fetch.setCacheStoreMode(mode);
         return this;
     }
 
+    @Override
     public FetchPlan setCacheRetrieveMode(DataCacheRetrieveMode mode) {
         _fetch.setCacheRetrieveMode(mode);
         return this;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
index 3f405e34a..fad3f5259 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Generator.java
@@ -27,36 +27,36 @@ package org.apache.openjpa.persistence;
  */
 public interface Generator {
 
-    public static final String UUID_HEX = "uuid-hex";
-    public static final String UUID_STRING = "uuid-string";
-    public static final String UUID_TYPE4_STRING = "uuid-type4-string";
-    public static final String UUID_TYPE4_HEX = "uuid-type4-hex";
+    String UUID_HEX = "uuid-hex";
+    String UUID_STRING = "uuid-string";
+    String UUID_TYPE4_STRING = "uuid-type4-string";
+    String UUID_TYPE4_HEX = "uuid-type4-hex";
 
     /**
      * The sequence name.
      */
-    public String getName();
+    String getName();
 
     /**
      * The next sequence value.
      */
-    public Object next();
+    Object next();
 
     /**
      * The current sequence value, or null if the sequence does not
      * support current values.
      */
-    public Object current();
+    Object current();
 
     /**
      * Hint to the sequence to allocate additional values up-front for
      * efficiency.
      */
-    public void allocate(int additional);
+    void allocate(int additional);
 
     /**
      * @deprecated cast to {@link GeneratorImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public org.apache.openjpa.kernel.Seq getDelegate();
+    @Deprecated org.apache.openjpa.kernel.Seq getDelegate();
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java
index b4ad629ea..11ce91e7a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/GeneratorImpl.java
@@ -51,30 +51,37 @@ public class GeneratorImpl
     /**
      * Delegate.
      */
+    @Override
     public Seq getDelegate() {
         return _seq.getDelegate();
     }
 
+    @Override
     public String getName() {
         return _name;
     }
 
+    @Override
     public Object next() {
         return _seq.next(_ctx, _meta);
     }
 
+    @Override
     public Object current() {
         return _seq.current(_ctx, _meta);
     }
 
+    @Override
     public void allocate(int additional) {
         _seq.allocate(additional, _ctx, _meta);
     }
 
+    @Override
     public int hashCode() {
         return ((_seq == null) ? 0  : _seq.hashCode());
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java
index efc5595af..5966cf14c 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java
@@ -118,7 +118,7 @@ public class HintHandler  {
             return Boolean.FALSE;
         if (_supportedHints.contains(hint)) {
             if (_hints == null)
-                _hints = new TreeMap<String, Object>();
+                _hints = new TreeMap<>();
             _hints.put(hint, value);
             return Boolean.TRUE;
         }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintValueConverter.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintValueConverter.java
index 4164d93c0..6355295f0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintValueConverter.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintValueConverter.java
@@ -69,12 +69,14 @@ public interface HintValueConverter {
             }
         }
 
+        @Override
         public Object convert(Object e) {
             if (e.getClass() == _type)
                 return map[((Enum<?>)e).ordinal()];
             return e;
         }
 
+        @Override
         public boolean canConvert(Class<?> type) {
             return Enum.class.isAssignableFrom(type);
         }
@@ -93,6 +95,7 @@ public interface HintValueConverter {
             _prototype = prototype;
         }
 
+        @Override
         public Object convert(Object e) {
             if (e.getClass() == _prototype.getClass())
                 return ((OpenJPAEnum<Enum<?>>)e).toKernelConstant();
@@ -105,6 +108,7 @@ public interface HintValueConverter {
             return e;
         }
 
+        @Override
         public boolean canConvert(Class<?> type) {
             return OpenJPAEnum.class.isAssignableFrom(type)
                 || type == String.class
@@ -148,6 +152,7 @@ public interface HintValueConverter {
             }
         }
 
+        @Override
         public Object convert(Object s) {
             if (s instanceof String == false)
                 return s;
@@ -167,12 +172,14 @@ public interface HintValueConverter {
                     Arrays.toString(strings));
         }
 
+        @Override
         public boolean canConvert(Class<?> cls) {
             return String.class == cls;
         }
     }
 
     public static class StringToBoolean implements HintValueConverter {
+        @Override
         public Object convert(Object v) {
             if (v instanceof String)
                 return Boolean.valueOf(v.toString());
@@ -181,6 +188,7 @@ public interface HintValueConverter {
             return v;
         }
 
+        @Override
         public boolean canConvert(Class<?> cls) {
             return String.class == cls || Boolean.class == cls || boolean.class == cls;
         }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InvalidStateException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InvalidStateException.java
index 467f874eb..a4e7d1f5d 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InvalidStateException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InvalidStateException.java
@@ -25,10 +25,10 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Serializable;
 
+import org.apache.openjpa.lib.util.Localizer.Message;
 import org.apache.openjpa.util.ExceptionInfo;
 import org.apache.openjpa.util.Exceptions;
 import org.apache.openjpa.util.UserException;
-import org.apache.openjpa.lib.util.Localizer.Message;
 
 /**
  * Extended {@link IllegalStateException}.
@@ -40,6 +40,8 @@ public class InvalidStateException
     extends IllegalStateException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -57,43 +59,53 @@ public class InvalidStateException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return USER;
     }
 
+    @Override
     public int getSubtype() {
         return UserException.INVALID_STATE;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InverseLogical.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InverseLogical.java
index 421e8fe08..e410d13e1 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InverseLogical.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/InverseLogical.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java
index fcc59605d..bfac9bb32 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java
@@ -25,9 +25,9 @@ import java.util.Map;
 import javax.persistence.CacheRetrieveMode;
 import javax.persistence.CacheStoreMode;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.kernel.DataCacheRetrieveMode;
 import org.apache.openjpa.kernel.DataCacheStoreMode;
+import org.apache.openjpa.lib.util.StringUtil;
 
 /**
  * Enumerates configuration property keys defined in JPA 2.0 Specification.
@@ -72,7 +72,7 @@ public class JPAProperties {
     public static final String VALIDATE_PRE_UPDATE  = PREFIX + "validation.group.pre-update";
     public static final String VALIDATE_GROUP_DEFAULT = "javax.validation.groups.Default";
 
-    private static Map<String,String> _names = new HashMap<String, String>();
+    private static Map<String,String> _names = new HashMap<>();
 
     /**
      * Record the given kernel property key (which is a bean property name without any suffix)
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.java
index b17cefb63..47d85fceb 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyDependent.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.java
index 658c57032..cca93138f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/KeyType.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java
index a76fee339..77d3e4eae 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LRS.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LoadFetchGroup.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LoadFetchGroup.java
index 178a2f349..5f81db3ac 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LoadFetchGroup.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LoadFetchGroup.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockTimeoutException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockTimeoutException.java
index f191c1c04..f132187af 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockTimeoutException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/LockTimeoutException.java
@@ -34,11 +34,11 @@ import org.apache.openjpa.util.StoreException;
  *
  * @since 2.0.0
  */
-@SuppressWarnings("serial")
 public class LockTimeoutException
     extends javax.persistence.LockTimeoutException
     implements Serializable, ExceptionInfo {
 
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -49,43 +49,53 @@ public class LockTimeoutException
         _failed = failed;
     }
 
+    @Override
     public int getType() {
         return STORE;
     }
 
+    @Override
     public int getSubtype() {
         return StoreException.LOCK;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ManagedInterface.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ManagedInterface.java
index 999b8c095..4278b79a7 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ManagedInterface.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ManagedInterface.java
@@ -19,8 +19,9 @@
 package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java
index 28f4413a6..c3ac6a572 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MixedLockLevelsHelper.java
@@ -19,9 +19,11 @@
 package org.apache.openjpa.persistence;
 
 import java.util.Locale;
+
 import javax.persistence.LockModeType;
 
 import org.apache.openjpa.kernel.FetchConfiguration;
+import org.apache.openjpa.kernel.LockLevels;
 import org.apache.openjpa.kernel.MixedLockLevels;
 
 /**
@@ -37,13 +39,13 @@ public class MixedLockLevelsHelper implements HintValueConverter {
      */
     public static int toLockLevel(LockModeType mode) {
         if (mode == null || mode == LockModeType.NONE)
-            return MixedLockLevels.LOCK_NONE;
+            return LockLevels.LOCK_NONE;
         if (mode == LockModeType.READ)
-            return MixedLockLevels.LOCK_READ;
+            return LockLevels.LOCK_READ;
         if (mode == LockModeType.OPTIMISTIC)
             return MixedLockLevels.LOCK_OPTIMISTIC;
         if (mode == LockModeType.WRITE)
-            return MixedLockLevels.LOCK_WRITE;
+            return LockLevels.LOCK_WRITE;
         if (mode == LockModeType.OPTIMISTIC_FORCE_INCREMENT)
             return MixedLockLevels.LOCK_OPTIMISTIC_FORCE_INCREMENT;
         if (mode == LockModeType.PESSIMISTIC_READ)
@@ -60,9 +62,9 @@ public class MixedLockLevelsHelper implements HintValueConverter {
         case MixedLockLevels.LOCK_PESSIMISTIC_FORCE_INCREMENT:
         case MixedLockLevels.LOCK_PESSIMISTIC_READ:
         case MixedLockLevels.LOCK_PESSIMISTIC_WRITE:
-        case MixedLockLevels.LOCK_NONE:
-        case MixedLockLevels.LOCK_READ:
-        case MixedLockLevels.LOCK_WRITE:
+        case LockLevels.LOCK_NONE:
+        case LockLevels.LOCK_READ:
+        case LockLevels.LOCK_WRITE:
         case FetchConfiguration.DEFAULT:
             return mode;
          default:
@@ -75,11 +77,11 @@ public class MixedLockLevelsHelper implements HintValueConverter {
      * Translates internal lock level to javax.persistence LockModeType.
      */
     public static LockModeType fromLockLevel(int level) {
-        if (level < MixedLockLevels.LOCK_READ)
+        if (level < LockLevels.LOCK_READ)
             return LockModeType.NONE;
         if (level < MixedLockLevels.LOCK_OPTIMISTIC)
             return LockModeType.READ;
-        if (level < MixedLockLevels.LOCK_WRITE)
+        if (level < LockLevels.LOCK_WRITE)
             return LockModeType.OPTIMISTIC;
         if (level < MixedLockLevels.LOCK_OPTIMISTIC_FORCE_INCREMENT)
             return LockModeType.WRITE;
@@ -92,10 +94,12 @@ public class MixedLockLevelsHelper implements HintValueConverter {
         return LockModeType.PESSIMISTIC_FORCE_INCREMENT;
     }
 
+    @Override
     public boolean canConvert(Class<?> type) {
         return type == LockModeType.class || type == String.class || type == Integer.class || type == int.class;
     }
 
+    @Override
     public Object convert(Object original) {
         if (original instanceof LockModeType)
             return MixedLockLevelsHelper.toLockLevel((LockModeType)original);
@@ -105,7 +109,7 @@ public class MixedLockLevelsHelper implements HintValueConverter {
                 return MixedLockLevelsHelper.toLockLevel(value);
             } catch (NumberFormatException nfe) {
                 if ("none".equalsIgnoreCase(original.toString())) {
-                    return MixedLockLevels.LOCK_NONE;
+                    return LockLevels.LOCK_NONE;
                 }
                 return MixedLockLevelsHelper.toLockLevel(
                         LockModeType.valueOf(original.toString().toUpperCase(Locale.ENGLISH).replace('-', '_')));
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java
index 80fd22495..9caaeb8bf 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NoResultException.java
@@ -39,6 +39,8 @@ public class NoResultException
     extends javax.persistence.NoResultException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -51,43 +53,53 @@ public class NoResultException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return USER;
     }
 
+    @Override
     public int getSubtype() {
         return UserException.INVALID_STATE;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java
index 9fe999320..3a829fef1 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/NonUniqueResultException.java
@@ -39,6 +39,8 @@ public class NonUniqueResultException
     extends javax.persistence.NonUniqueResultException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -51,43 +53,53 @@ public class NonUniqueResultException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return USER;
     }
 
+    @Override
     public int getSubtype() {
         return UserException.INVALID_STATE;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
index cbe898137..907df0774 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
@@ -52,13 +52,13 @@ public interface OpenJPAEntityManager
     /**
      * Return the factory that produced this entity manager.
      */
-    public OpenJPAEntityManagerFactory getEntityManagerFactory();
+    @Override OpenJPAEntityManagerFactory getEntityManagerFactory();
 
     /**
      * Return the (mutable) fetch plan for loading objects from this
      * entity manager.
      */
-    public FetchPlan getFetchPlan();
+    FetchPlan getFetchPlan();
 
     /**
      * Pushes a new fetch plan that inherits from the current fetch plan onto
@@ -67,7 +67,7 @@ public interface OpenJPAEntityManager
      * @since 1.1.0
      * @return the new fetch plan
      */
-    public FetchPlan pushFetchPlan();
+    FetchPlan pushFetchPlan();
 
     /**
      * Pops the fetch plan from the top of the stack, making the next one down
@@ -76,170 +76,170 @@ public interface OpenJPAEntityManager
      *
      * @since 1.1.0
      */
-    public void popFetchPlan();
+    void popFetchPlan();
 
     /**
      * Return the connection retain mode for this entity manager.
      */
-    public ConnectionRetainMode getConnectionRetainMode();
+    ConnectionRetainMode getConnectionRetainMode();
 
     /**
      * Whether this entity manager is using managed transactions.
      *
      * @since 1.1.0
      */
-    public boolean isTransactionManaged();
+    boolean isTransactionManaged();
 
     /**
      * @deprecated use {@link #isTransactionManaged} instead to interrogate
      * whether or not this EntityManager's transaction is managed. To determine
      * if a given entity instance is managed, use {@link #contains}.
      */
-    public boolean isManaged();
+    @Deprecated boolean isManaged();
 
     /**
      * Whether to check for a global transaction upon every managed,
      * non-transactional operation. Defaults to false.
      */
-    public boolean getSyncWithManagedTransactions();
+    boolean getSyncWithManagedTransactions();
 
     /**
      * Whether to check for a global transaction upon every managed,
      * non-transactional operation. Defaults to false.
      */
-    public void setSyncWithManagedTransactions(boolean resync);
+    void setSyncWithManagedTransactions(boolean resync);
 
     /**
      * Return the current thread's class loader at the time this entity
      * manager was obtained from the factory.
      */
-    public ClassLoader getClassLoader();
+    ClassLoader getClassLoader();
 
     /**
      * Return the connection user name.
      */
-    public String getConnectionUserName();
+    String getConnectionUserName();
 
     /**
      * Return the connection password.
      */
-    public String getConnectionPassword();
+    String getConnectionPassword();
 
     /**
      * Whether the entity manager or its managed instances are used in a
      * multithreaded environment.
      */
-    public boolean getMultithreaded();
+    boolean getMultithreaded();
 
     /**
      * Whether the entity manager or its managed instances are used in a
      * multithreaded environment.
      */
-    public void setMultithreaded(boolean multi);
+    void setMultithreaded(boolean multi);
 
     /**
      * Whether to take into account changes in the transaction when executing
      * a query or iterating an extent.
      */
-    public boolean getIgnoreChanges();
+    boolean getIgnoreChanges();
 
     /**
      * Whether to take into account changes in the transaction when executing
      * a query or iterating an extent.
      */
-    public void setIgnoreChanges(boolean ignore);
+    void setIgnoreChanges(boolean ignore);
 
     /**
      * Whether to allow nontransactional access to persistent state.
      */
-    public boolean getNontransactionalRead();
+    boolean getNontransactionalRead();
 
     /**
      * Whether to allow nontransactional access to persistent state.
      */
-    public void setNontransactionalRead(boolean read);
+    void setNontransactionalRead(boolean read);
 
     /**
      * Whether to allow nontransactional changes to persistent state.
      */
-    public boolean getNontransactionalWrite();
+    boolean getNontransactionalWrite();
 
     /**
      * Whether to allow nontransactional changes to persistent state.
      */
-    public void setNontransactionalWrite(boolean write);
+    void setNontransactionalWrite(boolean write);
 
     /**
      * Whether to use optimistic transactional semantics.
      */
-    public boolean getOptimistic();
+    boolean getOptimistic();
 
     /**
      * Whether to use optimistic transactional semantics.
      */
-    public void setOptimistic(boolean opt);
+    void setOptimistic(boolean opt);
 
     /**
      * Whether to restore an object's original state on rollback.
      */
-    public RestoreStateType getRestoreState();
+    RestoreStateType getRestoreState();
 
     /**
      * Whether to restore an object's original state on rollback.
      */
-    public void setRestoreState(RestoreStateType restoreType);
+    void setRestoreState(RestoreStateType restoreType);
 
     /**
      * Whether objects retain their persistent state on transaction commit.
      */
-    public boolean getRetainState();
+    boolean getRetainState();
 
     /**
      * Whether objects retain their persistent state on transaction commit.
      */
-    public void setRetainState(boolean retain);
+    void setRetainState(boolean retain);
 
     /**
      * Detach mode constant to determine which fields are part of the
      * detached graph.
      */
-    public DetachStateType getDetachState();
+    DetachStateType getDetachState();
 
     /**
      * Detach mode constant to determine which fields are part of the
      * detached graph.
      */
-    public void setDetachState(DetachStateType type);
+    void setDetachState(DetachStateType type);
 
     /**
      * Whether to clear state when entering a transaction.
      */
-    public AutoClearType getAutoClear();
+    AutoClearType getAutoClear();
 
     /**
      * Whether to clear state when entering a transaction.
      */
-    public void setAutoClear(AutoClearType clearType);
+    void setAutoClear(AutoClearType clearType);
 
     /**
      * {@link AutoDetachType} values which indicate when persistent
      * managed objects should be automatically detached in-place.
      */
-    public EnumSet<AutoDetachType> getAutoDetach();
+    EnumSet<AutoDetachType> getAutoDetach();
 
     /**
      * {@link AutoDetachType} values which indicate when persistent
      * managed objects should be automatically detached in-place.
      * The current value is replaced in its entirety.
      */
-    public void setAutoDetach(AutoDetachType value);
+    void setAutoDetach(AutoDetachType value);
 
     /**
      * {@link AutoDetachType} values which indicate when persistent
      * managed objects should be automatically detached in-place.
      * The current value is replaced in its entirety.
      */
-    public void setAutoDetach(EnumSet<AutoDetachType> values);
+    void setAutoDetach(EnumSet<AutoDetachType> values);
 
     /**
      * Bit flags marked in {@link AutoDetachType} which indicate when persistent
@@ -247,19 +247,19 @@ public interface OpenJPAEntityManager
      *
      * @since 1.1.0
      */
-    public void setAutoDetach(AutoDetachType value, boolean on);
+    void setAutoDetach(AutoDetachType value, boolean on);
 
     /**
      * Whether to also evict an object from the store cache when it is
      * evicted through this entity manager.
      */
-    public boolean getEvictFromStoreCache();
+    boolean getEvictFromStoreCache();
 
     /**
      * Whether to also evict an object from the store cache when it is
      * evicted through this entity manager.
      */
-    public void setEvictFromStoreCache(boolean evict);
+    void setEvictFromStoreCache(boolean evict);
 
     /**
      * Whether objects accessed during this transaction will be added to the
@@ -267,7 +267,7 @@ public interface OpenJPAEntityManager
      *
      * @since 0.3.4
      */
-    public boolean getPopulateStoreCache();
+    boolean getPopulateStoreCache();
 
     /**
      * Whether to populate the store cache with objects used by this
@@ -275,7 +275,7 @@ public interface OpenJPAEntityManager
      *
      * @since 0.3.4
      */
-    public void setPopulateStoreCache(boolean cache);
+    void setPopulateStoreCache(boolean cache);
 
     /**
      * Whether memory usage is reduced during this transaction at the expense
@@ -284,7 +284,7 @@ public interface OpenJPAEntityManager
      *
      * @since 1.0.0
      */
-    public boolean isTrackChangesByType();
+    boolean isTrackChangesByType();
 
     /**
      * If a large number of objects will be created, modified, or deleted
@@ -295,18 +295,18 @@ public interface OpenJPAEntityManager
      *
      * @since 1.0.0
      */
-    public void setTrackChangesByType(boolean track);
+    void setTrackChangesByType(boolean track);
 
     /**
      * Put the specified key-value pair into the map of user objects. Use
      * a value of null to remove the key.
      */
-    public Object putUserObject(Object key, Object val);
+    Object putUserObject(Object key, Object val);
 
     /**
      * Get the value for the specified key from the map of user objects.
      */
-    public Object getUserObject(Object key);
+    Object getUserObject(Object key);
 
     ///////////
     // Lookups
@@ -320,7 +320,7 @@ public interface OpenJPAEntityManager
      * same order as the oids parameter.
      * @see #find(Class,Object)
      */
-    public <T> T[] findAll(Class<T> cls, Object... oids);
+    <T> T[] findAll(Class<T> cls, Object... oids);
 
     /**
      * Return the objects with the given oids.
@@ -330,7 +330,7 @@ public interface OpenJPAEntityManager
      * same order as the oids parameter.
      * @see #find(Class,Object)
      */
-    public <T> Collection<T> findAll(Class<T> cls, Collection oids);
+    <T> Collection<T> findAll(Class<T> cls, Collection oids);
 
     /**
      * Return the cached instance for the given oid/object, or null if not
@@ -339,49 +339,49 @@ public interface OpenJPAEntityManager
      * @param oid the object's id
      * @return the cached object, or null if not cached
      */
-    public <T> T findCached(Class<T> cls, Object oid);
+    <T> T findCached(Class<T> cls, Object oid);
 
     /**
      * Return the application identity class the given persistent class uses
      * for object ids, or null if not a type that uses application identity.
      */
-    public Class getObjectIdClass(Class pcClass);
+    Class getObjectIdClass(Class pcClass);
 
     ////////////////
     // Transactions
     ////////////////
 
-    public OpenJPAEntityTransaction getTransaction();
+    @Override OpenJPAEntityTransaction getTransaction();
 
     /**
      * Set a transactional savepoint where operations after this savepoint
      * will be rolled back.
      */
-    public void setSavepoint(String name);
+    void setSavepoint(String name);
 
     /**
      * Rollback the current transaction to the last savepoint.
      * Savepoints set after this one will become invalid.
      */
-    public void rollbackToSavepoint();
+    void rollbackToSavepoint();
 
     /**
      * Rollback the current transaction to the given savepoint name.
      * Savepoints set after this one will become invalid.
      */
-    public void rollbackToSavepoint(String name);
+    void rollbackToSavepoint(String name);
 
     /**
      * Release the last set savepoint and any resources associated with it.
      * The given savepoint and any set after it will become invalid.
      */
-    public void releaseSavepoint();
+    void releaseSavepoint();
 
     /**
      * Release the savepoint and any resources associated with it.
      * The given savepoint and any set after it will become invalid.
      */
-    public void releaseSavepoint(String name);
+    void releaseSavepoint(String name);
 
     /**
      * Run pre-flush actions on transactional objects, including
@@ -391,7 +391,7 @@ public interface OpenJPAEntityManager
      *
      * @since 0.3.3
      */
-    public void preFlush();
+    void preFlush();
 
     /**
      * Validate the changes made in this transaction, reporting any optimistic
@@ -401,18 +401,18 @@ public interface OpenJPAEntityManager
      * datastore-level transaction, however, it will only report exceptions
      * that would occur on flush, without retaining any datastore resources.
      */
-    public void validateChanges();
+    void validateChanges();
 
     /**
      * Whether a store transaction is active.
      */
-    public boolean isStoreActive();
+    boolean isStoreActive();
 
     /**
      * Begins a store transaction if one isn't already started. The
      * entity manager must already be in a logical transaction.
      */
-    public void beginStore();
+    void beginStore();
 
     ////////////////////
     // Object Lifecycle
@@ -421,50 +421,50 @@ public interface OpenJPAEntityManager
     /**
      * Whether the given objects are managed.
      */
-    public boolean containsAll(Object... pcs);
+    boolean containsAll(Object... pcs);
 
     /**
      * Whether the given objects are managed.
      */
-    public boolean containsAll(Collection pcs);
+    boolean containsAll(Collection pcs);
 
     /**
      * Persist the given objects.
      */
-    public void persistAll(Object... pcs);
+    void persistAll(Object... pcs);
 
     /**
      * Persist the given objects.
      */
-    public void persistAll(Collection pcs);
+    void persistAll(Collection pcs);
 
     /**
      * Delete the given persistent objects.
      */
-    public void removeAll(Object... pcs);
+    void removeAll(Object... pcs);
 
     /**
      * Delete the given persistent objects.
      */
-    public void removeAll(Collection pcs);
+    void removeAll(Collection pcs);
 
     /**
      * Release the given object from management. This operation is not
      * recursive.
      */
-    public void release(Object pc);
+    void release(Object pc);
 
     /**
      * Release the given object from management. This operation is not
      * recursive.
      */
-    public void releaseAll(Object... pcs);
+    void releaseAll(Object... pcs);
 
     /**
      * Release the given objects from management. This operation is not
      * recursive.
      */
-    public void releaseAll(Collection pcs);
+    void releaseAll(Collection pcs);
 
     /**
      * Immediately load the given object's persistent fields. One might
@@ -473,36 +473,36 @@ public interface OpenJPAEntityManager
      * recursive. Any related objects that are loaded will not necessarily
      * have their fields loaded.
      */
-    public void retrieve(Object pc);
+    void retrieve(Object pc);
 
     /**
      * Retrieve the persistent state of the given objects.
      *
      * @see #retrieve
      */
-    public void retrieveAll(Object... pcs);
+    void retrieveAll(Object... pcs);
 
     /**
      * Retrieve the persistent state of the given objects.
      *
      * @see #retrieve
      */
-    public void retrieveAll(Collection pcs);
+    void retrieveAll(Collection pcs);
 
     /**
      * Refresh the state of the given objects.
      */
-    public void refreshAll(Object... pcs);
+    void refreshAll(Object... pcs);
 
     /**
      * Refresh the state of the given objects.
      */
-    public void refreshAll(Collection pcs);
+    void refreshAll(Collection pcs);
 
     /**
      * Refresh all transactional objects.
      */
-    public void refreshAll();
+    void refreshAll();
 
     /**
      * <P> Evict the given object.</P>
@@ -512,7 +512,7 @@ public interface OpenJPAEntityManager
      * </P>
      * @param pc A persistent class which will be evicted
      */
-    public void evict(Object pc);
+    void evict(Object pc);
 
     /**
      * <P>Evict the given objects.</P>
@@ -522,7 +522,7 @@ public interface OpenJPAEntityManager
      * </P>
      * @param pcs The persistent classes which will be evicted
      */
-    public void evictAll(Object... pcs);
+    void evictAll(Object... pcs);
 
     /**
      * <P>Evict the given objects.</P>
@@ -532,7 +532,7 @@ public interface OpenJPAEntityManager
      * </P>
      * @param pcs A collection of persistent classes which will be evicted.
      */
-    public void evictAll(Collection pcs);
+    void evictAll(Collection pcs);
 
     /**
      * <P>Evict all clean objects.</P>
@@ -541,7 +541,7 @@ public interface OpenJPAEntityManager
      * affects objects which are managed and unmodified.
      * </P>
      */
-    public void evictAll();
+    void evictAll();
 
     /**
      * <P>Evict all persistent-clean and persistent-nontransactional
@@ -552,7 +552,7 @@ public interface OpenJPAEntityManager
      * </P>
      * @param cls All clean instances of this class will be evicted.
      */
-    public void evictAll(Class cls);
+    void evictAll(Class cls);
 
     /**
      * <P>Evict all persistent-clean and persistent-nontransactional
@@ -563,7 +563,7 @@ public interface OpenJPAEntityManager
      * </P>
      * @param extent Extend which contains the persistent classes to evict.
      */
-    public void evictAll(Extent extent);
+    void evictAll(Extent extent);
 
     /**
      * Detach the specified object from the entity manager, detaching based on
@@ -581,7 +581,7 @@ public interface OpenJPAEntityManager
      * signature and different semantics.  The specification defined method
      * trumped the existing method.
      */
-    public <T> T detachCopy(T pc);
+    <T> T detachCopy(T pc);
 
     /**
      * Detach the specified objects from the entity manager.
@@ -589,7 +589,7 @@ public interface OpenJPAEntityManager
      * @param pcs the instances to detach
      * @return the detached instances
      */
-    public Collection detachAll(Collection pcs);
+    Collection detachAll(Collection pcs);
 
     /**
      * Detach the specified objects from the entity manager.
@@ -597,7 +597,7 @@ public interface OpenJPAEntityManager
      * @param pcs the instances to detach
      * @return the detached instances
      */
-    public Object[] detachAll(Object... pcs);
+    Object[] detachAll(Object... pcs);
 
     /**
      * Merge the specified objects into the entity manager.
@@ -605,7 +605,7 @@ public interface OpenJPAEntityManager
      * @param pcs instances to import
      * @return the re-attached instances
      */
-    public Object[] mergeAll(Object... pcs);
+    Object[] mergeAll(Object... pcs);
 
     /**
      * Merge the specified detached objects into the entity manager.
@@ -613,7 +613,7 @@ public interface OpenJPAEntityManager
      * @param pcs Collection of instances to import
      * @return the re-attached instances
      */
-    public Collection mergeAll(Collection pcs);
+    Collection mergeAll(Collection pcs);
 
     /**
      * Make the given object transactional.
@@ -622,7 +622,7 @@ public interface OpenJPAEntityManager
      * @param updateVersion if true, the instance's version will be
      * incremented at the next flush
      */
-    public void transactional(Object pc, boolean updateVersion);
+    void transactional(Object pc, boolean updateVersion);
 
     /**
      * Make the given objects transactional.
@@ -631,7 +631,7 @@ public interface OpenJPAEntityManager
      * @param updateVersion if true, the instance's version will be
      * incremented at the next flush
      */
-    public void transactionalAll(Collection objs, boolean updateVersion);
+    void transactionalAll(Collection objs, boolean updateVersion);
 
     /**
      * Make the given objects transactional.
@@ -640,22 +640,22 @@ public interface OpenJPAEntityManager
      * @param updateVersion if true, the instance's version will be
      * incremented at the next flush
      */
-    public void transactionalAll(Object[] objs, boolean updateVersion);
+    void transactionalAll(Object[] objs, boolean updateVersion);
 
     /**
      * Make the given object nontransactional.
      */
-    public void nontransactional(Object pc);
+    void nontransactional(Object pc);
 
     /**
      * Make the given objects nontransactional.
      */
-    public void nontransactionalAll(Collection objs);
+    void nontransactionalAll(Collection objs);
 
     /**
      * Make the given objects nontransactional.
      */
-    public void nontransactionalAll(Object[] objs);
+    void nontransactionalAll(Object[] objs);
 
     ////////////////////////////
     // Extent, Query, Generator
@@ -664,52 +664,52 @@ public interface OpenJPAEntityManager
     /**
      * Return the named generator defined in the metadata.
      */
-    public Generator getNamedGenerator(String name);
+    Generator getNamedGenerator(String name);
 
     /**
      * Returns a {@link Generator} for the datastore identity values of the
      * specified type, or null if the type is unmanaged or its identity
      * cannot be represented by a sequence.
      */
-    public Generator getIdGenerator(Class forClass);
+    Generator getIdGenerator(Class forClass);
 
     /**
      * Returns a {@link Generator} for the generated values of the specified
      * type, or null if the field is not generated.
      */
-    public Generator getFieldGenerator(Class forClass, String fieldName);
+    Generator getFieldGenerator(Class forClass, String fieldName);
 
     /**
      * Return an extent of the given class, optionally including subclasses.
      */
-    public <T> Extent<T> createExtent(Class<T> cls, boolean subs);
+    <T> Extent<T> createExtent(Class<T> cls, boolean subs);
 
-    public OpenJPAQuery createQuery(String query);
+    @Override OpenJPAQuery createQuery(String query);
 
-    public OpenJPAQuery createNamedQuery(String name);
+    @Override OpenJPAQuery createNamedQuery(String name);
 
-    public OpenJPAQuery createNativeQuery(String sql);
+    @Override OpenJPAQuery createNativeQuery(String sql);
 
-    public OpenJPAQuery createNativeQuery(String sql, Class resultClass);
+    @Override OpenJPAQuery createNativeQuery(String sql, Class resultClass);
 
-    public OpenJPAQuery createNativeQuery(String sql, String resultMapping);
+    @Override OpenJPAQuery createNativeQuery(String sql, String resultMapping);
 
     /**
      * Create a new query from the given one.
      */
-    public OpenJPAQuery createQuery(Query query);
+    OpenJPAQuery createQuery(Query query);
 
     /**
      * Create a new query in the given language.
      */
-    public OpenJPAQuery createQuery(String language, String query);
+    OpenJPAQuery createQuery(String language, String query);
 
     /**
      * Create an executable query from a dynamically defined query.
      *
      * @since 2.0.0
      */
-    public OpenJPAQuery createDynamicQuery(QueryDefinition dynamic);
+    OpenJPAQuery createDynamicQuery(QueryDefinition dynamic);
 
     ///////////
     // Locking
@@ -718,7 +718,7 @@ public interface OpenJPAEntityManager
     /**
      * Return the lock mode of the given instance, or null if not locked.
      */
-    public LockModeType getLockMode(Object pc);
+    @Override LockModeType getLockMode(Object pc);
 
     /**
      * Ensure that the given instance is locked at the given lock level.
@@ -728,13 +728,13 @@ public interface OpenJPAEntityManager
      * @param timeout the number of milliseconds to wait for the lock before
      * giving up, or -1 for no limit
      */
-    public void lock(Object pc, LockModeType mode, int timeout);
+    void lock(Object pc, LockModeType mode, int timeout);
 
     /**
      * Ensure that the given instance is locked at the current lock level, as
      * set in the {@link FetchPlan} for the entity manager.
      */
-    public void lock(Object pc);
+    void lock(Object pc);
 
     /**
      * Ensure that the given instances are locked at the given lock level.
@@ -744,13 +744,13 @@ public interface OpenJPAEntityManager
      * @param timeout the number of milliseconds to wait for the lock before
      * giving up, or -1 for no limit
      */
-    public void lockAll(Collection pcs, LockModeType mode, int timeout);
+    void lockAll(Collection pcs, LockModeType mode, int timeout);
 
     /**
      * Ensure that the given instances are locked at the current lock level,
      * as set in the {@link FetchPlan} for the entity manager.
      */
-    public void lockAll(Collection pcs);
+    void lockAll(Collection pcs);
 
     /**
      * Ensure that the given instances are locked at the given lock level.
@@ -760,13 +760,13 @@ public interface OpenJPAEntityManager
      * @param timeout the number of milliseconds to wait for the lock before
      * giving up, or -1 for no limit
      */
-    public void lockAll(Object[] pcs, LockModeType mode, int timeout);
+    void lockAll(Object[] pcs, LockModeType mode, int timeout);
 
     /**
      * Ensure that the given instances are locked at the current lock level,
      * as set in the {@link FetchPlan} for the entity manager.
      */
-    public void lockAll(Object... pcs);
+    void lockAll(Object... pcs);
 
     //////////////
     // Connection
@@ -779,13 +779,13 @@ public interface OpenJPAEntityManager
      *
      * @return true if any statements were cancelled, false otherwise
      */
-    public boolean cancelAll();
+    boolean cancelAll();
 
     /**
      * Return the connection in use by the entity manager, or a new
      * connection if none.
      */
-    public Object getConnection();
+    Object getConnection();
 
     /////////
     // Cache
@@ -794,58 +794,58 @@ public interface OpenJPAEntityManager
     /**
      * Return a set of all managed instances.
      */
-    public Collection getManagedObjects();
+    Collection getManagedObjects();
 
     /**
      * Return a set of current transaction instances.
      */
-    public Collection getTransactionalObjects();
+    Collection getTransactionalObjects();
 
     /**
      * Return a set of instances which will become transactional upon
      * the next transaction.
      */
-    public Collection getPendingTransactionalObjects();
+    Collection getPendingTransactionalObjects();
 
     /**
      * Return a set of current dirty instances.
      */
-    public Collection getDirtyObjects();
+    Collection getDirtyObjects();
 
     /**
      * Whether dirty objects will be returned in the order they were dirtied.
      * Default is determined by the store manager.
      */
-    public boolean getOrderDirtyObjects();
+    boolean getOrderDirtyObjects();
 
     /**
      * Whether dirty objects will be returned in the order they were dirtied.
      * Default is determined by the store manager.
      */
-    public void setOrderDirtyObjects(boolean order);
+    void setOrderDirtyObjects(boolean order);
 
     /**
      * Mark the given class as dirty within the current transaction.
      */
-    public void dirtyClass(Class cls);
+    void dirtyClass(Class cls);
 
     /**
      * Return the set of classes that have been made persistent in the current
      * transaction.
      */
-    public Collection<Class> getPersistedClasses();
+    Collection<Class> getPersistedClasses();
 
     /**
      * Return the set of classes that have been deleted in the current
      * transaction.
      */
-    public Collection<Class> getRemovedClasses();
+    Collection<Class> getRemovedClasses();
 
     /**
      * Return the set of classes for objects that have been modified
      * in the current transaction.
      */
-    public Collection<Class> getUpdatedClasses();
+    Collection<Class> getUpdatedClasses();
 
     /**
      * Create a new instance of type <code>cls</code>. If <code>cls</code> is
@@ -863,43 +863,43 @@ public interface OpenJPAEntityManager
      * @throws IllegalArgumentException if <code>cls</code> is not a managed
      * type or interface.
      */
-    public <T> T createInstance(Class<T> cls);
+    <T> T createInstance(Class<T> cls);
 
     /**
      * Make the named field of the given object dirty.
      */
-    public void dirty(Object o, String field);
+    void dirty(Object o, String field);
 
     /**
      * Return the oid of the given instance.
      */
-    public Object getObjectId(Object o);
+    Object getObjectId(Object o);
 
     /**
      * Return whether the given object is dirty.
      */
-    public boolean isDirty(Object o);
+    boolean isDirty(Object o);
 
     /**
      * Return whether the given object is transactional.
      */
-    public boolean isTransactional(Object o);
+    boolean isTransactional(Object o);
 
     /**
      * Return whether the given object is persistent.
      */
-    public boolean isPersistent(Object o);
+    boolean isPersistent(Object o);
 
     /**
      * Return whether the given object was made persistent in the current
      * transaction.
      */
-    public boolean isNewlyPersistent(Object o);
+    boolean isNewlyPersistent(Object o);
 
     /**
      * Return whether the given object is deleted.
      */
-    public boolean isRemoved(Object o);
+    boolean isRemoved(Object o);
 
     /**
      * Returns <code>true</code> if <code>pc</code> is a detached object
@@ -907,286 +907,292 @@ public interface OpenJPAEntityManager
 	 * to {@link EntityManager#merge}); otherwise returns
 	 * <code>false</code>.
 	 */
-	public boolean isDetached (Object o);
+	boolean isDetached (Object o);
 
 	/**
 	 * Returns the current version indicator for <code>o</code>.
 	 */
-	public Object getVersion (Object o);
+	Object getVersion (Object o);
 
     /**
      * @deprecated use the {@link ConnectionRetainMode} enum instead.
      */
-    public static final int CONN_RETAIN_DEMAND =
+    @Deprecated int CONN_RETAIN_DEMAND =
         ConnectionRetainModes.CONN_RETAIN_DEMAND;
 
     /**
      * @deprecated use the {@link ConnectionRetainMode} enum instead.
      */
-    public static final int CONN_RETAIN_TRANS =
+    @Deprecated int CONN_RETAIN_TRANS =
         ConnectionRetainModes.CONN_RETAIN_TRANS;
 
     /**
      * @deprecated use the {@link ConnectionRetainMode} enum instead.
      */
-    public static final int CONN_RETAIN_ALWAYS =
+    @Deprecated int CONN_RETAIN_ALWAYS =
         ConnectionRetainModes.CONN_RETAIN_ALWAYS;
 
     /**
      * @deprecated use the {@link DetachStateType} enum instead.
      */
-    public static final int DETACH_FETCH_GROUPS =
+    @Deprecated int DETACH_FETCH_GROUPS =
         DetachState.DETACH_FETCH_GROUPS;
 
     /**
      * @deprecated use the {@link DetachStateType} enum instead.
      */
-    public static final int DETACH_FGS = DetachState.DETACH_FGS;
+    @Deprecated int DETACH_FGS = DetachState.DETACH_FGS;
 
     /**
      * @deprecated use the {@link DetachStateType} enum instead.
      */
-    public static final int DETACH_LOADED = DetachState.DETACH_LOADED;
+    @Deprecated int DETACH_LOADED = DetachState.DETACH_LOADED;
 
     /**
      * @deprecated use the {@link DetachStateType} enum instead.
      */
-    public static final int DETACH_ALL = DetachState.DETACH_ALL;
+    @Deprecated int DETACH_ALL = DetachState.DETACH_ALL;
 
     /**
      * @deprecated use the {@link RestoreStateType} enum instead.
      */
-    public static final int RESTORE_NONE = RestoreState.RESTORE_NONE;
+    @Deprecated int RESTORE_NONE = RestoreState.RESTORE_NONE;
 
     /**
      * @deprecated use the {@link RestoreStateType} enum instead.
      */
-    public static final int RESTORE_IMMUTABLE = RestoreState.RESTORE_IMMUTABLE;
+    @Deprecated int RESTORE_IMMUTABLE = RestoreState.RESTORE_IMMUTABLE;
 
     /**
      * @deprecated use the {@link RestoreStateType} enum instead.
      */
-    public static final int RESTORE_ALL = RestoreState.RESTORE_ALL;
+    @Deprecated int RESTORE_ALL = RestoreState.RESTORE_ALL;
 
     /**
      * @deprecated use the {@link AutoDetachType} enum instead.
      */
-    public static final int DETACH_CLOSE = AutoDetach.DETACH_CLOSE;
+    @Deprecated int DETACH_CLOSE = AutoDetach.DETACH_CLOSE;
 
     /**
      * @deprecated use the {@link AutoDetachType} enum instead.
      */
-    public static final int DETACH_COMMIT = AutoDetach.DETACH_COMMIT;
+    @Deprecated int DETACH_COMMIT = AutoDetach.DETACH_COMMIT;
 
     /**
      * @deprecated use the {@link AutoDetachType} enum instead.
      */
-    public static final int DETACH_NONTXREAD = AutoDetach.DETACH_NONTXREAD;
+    @Deprecated int DETACH_NONTXREAD = AutoDetach.DETACH_NONTXREAD;
 
     /**
      * @deprecated use the {@link AutoDetachType} enum instead.
      */
-    public static final int DETACH_ROLLBACK = AutoDetach.DETACH_ROLLBACK;
+    @Deprecated int DETACH_ROLLBACK = AutoDetach.DETACH_ROLLBACK;
 
     /**
      * @deprecated use the {@link AutoClearType} enum instead.
      */
-    public static final int CLEAR_DATASTORE = AutoClear.CLEAR_DATASTORE;
+    @Deprecated int CLEAR_DATASTORE = AutoClear.CLEAR_DATASTORE;
 
     /**
      * @deprecated use the {@link AutoClearType} enum instead.
      */
-    public static final int CLEAR_ALL = AutoClear.CLEAR_ALL;
+    @Deprecated int CLEAR_ALL = AutoClear.CLEAR_ALL;
 
     /**
      * @deprecated use the {@link CallbackMode} enum instead.
      */
-    public static final int CALLBACK_FAIL_FAST =
+    @Deprecated int CALLBACK_FAIL_FAST =
         CallbackModes.CALLBACK_FAIL_FAST;
 
     /**
      * @deprecated use the {@link CallbackMode} enum instead.
      */
-    public static final int CALLBACK_IGNORE = CallbackModes.CALLBACK_IGNORE;
+    @Deprecated int CALLBACK_IGNORE = CallbackModes.CALLBACK_IGNORE;
 
     /**
      * @deprecated use the {@link CallbackMode} enum instead.
      */
-    public static final int CALLBACK_LOG = CallbackModes.CALLBACK_LOG;
+    @Deprecated int CALLBACK_LOG = CallbackModes.CALLBACK_LOG;
 
     /**
      * @deprecated use the {@link CallbackMode} enum instead.
      */
-    public static final int CALLBACK_RETHROW = CallbackModes.CALLBACK_RETHROW;
+    @Deprecated int CALLBACK_RETHROW = CallbackModes.CALLBACK_RETHROW;
 
     /**
      * @deprecated use the {@link CallbackMode} enum instead.
      */
-    public static final int CALLBACK_ROLLBACK = CallbackModes.CALLBACK_ROLLBACK;
+    @Deprecated int CALLBACK_ROLLBACK = CallbackModes.CALLBACK_ROLLBACK;
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public org.apache.openjpa.conf.OpenJPAConfiguration getConfiguration();
+    @Deprecated org.apache.openjpa.conf.OpenJPAConfiguration getConfiguration();
 
     /**
      * @deprecated use {@link #setRestoreState(RestoreStateType)} instead.
      */
-    public void setRestoreState(int restore);
+    @Deprecated void setRestoreState(int restore);
 
     /**
      * @deprecated use {@link #setDetachState(DetachStateType)} instead.
      */
-    public void setDetachState(int detach);
+    @Deprecated void setDetachState(int detach);
 
     /**
      * @deprecated use {@link #setAutoClear(AutoClearType)} instead.
      */
-    public void setAutoClear(int autoClear);
+    @Deprecated void setAutoClear(int autoClear);
 
     /**
      * @deprecated use {@link #setAutoDetach(AutoDetachType)} or
      * {@link #setAutoDetach(java.util.EnumSet)} instead.
      */
-    public void setAutoDetach(int autoDetachFlags);
+    @Deprecated void setAutoDetach(int autoDetachFlags);
 
     /**
      * @deprecated use {@link #setAutoDetach(AutoDetachType, boolean)} instead.
      */
-    public void setAutoDetach(int flag, boolean on);
+    @Deprecated void setAutoDetach(int flag, boolean on);
 
     /**
      * @deprecated use {@link #isTrackChangesByType()} instead.
      */
-    public boolean isLargeTransaction();
+    @Deprecated boolean isLargeTransaction();
 
     /**
      * @deprecated use {@link #setTrackChangesByType(boolean)} instead.
      */
-    public void setLargeTransaction(boolean value);
+    @Deprecated void setLargeTransaction(boolean value);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void addTransactionListener(Object listener);
+    @Deprecated void addTransactionListener(Object listener);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void removeTransactionListener(Object listener);
+    @Deprecated void removeTransactionListener(Object listener);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public int getTransactionListenerCallbackMode();
+    @Deprecated int getTransactionListenerCallbackMode();
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void setTransactionListenerCallbackMode(int callbackMode);
+    @Deprecated void setTransactionListenerCallbackMode(int callbackMode);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void addLifecycleListener(Object listener, Class... classes);
+    @Deprecated void addLifecycleListener(Object listener, Class... classes);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void removeLifecycleListener(Object listener);
+    @Deprecated void removeLifecycleListener(Object listener);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public int getLifecycleListenerCallbackMode();
+    @Deprecated int getLifecycleListenerCallbackMode();
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerSPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void setLifecycleListenerCallbackMode(int callbackMode);
+    @Deprecated void setLifecycleListenerCallbackMode(int callbackMode);
 
     /**
      * @deprecated use {@link EntityTransaction#begin}
      * instead: <code>em.getTransaction().begin()</code>
      */
-    public void begin();
+    @Deprecated
+    @Override void begin();
 
     /**
      * @deprecated use {@link EntityTransaction#commit}
      * instead: <code>em.getTransaction().commit()</code>
      */
-    public void commit();
+    @Deprecated
+    @Override void commit();
 
     /**
      * @deprecated use {@link EntityTransaction#rollback}
      * instead: <code>em.getTransaction().rollback()</code>
      */
-    public void rollback();
+    @Deprecated
+    @Override void rollback();
 
     /**
      * @deprecated use {@link EntityTransaction#isActive}
      * instead: <code>em.getTransaction().isActive()</code>
      */
-    public boolean isActive();
+    @Deprecated
+    @Override boolean isActive();
 
     /**
      * @deprecated use {@link OpenJPAEntityTransaction#commitAndResume} instead:
      * <code>em.getTransaction().commitAndResume()</code>
      */
-    public void commitAndResume();
+    @Deprecated void commitAndResume();
 
     /**
      * @deprecated use {@link OpenJPAEntityTransaction#rollbackAndResume}
      * instead: <code>em.getTransaction().rollbackAndResume()</code>
      */
-    public void rollbackAndResume();
+    @Deprecated void rollbackAndResume();
 
     /**
      * @deprecated use {@link EntityTransaction#setRollbackOnly}
      * instead: <code>em.getTransaction().setRollbackOnly()</code>
      */
-    public void setRollbackOnly();
+    @Deprecated
+    @Override void setRollbackOnly();
 
     /**
      * @deprecated use {@link OpenJPAEntityTransaction#setRollbackOnly}
      * instead: <code>em.getTransaction().setRollbackOnly()</code>
      */
-    public void setRollbackOnly(Throwable cause);
+    @Deprecated void setRollbackOnly(Throwable cause);
 
     /**
      * @deprecated use {@link OpenJPAEntityTransaction#getRollbackCause}
      * instead: <code>em.getTransaction().getRollbackCause()</code>
      */
-    public Throwable getRollbackCause();
+    @Deprecated Throwable getRollbackCause();
 
     /**
      * @deprecated use {@link EntityTransaction#getRollbackOnly}
      * instead: <code>em.getTransaction().getRollbackOnly()</code>
      */
-    public boolean getRollbackOnly();
+    @Deprecated
+    @Override boolean getRollbackOnly();
 
     /**
      * Gets the QueryBuilder with OpenJPA-extended capabilities.
      *
      * @since 2.0.0
      */
-    public OpenJPACriteriaBuilder getCriteriaBuilder();
+    @Override OpenJPACriteriaBuilder getCriteriaBuilder();
 
     /**
      * Get the properties supported by this runtime.
      *
      * @since 2.0.0
     */
-    public Set<String> getSupportedProperties();
+    Set<String> getSupportedProperties();
 
 
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java
index 30d5ff70d..a268a6ab6 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactory.java
@@ -40,35 +40,35 @@ public interface OpenJPAEntityManagerFactory
     /**
      * Return properties describing this runtime.
      */
-    public Map<String, Object> getProperties();
+    @Override Map<String, Object> getProperties();
 
     /**
      * Put the specified key-value pair into the map of user objects.
      */
-    public Object putUserObject(Object key, Object val);
+    Object putUserObject(Object key, Object val);
 
     /**
      * Get the value for the specified key from the map of user objects.
      */
-    public Object getUserObject(Object key);
+    Object getUserObject(Object key);
 
     /**
      * Access the level 2 store cache. This cache acts as a proxy to all
      * named caches.
      */
-    public StoreCache getStoreCache();
+    StoreCache getStoreCache();
 
     /**
      * Access a named level 2 store cache.
      */
-    public StoreCache getStoreCache(String name);
+    StoreCache getStoreCache(String name);
 
     /**
      * Access query result cache.
      */
-    public QueryResultCache getQueryResultCache();
+    QueryResultCache getQueryResultCache();
 
-    public OpenJPAEntityManager createEntityManager();
+    @Override OpenJPAEntityManager createEntityManager();
 
     /**
      * Return an entity manager with the provided additional configuration
@@ -81,69 +81,69 @@ public interface OpenJPAEntityManagerFactory
      * <li>openjpa.TransactionMode</li>
      * </ul>
      */
-    public OpenJPAEntityManager createEntityManager(Map props);
+    @Override OpenJPAEntityManager createEntityManager(Map props);
 
     /**
      * @deprecated use {@link ConnectionRetainMode} enums instead.
      */
-    public static final int CONN_RETAIN_DEMAND = 0;
+    @Deprecated int CONN_RETAIN_DEMAND = 0;
 
     /**
      * @deprecated use {@link ConnectionRetainMode} enums instead.
      */
-    public static final int CONN_RETAIN_TRANS = 1;
+    @Deprecated int CONN_RETAIN_TRANS = 1;
 
     /**
      * @deprecated use {@link ConnectionRetainMode} enums instead.
      */
-    public static final int CONN_RETAIN_ALWAYS = 2;
+    @Deprecated int CONN_RETAIN_ALWAYS = 2;
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerFactorySPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public org.apache.openjpa.conf.OpenJPAConfiguration getConfiguration();
+    @Deprecated org.apache.openjpa.conf.OpenJPAConfiguration getConfiguration();
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerFactorySPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void addLifecycleListener(Object listener, Class... classes);
+    @Deprecated void addLifecycleListener(Object listener, Class... classes);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerFactorySPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void removeLifecycleListener(Object listener);
+    @Deprecated void removeLifecycleListener(Object listener);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerFactorySPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void addTransactionListener(Object listener);
+    @Deprecated void addTransactionListener(Object listener);
 
     /**
      * @deprecated cast to {@link OpenJPAEntityManagerFactorySPI} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public void removeTransactionListener(Object listener);
+    @Deprecated void removeTransactionListener(Object listener);
 
     /**
      * Gets a builder for dynamic queries.
      */
-    public QueryBuilder getDynamicQueryBuilder();
+    QueryBuilder getDynamicQueryBuilder();
 
     /**
      * Gets the QueryBuilder with OpenJPA-extended capabilities.
      *
      * @since 2.0.0
      */
-    public OpenJPACriteriaBuilder getCriteriaBuilder();
+    @Override OpenJPACriteriaBuilder getCriteriaBuilder();
 
     /**
      * Get the properties supported by this runtime.
      *
      * @since 2.0.0
     */
-    public Set<String> getSupportedProperties();
+    Set<String> getSupportedProperties();
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java
index a5b7058f1..0dcd284e0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerFactorySPI.java
@@ -34,14 +34,14 @@ public interface OpenJPAEntityManagerFactorySPI
      *
      * @since 0.3.3
      */
-    public void addLifecycleListener(Object listener, Class... classes);
+    @Override void addLifecycleListener(Object listener, Class... classes);
 
     /**
      * Remove a listener for lifecycle-related events.
      *
      * @since 0.3.3
      */
-    public void removeLifecycleListener (Object listener);
+    @Override void removeLifecycleListener (Object listener);
 
     /**
      * Register a listener for transaction-related events on the specified
@@ -51,21 +51,21 @@ public interface OpenJPAEntityManagerFactorySPI
      *
      * @since 1.0.0
      */
-    public void addTransactionListener(Object listener);
+    @Override void addTransactionListener(Object listener);
 
     /**
      * Remove a listener for transaction-related events.
      *
      * @since 1.0.0
      */
-    public void removeTransactionListener (Object listener);
+    @Override void removeTransactionListener (Object listener);
 
     /**
      * Return the configuration for this factory.
      */
-    public OpenJPAConfiguration getConfiguration();
+    @Override OpenJPAConfiguration getConfiguration();
 
-    public OpenJPAEntityManagerSPI createEntityManager();
+    @Override OpenJPAEntityManagerSPI createEntityManager();
 
-    public OpenJPAEntityManagerSPI createEntityManager(Map props);
+    @Override OpenJPAEntityManagerSPI createEntityManager(Map props);
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
index be7465e46..369944508 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
@@ -29,12 +29,12 @@ public interface OpenJPAEntityManagerSPI
     /**
      * Return the configuration associated with this entity manager.
      */
-    public OpenJPAConfiguration getConfiguration();
+    @Override OpenJPAConfiguration getConfiguration();
 
     /**
      * Return the managed runtime in use.
      */
-    public ManagedRuntime getManagedRuntime();
+    ManagedRuntime getManagedRuntime();
 
     //////////
     // Events
@@ -43,12 +43,12 @@ public interface OpenJPAEntityManagerSPI
     /**
      * Register a listener for transaction-related events.
      */
-    public void addTransactionListener(Object listener);
+    @Override void addTransactionListener(Object listener);
 
     /**
      * Remove a listener for transaction-related events.
      */
-    public void removeTransactionListener(Object listener);
+    @Override void removeTransactionListener(Object listener);
 
     /**
      * The {@link CallbackMode} flags for handling transaction listener
@@ -56,33 +56,33 @@ public interface OpenJPAEntityManagerSPI
      *
      * @since 1.1.0
      */
-    public EnumSet<CallbackMode> getTransactionListenerCallbackModes();
+    EnumSet<CallbackMode> getTransactionListenerCallbackModes();
 
     /**
      * The {@link CallbackMode} flag for handling transaction listener
      * exceptions. The flags provided here will entirely replace the
      * previous settings.
      */
-    public void setTransactionListenerCallbackMode(CallbackMode mode);
+    void setTransactionListenerCallbackMode(CallbackMode mode);
 
     /**
      * The {@link CallbackMode} flags for handling transaction listener
      * exceptions. The flags provided here will entirely replace the
      * previous settings.
      */
-    public void setTransactionListenerCallbackMode(EnumSet<CallbackMode> modes);
+    void setTransactionListenerCallbackMode(EnumSet<CallbackMode> modes);
 
     /**
      * Register a listener for lifecycle-related events on the specified
      * classes. If the classes are null, all events will be propagated to
      * the listener.
      */
-    public void addLifecycleListener(Object listener, Class... classes);
+    @Override void addLifecycleListener(Object listener, Class... classes);
 
     /**
      * Remove a listener for lifecycle-related events.
      */
-    public void removeLifecycleListener(Object listener);
+    @Override void removeLifecycleListener(Object listener);
 
     /**
      * The {@link CallbackMode} flags for handling lifecycle listener
@@ -90,21 +90,21 @@ public interface OpenJPAEntityManagerSPI
      *
      * @since 1.1.0
      */
-    public EnumSet<CallbackMode> getLifecycleListenerCallbackModes();
+    EnumSet<CallbackMode> getLifecycleListenerCallbackModes();
 
     /**
      * The {@link CallbackMode} flag for handling lifecycle listener
      * exceptions. The flags provided here will entirely replace the
      * previous settings.
      */
-    public void setLifecycleListenerCallbackMode(CallbackMode mode);
+    void setLifecycleListenerCallbackMode(CallbackMode mode);
 
     /**
      * The {@link CallbackMode} flags for handling lifecycle listener
      * exceptions. The flags provided here will entirely replace the
      * previous settings.
      */
-    public void setLifecycleListenerCallbackMode(EnumSet<CallbackMode> modes);
+    void setLifecycleListenerCallbackMode(EnumSet<CallbackMode> modes);
 
 
     /**
@@ -112,7 +112,7 @@ public interface OpenJPAEntityManagerSPI
      *
      * @since 2.0.0
      */
-    public boolean getQuerySQLCache();
+    boolean getQuerySQLCache();
 
     /**
      * Sets whether this receiver will cache database queries during its
@@ -121,6 +121,6 @@ public interface OpenJPAEntityManagerSPI
      *
      * @since 2.0.0
      */
-    public void setQuerySQLCache(boolean flag);
+    void setQuerySQLCache(boolean flag);
 
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java
index 7b7cf8597..4588cfa58 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityTransaction.java
@@ -38,7 +38,7 @@ public interface OpenJPAEntityTransaction
      * @see javax.persistence.EntityTransaction#commit()
      * @see javax.persistence.EntityTransaction#begin()
      */
-    public void commitAndResume();
+    void commitAndResume();
 
     /**
      * Issue a rollback and then start a new transaction. This is identical to:
@@ -49,7 +49,7 @@ public interface OpenJPAEntityTransaction
      * @see javax.persistence.EntityTransaction#rollback()
      * @see javax.persistence.EntityTransaction#begin()
      */
-    public void rollbackAndResume();
+    void rollbackAndResume();
 
     /**
      * Mark the current transaction for rollback with the specified cause
@@ -57,7 +57,7 @@ public interface OpenJPAEntityTransaction
      *
      * @since 0.9.7
      */
-    public void setRollbackOnly(Throwable cause);
+    void setRollbackOnly(Throwable cause);
 
     /**
      * Returns the Throwable that caused the transaction to be
@@ -67,5 +67,5 @@ public interface OpenJPAEntityTransaction
      *
      * @since 0.9.7
      */
-    public Throwable getRollbackCause();
+    Throwable getRollbackCause();
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java
index 883f0fcc0..b0a626dce 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java
@@ -20,6 +20,7 @@ package org.apache.openjpa.persistence;
 
 import java.util.Collection;
 import java.util.Map;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -204,6 +205,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static final String EM_KEY =
         "org.apache.openjpa.persistence.EntityManager";
 
@@ -211,6 +213,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static final String EMF_KEY =
         "org.apache.openjpa.persistence.EntityManagerFactory";
 
@@ -218,6 +221,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static OpenJPAEntityManagerFactory toEntityManagerFactory(
         org.apache.openjpa.kernel.BrokerFactory factory) {
         return JPAFacadeHelper.toEntityManagerFactory(factory);
@@ -227,6 +231,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static org.apache.openjpa.kernel.BrokerFactory toBrokerFactory(
         EntityManagerFactory factory) {
         return JPAFacadeHelper.toBrokerFactory(factory);
@@ -236,6 +241,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static OpenJPAEntityManager toEntityManager(
         org.apache.openjpa.kernel.Broker broker) {
         return JPAFacadeHelper.toEntityManager(broker);
@@ -245,6 +251,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static Broker toBroker(EntityManager em) {
         return JPAFacadeHelper.toBroker(em);
     }
@@ -253,6 +260,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static org.apache.openjpa.meta.ClassMetaData getMetaData(Object o) {
         return JPAFacadeHelper.getMetaData(o);
     }
@@ -261,6 +269,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static org.apache.openjpa.meta.ClassMetaData getMetaData(
         EntityManager em, Class cls) {
         return JPAFacadeHelper.getMetaData(em, cls);
@@ -270,6 +279,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static org.apache.openjpa.meta.ClassMetaData getMetaData(
         EntityManagerFactory factory, Class cls) {
         return JPAFacadeHelper.getMetaData(factory, cls);
@@ -279,6 +289,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static Object fromOpenJPAObjectId(Object oid) {
         return JPAFacadeHelper.fromOpenJPAObjectId(oid);
     }
@@ -287,6 +298,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static Object toOpenJPAObjectId(
         org.apache.openjpa.meta.ClassMetaData meta, Object oid) {
         return JPAFacadeHelper.toOpenJPAObjectId(meta, oid);
@@ -296,6 +308,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static Object[] toOpenJPAObjectIds(
         org.apache.openjpa.meta.ClassMetaData meta, Object... oids) {
         return JPAFacadeHelper.toOpenJPAObjectIds(meta, oids);
@@ -305,6 +318,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static Collection toOpenJPAObjectIds(
         org.apache.openjpa.meta.ClassMetaData meta, Collection oids) {
         return JPAFacadeHelper.toOpenJPAObjectIds(meta, oids);
@@ -314,6 +328,7 @@ public class OpenJPAPersistence {
      * @deprecated use {@link JPAFacadeHelper} instead. This method pierces
      * the published-API boundary, as does the JPAFacadeHelper utilization.
      */
+    @Deprecated
     public static Class fromOpenJPAObjectIdClass(Class oidClass) {
         return JPAFacadeHelper.fromOpenJPAObjectIdClass(oidClass);
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
index d236079ce..cb179f46f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
@@ -186,7 +186,7 @@ public class OpenJPAPersistenceUtil {
     private static HashSet<OpenJPAStateManager> addToLoadSet(
         HashSet<OpenJPAStateManager> pcs, OpenJPAStateManager sm) {
         if (pcs == null) {
-            pcs = new HashSet<OpenJPAStateManager>();
+            pcs = new HashSet<>();
         }
         pcs.add(sm);
         return pcs;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
index 5be732cee..9e5088743 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuery.java
@@ -46,121 +46,121 @@ public interface OpenJPAQuery<X> extends TypedQuery<X> {
     /**
      * Hint key for specifying the number of rows to optimize for.
      */
-    public static final String HINT_RESULT_COUNT = QueryHints.HINT_RESULT_COUNT;
+    String HINT_RESULT_COUNT = QueryHints.HINT_RESULT_COUNT;
 
     /**
      * The owning entity manager.
      */
-    public OpenJPAEntityManager getEntityManager();
+    OpenJPAEntityManager getEntityManager();
 
     /**
      * Query language.
      */
-    public String getLanguage();
+    String getLanguage();
 
     /**
      * Query operation type.
      */
-    public QueryOperationType getOperation();
+    QueryOperationType getOperation();
 
     /**
      * Fetch plan for controlling the loading of results.
      */
-    public FetchPlan getFetchPlan();
+    FetchPlan getFetchPlan();
 
     /**
      * Query string.
      */
-    public String getQueryString();
+    String getQueryString();
 
     /**
      * Whether to ignore changes in the current transaction.
      */
-    public boolean getIgnoreChanges();
+    boolean getIgnoreChanges();
 
     /**
      * Whether to ignore changes in the current transaction.
      */
-    public OpenJPAQuery<X>setIgnoreChanges(boolean ignore);
+    OpenJPAQuery<X>setIgnoreChanges(boolean ignore);
 
     /**
      * Return the candidate collection, or <code>null</code> if an
      * extent was specified instead of a collection.
      */
-    public Collection getCandidateCollection();
+    Collection getCandidateCollection();
 
     /**
      * Set a collection of candidates.
      */
-    public OpenJPAQuery<X> setCandidateCollection(Collection coll);
+    OpenJPAQuery<X> setCandidateCollection(Collection coll);
 
     /**
      * Query result element type.
      */
-    public Class getResultClass();
+    Class getResultClass();
 
     /**
      * Query result element type.
      */
-    public OpenJPAQuery<X> setResultClass(Class type);
+    OpenJPAQuery<X> setResultClass(Class type);
 
     /**
      * Whether subclasses are included in the query results.
      */
-    public boolean hasSubclasses();
+    boolean hasSubclasses();
 
     /**
      * Whether subclasses are included in the query results.
      */
-    public OpenJPAQuery<X> setSubclasses(boolean subs);
+    OpenJPAQuery<X> setSubclasses(boolean subs);
 
     /**
      * Return the 0-based start index for the returned results.
      */
-    public int getFirstResult();
+    @Override int getFirstResult();
 
     /**
      * Return the maximum number of results to retrieve.
      * or {@link Integer#MAX_VALUE} for no limit.
      */
-    public int getMaxResults();
+    @Override int getMaxResults();
 
     /**
      * Compile the query.
      */
-    public OpenJPAQuery<X> compile();
+    OpenJPAQuery<X> compile();
 
     /**
      * Whether this query has positional parameters.
      */
-    public boolean hasPositionalParameters();
+    boolean hasPositionalParameters();
 
     /**
      * The positional parameters for the query; empty array if none or
      * if query uses named parameters.
      */
-    public Object[] getPositionalParameters();
+    Object[] getPositionalParameters();
 
     /**
      * The named parameters for the query; empty map if none or
      * if query uses positional parameters.
      */
-    public Map<String, Object> getNamedParameters();
+    Map<String, Object> getNamedParameters();
 
     /**
      * Set parameters.
      */
-    public OpenJPAQuery<X> setParameters(Map params);
+    OpenJPAQuery<X> setParameters(Map params);
 
     /**
      * Set parameters.
      */
-    public OpenJPAQuery<X> setParameters(Object... params);
+    OpenJPAQuery<X> setParameters(Object... params);
 
     /**
      * Close all open query results.
      */
-    public OpenJPAQuery<X>closeAll();
+    OpenJPAQuery<X>closeAll();
 
     /**
      * Returns a description of the commands that will be sent to
@@ -169,25 +169,25 @@ public interface OpenJPAQuery<X> extends TypedQuery<X> {
      *
      * @param params the named parameter map for the query invocation
      */
-    public String[] getDataStoreActions(Map params);
+    String[] getDataStoreActions(Map params);
 
-    public OpenJPAQuery<X> setMaxResults(int maxResult);
+    @Override OpenJPAQuery<X> setMaxResults(int maxResult);
 
-    public OpenJPAQuery<X> setFirstResult(int startPosition);
+    @Override OpenJPAQuery<X> setFirstResult(int startPosition);
 
-    public OpenJPAQuery<X> setHint(String hintName, Object value);
+    @Override OpenJPAQuery<X> setHint(String hintName, Object value);
 
-    public OpenJPAQuery<X> setParameter(String name, Object value);
+    @Override OpenJPAQuery<X> setParameter(String name, Object value);
 
-    public OpenJPAQuery<X> setParameter(String name, Date value, TemporalType temporalType);
+    @Override OpenJPAQuery<X> setParameter(String name, Date value, TemporalType temporalType);
 
-    public OpenJPAQuery<X> setParameter(String name, Calendar value, TemporalType temporalType);
+    @Override OpenJPAQuery<X> setParameter(String name, Calendar value, TemporalType temporalType);
 
-    public OpenJPAQuery<X> setParameter(int position, Object value);
+    @Override OpenJPAQuery<X> setParameter(int position, Object value);
 
-    public OpenJPAQuery<X> setParameter(int position, Date value, TemporalType temporalType);
+    @Override OpenJPAQuery<X> setParameter(int position, Date value, TemporalType temporalType);
 
-    public OpenJPAQuery<X> setParameter(int position, Calendar value, TemporalType temporalType);
+    @Override OpenJPAQuery<X> setParameter(int position, Calendar value, TemporalType temporalType);
 
     /**
      * Sets whether the type of user-supplied bind parameter value and the type of target persistent
@@ -201,7 +201,7 @@ public interface OpenJPAQuery<X> extends TypedQuery<X> {
      *
      * @param hint a String or Boolean value.
      */
-    public void setRelaxBindParameterTypeChecking(Object hint);
+    void setRelaxBindParameterTypeChecking(Object hint);
 
     /**
      * Gets whether the type of user-supplied bind parameter value and the type of target persistent
@@ -210,75 +210,75 @@ public interface OpenJPAQuery<X> extends TypedQuery<X> {
      * @return the booelan state. False by default, i.e. the type of a bind parameter value is checked
      * strongly against the target property type.
      */
-    public boolean getRelaxBindParameterTypeChecking();
+    boolean getRelaxBindParameterTypeChecking();
 
 
-    public OpenJPAQuery<X> setFlushMode(FlushModeType flushMode);
+    @Override OpenJPAQuery<X> setFlushMode(FlushModeType flushMode);
 
     /**
      * Return the current flush mode.
 	 */
-	public FlushModeType getFlushMode ();
+	@Override FlushModeType getFlushMode ();
 
     /**
      * @deprecated use the {@link QueryOperationType} instead.
      */
-    public static final int OP_SELECT = QueryOperations.OP_SELECT;
+    @Deprecated int OP_SELECT = QueryOperations.OP_SELECT;
 
     /**
      * @deprecated use the {@link QueryOperationType} instead.
      */
-    public static final int OP_DELETE = QueryOperations.OP_DELETE;
+    @Deprecated int OP_DELETE = QueryOperations.OP_DELETE;
 
     /**
      * @deprecated use the {@link QueryOperationType} instead.
      */
-    public static final int OP_UPDATE = QueryOperations.OP_DELETE;
+    @Deprecated int OP_UPDATE = QueryOperations.OP_DELETE;
 
     /**
      * @deprecated use the {@link FlushModeType} enum instead.
      */
-    public static final int FLUSH_TRUE = QueryFlushModes.FLUSH_TRUE;
+    @Deprecated int FLUSH_TRUE = QueryFlushModes.FLUSH_TRUE;
 
     /**
      * @deprecated use the {@link FlushModeType} enum instead.
      */
-    public static final int FLUSH_FALSE = QueryFlushModes.FLUSH_FALSE;
+    @Deprecated int FLUSH_FALSE = QueryFlushModes.FLUSH_FALSE;
 
     /**
      * @deprecated use the {@link FlushModeType} enum instead.
      */
-    public static final int FLUSH_WITH_CONNECTION =
+    @Deprecated int FLUSH_WITH_CONNECTION =
         QueryFlushModes.FLUSH_WITH_CONNECTION;
 
     /**
      * @deprecated cast to {@link QueryImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public OpenJPAQuery<X> addFilterListener(org.apache.openjpa.kernel.exps.FilterListener listener);
+    @Deprecated OpenJPAQuery<X> addFilterListener(org.apache.openjpa.kernel.exps.FilterListener listener);
 
     /**
      * @deprecated cast to {@link QueryImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public OpenJPAQuery<X> removeFilterListener(org.apache.openjpa.kernel.exps.FilterListener listener);
+    @Deprecated OpenJPAQuery<X> removeFilterListener(org.apache.openjpa.kernel.exps.FilterListener listener);
 
     /**
      * @deprecated cast to {@link QueryImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public OpenJPAQuery<X> addAggregateListener(org.apache.openjpa.kernel.exps.AggregateListener listener);
+    @Deprecated OpenJPAQuery<X> addAggregateListener(org.apache.openjpa.kernel.exps.AggregateListener listener);
 
     /**
      * @deprecated cast to {@link QueryImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public OpenJPAQuery<X> removeAggregateListener(org.apache.openjpa.kernel.exps.AggregateListener listener);
+    @Deprecated OpenJPAQuery<X> removeAggregateListener(org.apache.openjpa.kernel.exps.AggregateListener listener);
 
     /**
      * Gets hints supported by this query.
      *
      * @since 2.0.0
      */
-    public Set<String> getSupportedHints();
+    Set<String> getSupportedHints();
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java
index 7c9cc291a..fbbf7d717 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAQuerySPI.java
@@ -18,28 +18,28 @@
  */
 package org.apache.openjpa.persistence;
 
-import org.apache.openjpa.kernel.exps.FilterListener;
 import org.apache.openjpa.kernel.exps.AggregateListener;
+import org.apache.openjpa.kernel.exps.FilterListener;
 
 public interface OpenJPAQuerySPI<X> extends OpenJPAQuery<X> {
 
     /**
      * Register a filter listener for the query.
      */
-    public OpenJPAQuery<X> addFilterListener(FilterListener listener);
+    @Override OpenJPAQuery<X> addFilterListener(FilterListener listener);
 
     /**
      * Remove a filter listener from the query.
      */
-    public OpenJPAQuery<X> removeFilterListener(FilterListener listener);
+    @Override OpenJPAQuery<X> removeFilterListener(FilterListener listener);
 
     /**
      * Register an aggregate listener for the query.
      */
-    public OpenJPAQuery<X> addAggregateListener(AggregateListener listener);
+    @Override OpenJPAQuery<X> addAggregateListener(AggregateListener listener);
 
     /**
      * Remove an aggregate listener from the query.
      */
-    public OpenJPAQuery<X> removeAggregateListener(AggregateListener listener);
+    @Override OpenJPAQuery<X> removeAggregateListener(AggregateListener listener);
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java
index 2a5a937a1..7ace0e2a5 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OptimisticLockException.java
@@ -39,6 +39,8 @@ public class OptimisticLockException
     extends javax.persistence.OptimisticLockException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -51,43 +53,53 @@ public class OptimisticLockException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return STORE;
     }
 
+    @Override
     public int getSubtype() {
         return StoreException.LOCK;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java
index 1421cd2cd..472bd4b80 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ParameterImpl.java
@@ -64,14 +64,17 @@ public class ParameterImpl<T> implements Parameter<T> {
         _expectedValueType = expectedValueType;
     }
 
+    @Override
     public final String getName() {
         return _name;
     }
 
+    @Override
     public final Integer getPosition() {
         return _position;
     }
 
+    @Override
     public Class<T> getParameterType() {
       return _expectedValueType;
     }
@@ -99,6 +102,7 @@ public class ParameterImpl<T> implements Parameter<T> {
             ^ ((_position != null) ? _position.hashCode() : 0);
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder("Parameter");
         buf.append("<" + getParameterType().getSimpleName() + ">");
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java
index befadd617..9da3df565 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceException.java
@@ -38,6 +38,8 @@ public class PersistenceException
     extends javax.persistence.PersistenceException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -50,43 +52,53 @@ public class PersistenceException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return GENERAL;
     }
 
+    @Override
     public int getSubtype() {
         return 0;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
index 03089fa50..27ecbaf52 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
@@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException;
 
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.kernel.MixedLockLevels;
+import org.apache.openjpa.util.ExceptionInfo;
 import org.apache.openjpa.util.Exceptions;
 import org.apache.openjpa.util.LockException;
 import org.apache.openjpa.util.NoTransactionException;
@@ -45,6 +46,10 @@ public class PersistenceExceptions
 
     public static final RuntimeExceptionTranslator TRANSLATOR =
         new RuntimeExceptionTranslator() {
+            
+            private static final long serialVersionUID = 1L;
+
+            @Override
             public RuntimeException translate(RuntimeException re) {
                 return PersistenceExceptions.toPersistenceException(re);
             }
@@ -60,8 +65,11 @@ public class PersistenceExceptions
     public static RuntimeExceptionTranslator getRollbackTranslator(
         final OpenJPAEntityManager em) {
         return new RuntimeExceptionTranslator() {
+            
+            private static final long serialVersionUID = 1L;
             private boolean throwing = false;
 
+            @Override
             public RuntimeException translate(RuntimeException re) {
                 RuntimeException ex = toPersistenceException(re);
                 if (!(ex instanceof NonUniqueResultException)
@@ -120,7 +128,7 @@ public class PersistenceExceptions
             return ke.getCause();
 
         // RuntimeExceptions thrown from callbacks should be thrown directly
-        if (ke.getType() == OpenJPAException.USER
+        if (ke.getType() == ExceptionInfo.USER
             && ke.getSubtype() == UserException.CALLBACK
             && ke.getNestedThrowables().length == 1) {
             Throwable e = ke.getCause();
@@ -133,11 +141,11 @@ public class PersistenceExceptions
 
         // perform intelligent translation of openjpa exceptions
         switch (ke.getType()) {
-            case OpenJPAException.STORE:
+            case ExceptionInfo.STORE:
                 return translateStoreException(ke);
-            case OpenJPAException.USER:
+            case ExceptionInfo.USER:
                 return translateUserException(ke);
-            case OpenJPAException.WRAPPED:
+            case ExceptionInfo.WRAPPED:
                 return translateWrappedException(ke);
             default:
                 return translateGeneralException(ke);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java
index d4bb72129..abc938820 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceListenerAdapter.java
@@ -27,9 +27,9 @@ import org.apache.openjpa.event.LifecycleEvent;
 import org.apache.openjpa.event.LifecycleEventManager;
 import org.apache.openjpa.event.LoadListener;
 import org.apache.openjpa.event.PersistListener;
+import org.apache.openjpa.event.PostDeleteListener;
 import org.apache.openjpa.event.PostPersistListener;
 import org.apache.openjpa.event.UpdateListener;
-import org.apache.openjpa.event.PostDeleteListener;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.CallbackException;
 
@@ -57,6 +57,7 @@ class PersistenceListenerAdapter
         }
     }
 
+    @Override
     public boolean respondsTo(int eventType) {
         return _callbacks[eventType] != null;
     }
@@ -81,42 +82,52 @@ class PersistenceListenerAdapter
         }
     }
 
+    @Override
     public void beforePersist(LifecycleEvent event) {
         makeCallback(event);
     }
 
+    @Override
     public void afterPersist(LifecycleEvent event) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void afterPersistPerformed(LifecycleEvent event) {
         makeCallback(event);
     }
 
+    @Override
     public void afterLoad(LifecycleEvent event) {
         makeCallback(event);
     }
 
+    @Override
     public void afterRefresh(LifecycleEvent event) {
         // no analagous callback
     }
 
+    @Override
     public void beforeUpdate(LifecycleEvent event) {
         makeCallback(event);
     }
 
+    @Override
     public void afterUpdatePerformed(LifecycleEvent event) {
         makeCallback(event);
     }
 
+    @Override
     public void beforeDelete(LifecycleEvent event) {
         makeCallback(event);
     }
 
+    @Override
     public void afterDelete(LifecycleEvent event) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void afterDeletePerformed(LifecycleEvent event) {
         makeCallback(event);
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
index 566216429..21e93584c 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
@@ -18,6 +18,20 @@
  */
 package org.apache.openjpa.persistence;
 
+import static javax.persistence.AccessType.FIELD;
+import static javax.persistence.AccessType.PROPERTY;
+import static org.apache.openjpa.persistence.PersistenceStrategy.BASIC;
+import static org.apache.openjpa.persistence.PersistenceStrategy.ELEM_COLL;
+import static org.apache.openjpa.persistence.PersistenceStrategy.EMBEDDED;
+import static org.apache.openjpa.persistence.PersistenceStrategy.MANY_MANY;
+import static org.apache.openjpa.persistence.PersistenceStrategy.MANY_ONE;
+import static org.apache.openjpa.persistence.PersistenceStrategy.ONE_MANY;
+import static org.apache.openjpa.persistence.PersistenceStrategy.ONE_ONE;
+import static org.apache.openjpa.persistence.PersistenceStrategy.PERS;
+import static org.apache.openjpa.persistence.PersistenceStrategy.PERS_COLL;
+import static org.apache.openjpa.persistence.PersistenceStrategy.PERS_MAP;
+import static org.apache.openjpa.persistence.PersistenceStrategy.TRANSIENT;
+
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -26,15 +40,15 @@ import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.security.AccessController;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Locale;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;
@@ -56,9 +70,11 @@ import javax.persistence.PreRemove;
 import javax.persistence.PreUpdate;
 import javax.persistence.Transient;
 
+import org.apache.openjpa.conf.OpenJPAConfiguration;
+import org.apache.openjpa.enhance.Reflection;
+import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.meta.AbstractMetaDataDefaults;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
@@ -66,16 +82,9 @@ import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.ValueMetaData;
-
-import static javax.persistence.AccessType.FIELD;
-import static javax.persistence.AccessType.PROPERTY;
-import static org.apache.openjpa.persistence.PersistenceStrategy.*;
-
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
 import org.apache.openjpa.util.UserException;
-import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.enhance.Reflection;
 
 /**
  * JPA-based metadata defaults.
@@ -91,8 +100,8 @@ public class PersistenceMetaDataDefaults
         (PersistenceMetaDataDefaults.class);
 
     private static final Map<Class<?>, PersistenceStrategy> _strats =
-        new HashMap<Class<?>, PersistenceStrategy>();
-    private static final Set<String> _ignoredAnnos = new HashSet<String>();
+        new HashMap<>();
+    private static final Set<String> _ignoredAnnos = new HashSet<>();
 
     static {
         _strats.put(Basic.class, BASIC);
@@ -419,7 +428,7 @@ public class PersistenceMetaDataDefaults
      */
     private List<Method> matchGetterAndSetter(List<Method> getters,
     		List<Method> setters) {
-        Collection<Method> unmatched =  new ArrayList<Method>();
+        Collection<Method> unmatched =  new ArrayList<>();
 
         for (Method getter : getters) {
             String getterName = getter.getName();
@@ -512,7 +521,7 @@ public class PersistenceMetaDataDefaults
      */
     @Override
     public List<Member> getPersistentMembers(ClassMetaData meta, boolean ignoreTransient) {
-    	List<Member> members = new ArrayList<Member>();
+    	List<Member> members = new ArrayList<>();
     	List<Field> fields   = getPersistentFields(meta, ignoreTransient);
     	List<Method> getters = getPersistentMethods(meta, ignoreTransient);
 
@@ -587,6 +596,7 @@ public class PersistenceMetaDataDefaults
         return isDefaultPersistent(meta, member, name, false);
     }
 
+    @Override
     protected boolean isDefaultPersistent(ClassMetaData meta, Member member,
         String name, boolean ignoreTransient) {
         int mods = member.getModifiers();
@@ -682,6 +692,7 @@ public class PersistenceMetaDataDefaults
      * Gets either the instance field or the getter method depending upon the
      * access style of the given meta-data.
      */
+    @Override
     public Member getMemberByProperty(ClassMetaData meta, String property,
     	int access, boolean applyDefaultRule) {
     	Class<?> cls = meta.getDescribedType();
@@ -736,7 +747,7 @@ public class PersistenceMetaDataDefaults
      * Inclusive element filtering predicate.
      *
      */
-    private static interface InclusiveFilter<T extends AnnotatedElement> {
+    private interface InclusiveFilter<T extends AnnotatedElement> {
         /**
          * Return true to include the given element.
          */
@@ -749,7 +760,7 @@ public class PersistenceMetaDataDefaults
      */
     <T extends AnnotatedElement> List<T> filter(T[] array,
     	InclusiveFilter... filters) {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
         for (T e : array) {
             boolean include = true;
             for (InclusiveFilter f : filters) {
@@ -766,7 +777,7 @@ public class PersistenceMetaDataDefaults
 
     <T extends AnnotatedElement> List<T> filter(List<T> list,
         	InclusiveFilter... filters) {
-        List<T> result = new ArrayList<T>();
+        List<T> result = new ArrayList<>();
         for (T e : list) {
             boolean include = true;
             for (InclusiveFilter f : filters) {
@@ -791,6 +802,7 @@ public class PersistenceMetaDataDefaults
 
         private boolean includePrivate;
 
+        @Override
         public boolean includes(Method method) {
             return isGetter(method, isIncludePrivate());
         }
@@ -810,6 +822,7 @@ public class PersistenceMetaDataDefaults
      *
      */
     static class SetterFilter implements InclusiveFilter<Method> {
+        @Override
         public boolean includes(Method method) {
             return isSetter(method);
         }
@@ -837,6 +850,7 @@ public class PersistenceMetaDataDefaults
             this.target = target;
         }
 
+        @Override
         public boolean includes(AnnotatedElement obj) {
         	Access access = obj.getAnnotation(Access.class);
         	return access != null && access.value().equals(target);
@@ -855,6 +869,7 @@ public class PersistenceMetaDataDefaults
             this.target = target;
         }
 
+        @Override
         public boolean includes(AnnotatedElement obj) {
         	int mods = ((Member)obj).getModifiers();
 
@@ -876,6 +891,7 @@ public class PersistenceMetaDataDefaults
             modifierOnly = modOnly;
         }
 
+        @Override
         public boolean includes(AnnotatedElement obj) {
             if (modifierOnly) {
                 return !Modifier.isTransient(((Member)obj).getModifiers());
@@ -891,6 +907,7 @@ public class PersistenceMetaDataDefaults
      * marked to be ignored.
      */
     static class AnnotatedFilter implements InclusiveFilter<AnnotatedElement> {
+        @Override
         public boolean includes(AnnotatedElement obj) {
             Annotation[] annos = AccessController.doPrivileged(J2DoPrivHelper
                     .getAnnotationsAction(obj));
@@ -930,6 +947,7 @@ public class PersistenceMetaDataDefaults
     	return methods.toString();
     }
 
+    @Override
     public boolean isAbstractMappingUniDirectional(OpenJPAConfiguration conf) {
         if (_isAbstractMappingUniDirectional == null)
             setAbstractMappingUniDirectional(conf);
@@ -940,6 +958,7 @@ public class PersistenceMetaDataDefaults
         _isAbstractMappingUniDirectional = conf.getCompatibilityInstance().isAbstractMappingUniDirectional();
     }
 
+    @Override
     public boolean isNonDefaultMappingAllowed(OpenJPAConfiguration conf) {
         if (_isNonDefaultMappingAllowed == null)
             setNonDefaultMappingAllowed(conf);
@@ -951,10 +970,12 @@ public class PersistenceMetaDataDefaults
             isNonDefaultMappingAllowed();
     }
 
+    @Override
     public Boolean isDefaultCascadePersistEnabled() {
         return _isCascadePersistPersistenceUnitDefaultEnabled;
     }
 
+    @Override
     public void setDefaultCascadePersistEnabled(Boolean bool) {
         _isCascadePersistPersistenceUnitDefaultEnabled = bool;
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
index a13aa7e0d..195083233 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
@@ -90,7 +90,7 @@ public class PersistenceMetaDataFactory
     private boolean _fieldOverride = true;
 
     protected Stack<XMLPersistenceMetaDataParser> _stack =
-        new Stack<XMLPersistenceMetaDataParser>();
+        new Stack<>();
 
     /**
      * Whether to use field-level override or class-level override.
@@ -142,6 +142,7 @@ public class PersistenceMetaDataFactory
     /**
      * Create a new annotation serializer.
      */
+    @Override
     protected AnnotationPersistenceMetaDataSerializer
         newAnnotationSerializer() {
         return new AnnotationPersistenceMetaDataSerializer
@@ -207,6 +208,7 @@ public class PersistenceMetaDataFactory
         return new XMLPersistenceMetaDataSerializer(repos.getConfiguration());
     }
 
+    @Override
     public void load(Class<?> cls, int mode, ClassLoader envLoader) {
         if (mode == MODE_NONE)
             return;
@@ -225,7 +227,7 @@ public class PersistenceMetaDataFactory
         boolean parsedXML = false;
         if (_unparsed != null && !_unparsed.isEmpty()
             && (mode & MODE_META) != 0) {
-            Set<URL> unparsed = new HashSet<URL>(_unparsed);
+            Set<URL> unparsed = new HashSet<>(_unparsed);
             for (URL url : unparsed) {
                 parseXML(url, cls, mode, envLoader);
             }
@@ -337,11 +339,11 @@ public class PersistenceMetaDataFactory
                 "map-persistent-type-names", rsrc, Arrays.asList(names)));
 
         if (_xml == null)
-            _xml = new HashMap<URL, Set<String>>();
-        _xml.put((URL) rsrc, new HashSet<String>(Arrays.asList(names)));
+            _xml = new HashMap<>();
+        _xml.put((URL) rsrc, new HashSet<>(Arrays.asList(names)));
 
         if (_unparsed == null)
-            _unparsed = new HashSet<URL>();
+            _unparsed = new HashSet<>();
         _unparsed.add((URL) rsrc);
     }
 
@@ -476,6 +478,7 @@ public class PersistenceMetaDataFactory
         }
     }
 
+    @Override
     public MetaDataDefaults getDefaults() {
         return _def;
     }
@@ -499,10 +502,12 @@ public class PersistenceMetaDataFactory
             _xml.clear();
     }
 
+    @Override
     protected Parser newParser(boolean loading) {
         return newXMLParser(loading);
     }
 
+    @Override
     protected Serializer newSerializer() {
         return newXMLSerializer();
     }
@@ -512,10 +517,12 @@ public class PersistenceMetaDataFactory
         parse(parser, Collections.singleton(defaultXMLFile()));
     }
 
+    @Override
     protected File defaultSourceFile(ClassMetaData meta) {
         return defaultXMLFile();
     }
 
+    @Override
     protected File defaultSourceFile(QueryMetaData query, Map clsNames) {
         ClassMetaData meta = getDefiningMetaData(query, clsNames);
         File file = (meta == null) ? null : meta.getSourceFile();
@@ -524,6 +531,7 @@ public class PersistenceMetaDataFactory
         return defaultXMLFile();
     }
 
+    @Override
     protected File defaultSourceFile(SequenceMetaData seq, Map clsNames) {
         return defaultXMLFile();
     }
@@ -545,12 +553,15 @@ public class PersistenceMetaDataFactory
         return new File(dir, "orm.xml");
     }
 
+    @Override
     public void setConfiguration(Configuration conf) {
     }
 
+    @Override
     public void startConfiguration() {
     }
 
+    @Override
     public void endConfiguration() {
         if (rsrcs == null)
             rsrcs = Collections.singleton("META-INF/orm.xml");
@@ -558,6 +569,7 @@ public class PersistenceMetaDataFactory
 			rsrcs.add("META-INF/orm.xml");
 	}
 
+    @Override
     public void setInto(Options opts) {
         opts.keySet().retainAll(opts.setInto(_def).keySet());
     }
@@ -594,6 +606,7 @@ public class PersistenceMetaDataFactory
             (repos.getConfiguration());
     }
 
+    @Override
     public void loadXMLMetaData(Class<?> cls) {
         AnnotationPersistenceXMLMetaDataParser parser
             = getXMLAnnotationParser();
@@ -602,6 +615,7 @@ public class PersistenceMetaDataFactory
 
     private static String UNDERSCORE = "_";
 
+    @Override
     public String getManagedClassName(String mmClassName) {
         if (mmClassName == null || mmClassName.length() == 0)
             return null;
@@ -610,16 +624,19 @@ public class PersistenceMetaDataFactory
         return mmClassName;
     }
 
+    @Override
     public String getMetaModelClassName(String managedClassName) {
         if (managedClassName == null || managedClassName.length() == 0)
             return null;
         return managedClassName + UNDERSCORE;
     }
 
+    @Override
     public boolean isMetaClass(Class<?> c) {
         return c != null && c.getAnnotation(StaticMetamodel.class) != null;
     }
 
+    @Override
     public Class<?> getManagedClass(Class<?> c) {
         if (isMetaClass(c)) {
             return c.getAnnotation(StaticMetamodel.class).value();
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
index 3e074a3c9..768449b12 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
@@ -42,7 +42,6 @@ import javax.persistence.ValidationMode;
 import javax.persistence.spi.PersistenceUnitInfo;
 import javax.persistence.spi.PersistenceUnitTransactionType;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.Compatibility;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
@@ -63,6 +62,7 @@ import org.apache.openjpa.lib.meta.XMLVersionParser;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.MultiClassLoader;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -95,7 +95,7 @@ public class PersistenceProductDerivation
         (PersistenceProductDerivation.class);
 
     private HashMap<String, PUNameCollision> _puNameCollisions
-        = new HashMap<String,PUNameCollision>();
+        = new HashMap<>();
 
     public static final String PREFIX = "javax.persistence";
 
@@ -103,7 +103,7 @@ public class PersistenceProductDerivation
     private static final String[] _invalidPersistenceProperties =
         new String[] { PREFIX + ".cache.storeMode", PREFIX + ".cache.retrieveMode" };
 
-    private static Set<String> _hints = new HashSet<String>();
+    private static Set<String> _hints = new HashSet<>();
 
     // Provider name to filter out PUs that don't belong to this derivation.
     protected String _providerImplName;
@@ -156,9 +156,11 @@ public class PersistenceProductDerivation
 		_providerImplName = PersistenceProviderImpl.class.getName();
 	}
 
+    @Override
     public void putBrokerFactoryAliases(Map<String, String> m) {
     }
 
+    @Override
     public int getType() {
         return TYPE_SPEC;
     }
@@ -396,7 +398,7 @@ public class PersistenceProductDerivation
 
     private List<String> getUnitNames(ConfigurationParser parser) {
         List<PersistenceUnitInfoImpl> units = parser.getResults();
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         for (PersistenceUnitInfoImpl unit : units){
         	String provider = unit.getPersistenceProviderClassName();
 			// Only add the PU name if the provider it is ours or not specified.
@@ -571,7 +573,7 @@ public class PersistenceProductDerivation
     private PersistenceUnitInfoImpl parseResources(ConfigurationParser parser,
         List<URL> urls, String name, ClassLoader loader)
         throws IOException {
-        List<PersistenceUnitInfoImpl> pinfos = new ArrayList<PersistenceUnitInfoImpl>();
+        List<PersistenceUnitInfoImpl> pinfos = new ArrayList<>();
         for (URL url : urls) {
             parser.parse(url);
             pinfos.addAll((List<PersistenceUnitInfoImpl>) parser.getResults());
@@ -858,6 +860,7 @@ public class PersistenceProductDerivation
             _excludeUnlistedSet = false;
         }
 
+        @Override
         protected boolean startElement(String name, Attributes attrs)
             throws SAXException {
             if (currentDepth() == 1)
@@ -867,6 +870,7 @@ public class PersistenceProductDerivation
             return true;
         }
 
+        @Override
         protected void endElement(String name)
             throws SAXException {
             if (currentDepth() == 1) {
@@ -992,7 +996,7 @@ public class PersistenceProductDerivation
         private Set<String> _resources;
 
         PUNameCollision(String puName, String file1, String file2) {
-            _resources = new LinkedHashSet<String>();
+            _resources = new LinkedHashSet<>();
             _resources.add(file1);
             _resources.add(file2);
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
index 264af8ac4..1d337af9c 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
@@ -151,10 +151,12 @@ public class PersistenceProviderImpl
             return Bootstrap.getBrokerFactory(cp, loader);
     }
 
+    @Override
     public OpenJPAEntityManagerFactory createEntityManagerFactory(String name, Map m) {
         return createEntityManagerFactory(name, null, m);
     }
 
+    @Override
     public OpenJPAEntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo pui, Map m) {
         PersistenceProductDerivation pd = new PersistenceProductDerivation();
         try {
@@ -235,7 +237,7 @@ public class PersistenceProviderImpl
         if (conf instanceof OpenJPAConfigurationImpl) {
             Map<String, Object> peMap =((OpenJPAConfigurationImpl)conf).getPersistenceEnvironment();
             if (peMap == null) {
-                peMap = new HashMap<String, Object>();
+                peMap = new HashMap<>();
                 ((OpenJPAConfigurationImpl)conf).setPersistenceEnvironment(peMap);
             }
             peMap.put(AbstractCFMetaDataFactory.PERSISTENCE_UNIT_ROOT_URL, pui.getPersistenceUnitRootUrl());
@@ -248,6 +250,7 @@ public class PersistenceProviderImpl
      * Returns a ProviderUtil for use with entities managed by this
      * persistence provider.
      */
+    @Override
     public ProviderUtil getProviderUtil() {
         return this;
     }
@@ -284,6 +287,7 @@ public class PersistenceProviderImpl
             cp.setInto(conf);
             // use the temporary loader for everything
             conf.setClassResolver(new ClassResolver() {
+                @Override
                 public ClassLoader getClassLoader(Class<?> context, ClassLoader env) {
                     return tmpLoader;
                 }
@@ -296,6 +300,7 @@ public class PersistenceProviderImpl
                 Configurations.parseProperties(props), tmpLoader);
         }
 
+        @Override
         public byte[] transform(ClassLoader cl, String name,
             Class<?> previousVersion, ProtectionDomain pd, byte[] bytes)
             throws IllegalClassFormatException {
@@ -346,6 +351,7 @@ public class PersistenceProviderImpl
      *         LoadState.UNKNOWN - if the entity is not managed by this
      *         provider.
      */
+    @Override
     public LoadState isLoaded(Object obj) {
         return isLoadedWithoutReference(obj, null);
     }
@@ -362,6 +368,7 @@ public class PersistenceProviderImpl
      *         provider or if it does not contain the persistent
      *         attribute.
      */
+    @Override
     public LoadState isLoadedWithReference(Object obj, String attr) {
         // TODO: Are there be any cases where OpenJPA will need to examine
         // the contents of a field to determine load state?  If so, per JPA
@@ -384,6 +391,7 @@ public class PersistenceProviderImpl
      *         provider or if it does not contain the persistent
      *         attribute.
      */
+    @Override
     public LoadState isLoadedWithoutReference(Object obj, String attr) {
         if (obj == null) {
             return LoadState.UNKNOWN;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
index 7b9b32447..7f4ac0f4e 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
@@ -66,7 +66,7 @@ public class PersistenceUnitInfoImpl
         (PersistenceUnitInfoImpl.class);
 
     private String _name;
-    private final HashMap<Object,Object> _props = new HashMap<Object, Object>();
+    private final HashMap<Object,Object> _props = new HashMap<>();
     private PersistenceUnitTransactionType _transType =
         PersistenceUnitTransactionType.RESOURCE_LOCAL;
 
@@ -98,16 +98,19 @@ public class PersistenceUnitInfoImpl
     // - an application client jar file
     private URL _root;
 
+    @Override
     public ClassLoader getClassLoader() {
         return null;
     }
 
+    @Override
     public ClassLoader getNewTempClassLoader() {
         return AccessController.doPrivileged(J2DoPrivHelper
             .newTemporaryClassLoaderAction(AccessController
                 .doPrivileged(J2DoPrivHelper.getContextClassLoaderAction())));
     }
 
+    @Override
     public String getPersistenceUnitName() {
         return _name;
     }
@@ -116,6 +119,7 @@ public class PersistenceUnitInfoImpl
         _name = emName;
     }
 
+    @Override
     public String getPersistenceProviderClassName() {
         return _providerClassName;
     }
@@ -124,6 +128,7 @@ public class PersistenceUnitInfoImpl
         _providerClassName = providerClassName;
     }
 
+    @Override
     public PersistenceUnitTransactionType getTransactionType() {
         return _transType;
     }
@@ -142,6 +147,7 @@ public class PersistenceUnitInfoImpl
             _jtaDataSource = null;
     }
 
+    @Override
     public DataSource getJtaDataSource() {
         return _jtaDataSource;
     }
@@ -162,6 +168,7 @@ public class PersistenceUnitInfoImpl
             _nonJtaDataSource = null;
     }
 
+    @Override
     public DataSource getNonJtaDataSource() {
         return _nonJtaDataSource;
     }
@@ -172,6 +179,7 @@ public class PersistenceUnitInfoImpl
             _nonJtaDataSourceName = null;
     }
 
+    @Override
     public URL getPersistenceUnitRootUrl() {
         return _root;
     }
@@ -180,6 +188,7 @@ public class PersistenceUnitInfoImpl
         _root = root;
     }
 
+    @Override
     public boolean excludeUnlistedClasses() {
         return _excludeUnlisted;
     }
@@ -188,6 +197,7 @@ public class PersistenceUnitInfoImpl
         _excludeUnlisted = excludeUnlisted;
     }
 
+    @Override
     public List<String> getMappingFileNames() {
         if (_mappingFileNames == null)
             return Collections.emptyList();
@@ -196,10 +206,11 @@ public class PersistenceUnitInfoImpl
 
     public void addMappingFileName(String name) {
         if (_mappingFileNames == null)
-            _mappingFileNames = new ArrayList<String>();
+            _mappingFileNames = new ArrayList<>();
         _mappingFileNames.add(name);
     }
 
+    @Override
     public List<URL> getJarFileUrls() {
         if (_jarFiles == null)
             return Collections.emptyList();
@@ -208,7 +219,7 @@ public class PersistenceUnitInfoImpl
 
     public void addJarFile(URL jar) {
         if (_jarFiles == null)
-            _jarFiles = new ArrayList<URL>();
+            _jarFiles = new ArrayList<>();
         _jarFiles.add(jar);
     }
 
@@ -217,7 +228,7 @@ public class PersistenceUnitInfoImpl
         // the XML has been parsed and it has been confirmed that OpenJPA is the desired JPA provider.
 
         if (_jarFileNames == null) {
-            _jarFileNames = new ArrayList<String>();
+            _jarFileNames = new ArrayList<>();
         }
         _jarFileNames.add(name);
     }
@@ -292,6 +303,7 @@ public class PersistenceUnitInfoImpl
             getMessage());
     }
 
+    @Override
     public List<String> getManagedClassNames() {
         if (_entityClassNames == null)
             return Collections.emptyList();
@@ -300,10 +312,11 @@ public class PersistenceUnitInfoImpl
 
     public void addManagedClassName(String name) {
         if (_entityClassNames == null)
-            _entityClassNames = new ArrayList<String>();
+            _entityClassNames = new ArrayList<>();
         _entityClassNames.add(name);
     }
 
+    @Override
     public Properties getProperties() {
         Properties copy = new Properties();
         copy.putAll(_props);
@@ -314,6 +327,7 @@ public class PersistenceUnitInfoImpl
         _props.put(key, value);
     }
 
+    @Override
     public void addTransformer(ClassTransformer transformer) {
         throw new UnsupportedOperationException();
     }
@@ -387,7 +401,7 @@ public class PersistenceUnitInfoImpl
      */
     public static Map toOpenJPAProperties(PersistenceUnitInfo info) {
         Map map = new HashMap<String,Object>();
-        Set<String> added = new HashSet<String>();
+        Set<String> added = new HashSet<>();
         if (info.getTransactionType() == PersistenceUnitTransactionType.JTA)
             replaceAsOpenJPAProperty(map, added, "TransactionMode", "managed");
 
@@ -520,6 +534,7 @@ public class PersistenceUnitInfoImpl
 
     // --------------------
 
+    @Override
     public File getSourceFile() {
         if (_persistenceXmlFile == null)
             return null;
@@ -531,22 +546,27 @@ public class PersistenceUnitInfoImpl
         }
     }
 
+    @Override
     public Object getSourceScope() {
         return null;
     }
 
+    @Override
     public int getSourceType() {
         return SRC_XML;
     }
 
+    @Override
     public int getLineNumber() {
         return 0;
     }
 
+    @Override
     public int getColNumber() {
         return 0;
     }
 
+    @Override
     public String getResourceName() {
         return "PersistenceUnitInfo:" + _name;
     }
@@ -563,11 +583,13 @@ public class PersistenceUnitInfoImpl
             _loader = loader;
         }
 
+        @Override
         public ClassLoader getClassLoader(Class ctx, ClassLoader env) {
             return _loader;
         }
 	}
 
+    @Override
     public String getPersistenceXMLSchemaVersion() {
         return _schemaVersion;
     }
@@ -576,6 +598,7 @@ public class PersistenceUnitInfoImpl
         _schemaVersion = version;
     }
 
+    @Override
     public ValidationMode getValidationMode() {
         return _validationMode;
     }
@@ -584,6 +607,7 @@ public class PersistenceUnitInfoImpl
         _validationMode = mode;
     }
 
+    @Override
     public SharedCacheMode getSharedCacheMode() {
         return _sharedCacheMode;
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java
index 46fdaa8b9..b6a8e309d 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Persistent.java
@@ -20,9 +20,11 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import javax.persistence.CascadeType;
 import javax.persistence.FetchType;
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java
index dd9ca8e61..bde0b95c1 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentCollection.java
@@ -20,9 +20,11 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import javax.persistence.CascadeType;
 import javax.persistence.FetchType;
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java
index edf4bfe80..86f0e5cc9 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistentMap.java
@@ -20,9 +20,11 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import javax.persistence.CascadeType;
 import javax.persistence.FetchType;
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PessimisticLockException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PessimisticLockException.java
index 79b67d58f..dacb64f2d 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PessimisticLockException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PessimisticLockException.java
@@ -35,11 +35,11 @@ import org.apache.openjpa.util.StoreException;
  *
  * @since 2.0.0
  */
-@SuppressWarnings("serial")
 public class PessimisticLockException
     extends javax.persistence.PessimisticLockException
     implements Serializable, ExceptionInfo {
 
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = true;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -51,43 +51,53 @@ public class PessimisticLockException
 
     }
 
+    @Override
     public int getType() {
         return STORE;
     }
 
+    @Override
     public int getSubtype() {
         return StoreException.LOCK;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
index 55b43dea6..44f0388db 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
@@ -56,7 +56,7 @@ import org.apache.openjpa.lib.rop.ResultList;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.OrderedMap;
 import org.apache.openjpa.meta.QueryMetaData;
-import org.apache.openjpa.persistence.criteria.CriteriaBuilderImpl;
+import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;
 import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.RuntimeExceptionTranslator;
 import org.apache.openjpa.util.UserException;
@@ -68,9 +68,8 @@ import org.apache.openjpa.util.UserException;
  * @author Marc Prud'hommeaux
  * @author Abe White
  */
-@SuppressWarnings("serial")
 public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
-
+    private static final long serialVersionUID = 1L;
     private static final Localizer _loc = Localizer.forPackage(QueryImpl.class);
 	private transient FetchPlan _fetch;
 
@@ -105,6 +104,7 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 	 *
 	 * @deprecated
 	 */
+    @Deprecated
     public QueryImpl(EntityManagerImpl em, RuntimeExceptionTranslator ret, org.apache.openjpa.kernel.Query query) {
         this(em, ret, query, null);
     }
@@ -114,6 +114,7 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
      *
      * @deprecated
      */
+    @Deprecated
     public QueryImpl(EntityManagerImpl em, org.apache.openjpa.kernel.Query query) {
         this(em, null, query, null);
     }
@@ -125,19 +126,23 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 		return _query.getDelegate();
 	}
 
-	public OpenJPAEntityManager getEntityManager() {
+	@Override
+    public OpenJPAEntityManager getEntityManager() {
 		return _em;
 	}
 
-	public String getLanguage() {
+	@Override
+    public String getLanguage() {
 		return _query.getLanguage();
 	}
 
-	public QueryOperationType getOperation() {
+	@Override
+    public QueryOperationType getOperation() {
         return QueryOperationType.fromKernelConstant(_query.getOperation());
 	}
 
-	public FetchPlan getFetchPlan() {
+	@Override
+    public FetchPlan getFetchPlan() {
 		_em.assertNotCloseInvoked();
 		_query.assertNotSerialized();
 		_query.lock();
@@ -152,63 +157,74 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 		}
 	}
 
-	public String getQueryString() {
+	@Override
+    public String getQueryString() {
 		String result = _query.getQueryString();
 		return result != null ? result : _id;
 	}
 
-	public boolean getIgnoreChanges() {
+	@Override
+    public boolean getIgnoreChanges() {
 		return _query.getIgnoreChanges();
 	}
 
-	public OpenJPAQuery<X> setIgnoreChanges(boolean ignore) {
+	@Override
+    public OpenJPAQuery<X> setIgnoreChanges(boolean ignore) {
 		_em.assertNotCloseInvoked();
 		_query.setIgnoreChanges(ignore);
 		return this;
 	}
 
-	public OpenJPAQuery<X> addFilterListener(FilterListener listener) {
+	@Override
+    public OpenJPAQuery<X> addFilterListener(FilterListener listener) {
 		_em.assertNotCloseInvoked();
 		_query.addFilterListener(listener);
 		return this;
 	}
 
-	public OpenJPAQuery<X> removeFilterListener(FilterListener listener) {
+	@Override
+    public OpenJPAQuery<X> removeFilterListener(FilterListener listener) {
 		_em.assertNotCloseInvoked();
 		_query.removeFilterListener(listener);
 		return this;
 	}
 
-	public OpenJPAQuery<X> addAggregateListener(AggregateListener listener) {
+	@Override
+    public OpenJPAQuery<X> addAggregateListener(AggregateListener listener) {
 		_em.assertNotCloseInvoked();
 		_query.addAggregateListener(listener);
 		return this;
 	}
 
+    @Override
     public OpenJPAQuery<X> removeAggregateListener(AggregateListener listener) {
 		_em.assertNotCloseInvoked();
 		_query.removeAggregateListener(listener);
 		return this;
 	}
 
-	public Collection<?> getCandidateCollection() {
+	@Override
+    public Collection<?> getCandidateCollection() {
 		return _query.getCandidateCollection();
 	}
 
-	public OpenJPAQuery<X> setCandidateCollection(Collection coll) {
+	@Override
+    public OpenJPAQuery<X> setCandidateCollection(Collection coll) {
 		_em.assertNotCloseInvoked();
 		_query.setCandidateCollection(coll);
 		return this;
 	}
 
-	public Class getResultClass() {
+	@Override
+    public Class getResultClass() {
 		Class res = _query.getResultType();
 		if (res != null)
 			return res;
 		return _query.getCandidateType();
 	}
 
-	public OpenJPAQuery<X> setResultClass(Class cls) {
+	@Override
+    public OpenJPAQuery<X> setResultClass(Class cls) {
 		_em.assertNotCloseInvoked();
 		if (ImplHelper.isManagedType(_em.getConfiguration(), cls))
 			_query.setCandidateType(cls, true);
@@ -217,22 +233,26 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 		return this;
 	}
 
-	public boolean hasSubclasses() {
+	@Override
+    public boolean hasSubclasses() {
 		return _query.hasSubclasses();
 	}
 
-	public OpenJPAQuery<X> setSubclasses(boolean subs) {
+	@Override
+    public OpenJPAQuery<X> setSubclasses(boolean subs) {
 		_em.assertNotCloseInvoked();
 		Class<?> cls = _query.getCandidateType();
         _query.setCandidateExtent(_query.getBroker().newExtent(cls, subs));
 		return this;
 	}
 
-	public int getFirstResult() {
+	@Override
+    public int getFirstResult() {
 		return asInt(_query.getStartRange());
 	}
 
-	public OpenJPAQuery<X> setFirstResult(int startPosition) {
+	@Override
+    public OpenJPAQuery<X> setFirstResult(int startPosition) {
 		_em.assertNotCloseInvoked();
 		long end;
 		if (_query.getEndRange() == Long.MAX_VALUE)
@@ -244,11 +264,13 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 		return this;
 	}
 
-	public int getMaxResults() {
+	@Override
+    public int getMaxResults() {
 		return asInt(_query.getEndRange() - _query.getStartRange());
 	}
 
-	public OpenJPAQuery<X> setMaxResults(int max) {
+	@Override
+    public OpenJPAQuery<X> setMaxResults(int max) {
 		_em.assertNotCloseInvoked();
 		long start = _query.getStartRange();
 		if (max == Integer.MAX_VALUE)
@@ -258,7 +280,8 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 		return this;
 	}
 
-	public OpenJPAQuery<X> compile() {
+	@Override
+    public OpenJPAQuery<X> compile() {
 		_em.assertNotCloseInvoked();
 		_query.compile();
 		return this;
@@ -283,7 +306,8 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 		}
 	}
 
-	public List getResultList() {
+	@Override
+    public List getResultList() {
 		_em.assertNotCloseInvoked();
 		boolean queryFetchPlanUsed = pushQueryFetchPlan();
 		try {
@@ -310,7 +334,8 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 	/**
 	 * Execute a query that returns a single result.
 	 */
-	public X getSingleResult() {
+	@Override
+    public X getSingleResult() {
 		_em.assertNotCloseInvoked();
         setHint(QueryHints.HINT_RESULT_COUNT, 1); // for DB2 optimization
 		boolean queryFetchPlanUsed = pushQueryFetchPlan();
@@ -360,7 +385,8 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 		}
 	}
 
-	public int executeUpdate() {
+	@Override
+    public int executeUpdate() {
 		_em.assertNotCloseInvoked();
         Map<?,?> paramValues = getParameterValues();
 		if (_query.getOperation() == QueryOperations.OP_DELETE) {
@@ -383,12 +409,14 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 		return (int) l;
 	}
 
-	public FlushModeType getFlushMode() {
+	@Override
+    public FlushModeType getFlushMode() {
 		return EntityManagerImpl.fromFlushBeforeQueries(_query
                 .getFetchConfiguration().getFlushBeforeQueries());
 	}
 
-	public OpenJPAQuery<X> setFlushMode(FlushModeType flushMode) {
+	@Override
+    public OpenJPAQuery<X> setFlushMode(FlushModeType flushMode) {
 		_em.assertNotCloseInvoked();
 		_query.getFetchConfiguration().setFlushBeforeQueries(
                 EntityManagerImpl.toFlushBeforeQueries(flushMode));
@@ -402,22 +430,25 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
         String language = getLanguage();
         if (JPQLParser.LANG_JPQL.equals(language)
          || QueryLanguages.LANG_PREPARED_SQL.equals(language)
-         || CriteriaBuilderImpl.LANG_CRITERIA.equals(language)) {
+         || OpenJPACriteriaBuilder.LANG_CRITERIA.equals(language)) {
             return;
         } else {
             throw new IllegalStateException(_loc.get("not-jpql-or-criteria-query").getMessage());
         }
 	}
 
-	public OpenJPAQuery<X> closeAll() {
+	@Override
+    public OpenJPAQuery<X> closeAll() {
 		_query.closeAll();
 		return this;
 	}
 
-	public String[] getDataStoreActions(Map params) {
+	@Override
+    public String[] getDataStoreActions(Map params) {
 		return _query.getDataStoreActions(params);
 	}
 
+    @Override
     public LockModeType getLockMode() {
         assertJPQLOrCriteriaQuery();
         return getFetchPlan().getReadLockMode();
@@ -428,6 +459,7 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
      * If the target query has been prepared and cached, then ignores the cached version.
      * @see #ignorePreparedQuery()
      */
+    @Override
     public TypedQuery<X> setLockMode(LockModeType lockMode) {
         String language = getLanguage();
         if (QueryLanguages.LANG_PREPARED_SQL.equals(language)) {
@@ -438,11 +470,13 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
        return this;
     }
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
         return (_query == null) ? 0 : _query.hashCode();
 	}
 
-	public boolean equals(Object other) {
+	@Override
+    public boolean equals(Object other) {
 		if (other == this)
 			return true;
         if ((other == null) || (other.getClass() != this.getClass()))
@@ -457,12 +491,14 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
 	 *
 	 */
     //TODO: JPA 2.0 Hints that are not set to FetchConfiguration
+    @Override
     public Map<String, Object> getHints() {
         if (_hintHandler == null)
             return Collections.emptyMap();
         return _hintHandler.getHints();
     }
 
+    @Override
     public OpenJPAQuery<X> setHint(String key, Object value) {
         _em.assertNotCloseInvoked();
         if (_hintHandler == null) {
@@ -472,6 +508,7 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
         return this;
     }
 
+    @Override
     public Set<String> getSupportedHints() {
         if (_hintHandler == null) {
             _hintHandler = new HintHandler(this);
@@ -487,6 +524,7 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
      *
      * @since 2.0.0
      */
+    @Override
     public <T> T unwrap(Class<T> cls) {
         Object[] delegates = new Object[]{_query.getInnermostDelegate(), _query.getDelegate(), _query, this};
         for (Object o : delegates) {
@@ -623,11 +661,13 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
     }
     // ================ End of Prepared Query related methods =====================
 
+    @Override
     protected void lock() {
         if (_lock != null)
             _lock.lock();
     }
 
+    @Override
     protected void unlock() {
         if (_lock != null)
             _lock.unlock();
@@ -643,6 +683,7 @@ public class QueryImpl<X> extends AbstractQuery<X> implements Serializable {
         return _query.getOrderedParameterTypes();
     }
 
+    @Override
     public String toString() {
         String result = _query.getQueryString();
         return result != null ? result : _id;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java
index 765ca49f6..e2c39786c 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCache.java
@@ -34,31 +34,31 @@ public interface QueryResultCache {
     /**
      * Pin the given query's result to the cache.
      */
-    public void pin(Query q);
+    void pin(Query q);
 
     /**
      * Unpin a previously-pinned query result.
      */
-    public void unpin(Query q);
+    void unpin(Query q);
 
     /**
      * Evict a query result from the cache.
      */
-    public void evict(Query q);
+    void evict(Query q);
 
     /**
      * Clear the cache.
      */
-    public void evictAll();
+    void evictAll();
 
     /**
      * Evict all result for queries involving the given class.
      */
-    public void evictAll(Class cls);
+    void evictAll(Class cls);
 
     /**
      * @deprecated cast to {@link QueryResultCacheImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public QueryCache getDelegate();
+    @Deprecated QueryCache getDelegate();
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java
index ae2960529..115390304 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryResultCacheImpl.java
@@ -19,6 +19,7 @@
 package org.apache.openjpa.persistence;
 
 import java.util.Collections;
+
 import javax.persistence.Query;
 
 import org.apache.openjpa.datacache.DelegatingQueryCache;
@@ -48,29 +49,35 @@ public class QueryResultCacheImpl
     /**
      * Delegate.
      */
+    @Override
     public QueryCache getDelegate() {
         return _cache.getDelegate();
     }
 
+    @Override
     public void pin(Query q) {
         if (_cache.getDelegate() != null)
             _cache.pin(toQueryKey(q));
     }
 
+    @Override
     public void unpin(Query q) {
         if (_cache.getDelegate() != null)
             _cache.unpin(toQueryKey(q));
     }
 
+    @Override
     public void evict(Query q) {
         if (_cache.getDelegate() != null)
             _cache.remove(toQueryKey(q));
     }
 
+    @Override
     public void evictAll() {
         _cache.clear();
     }
 
+    @Override
     public void evictAll(Class cls) {
         _cache.onTypesChanged(new TypesChangedEvent(this,
             Collections.singleton(cls)));
@@ -88,10 +95,12 @@ public class QueryResultCacheImpl
             impl.getNamedParameters());
     }
 
+    @Override
     public int hashCode() {
         return (_cache == null) ? 0 : _cache.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryTimeoutException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryTimeoutException.java
index 47884dfc0..225906ed6 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryTimeoutException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryTimeoutException.java
@@ -36,11 +36,11 @@ import org.apache.openjpa.util.StoreException;
  *
  * @since 2.0.0
  */
-@SuppressWarnings("serial")
 public class QueryTimeoutException
     extends javax.persistence.QueryTimeoutException
     implements Serializable, ExceptionInfo {
 
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -56,43 +56,53 @@ public class QueryTimeoutException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return STORE;
     }
 
+    @Override
     public int getSubtype() {
         return StoreException.QUERY;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java
index 4ed37cdfa..fd3be815f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ReadOnly.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java
index d4e2dc77f..c781f221d 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/RollbackException.java
@@ -38,6 +38,9 @@ public class RollbackException
     extends javax.persistence.RollbackException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
+
     private transient Object _failed = null;
 
     private transient Throwable[] _nested;
@@ -47,26 +50,32 @@ public class RollbackException
         _nested = new Throwable[]{ e };
     }
 
+    @Override
     public int getType() {
         return STORE;
     }
 
+    @Override
     public int getSubtype() {
         return GENERAL;
     }
 
+    @Override
     public boolean isFatal() {
         return true;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
@@ -76,19 +85,23 @@ public class RollbackException
         return this;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java
index 584362540..e6673c2bb 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCache.java
@@ -34,71 +34,71 @@ import org.apache.openjpa.datacache.DataCache;
  */
 public interface StoreCache extends Cache {
 
-    public static final String NAME_DEFAULT = DataCache.NAME_DEFAULT;
+    String NAME_DEFAULT = DataCache.NAME_DEFAULT;
 
     /**
      * Whether the cache contains data for the given oid.
      */
-    public boolean contains(Class cls, Object oid);
+    @Override boolean contains(Class cls, Object oid);
 
     /**
      * Whether the cache contains data for the given oids.
      */
-    public boolean containsAll(Class cls, Object... oids);
+    boolean containsAll(Class cls, Object... oids);
 
     /**
      * Whether the cache contains data for the given oids.
      */
-    public boolean containsAll(Class cls, Collection oids);
+    boolean containsAll(Class cls, Collection oids);
 
     /**
      * Pin the data for the given oid to the cache.
      */
-    public void pin(Class cls, Object oid);
+    void pin(Class cls, Object oid);
 
     /**
      * Pin the data for the given oids to the cache.
      */
-    public void pinAll(Class cls, Object... oids);
+    void pinAll(Class cls, Object... oids);
 
     /**
      * Pin the data for the given oids to the cache.
      */
-    public void pinAll(Class cls, Collection oids);
+    void pinAll(Class cls, Collection oids);
 
     /**
      * Unpin the data for the given oid from the cache.
      */
-    public void unpin(Class cls, Object oid);
+    void unpin(Class cls, Object oid);
 
     /**
      * Unpin the data for the given oids from the cache.
      */
-    public void unpinAll(Class cls, Object... oids);
+    void unpinAll(Class cls, Object... oids);
 
     /**
      * Unpin the data for the given oids from the cache.
      */
-    public void unpinAll(Class cls, Collection oids);
+    void unpinAll(Class cls, Collection oids);
 
     /**
      * Remove data for the given oid from the cache.
      */
-    public void evict(Class cls, Object oid);
+    @Override void evict(Class cls, Object oid);
     /**
      * Remove data for the given oids from the cache.
      */
-    public void evictAll(Class cls, Object... oids);
+    void evictAll(Class cls, Object... oids);
 
     /**
      * Remove data for the given oids from the cache.
      */
-    public void evictAll(Class cls, Collection oids);
+    void evictAll(Class cls, Collection oids);
 
     /**
      * Clear the cache.
      */
-    public void evictAll();
+    @Override void evictAll();
 
     /**
      * Gets the number of read/write/hit on this receiver in total and per
@@ -106,11 +106,11 @@ public interface StoreCache extends Cache {
      *
      * @since 1.3.0
      */
-    public CacheStatistics getStatistics();
+    CacheStatistics getStatistics();
 
     /**
      * @deprecated cast to {@link StoreCacheImpl} instead. This
      * method pierces the published-API boundary, as does the SPI cast.
      */
-    public DataCache getDelegate();
+    @Deprecated DataCache getDelegate();
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java
index e94213023..a5d771449 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoreCacheImpl.java
@@ -53,19 +53,23 @@ public class StoreCacheImpl
     /**
      * Delegate.
      */
+    @Override
     public DataCache getDelegate() {
         return _cache.getDelegate();
     }
 
+    @Override
     public boolean contains(Class cls, Object oid) {
         return _cache.getDelegate() != null && _cache.contains
             (JPAFacadeHelper.toOpenJPAObjectId(getMetaData(cls), oid));
     }
 
+    @Override
     public boolean containsAll(Class cls, Object... oids) {
         return containsAll(cls, Arrays.asList(oids));
     }
 
+    @Override
     public boolean containsAll(Class cls, Collection oids) {
         if (_cache.getDelegate() == null)
             return oids.isEmpty();
@@ -78,54 +82,64 @@ public class StoreCacheImpl
         return true;
     }
 
+    @Override
     public void pin(Class cls, Object oid) {
         if (_cache.getDelegate() != null)
             _cache.pin(JPAFacadeHelper.toOpenJPAObjectId(getMetaData(cls),
                 oid));
     }
 
+    @Override
     public void pinAll(Class cls, Object... oids) {
         pinAll(cls, Arrays.asList(oids));
     }
 
+    @Override
     public void pinAll(Class cls, Collection oids) {
         if (_cache.getDelegate() != null)
             _cache.pinAll(JPAFacadeHelper.toOpenJPAObjectIds
                 (getMetaData(cls), oids));
     }
 
+    @Override
     public void unpin(Class cls, Object oid) {
         if (_cache.getDelegate() != null)
             _cache.unpin(JPAFacadeHelper.toOpenJPAObjectId(getMetaData(cls),
                 oid));
     }
 
+    @Override
     public void unpinAll(Class cls, Object... oids) {
         unpinAll(cls, Arrays.asList(oids));
     }
 
+    @Override
     public void unpinAll(Class cls, Collection oids) {
         if (_cache.getDelegate() != null)
             _cache.unpinAll(JPAFacadeHelper.toOpenJPAObjectIds
                 (getMetaData(cls), oids));
     }
 
+    @Override
     public void evict(Class cls, Object oid) {
         if (_cache.getDelegate() != null)
             _cache.remove(JPAFacadeHelper.toOpenJPAObjectId(getMetaData(cls),
                 oid));
     }
 
+    @Override
     public void evictAll(Class cls, Object... oids) {
         evictAll(cls, Arrays.asList(oids));
     }
 
+    @Override
     public void evictAll(Class cls, Collection oids) {
         if (_cache.getDelegate() != null)
             _cache.removeAll(JPAFacadeHelper.toOpenJPAObjectIds
                 (getMetaData(cls), oids));
     }
 
+    @Override
     public void evictAll() {
         _cache.clear();
     }
@@ -138,6 +152,7 @@ public class StoreCacheImpl
         throw new javax.persistence.PersistenceException(cls.getName() + " not supported");
     }
 
+    @Override
     public CacheStatistics getStatistics() {
     	return (_cache == null) ? null : _cache.getStatistics();
     }
@@ -154,10 +169,12 @@ public class StoreCacheImpl
         }
     }
 
+    @Override
     public int hashCode() {
         return (_cache == null) ? 0 : _cache.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == this)
             return true;
@@ -168,6 +185,7 @@ public class StoreCacheImpl
       return _cache.equals (((StoreCacheImpl) other)._cache);
 	}
 
+    @Override
     @SuppressWarnings("unchecked")
     public void evict(Class cls) {
         // Check MetaData throws a consistent exception with evict(Class,
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoredProcedureQueryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoredProcedureQueryImpl.java
index d1205ffab..403cb42fb 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoredProcedureQueryImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/StoredProcedureQueryImpl.java
@@ -18,6 +18,21 @@
  */
 package org.apache.openjpa.persistence;
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.NoResultException;
+import javax.persistence.NonUniqueResultException;
+import javax.persistence.Parameter;
+import javax.persistence.ParameterMode;
+import javax.persistence.StoredProcedureQuery;
+import javax.persistence.TemporalType;
+
 import org.apache.openjpa.kernel.DelegatingResultList;
 import org.apache.openjpa.kernel.QueryResultCallback;
 import org.apache.openjpa.lib.rop.ResultList;
@@ -27,15 +42,6 @@ import org.apache.openjpa.meta.MultiQueryMetaData;
 import org.apache.openjpa.util.RuntimeExceptionTranslator;
 import org.apache.openjpa.util.UserException;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.persistence.*;
-import javax.persistence.NoResultException;
-import javax.persistence.NonUniqueResultException;
-
 /**
  * Implements Store Procedure based query for JPA facade.
  * <br>
@@ -409,6 +415,7 @@ public class StoredProcedureQueryImpl implements StoredProcedureQuery {
         return true;
     }
 
+    @Override
     public String toString() {
         return _name;
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java
index ea928cbb0..4659b1579 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TransactionRequiredException.java
@@ -40,6 +40,8 @@ public class TransactionRequiredException
     extends javax.persistence.TransactionRequiredException
     implements Serializable, ExceptionInfo {
 
+    
+    private static final long serialVersionUID = 1L;
     private transient boolean _fatal = false;
     private transient Object _failed = null;
     private transient Throwable[] _nested = null;
@@ -57,43 +59,53 @@ public class TransactionRequiredException
         _fatal = fatal;
     }
 
+    @Override
     public int getType() {
         return USER;
     }
 
+    @Override
     public int getSubtype() {
         return UserException.NO_TRANSACTION;
     }
 
+    @Override
     public boolean isFatal() {
         return _fatal;
     }
 
+    @Override
     public Throwable getCause() {
         return PersistenceExceptions.getCause(_nested);
     }
 
+    @Override
     public Throwable[] getNestedThrowables() {
         return (_nested == null) ? Exceptions.EMPTY_THROWABLES : _nested;
     }
 
+    @Override
     public Object getFailedObject() {
         return _failed;
     }
 
+    @Override
     public String toString() {
         return Exceptions.toString(this);
     }
 
+    @Override
     public void printStackTrace() {
         printStackTrace(System.err);
     }
 
+    @Override
     public void printStackTrace(PrintStream out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
     }
 
+    @Override
     public void printStackTrace(PrintWriter out) {
         super.printStackTrace(out);
         Exceptions.printNestedThrowables(this, out);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleFactory.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleFactory.java
index 69111d4d4..9f2d4b85a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleFactory.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleFactory.java
@@ -57,7 +57,7 @@ public class TupleFactory implements ObjectFactory<Tuple> {
     }
 
     public TupleFactory(Selection<?>... elems) {
-        List<TupleElement<?>> list = new ArrayList<TupleElement<?>>();
+        List<TupleElement<?>> list = new ArrayList<>();
         for (Selection<?> s : elems)
             list.add(s);
         elements = Collections.unmodifiableList(list);
@@ -67,6 +67,7 @@ public class TupleFactory implements ObjectFactory<Tuple> {
         return elements;
     }
 
+    @Override
     public TupleImpl newInstance() {
         TupleImpl impl = new TupleImpl(this);
         return impl;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleImpl.java
index 9df1d32a7..a9ea3b838 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/TupleImpl.java
@@ -57,20 +57,24 @@ public class TupleImpl implements Tuple {
         values = new Object[factory.getElements().size()];
     }
 
+    @Override
     public <X> X get(TupleElement<X> tupleElement) {
         int i = factory.getIndex(tupleElement);
         return assertAndConvertType(""+i, values[i], tupleElement.getJavaType());
     }
 
+    @Override
     public <X> X get(String alias, Class<X> type) {
         Object val = values[factory.getIndex(alias)];
         return assertAndConvertType(alias, val, type);
     }
 
+    @Override
     public Object get(String alias) {
         return get(alias, null);
     }
 
+    @Override
     public <X> X get(int i, Class<X> type) {
         if (i >= values.length || i < 0) {
             throw new IllegalArgumentException(_loc.get("tuple-exceeded-size", i, values.length).getMessage());
@@ -79,14 +83,17 @@ public class TupleImpl implements Tuple {
         return assertAndConvertType(""+i, val, type);
     }
 
+    @Override
     public Object get(int i) {
         return get(i, null);
     }
 
+    @Override
     public Object[] toArray() {
         return values;
     }
 
+    @Override
     public List<TupleElement<?>> getElements() {
         return factory.getElements();
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java
index 06b42f289..3c2cf7652 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/Type.java
@@ -20,8 +20,9 @@ package org.apache.openjpa.persistence;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
 /**
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
index 5fd1c3e90..fc5e3db6f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
@@ -18,6 +18,66 @@
  */
 package org.apache.openjpa.persistence;
 
+import static javax.persistence.CascadeType.DETACH;
+import static javax.persistence.CascadeType.MERGE;
+import static javax.persistence.CascadeType.PERSIST;
+import static javax.persistence.CascadeType.REFRESH;
+import static javax.persistence.CascadeType.REMOVE;
+import static org.apache.openjpa.meta.MetaDataModes.MODE_MAPPING;
+import static org.apache.openjpa.meta.MetaDataModes.MODE_META;
+import static org.apache.openjpa.meta.MetaDataModes.MODE_NONE;
+import static org.apache.openjpa.meta.MetaDataModes.MODE_QUERY;
+import static org.apache.openjpa.persistence.MetaDataTag.DATASTORE_ID;
+import static org.apache.openjpa.persistence.MetaDataTag.DATA_CACHE;
+import static org.apache.openjpa.persistence.MetaDataTag.EMBEDDED_ID;
+import static org.apache.openjpa.persistence.MetaDataTag.ENTITY_LISTENERS;
+import static org.apache.openjpa.persistence.MetaDataTag.EXCLUDE_DEFAULT_LISTENERS;
+import static org.apache.openjpa.persistence.MetaDataTag.EXCLUDE_SUPERCLASS_LISTENERS;
+import static org.apache.openjpa.persistence.MetaDataTag.EXTERNALIZER;
+import static org.apache.openjpa.persistence.MetaDataTag.EXTERNAL_VAL;
+import static org.apache.openjpa.persistence.MetaDataTag.EXTERNAL_VALS;
+import static org.apache.openjpa.persistence.MetaDataTag.FACTORY;
+import static org.apache.openjpa.persistence.MetaDataTag.FETCH_ATTRIBUTE;
+import static org.apache.openjpa.persistence.MetaDataTag.FETCH_GROUP;
+import static org.apache.openjpa.persistence.MetaDataTag.FETCH_GROUPS;
+import static org.apache.openjpa.persistence.MetaDataTag.FLUSH_MODE;
+import static org.apache.openjpa.persistence.MetaDataTag.GENERATED_VALUE;
+import static org.apache.openjpa.persistence.MetaDataTag.ID;
+import static org.apache.openjpa.persistence.MetaDataTag.ID_CLASS;
+import static org.apache.openjpa.persistence.MetaDataTag.LOB;
+import static org.apache.openjpa.persistence.MetaDataTag.MAPPED_BY_ID;
+import static org.apache.openjpa.persistence.MetaDataTag.MAP_KEY;
+import static org.apache.openjpa.persistence.MetaDataTag.MAP_KEY_CLASS;
+import static org.apache.openjpa.persistence.MetaDataTag.NATIVE_QUERY;
+import static org.apache.openjpa.persistence.MetaDataTag.OPENJPA_VERSION;
+import static org.apache.openjpa.persistence.MetaDataTag.ORDER_BY;
+import static org.apache.openjpa.persistence.MetaDataTag.ORDER_COLUMN;
+import static org.apache.openjpa.persistence.MetaDataTag.POST_LOAD;
+import static org.apache.openjpa.persistence.MetaDataTag.POST_PERSIST;
+import static org.apache.openjpa.persistence.MetaDataTag.POST_REMOVE;
+import static org.apache.openjpa.persistence.MetaDataTag.POST_UPDATE;
+import static org.apache.openjpa.persistence.MetaDataTag.PRE_PERSIST;
+import static org.apache.openjpa.persistence.MetaDataTag.PRE_REMOVE;
+import static org.apache.openjpa.persistence.MetaDataTag.PRE_UPDATE;
+import static org.apache.openjpa.persistence.MetaDataTag.QUERY;
+import static org.apache.openjpa.persistence.MetaDataTag.QUERY_HINT;
+import static org.apache.openjpa.persistence.MetaDataTag.QUERY_STRING;
+import static org.apache.openjpa.persistence.MetaDataTag.READ_ONLY;
+import static org.apache.openjpa.persistence.MetaDataTag.REFERENCED_FETCH_GROUP;
+import static org.apache.openjpa.persistence.MetaDataTag.SEQ_GENERATOR;
+import static org.apache.openjpa.persistence.MetaDataTag.VERSION;
+import static org.apache.openjpa.persistence.PersistenceStrategy.BASIC;
+import static org.apache.openjpa.persistence.PersistenceStrategy.ELEM_COLL;
+import static org.apache.openjpa.persistence.PersistenceStrategy.EMBEDDED;
+import static org.apache.openjpa.persistence.PersistenceStrategy.MANY_MANY;
+import static org.apache.openjpa.persistence.PersistenceStrategy.MANY_ONE;
+import static org.apache.openjpa.persistence.PersistenceStrategy.ONE_MANY;
+import static org.apache.openjpa.persistence.PersistenceStrategy.ONE_ONE;
+import static org.apache.openjpa.persistence.PersistenceStrategy.PERS;
+import static org.apache.openjpa.persistence.PersistenceStrategy.PERS_COLL;
+import static org.apache.openjpa.persistence.PersistenceStrategy.PERS_MAP;
+import static org.apache.openjpa.persistence.PersistenceStrategy.TRANSIENT;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,9 +100,6 @@ import javax.persistence.CascadeType;
 import javax.persistence.GenerationType;
 import javax.persistence.LockModeType;
 
-import static javax.persistence.CascadeType.*;
-
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.event.BeanLifecycleCallbacks;
@@ -57,6 +114,7 @@ import org.apache.openjpa.lib.meta.CFMetaDataParser;
 import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.meta.XMLVersionParser;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.DelegatingMetaDataFactory;
@@ -66,19 +124,14 @@ import org.apache.openjpa.meta.LifecycleMetaData;
 import org.apache.openjpa.meta.MetaDataContext;
 import org.apache.openjpa.meta.MetaDataDefaults;
 import org.apache.openjpa.meta.MetaDataFactory;
-import org.apache.openjpa.meta.UpdateStrategies;
-
-import static org.apache.openjpa.meta.MetaDataModes.*;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.Order;
 import org.apache.openjpa.meta.QueryMetaData;
 import org.apache.openjpa.meta.SequenceMetaData;
+import org.apache.openjpa.meta.UpdateStrategies;
 import org.apache.openjpa.meta.ValueMetaData;
 import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataParser.FetchAttributeImpl;
 import org.apache.openjpa.persistence.AnnotationPersistenceMetaDataParser.FetchGroupImpl;
-
-import static org.apache.openjpa.persistence.MetaDataTag.*;
-import static org.apache.openjpa.persistence.PersistenceStrategy.*;
 import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.MetaDataException;
@@ -124,14 +177,14 @@ public class XMLPersistenceMetaDataParser
     }
 
     private static final Map<String, Object> _elems =
-        new HashMap<String, Object>();
+        new HashMap<>();
 
     // Map for storing deferred metadata which needs to be populated
     // after embeddables are loaded.
     private static final Map<Class<?>, ArrayList<MetaDataContext>>
-        _embeddables = new HashMap<Class<?>, ArrayList<MetaDataContext>>();
+        _embeddables = new HashMap<>();
     private static final Map<Class<?>, Integer>
-        _embeddableAccess = new HashMap<Class<?>, Integer>();
+        _embeddableAccess = new HashMap<>();
 
     // Hold fetch group info
     private FetchGroupImpl[] _fgs = null;
@@ -227,14 +280,14 @@ public class XMLPersistenceMetaDataParser
     private int _mode = MODE_NONE;
     private boolean _override = false;
 
-    private final Stack<Object> _elements = new Stack<Object>();
-    private final Stack<Object> _parents = new Stack<Object>();
+    private final Stack<Object> _elements = new Stack<>();
+    private final Stack<Object> _parents = new Stack<>();
 
     private StringBuffer _externalValues = null;
 
     protected Class<?> _cls = null;
     // List of classes currently being parsed
-    private ArrayList<Class<?>> _parseList = new ArrayList<Class<?>>();
+    private ArrayList<Class<?>> _parseList = new ArrayList<>();
     private int _fieldPos = 0;
     private int _clsPos = 0;
     private int _access = AccessCode.UNKNOWN;
@@ -293,6 +346,7 @@ public class XMLPersistenceMetaDataParser
      * Returns the repository for this parser. If none has been set, creates
      * a new repository and sets it.
      */
+    @Override
     public MetaDataRepository getRepository() {
         if (_repos == null) {
             MetaDataRepository repos = _conf.newMetaDataRepositoryInstance();
@@ -385,12 +439,14 @@ public class XMLPersistenceMetaDataParser
     /**
      * The parse mode according to the expected document type.
      */
+    @Override
     public void setMode(int mode) {
         _mode = mode;
         if (_parser != null)
             _parser.setMode(mode);
     }
 
+    @Override
     public void parse(URL url) throws IOException {
         // peek at the doc to determine the version
         XMLVersionParser vp = new XMLVersionParser("entity-mappings");
@@ -407,6 +463,7 @@ public class XMLPersistenceMetaDataParser
         super.parse(url);
     }
 
+    @Override
     public void parse(File file) throws IOException {
         // peek at the doc to determine the version
         XMLVersionParser vp = new XMLVersionParser("entity-mappings");
@@ -527,7 +584,7 @@ public class XMLPersistenceMetaDataParser
         }
         InputStream ormxsdIS = XMLPersistenceMetaDataParser.class.getResourceAsStream(ormxsd);
 
-        ArrayList<InputStream> schema = new ArrayList<InputStream>();
+        ArrayList<InputStream> schema = new ArrayList<>();
         schema.add(ormxsdIS);
 
         if (useExtendedSchema) {
@@ -2049,7 +2106,7 @@ public class XMLPersistenceMetaDataParser
         _listener = classForName(attrs.getValue("class"));
         if (!_conf.getCallbackOptionsInstance().getAllowsDuplicateListener()) {
             if (_listeners == null)
-                _listeners = new ArrayList<Class<?>>();
+                _listeners = new ArrayList<>();
             if (_listeners.contains(_listener))
                 return true;
             _listeners.add(_listener);
@@ -2142,7 +2199,7 @@ public class XMLPersistenceMetaDataParser
 
             }
             if (_callbacks[event] == null)
-                _callbacks[event] = new ArrayList<LifecycleCallbacks>(3);
+                _callbacks[event] = new ArrayList<>(3);
             _callbacks[event].add(adapter);
             if (!system && _listener != null)
                 _highs[event]++;
@@ -2287,7 +2344,7 @@ public class XMLPersistenceMetaDataParser
     protected void deferEmbeddable(Class<?> embedType, MetaDataContext fmd) {
         ArrayList<MetaDataContext> fmds = _embeddables.get(embedType);
         if (fmds == null) {
-            fmds = new ArrayList<MetaDataContext>();
+            fmds = new ArrayList<>();
             _embeddables.put(embedType, fmds);
         }
         fmds.add(fmd);
@@ -2845,7 +2902,7 @@ public class XMLPersistenceMetaDataParser
     private boolean startFetchGroups(Attributes attrs)
         throws SAXException {
         if (_fgList == null) {
-            _fgList = new ArrayList<FetchGroupImpl>();
+            _fgList = new ArrayList<>();
         }
         return true;
     }
@@ -2854,7 +2911,7 @@ public class XMLPersistenceMetaDataParser
         throws SAXException {
 
         if (_fgList == null) {
-            _fgList = new ArrayList<FetchGroupImpl>();
+            _fgList = new ArrayList<>();
         }
         _currentFg = new AnnotationPersistenceMetaDataParser.FetchGroupImpl(attrs.getValue("name"),
             Boolean.parseBoolean(attrs.getValue("post-load")));
@@ -2886,7 +2943,7 @@ public class XMLPersistenceMetaDataParser
     private boolean startFetchAttribute(Attributes attrs)
         throws SAXException {
         if (_fetchAttrList == null) {
-            _fetchAttrList = new ArrayList<FetchAttributeImpl>();
+            _fetchAttrList = new ArrayList<>();
         }
 
         FetchAttributeImpl fetchAttribute = new FetchAttributeImpl(attrs.getValue("name"),
@@ -2901,7 +2958,7 @@ public class XMLPersistenceMetaDataParser
         throws SAXException {
 
         if (_referencedFgList == null) {
-            _referencedFgList = new ArrayList<String>();
+            _referencedFgList = new ArrayList<>();
         }
 
         return true;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java
index a3cb32917..65870f35c 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java
@@ -18,6 +18,11 @@
  */
 package org.apache.openjpa.persistence;
 
+import static org.apache.openjpa.meta.MetaDataModes.MODE_MAPPING;
+import static org.apache.openjpa.meta.MetaDataModes.MODE_META;
+import static org.apache.openjpa.meta.MetaDataModes.MODE_NONE;
+import static org.apache.openjpa.meta.MetaDataModes.MODE_QUERY;
+
 import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
@@ -43,13 +48,11 @@ import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.ClassUtil;
 import org.apache.openjpa.lib.util.JavaVersions;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.MetaDataInheritanceComparator;
-import static org.apache.openjpa.meta.MetaDataModes.*;
-
-import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.MetaDataRepository;
 import org.apache.openjpa.meta.Order;
 import org.apache.openjpa.meta.QueryMetaData;
@@ -136,6 +139,7 @@ public class XMLPersistenceMetaDataSerializer
      * The serialization mode according to the expected document type. The
      * mode constants act as bit flags, and therefore can be combined.
      */
+    @Override
     public void setMode(int mode) {
         _mode = mode;
     }
@@ -208,18 +212,20 @@ public class XMLPersistenceMetaDataSerializer
     /**
      * Add a class meta data to the set to be serialized.
      */
+    @Override
     public void addMetaData(ClassMetaData meta) {
         if (meta == null)
             return;
 
         if (_metas == null)
-            _metas = new HashMap<String, ClassMetaData>();
+            _metas = new HashMap<>();
         _metas.put(meta.getDescribedType().getName(), meta);
     }
 
     /**
      * Add a sequence meta data to the set to be serialized.
      */
+    @Override
     public void addSequenceMetaData(SequenceMetaData meta) {
         if (meta == null)
             return;
@@ -229,7 +235,7 @@ public class XMLPersistenceMetaDataSerializer
         if (meta.getSourceScope() instanceof Class)
             defName = ((Class) meta.getSourceScope()).getName();
         if (_seqs == null)
-            _seqs = new HashMap<String, List>();
+            _seqs = new HashMap<>();
         else
             seqs = _seqs.get(defName);
 
@@ -244,6 +250,7 @@ public class XMLPersistenceMetaDataSerializer
     /**
      * Add a query meta data to the set to be serialized.
      */
+    @Override
     public void addQueryMetaData(QueryMetaData meta) {
         if (meta == null)
             return;
@@ -253,7 +260,7 @@ public class XMLPersistenceMetaDataSerializer
         if (meta.getSourceScope() instanceof Class)
             defName = ((Class) meta.getSourceScope()).getName();
         if (_queries == null)
-            _queries = new HashMap<String, List>();
+            _queries = new HashMap<>();
         else
             queries = _queries.get(defName);
 
@@ -268,6 +275,7 @@ public class XMLPersistenceMetaDataSerializer
     /**
      * Add all components in the given repository to the set to be serialized.
      */
+    @Override
     public void addAll(MetaDataRepository repos) {
         if (repos == null)
             return;
@@ -285,6 +293,7 @@ public class XMLPersistenceMetaDataSerializer
      *
      * @return true if removed, false if not in set
      */
+    @Override
     public boolean removeMetaData(ClassMetaData meta) {
         return _metas != null && meta != null
             && _metas.remove(meta.getDescribedType().getName()) != null;
@@ -589,7 +598,7 @@ public class XMLPersistenceMetaDataSerializer
      */
     private void serializeQuery(QueryMetaData meta)
         throws SAXException {
-        if (!_annos && meta.getSourceType() == meta.SRC_ANNOTATIONS)
+        if (!_annos && meta.getSourceType() == SourceTracker.SRC_ANNOTATIONS)
             return;
 
         Log log = getLog();
@@ -637,7 +646,7 @@ public class XMLPersistenceMetaDataSerializer
      */
     protected void serializeSequence(SequenceMetaData meta)
         throws SAXException {
-        if (!_annos && meta.getSourceType() == meta.SRC_ANNOTATIONS)
+        if (!_annos && meta.getSourceType() == SourceTracker.SRC_ANNOTATIONS)
             return;
 
         Log log = getLog();
@@ -682,7 +691,7 @@ public class XMLPersistenceMetaDataSerializer
      */
     protected void serializeClass(ClassMetaData meta, boolean access)
         throws SAXException {
-        if (!_annos && meta.getSourceType() == meta.SRC_ANNOTATIONS)
+        if (!_annos && meta.getSourceType() == SourceTracker.SRC_ANNOTATIONS)
             return;
 
         Log log = getLog();
@@ -1014,27 +1023,27 @@ public class XMLPersistenceMetaDataSerializer
         Collection<String> cascades = null;
         if (vmd.getCascadePersist() == ValueMetaData.CASCADE_IMMEDIATE) {
             if (cascades == null)
-                cascades = new ArrayList<String>();
+                cascades = new ArrayList<>();
             cascades.add("cascade-persist");
         }
         if (vmd.getCascadeAttach() == ValueMetaData.CASCADE_IMMEDIATE) {
             if (cascades == null)
-                cascades = new ArrayList<String>();
+                cascades = new ArrayList<>();
             cascades.add("cascade-merge");
         }
         if (vmd.getCascadeDelete() == ValueMetaData.CASCADE_IMMEDIATE) {
             if (cascades == null)
-                cascades = new ArrayList<String>();
+                cascades = new ArrayList<>();
             cascades.add("cascade-remove");
         }
         if (vmd.getCascadeRefresh() == ValueMetaData.CASCADE_IMMEDIATE) {
             if (cascades == null)
-                cascades = new ArrayList<String>();
+                cascades = new ArrayList<>();
             cascades.add("cascade-refresh");
         }
         if (vmd.getCascadeDetach() == ValueMetaData.CASCADE_IMMEDIATE) {
             if (cascades == null)
-                cascades = new ArrayList<String>();
+                cascades = new ArrayList<>();
             cascades.add("cascade-detach");
         }
         if (cascades != null && cascades.size() == 5) // ALL
@@ -1056,7 +1065,7 @@ public class XMLPersistenceMetaDataSerializer
      * Return the serialized strategy name.
      */
     protected PersistenceStrategy getStrategy(FieldMetaData fmd) {
-        if (fmd.getManagement() == fmd.MANAGE_NONE)
+        if (fmd.getManagement() == FieldMetaData.MANAGE_NONE)
             return PersistenceStrategy.TRANSIENT;
 
         if (fmd.isSerialized()
@@ -1243,34 +1252,42 @@ public class XMLPersistenceMetaDataSerializer
         /**
          * Compare sequence metadata on name.
          */
+        @Override
         public int compare(SequenceMetaData o1, SequenceMetaData o2) {
             return o1.getName().compareTo(o2.getName());
         }
 
+        @Override
         public File getSourceFile() {
             return _seqs[0].getSourceFile();
         }
 
+        @Override
         public Object getSourceScope() {
             return _seqs[0].getSourceScope();
         }
 
+        @Override
         public int getSourceType() {
             return _seqs[0].getSourceType();
         }
 
+        @Override
         public String getResourceName() {
             return _seqs[0].getResourceName();
         }
 
+        @Override
         public int getLineNumber() {
             return _seqs[0].getLineNumber();
         }
 
+        @Override
         public int getColNumber() {
             return _seqs[0].getColNumber();
         }
 
+        @Override
         public int compareTo(ClassSeqs other) {
             if (other == this)
                 return 0;
@@ -1313,6 +1330,7 @@ public class XMLPersistenceMetaDataSerializer
          * If the given queries use same language, then their names are
          * compared.
          */
+        @Override
         public int compare(QueryMetaData o1, QueryMetaData o2) {
             // normal queries before native
             if (!Objects.equals(o1.getLanguage(), o2.getLanguage())) {
@@ -1324,30 +1342,37 @@ public class XMLPersistenceMetaDataSerializer
             return o1.getName().compareTo(o2.getName());
         }
 
+        @Override
         public File getSourceFile() {
             return _queries[0].getSourceFile();
         }
 
+        @Override
         public Object getSourceScope() {
             return _queries[0].getSourceScope();
         }
 
+        @Override
         public int getSourceType() {
             return _queries[0].getSourceType();
         }
 
+        @Override
         public String getResourceName() {
             return _queries[0].getResourceName();
         }
 
+        @Override
         public int getLineNumber() {
             return _queries[0].getLineNumber();
         }
 
+        @Override
         public int getColNumber() {
             return _queries[0].getColNumber();
         }
 
+        @Override
         public int compareTo(ClassQueries other) {
             if (other == this)
                 return 0;
@@ -1371,6 +1396,10 @@ public class XMLPersistenceMetaDataSerializer
     protected class SerializationComparator
         extends MetaDataInheritanceComparator {
 
+        
+        private static final long serialVersionUID = 1L;
+
+        @Override
         public int compare(Object o1, Object o2) {
             if (o1 == o2)
                 return 0;
@@ -1463,6 +1492,7 @@ public class XMLPersistenceMetaDataSerializer
     private class FieldComparator
         implements Comparator {
 
+        @Override
         public int compare(Object o1, Object o2) {
             FieldMetaData fmd1 = (FieldMetaData) o1;
             FieldMetaData fmd2 = (FieldMetaData) o2;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompareByExample.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompareByExample.java
index 7f251fa0e..052239f31 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompareByExample.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompareByExample.java
@@ -48,7 +48,7 @@ class CompareByExample<T> extends PredicateImpl {
             Attribute<?, ?>... excludes) {
         super(extractOperator(style));
         List<Attribute<?, ?>> excludeAttr = excludes == null
-            ? new ArrayList<Attribute<?,?>>() : Arrays.asList(excludes);
+            ? new ArrayList<>() : Arrays.asList(excludes);
 
         Set<SingularAttribute<? super T, ?>> attrs = type.getSingularAttributes();
         for (SingularAttribute<? super T, ?> attr : attrs) {
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ComparisonStyle.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ComparisonStyle.java
index d3217a3ba..1012756d6 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ComparisonStyle.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ComparisonStyle.java
@@ -112,57 +112,69 @@ public interface ComparisonStyle {
         private boolean disjunction = false;
         private StringComparisonMode stringMode = StringComparisonMode.EXACT;
 
+        @Override
         public boolean excludeDefault() {
             return excludeDefault;
         }
 
+        @Override
         public boolean excludeNull() {
             return excludeNull;
         }
 
+        @Override
         public StringComparisonMode getStringComparsionMode() {
             return stringMode;
         }
 
+        @Override
         public boolean isDisjunction() {
             return disjunction;
         }
 
+        @Override
         public ComparisonStyle setExcludeDefault(boolean flag) {
             excludeDefault = flag;
             return this;
         }
 
+        @Override
         public ComparisonStyle setExcludeNull(boolean flag) {
             excludeNull = flag;
             return this;
         }
 
+        @Override
         public ComparisonStyle setStringComparisonMode(StringComparisonMode mode) {
             stringMode = mode;
             return this;
         }
 
+        @Override
         public ComparisonStyle setDisjunction(boolean flag) {
             disjunction = flag;
             return this;
         }
 
+        @Override
         public boolean excludeIdentity() {
             return excludeIdentity;
 
         }
 
+        @Override
         public ComparisonStyle setExcludeIdentity(boolean flag) {
             excludeIdentity = flag;
             return this;
         }
 
+        @Override
         public boolean excludeVersion() {
             return excludeVersion;
 
         }
 
+        @Override
         public ComparisonStyle setExcludeVersion(boolean flag) {
             excludeVersion = flag;
             return this;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompoundSelections.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompoundSelections.java
index 0a33eb0be..441f34c4e 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompoundSelections.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CompoundSelections.java
@@ -50,7 +50,7 @@ class CompoundSelections {
         if (s instanceof CompoundSelectionImpl) {
             return ((CompoundSelectionImpl<X>)s).getFillStrategy();
         } else {
-            return new FillStrategy.Assign<X>();
+            return new FillStrategy.Assign<>();
         }
     }
 
@@ -67,6 +67,7 @@ class CompoundSelections {
             _args = args == null ? (List<Selection<?>>)Collections.EMPTY_LIST : Arrays.asList(args);
         }
 
+        @Override
         public final boolean isCompoundSelection() {
             return true;
         }
@@ -77,6 +78,7 @@ class CompoundSelections {
          * @throws IllegalStateException if selection is not a compound
          *           selection
          */
+        @Override
         public final List<Selection<?>> getCompoundSelectionItems() {
             return Expressions.returnCopy(_args);
         }
@@ -129,8 +131,9 @@ class CompoundSelections {
             }
         }
 
+        @Override
         public FillStrategy<X> getFillStrategy() {
-            return new FillStrategy.Array<X>(getJavaType());
+            return new FillStrategy.Array<>(getJavaType());
         }
     }
 
@@ -143,9 +146,10 @@ class CompoundSelections {
         private FillStrategy.NewInstance<X> strategy;
         public NewInstance(Class<X> cls, Selection<?>... selections) {
             super(cls, selections);
-            strategy = new FillStrategy.NewInstance<X>(findConstructor(cls, selections));
+            strategy = new FillStrategy.NewInstance<>(findConstructor(cls, selections));
         }
 
+        @Override
         public FillStrategy<X> getFillStrategy() {
             return strategy;
         }
@@ -181,10 +185,11 @@ class CompoundSelections {
             super(javax.persistence.Tuple.class, selections);
         }
 
+        @Override
         public FillStrategy<javax.persistence.Tuple> getFillStrategy() {
             List<Selection<?>> terms = getCompoundSelectionItems();
             TupleFactory factory = new TupleFactory(terms.toArray(new TupleElement[terms.size()]));
-            return new FillStrategy.Factory<javax.persistence.Tuple>(factory, TupleImpl.PUT);
+            return new FillStrategy.Factory<>(factory, TupleImpl.PUT);
         }
     }
 
@@ -198,17 +203,18 @@ class CompoundSelections {
             super(result, selections);
         }
 
+        @Override
         public FillStrategy<T> getFillStrategy() {
             Class<?> resultClass = getJavaType();
             List<Selection<?>> terms = getCompoundSelectionItems();
             FillStrategy<?> strategy = null;
             if (javax.persistence.Tuple.class.isAssignableFrom(resultClass)) {
                 TupleFactory factory = new TupleFactory(terms.toArray(new TupleElement[terms.size()]));
-                strategy = new FillStrategy.Factory<javax.persistence.Tuple>(factory,  TupleImpl.PUT);
+                strategy = new FillStrategy.Factory<>(factory,  TupleImpl.PUT);
            } else if (resultClass == Object.class) {
                if (terms.size() > 1) {
                    resultClass = Object[].class;
-                   strategy = new FillStrategy.Array<Object[]>(Object[].class);
+                   strategy = new FillStrategy.Array<>(Object[].class);
                } else {
                    strategy = new FillStrategy.Assign();
                }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java
index 10486c833..05a6b13a6 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java
@@ -42,11 +42,11 @@ import javax.persistence.criteria.Order;
 import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Predicate.BooleanOperator;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Selection;
 import javax.persistence.criteria.SetJoin;
 import javax.persistence.criteria.Subquery;
-import javax.persistence.criteria.Predicate.BooleanOperator;
 import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.ManagedType;
 import javax.persistence.metamodel.Metamodel;
@@ -70,9 +70,8 @@ import org.apache.openjpa.persistence.meta.MetamodelImpl;
  * @since 2.0.0
  *
  */
-@SuppressWarnings("serial")
 public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionParser {
-
+    private static final long serialVersionUID = 1L;
     private MetamodelImpl _model;
 
     public OpenJPACriteriaBuilder setMetaModel(MetamodelImpl model) {
@@ -80,21 +79,25 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
         return this;
     }
 
+    @Override
     public Metamodel getMetamodel() {
         return _model;
     }
 
+    @Override
     public QueryExpressions eval(Object parsed, ExpressionStoreQuery query,
         ExpressionFactory factory, ClassMetaData candidate) {
         CriteriaQueryImpl<?> c = (CriteriaQueryImpl<?>) parsed;
         return c.getQueryExpressions(factory);
     }
 
+    @Override
     public Value[] eval(String[] vals, ExpressionStoreQuery query,
         ExpressionFactory factory, ClassMetaData candidate) {
         return null;
     }
 
+    @Override
     public String getLanguage() {
         return LANG_CRITERIA;
     }
@@ -104,8 +107,9 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
      *  @param resultClass  type of the query result
      *  @return query object
      */
+    @Override
     public <T> OpenJPACriteriaQuery<T> createQuery(Class<T> resultClass) {
-        return new CriteriaQueryImpl<T>(_model, resultClass);
+        return new CriteriaQueryImpl<>(_model, resultClass);
     }
 
     /**
@@ -113,8 +117,9 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
      *  objects as its result.
      *  @return query object
      */
+    @Override
     public OpenJPACriteriaQuery<Tuple> createTupleQuery() {
-        return new CriteriaQueryImpl<Tuple>(_model, Tuple.class);
+        return new CriteriaQueryImpl<>(_model, Tuple.class);
     }
 
     @Override
@@ -127,10 +132,12 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
         throw new UnsupportedOperationException("JPA 2.1");
     }
 
+    @Override
     public Object parse(String ql, ExpressionStoreQuery query) {
         throw new AbstractMethodError();
     }
 
+    @Override
     public void populate(Object parsed, ExpressionStoreQuery query) {
         CriteriaQueryImpl<?> c = (CriteriaQueryImpl<?>) parsed;
         query.invalidateCompilation();
@@ -138,134 +145,165 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
         query.setQuery(parsed);
     }
 
+    @Override
     public <N extends Number> Expression<N> abs(Expression<N> x) {
-        return new Expressions.Abs<N>(x);
+        return new Expressions.Abs<>(x);
     }
 
+    @Override
     public <Y> Expression<Y> all(Subquery<Y> subquery) {
-        return new Expressions.All<Y>(subquery);
+        return new Expressions.All<>(subquery);
     }
 
+    @Override
     public Predicate and(Predicate... restrictions) {
     	return new PredicateImpl.And(restrictions);
     }
 
+    @Override
     public Predicate and(Expression<Boolean> x, Expression<Boolean> y) {
     	return new PredicateImpl.And(x,y);
     }
 
+    @Override
     public <Y> Expression<Y> any(Subquery<Y> subquery) {
-        return new Expressions.Any<Y>(subquery);
+        return new Expressions.Any<>(subquery);
     }
 
+    @Override
     public Order asc(Expression<?> x) {
         return new OrderImpl(x, true);
     }
 
+    @Override
     public <N extends Number> Expression<Double> avg(Expression<N> x) {
         return new Expressions.Avg(x);
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate between(Expression<? extends Y> v, Expression<? extends Y> x,
         Expression<? extends Y> y) {
         return new Expressions.Between(v,x,y);
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate between(Expression<? extends Y> v, Y x, Y y) {
         return new Expressions.Between(v,x,y);
     }
 
+    @Override
     public <T> Coalesce<T> coalesce() {
         return new Expressions.Coalesce(Object.class);
     }
 
+    @Override
     public <Y> Expression<Y> coalesce(Expression<? extends Y> x, Expression<? extends Y> y) {
     	return new Expressions.Coalesce(x.getJavaType()).value(x).value(y);
     }
 
+    @Override
     public <Y> Expression<Y> coalesce(Expression<? extends Y> x, Y y) {
     	return new Expressions.Coalesce(x.getJavaType()).value(x).value(y);
    }
 
+    @Override
     public Expression<String> concat(Expression<String> x, Expression<String> y) {
     	return new Expressions.Concat(x, y);
     }
 
+    @Override
     public Expression<String> concat(Expression<String> x, String y) {
     	return new Expressions.Concat(x, y);
     }
 
+    @Override
     public Expression<String> concat(String x, Expression<String> y) {
     	return new Expressions.Concat(x, y);
     }
 
+    @Override
     public Predicate conjunction() {
         return new PredicateImpl.And();
     }
 
+    @Override
     public Expression<Long> count(Expression<?> x) {
         return new Expressions.Count(x);
     }
 
+    @Override
     public Expression<Long> countDistinct(Expression<?> x) {
         return new Expressions.Count(x, true);
     }
 
+    @Override
     public OpenJPACriteriaQuery<Object> createQuery() {
-        return new CriteriaQueryImpl<Object>(_model, Object.class);
+        return new CriteriaQueryImpl<>(_model, Object.class);
     }
 
+    @Override
     public Expression<Date> currentDate() {
     	return new Expressions.CurrentDate();
     }
 
+    @Override
     public Expression<Time> currentTime() {
     	return new Expressions.CurrentTime();
     }
 
+    @Override
     public Expression<Timestamp> currentTimestamp() {
     	return new Expressions.CurrentTimestamp();
     }
 
+    @Override
     public Order desc(Expression<?> x) {
     	return new OrderImpl(x, false);
     }
 
+    @Override
     public <N extends Number> Expression<N> diff(Expression<? extends N> x,
         Expression<? extends N> y) {
-        return new Expressions.Diff<N>(x, y);
+        return new Expressions.Diff<>(x, y);
     }
 
+    @Override
     public <N extends Number> Expression<N> diff(
         Expression<? extends N> x, N y) {
-        return new Expressions.Diff<N>(x, y);
+        return new Expressions.Diff<>(x, y);
     }
 
+    @Override
     public <N extends Number> Expression<N> diff(N x,
         Expression<? extends N> y) {
-        return new Expressions.Diff<N>(x, y);
+        return new Expressions.Diff<>(x, y);
     }
 
+    @Override
     public Predicate disjunction() {
         return new PredicateImpl.Or();
     }
 
+    @Override
     public Predicate equal(Expression<?> x, Expression<?> y) {
         if (y == null)
             return new Expressions.IsNull((ExpressionImpl<?> )x);
         return new Expressions.Equal(x, y);
     }
 
+    @Override
     public Predicate equal(Expression<?> x, Object y) {
         if (y == null)
             return new Expressions.IsNull((ExpressionImpl<?> )x);
         return new Expressions.Equal(x, y);
     }
 
+    @Override
     public Predicate exists(Subquery<?> subquery) {
         return new Expressions.Exists(subquery);
     }
 
+    @Override
     public <T> Expression<T> function(String name, Class<T> type,
         Expression<?>... args) {
         return new Expressions.DatabaseFunction(name, type, args);
@@ -306,80 +344,98 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
         throw new UnsupportedOperationException("JPA 2.1");
     }
 
+    @Override
     public Predicate ge(Expression<? extends Number> x,
         Expression<? extends Number> y) {
         return new Expressions.GreaterThanEqual(x,y);
     }
 
+    @Override
     public Predicate ge(Expression<? extends Number> x, Number y) {
         return new Expressions.GreaterThanEqual(x,y);
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate greaterThan(
         Expression<? extends Y> x, Expression<? extends Y> y) {
         return new Expressions.GreaterThan(x,y);
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate greaterThan(
         Expression<? extends Y> x, Y y) {
         return new Expressions.GreaterThan(x, y);
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate greaterThanOrEqualTo(
         Expression<? extends Y> x, Expression<? extends Y> y) {
         return new Expressions.GreaterThanEqual(x,y);
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate greaterThanOrEqualTo(
         Expression<? extends Y> x, Y y) {
         return new Expressions.GreaterThanEqual(x,y);
     }
 
+    @Override
     public <X extends Comparable<? super X>> Expression<X> greatest(Expression<X> x) {
-    	return new Expressions.Max<X>(x);
+    	return new Expressions.Max<>(x);
     }
 
+    @Override
     public Predicate gt(Expression<? extends Number> x,
         Expression<? extends Number> y) {
         return new Expressions.GreaterThan(x,y);
     }
 
+    @Override
     public Predicate gt(Expression<? extends Number> x, Number y) {
         return new Expressions.GreaterThan(x,y);
     }
 
+    @Override
     public <T> In<T> in(Expression<? extends T> expression) {
-        return new Expressions.In<T>(expression);
+        return new Expressions.In<>(expression);
     }
 
+    @Override
     public <C extends Collection<?>> Predicate isEmpty(Expression<C> collection) {
         return new Expressions.IsEmpty(collection);
     }
 
+    @Override
     public Predicate isFalse(Expression<Boolean> x) {
         return new Expressions.Equal(x, false);
     }
 
+    @Override
     public <E, C extends Collection<E>> Predicate isMember(E e, Expression<C> c) {
-        return new Expressions.IsMember<E>(e, c);
+        return new Expressions.IsMember<>(e, c);
     }
 
+    @Override
     public <E, C extends Collection<E>> Predicate isMember(Expression<E> e, Expression<C> c) {
-        return new Expressions.IsMember<E>(e, c);
+        return new Expressions.IsMember<>(e, c);
     }
 
+    @Override
     public <C extends Collection<?>> Predicate isNotEmpty(Expression<C> collection) {
         return new Expressions.IsNotEmpty(collection);
     }
 
+    @Override
     public <E, C extends Collection<E>> Predicate isNotMember(E e, Expression<C> c) {
         return isMember(e, c).not();
     }
 
+    @Override
     public <E, C extends Collection<E>> Predicate isNotMember(Expression<E> e, Expression<C> c) {
         return isMember(e, c).not();
     }
 
+    @Override
     public Predicate isTrue(Expression<Boolean> x) {
         if (x instanceof PredicateImpl) {
             PredicateImpl predicate = (PredicateImpl)x;
@@ -390,181 +446,223 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
         return new Expressions.Equal(x, true);
     }
 
+    @Override
     public <K, M extends Map<K, ?>> Expression<Set<K>> keys(M map) {
-        return new Expressions.Constant<Set<K>>(map == null ? Collections.EMPTY_SET : map.keySet());
+        return new Expressions.Constant<>(map == null ? Collections.EMPTY_SET : map.keySet());
     }
 
+    @Override
     public Predicate le(Expression<? extends Number> x, Expression<? extends Number> y) {
         return new Expressions.LessThanEqual(x,y);
     }
 
+    @Override
     public Predicate le(Expression<? extends Number> x, Number y) {
         return new Expressions.LessThanEqual(x,y);
     }
 
+    @Override
     public <X extends Comparable<? super X>> Expression<X> least(Expression<X> x) {
-        return new Expressions.Min<X>(x);
+        return new Expressions.Min<>(x);
     }
 
+    @Override
     public Expression<Integer> length(Expression<String> x) {
         return new Expressions.Length(x);
 
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate lessThan(Expression<? extends Y> x, Expression<? extends Y> y) {
         return new Expressions.LessThan(x,y);
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate lessThan(Expression<? extends Y> x, Y y) {
         return new Expressions.LessThan(x,y);
 
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate lessThanOrEqualTo(Expression<? extends Y> x,
         Expression<? extends Y> y) {
         return new Expressions.LessThanEqual(x,y);
     }
 
+    @Override
     public <Y extends Comparable<? super Y>> Predicate lessThanOrEqualTo(Expression<? extends Y> x, Y y) {
         return new Expressions.LessThanEqual(x,y);
     }
 
+    @Override
     public Predicate like(Expression<String> x, Expression<String> pattern) {
         return new Expressions.Like(x,pattern);
     }
 
+    @Override
     public Predicate like(Expression<String> x, String pattern) {
         return new Expressions.Like(x,pattern);
     }
 
+    @Override
     public Predicate like(Expression<String> x, Expression<String> pattern, Expression<Character> escapeChar) {
         return new Expressions.Like(x,pattern,escapeChar);
     }
 
+    @Override
     public Predicate like(Expression<String> x, Expression<String> pattern, char escapeChar) {
         return new Expressions.Like(x,pattern,escapeChar);
     }
 
+    @Override
     public Predicate like(Expression<String> x, String pattern, Expression<Character> escapeChar) {
         return new Expressions.Like(x,pattern,escapeChar);
     }
 
+    @Override
     public Predicate like(Expression<String> x, String pattern, char escapeChar) {
         return new Expressions.Like(x,pattern,escapeChar);
     }
 
+    @Override
     public <T> Expression<T> literal(T value) {
         if (Boolean.TRUE.equals(value))
             return (Expression<T>)PredicateImpl.TRUE();
         if (Boolean.FALSE.equals(value))
             return (Expression<T>)PredicateImpl.FALSE();
-        return new Expressions.Constant<T>(value);
+        return new Expressions.Constant<>(value);
     }
 
+    @Override
     public Expression<Integer> locate(Expression<String> x, Expression<String> pattern) {
         return new Expressions.Locate(x, pattern);
     }
 
+    @Override
     public Expression<Integer> locate(Expression<String> x, String pattern) {
         return new Expressions.Locate(x, pattern);
 
     }
 
+    @Override
     public Expression<Integer> locate(Expression<String> x, Expression<String> pattern, Expression<Integer> from) {
         return new Expressions.Locate(x, pattern, from);
 
     }
 
+    @Override
     public Expression<Integer> locate(Expression<String> x, String pattern, int from) {
         return new Expressions.Locate(x, pattern, from);
 
     }
 
+    @Override
     public Expression<String> lower(Expression<String> x) {
         return new Expressions.Lower(x);
 
     }
 
+    @Override
     public Predicate lt(Expression<? extends Number> x, Expression<? extends Number> y) {
         return new Expressions.LessThan(x,y);
     }
 
+    @Override
     public Predicate lt(Expression<? extends Number> x, Number y) {
         return new Expressions.LessThan(x,y);
     }
 
+    @Override
     public <N extends Number> Expression<N> max(Expression<N> x) {
-        return new Expressions.Max<N>(x);
+        return new Expressions.Max<>(x);
     }
 
+    @Override
     public <N extends Number> Expression<N> min(Expression<N> x) {
-        return new Expressions.Min<N>(x);
+        return new Expressions.Min<>(x);
     }
 
+    @Override
     public Expression<Integer> mod(Expression<Integer> x, Expression<Integer> y) {
         return new Expressions.Mod(x,y);
     }
 
+    @Override
     public Expression<Integer> mod(Expression<Integer> x, Integer y) {
         return new Expressions.Mod(x,y);
     }
 
+    @Override
     public Expression<Integer> mod(Integer x, Expression<Integer> y) {
         return new Expressions.Mod(x,y);
     }
 
+    @Override
     public <N extends Number> Expression<N> neg(Expression<N> x) {
-        return new Expressions.Diff<N>(0, x);
+        return new Expressions.Diff<>(0, x);
     }
 
+    @Override
     public Predicate not(Expression<Boolean> restriction) {
         return ((Predicate)restriction).not();
     }
 
+    @Override
     public Predicate notEqual(Expression<?> x, Expression<?> y) {
         return new Expressions.NotEqual(x, y);
     }
 
+    @Override
     public Predicate notEqual(Expression<?> x, Object y) {
         return new Expressions.NotEqual(x, y);
     }
 
+    @Override
     public Predicate notLike(Expression<String> x, Expression<String> pattern) {
         return like(x, pattern).not();
     }
 
+    @Override
     public Predicate notLike(Expression<String> x, String pattern) {
         return like(x, pattern).not();
     }
 
+    @Override
     public Predicate notLike(Expression<String> x, Expression<String> pattern, Expression<Character> escapeChar) {
         return like(x, pattern, escapeChar).not();
     }
 
+    @Override
     public Predicate notLike(Expression<String> x, Expression<String> pattern, char escapeChar) {
         return like(x, pattern, escapeChar).not();
     }
 
+    @Override
     public Predicate notLike(Expression<String> x, String pattern, Expression<Character> escapeChar) {
         return like(x, pattern, escapeChar).not();
     }
 
+    @Override
     public Predicate notLike(Expression<String> x, String pattern, char escapeChar) {
         return like(x, pattern, escapeChar).not();
     }
 
+    @Override
     public <Y> Expression<Y> nullif(Expression<Y> x, Expression<?> y) {
         return new Expressions.Nullif(x, y);
     }
 
+    @Override
     public <Y> Expression<Y> nullif(Expression<Y> x, Y y) {
         return new Expressions.Nullif(x, y);
     }
 
+    @Override
     public Predicate or(Predicate... restrictions) {
         return new PredicateImpl.Or(restrictions);
     }
 
+    @Override
     public Predicate or(Expression<Boolean> x, Expression<Boolean> y) {
     	return new PredicateImpl.Or(x,y);
     }
@@ -578,36 +676,44 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
      *
      * @see ParameterExpressionImpl#assignAutoName(String)
      */
+    @Override
     public <T> ParameterExpression<T> parameter(Class<T> paramClass) {
-        return new ParameterExpressionImpl<T>(paramClass, null);
+        return new ParameterExpressionImpl<>(paramClass, null);
     }
 
+    @Override
     public <T> ParameterExpression<T> parameter(Class<T> paramClass, String name) {
-        return new ParameterExpressionImpl<T>(paramClass, name);
+        return new ParameterExpressionImpl<>(paramClass, name);
     }
 
+    @Override
     public <N extends Number> Expression<N> prod(Expression<? extends N> x, Expression<? extends N> y) {
-        return new Expressions.Product<N>(x,y);
+        return new Expressions.Product<>(x,y);
     }
 
+    @Override
     public <N extends Number> Expression<N> prod(Expression<? extends N> x, N y) {
-        return new Expressions.Product<N>(x,y);
+        return new Expressions.Product<>(x,y);
     }
 
+    @Override
     public <N extends Number> Expression<N> prod(N x, Expression<? extends N> y) {
-        return new Expressions.Product<N>(x,y);
+        return new Expressions.Product<>(x,y);
     }
 
+    @Override
     public Expression<Number> quot(Expression<? extends Number> x, Expression<? extends Number> y) {
-        return new Expressions.Quotient<Number>(x,y);
+        return new Expressions.Quotient<>(x,y);
     }
 
+    @Override
     public Expression<Number> quot(Expression<? extends Number> x, Number y) {
-        return new Expressions.Quotient<Number>(x,y);
+        return new Expressions.Quotient<>(x,y);
     }
 
+    @Override
     public Expression<Number> quot(Number x, Expression<? extends Number> y) {
-        return new Expressions.Quotient<Number>(x,y);
+        return new Expressions.Quotient<>(x,y);
     }
 
     /**
@@ -616,150 +722,186 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
      * @param selections  arguments to the constructor
      * @return selection item
      */
+    @Override
     public <Y> CompoundSelection<Y> construct(Class<Y> result, Selection<?>... selections) {
-        return new CompoundSelections.NewInstance<Y>(result, selections);
+        return new CompoundSelections.NewInstance<>(result, selections);
     }
 
+    @Override
     public <R> Case<R> selectCase() {
         return new Expressions.Case(Object.class);
     }
 
+    @Override
     public <C, R> SimpleCase<C, R> selectCase(Expression<? extends C> expression) {
         return new Expressions.SimpleCase(expression);
     }
 
+    @Override
     public <C extends Collection<?>> Expression<Integer> size(C collection) {
         return new Expressions.Size(collection);
     }
 
+    @Override
     public <C extends Collection<?>> Expression<Integer> size(Expression<C> collection) {
         return new Expressions.Size(collection);
     }
 
+    @Override
     public <Y> Expression<Y> some(Subquery<Y> subquery) {
         //some and any are synonymous
-        return new Expressions.Any<Y>(subquery);
+        return new Expressions.Any<>(subquery);
     }
 
+    @Override
     public Expression<Double> sqrt(Expression<? extends Number> x) {
         return new Expressions.Sqrt(x);
     }
 
+    @Override
     public Expression<String> substring(Expression<String> x, Expression<Integer> from) {
     	return new Expressions.Substring(x, from);
     }
 
+    @Override
     public Expression<String> substring(Expression<String> x, int from) {
         return new Expressions.Substring(x, from);
     }
 
+    @Override
     public Expression<String> substring(Expression<String> x, Expression<Integer> from, Expression<Integer> len) {
         return new Expressions.Substring(x, from, len);
     }
 
+    @Override
     public Expression<String> substring(Expression<String> x, int from, int len) {
         return new Expressions.Substring(x, from, len);
     }
 
+    @Override
     public <N extends Number> Expression<N> sum(Expression<N> x) {
-        return new Expressions.Sum<N>(x);
+        return new Expressions.Sum<>(x);
     }
 
+    @Override
     public <N extends Number> Expression<N> sum(Expression<? extends N> x, Expression<? extends N> y) {
-        return new Expressions.Sum<N>(x,y);
+        return new Expressions.Sum<>(x,y);
     }
 
+    @Override
     public <N extends Number> Expression<N> sum(Expression<? extends N> x, N y) {
-        return new Expressions.Sum<N>(x,y);
+        return new Expressions.Sum<>(x,y);
     }
 
+    @Override
     public <N extends Number> Expression<N> sum(N x, Expression<? extends N> y) {
-        return new Expressions.Sum<N>(x,y);
+        return new Expressions.Sum<>(x,y);
     }
 
+    @Override
     public Expression<Long> sumAsLong(Expression<Integer> x) {
         return sum(x).as(Long.class);
     }
 
+    @Override
     public Expression<Double> sumAsDouble(Expression<Float> x) {
         return sum(x).as(Double.class);
     }
 
+    @Override
     public Expression<BigDecimal> toBigDecimal(Expression<? extends Number> number) {
-        return new Expressions.Cast<BigDecimal>(number, BigDecimal.class);
+        return new Expressions.Cast<>(number, BigDecimal.class);
     }
 
+    @Override
     public Expression<BigInteger> toBigInteger(Expression<? extends Number> number) {
-        return new Expressions.Cast<BigInteger>(number, BigInteger.class);
+        return new Expressions.Cast<>(number, BigInteger.class);
     }
 
+    @Override
     public Expression<Double> toDouble(Expression<? extends Number> number) {
-        return new Expressions.Cast<Double>(number, Double.class);
+        return new Expressions.Cast<>(number, Double.class);
     }
 
+    @Override
     public Expression<Float> toFloat(Expression<? extends Number> number) {
-        return new Expressions.Cast<Float>(number, Float.class);
+        return new Expressions.Cast<>(number, Float.class);
     }
 
+    @Override
     public Expression<Integer> toInteger(Expression<? extends Number> number) {
-        return new Expressions.Cast<Integer>(number, Integer.class);
+        return new Expressions.Cast<>(number, Integer.class);
     }
 
+    @Override
     public Expression<Long> toLong(Expression<? extends Number> number) {
-        return new Expressions.Cast<Long>(number, Long.class);
+        return new Expressions.Cast<>(number, Long.class);
     }
 
+    @Override
     public Expression<String> toString(Expression<Character> character) {
-        return new Expressions.Cast<String>(character, String.class);
+        return new Expressions.Cast<>(character, String.class);
     }
 
+    @Override
     public Expression<String> trim(Expression<String> x) {
         return new Expressions.Trim(x);
     }
 
+    @Override
     public Expression<String> trim(Trimspec ts, Expression<String> x) {
         return new Expressions.Trim(x, ts);
     }
 
+    @Override
     public Expression<String> trim(Expression<Character> t, Expression<String> x) {
         return new Expressions.Trim(x, t);
     }
 
+    @Override
     public Expression<String> trim(char t, Expression<String> x) {
         return new Expressions.Trim(x, t);
     }
 
+    @Override
     public Expression<String> trim(Trimspec ts, Expression<Character> t, Expression<String> x) {
         return new Expressions.Trim(x, t, ts);
     }
 
+    @Override
     public Expression<String> trim(Trimspec ts, char t, Expression<String> x) {
         return new Expressions.Trim(x, t, ts);
     }
 
+    @Override
     public Expression<String> upper(Expression<String> x) {
         return new Expressions.Upper(x);
 
     }
 
+    @Override
     public <V, M extends Map<?, V>> Expression<Collection<V>> values(M map) {
-        return new Expressions.Constant<Collection<V>>(map == null ? Collections.EMPTY_LIST : map.values());
+        return new Expressions.Constant<>(map == null ? Collections.EMPTY_LIST : map.values());
     }
 
+    @Override
     public CompoundSelection<Object[]> array(Selection<?>... terms) {
-        return new CompoundSelections.Array<Object[]>(Object[].class, terms);
+        return new CompoundSelections.Array<>(Object[].class, terms);
     }
 
+    @Override
     public Predicate isNotNull(Expression<?> x) {
         return new Expressions.IsNotNull((ExpressionImpl<?>)x);
     }
 
+    @Override
     public Predicate isNull(Expression<?> x) {
         return new Expressions.IsNull((ExpressionImpl<?> )x);
     }
 
+    @Override
     public <T> Expression<T> nullLiteral(Class<T> t) {
-        return new Expressions.Constant<T>(t, (T)null);
+        return new Expressions.Constant<>(t, (T)null);
     }
 
 
@@ -770,6 +912,7 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
      * @throws IllegalArgumentException if an argument is a tuple- or
      *          array-valued selection item
      */
+    @Override
     public CompoundSelection<Tuple> tuple(Selection<?>... selections) {
         return new CompoundSelections.Tuple(selections);
     }
@@ -796,6 +939,7 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
      *
      * @return a predicate
      */
+    @Override
     public <T> Predicate qbe(From<?, T> from, T example, ComparisonStyle style, Attribute<?,?>... excludes) {
         if (from == null)
             throw new NullPointerException();
@@ -803,18 +947,21 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
             return from.isNull();
         }
         ManagedType<T> type = (ManagedType<T>)_model.managedType(example.getClass());
-        return new CompareByExample<T>(this, type, from, example,
+        return new CompareByExample<>(this, type, from, example,
             style == null ? qbeStyle() : style, excludes);
     }
 
+    @Override
     public <T> Predicate qbe(From<?, T> from, T example, ComparisonStyle style) {
         return qbe(from, example, style, null);
     }
 
+    @Override
     public <T> Predicate qbe(From<?, T> from, T example, Attribute<?,?>... excludes) {
         return qbe(from, example, qbeStyle(), excludes);
     }
 
+    @Override
     public <T> Predicate qbe(From<?, T> from, T example) {
         return qbe(from, example, qbeStyle(), null);
     }
@@ -822,6 +969,7 @@ public class CriteriaBuilderImpl implements OpenJPACriteriaBuilder, ExpressionPa
     /**
      * Create a style to tune different aspects of comparison by example.
      */
+    @Override
     public ComparisonStyle qbeStyle() {
         return new ComparisonStyle.Default();
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
index e9a7eaed5..33e7b29db 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
@@ -85,7 +85,7 @@ class CriteriaExpressionBuilder {
     }
 
     protected void evalAccessPaths(QueryExpressions exps, ExpressionFactory factory, CriteriaQueryImpl<?> q) {
-        Set<ClassMetaData> metas = new HashSet<ClassMetaData>();
+        Set<ClassMetaData> metas = new HashSet<>();
         MetamodelImpl metamodel = q.getMetamodel();
         for (Root<?> root : q.getRoots()) {
             metas.add(((AbstractManagedType<?>)root.getModel()).meta);
@@ -128,7 +128,7 @@ class CriteriaExpressionBuilder {
         List<Order> orders = q.getOrderList();
         MetamodelImpl model = q.getMetamodel();
         int ordercount = (orders == null) ? 0 : orders.size();
-        Map<ExpressionImpl<?>, Value> exp2Vals = new HashMap<ExpressionImpl<?>, Value>();
+        Map<ExpressionImpl<?>, Value> exp2Vals = new HashMap<>();
         exps.ordering = new Value[ordercount];
         exps.orderingClauses = new String[ordercount];
         exps.orderingAliases = new String[ordercount];
@@ -229,9 +229,9 @@ class CriteriaExpressionBuilder {
             return ;
         }
         exps.projections = new Value[selections.size()];
-        List<Value> projections = new ArrayList<Value>();
-        List<String> aliases = new ArrayList<String>();
-        List<String> clauses = new ArrayList<String>();
+        List<Value> projections = new ArrayList<>();
+        List<String> aliases = new ArrayList<>();
+        List<String> clauses = new ArrayList<>();
         getProjections(exps, selections, projections, aliases, clauses, factory, q, model, exp2Vals);
         exps.projections = projections.toArray(new Value[projections.size()]);
         exps.projectionAliases = aliases.toArray(new String[aliases.size()]);
@@ -259,7 +259,7 @@ class CriteriaExpressionBuilder {
 
         if (selections.size() == 0 && q.getDelegator() != null) { // this is subquery
             Root<?> r = q.getRoot();
-            selections = new ArrayList<Selection<?>>(1);
+            selections = new ArrayList<>(1);
             selections.add(r);
         }
         for (Selection<?> s : selections) {
@@ -279,8 +279,8 @@ class CriteriaExpressionBuilder {
     }
 
     protected void evalFetchJoin(QueryExpressions exps, ExpressionFactory factory, CriteriaQueryImpl<?> q) {
-        List<String> iPaths = new ArrayList<String>();
-        List<String> oPaths = new ArrayList<String>();
+        List<String> iPaths = new ArrayList<>();
+        List<String> oPaths = new ArrayList<>();
         Set<Root<?>> roots = q.getRoots();
         for (Root root : roots) {
             Set<Fetch> fetches = root.getFetches();
@@ -358,7 +358,7 @@ class CriteriaExpressionBuilder {
             FillStrategy<?> strategy = new FillStrategy.Assign();
             if (Tuple.class.isAssignableFrom(resultClass)) {
                 TupleFactory factory = new TupleFactory(selections.toArray(new TupleElement[selections.size()]));
-                strategy = new FillStrategy.Factory<Tuple>(factory,  TupleImpl.PUT);
+                strategy = new FillStrategy.Factory<>(factory,  TupleImpl.PUT);
             }
             result = new ResultShape(resultClass, strategy);
             if (q.getSelectionList() == null) {
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionVisitor.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionVisitor.java
index 2a8d99d3b..6843c7aec 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionVisitor.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionVisitor.java
@@ -62,11 +62,12 @@ public interface CriteriaExpressionVisitor {
      *
      */
     public static abstract class AbstractVisitor implements CriteriaExpressionVisitor {
-        protected final Set<CriteriaExpression> _visited = new HashSet<CriteriaExpression>();
+        protected final Set<CriteriaExpression> _visited = new HashSet<>();
 
         /**
          * Remembers the node being visited.
          */
+        @Override
         public void exit(CriteriaExpression node) {
             _visited.add(node);
         }
@@ -74,6 +75,7 @@ public interface CriteriaExpressionVisitor {
         /**
          * Affirms if this node has been visited before.
          */
+        @Override
         public boolean isVisited(CriteriaExpression node) {
             return _visited.contains(node);
         }
@@ -81,6 +83,7 @@ public interface CriteriaExpressionVisitor {
         /**
          * Returns PREFIX as the default traversal style.
          */
+        @Override
         public TraversalStyle getTraversalStyle(CriteriaExpression node) {
             return TraversalStyle.PREFIX;
         }
@@ -97,6 +100,7 @@ public interface CriteriaExpressionVisitor {
             query = q;
         }
 
+        @Override
         public void enter(CriteriaExpression expr) {
             if (expr instanceof ParameterExpressionImpl) {
                 query.registerParameter((ParameterExpressionImpl<?>)expr);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
index 2270d2d29..034c78452 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
@@ -89,16 +89,16 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
     private int aliasCount = 0;
     private static String ALIAS_BASE = "autoAlias";
 
-    private Map<Selection<?>,Value> _variables = new HashMap<Selection<?>, Value>();
-    private Map<Selection<?>,Value> _values    = new HashMap<Selection<?>, Value>();
+    private Map<Selection<?>,Value> _variables = new HashMap<>();
+    private Map<Selection<?>,Value> _values    = new HashMap<>();
     private Map<Selection<?>,String> _aliases  = null;
-    private Map<Selection<?>,Value> _rootVariables = new HashMap<Selection<?>, Value>();
+    private Map<Selection<?>,Value> _rootVariables = new HashMap<>();
 
     // SubqueryContext
     private ThreadLocal<Stack<Context>> _contexts = new  ThreadLocal<Stack<Context>>(){
         @Override
         protected Stack<Context> initialValue() {
-            return new Stack<Context>();
+            return new Stack<>();
         }
     };
 
@@ -106,7 +106,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         this._model = model;
         this._resultClass = resultClass;
         this._delegator = null;
-        _aliases = new HashMap<Selection<?>, String>();
+        _aliases = new HashMap<>();
     }
 
     /**
@@ -146,6 +146,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
     /**
      * Sets whether this query as distinct.
      */
+    @Override
     public CriteriaQuery<T> distinct(boolean distinct) {
         _distinct = distinct;
         return this;
@@ -157,6 +158,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
      * @return Empty list if there is no ordering elements.
      * The returned list if mutable but mutation has no impact on this query.
      */
+    @Override
     public List<Order> getOrderList() {
         return Expressions.returnCopy(_orders);
     }
@@ -165,6 +167,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
      * Return the selection of the query
      * @return the item to be returned in the query result
      */
+    @Override
     public Selection<T> getSelection() {
         return (Selection<T>)_selection;
     }
@@ -211,6 +214,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
      *        are returned in the query result
      * @return the modified query
      */
+    @Override
     public CriteriaQuery<T> multiselect(Selection<?>... selections) {
         _selections = Arrays.asList(selections); // do not telescope
         _selection  = new CompoundSelections.MultiSelection(_resultClass, selections);
@@ -229,6 +233,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         }
     }
 
+    @Override
     public Set<ParameterExpression<?>> getParameters() {
         collectParameters(new CriteriaExpressionVisitor.ParameterVisitor(this));
         return _params == null ? Collections.EMPTY_SET : (Set) _params.keySet();
@@ -242,34 +247,38 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         return Expressions.returnCopy(_selections);
     }
 
+    @Override
     public CriteriaQuery<T> groupBy(Expression<?>... grouping) {
     	if (grouping == null) {
     	    _groups = null;
     	    return this;
     	}
-        _groups = new ArrayList<Expression<?>>();
+        _groups = new ArrayList<>();
     	for (Expression<?> e : grouping)
     		_groups.add(e);
         return this;
     }
 
+    @Override
     public CriteriaQuery<T> groupBy(List<Expression<?>> grouping) {
         if (grouping == null) {
             _groups = null;
             return this;
         }
-        _groups = new ArrayList<Expression<?>>();
+        _groups = new ArrayList<>();
         for (Expression<?> e : grouping)
             _groups.add(e);
         return this;
     }
 
 
+    @Override
     public CriteriaQuery<T> having(Expression<Boolean> restriction) {
         _having = (PredicateImpl)restriction;
         return this;
     }
 
+    @Override
     public CriteriaQuery<T> having(Predicate... restrictions) {
         if (restrictions == null) {
             _having = null;
@@ -281,24 +290,26 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         return this;
     }
 
+    @Override
     public CriteriaQuery<T> orderBy(Order... orders) {
         if (orders == null) {
             _orders = null;
             return this;
         }
-        _orders = new ArrayList<Order>();
+        _orders = new ArrayList<>();
         for (Order o : orders) {
             _orders.add(o);
         }
         return this;
     }
 
+    @Override
     public CriteriaQuery<T> orderBy(List<Order> orders) {
         if (orders == null) {
             _orders = null;
             return this;
         }
-        _orders = new ArrayList<Order>();
+        _orders = new ArrayList<>();
         for (Order o : orders) {
             _orders.add(o);
         }
@@ -312,13 +323,15 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
      *        is to be returned in the query result
      * @return the modified query
      */
+    @Override
     public CriteriaQuery<T> select(Selection<? extends T> selection) {
         _selection = selection;
-        _selections = new ArrayList<Selection<?>>();
+        _selections = new ArrayList<>();
         _selections.add(selection);
         return this;
     }
 
+    @Override
     public CriteriaQuery<T> where(Expression<Boolean> restriction) {
         invalidateCompilation();
         if (restriction == null) {
@@ -329,6 +342,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         return this;
     }
 
+    @Override
     public CriteriaQuery<T> where(Predicate... restrictions) {
         invalidateCompilation();
         if (restrictions == null) {
@@ -339,13 +353,15 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         return this;
     }
 
+    @Override
     public <X> Root<X> from(EntityType<X> entity) {
-        RootImpl<X> root = new RootImpl<X>((Types.Entity<X>)entity);
+        RootImpl<X> root = new RootImpl<>((Types.Entity<X>)entity);
         addRoot(root);
         return root;
     }
 
 
+    @Override
     public <X> Root<X> from(Class<X> cls) {
         EntityType<X> entity = _model.entityImpl(cls);
         if (entity == null)
@@ -353,18 +369,22 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         return from(entity);
     }
 
+    @Override
     public List<Expression<?>> getGroupList() {
         return Expressions.returnCopy(_groups);
     }
 
+    @Override
     public PredicateImpl getGroupRestriction() {
         return _having;
     }
 
+    @Override
     public PredicateImpl getRestriction() {
         return _where;
     }
 
+    @Override
     public Set<Root<?>> getRoots() {
         return Expressions.returnCopy(_roots);
     }
@@ -383,7 +403,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
 
     void addRoot(RootImpl<?> root) {
         if (_roots == null) {
-            _roots = new LinkedHashSet<Root<?>>();
+            _roots = new LinkedHashSet<>();
         }
         _roots.add(root);
     }
@@ -391,14 +411,16 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
     /**
      * Affirms if selection of this query is distinct.
      */
+    @Override
     public boolean isDistinct() {
         return _distinct;
     }
 
+    @Override
     public <U> Subquery<U> subquery(Class<U> type) {
         if (_subqueries == null)
-            _subqueries = new ArrayList<Subquery<?>>();
-        Subquery<U> subquery = new SubqueryImpl<U>(type, this);
+            _subqueries = new ArrayList<>();
+        Subquery<U> subquery = new SubqueryImpl<>(type, this);
         _subqueries.add(subquery);
         return subquery;
     }
@@ -461,7 +483,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
     public Map<Selection<?>,String> getAliases() {
         CriteriaQueryImpl<?> c = getAncestor();
         if (c._aliases == null)
-            c._aliases = new HashMap<Selection<?>, String>();
+            c._aliases = new HashMap<>();
         return c._aliases;
     }
 
@@ -480,6 +502,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
     /**
      * Gets the alias of the given node. Creates an automatic alias, if necessary.
      */
+    @Override
     public String getAlias(Selection<?> selection) {
         String alias = selection.getAlias();
         if (alias != null) {
@@ -501,6 +524,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
      * be equal to the alias of the given node. Otherwise, the node alias is set
      * on the variable and path.
      */
+    @Override
     public void registerVariable(Selection<?> node, Value var, Value path) {
         if (isRegistered(node)) {
             return;
@@ -534,6 +558,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         ctx().addVariable(alias, var);
     }
 
+    @Override
     public boolean isRegistered(Selection<?> selection) {
         if (_variables.containsKey(selection))
             return true;
@@ -541,6 +566,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         return (delegator == null) ? false : getDelegatorParent().isRegistered(selection);
     }
 
+    @Override
     public Value getRegisteredVariable(Selection<?> selection) {
         Value var = _variables.get(selection);
         if (var != null)
@@ -549,6 +575,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         return (delegator == null) ? null : getDelegatorParent().getRegisteredVariable(selection);
     }
 
+    @Override
     public Value getRegisteredValue(Selection<?> selection) {
         Value val = _values.get(selection);
         if (val != null)
@@ -575,6 +602,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
     /**
      * Gets the registered variable for the given root.
      */
+    @Override
     public Value getRegisteredRootVariable(Root<?> root) {
         Value var = _rootVariables.get(root);
         if (var != null)
@@ -591,10 +619,12 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         return ((SubqueryImpl<?>)parent).getDelegate();
     }
 
+    @Override
     public Class<T> getResultType() {
         return _resultClass;
     }
 
+    @Override
     public CriteriaQuery<T> multiselect(List<Selection<?>> list) {
         return multiselect(list.toArray(new Selection<?>[list.size()]));
     }
@@ -632,6 +662,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
      * and, most importantly, collects all the parameters so that they can be bound to
      * the executable query.
      */
+    @Override
     public OpenJPACriteriaQuery<T> compile() {
         if (_compiled)
             return this;
@@ -662,6 +693,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
     /**
      * Gets the string representation of the query.
      */
+    @Override
     public String toCQL() {
         StringBuilder buffer = new StringBuilder();
         render(buffer, _roots, null);
@@ -727,6 +759,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
      * Returns a JPQL-like string, if this receiver is populated. Otherwise
      * returns <code>Object.toString()</code>.
      */
+    @Override
     public String toString() {
         try {
             return toCQL();
@@ -735,6 +768,7 @@ class CriteriaQueryImpl<T> implements OpenJPACriteriaQuery<T>, AliasContext {
         }
     }
 
+    @Override
     public boolean equals(Object other) {
         if(other == null) {
             return false;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java
index 751951565..c11f7d7af 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ExpressionImpl.java
@@ -21,9 +21,9 @@ package org.apache.openjpa.persistence.criteria;
 
 import java.util.Collection;
 
+import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.CriteriaBuilder.In;
 
 import org.apache.openjpa.kernel.exps.ExpressionFactory;
 
@@ -49,15 +49,17 @@ abstract class ExpressionImpl<X> extends SelectionImpl<X> implements Expression<
      * returns the same instance.
      * May cause runtime cast failure if this expression's immutable type is not convertible to the given type.
      */
+    @Override
     public <Y> Expression<Y> as(Class<Y> type) {
-       return type == getJavaType() ? (Expression<Y>)this : new Expressions.CastAs<Y>(type, this);
+       return type == getJavaType() ? (Expression<Y>)this : new Expressions.CastAs<>(type, this);
     }
 
     /**
      * Create a predicate to test whether this expression is a member of the given argument values.
      */
-   public Predicate in(Object... values) {
-        In<X> result = new Expressions.In<X>(this);
+   @Override
+public Predicate in(Object... values) {
+        In<X> result = new Expressions.In<>(this);
         for (Object v : values)
         	result.value((X)v);
         return result;
@@ -66,8 +68,9 @@ abstract class ExpressionImpl<X> extends SelectionImpl<X> implements Expression<
    /**
     * Create a predicate to test whether this expression is a member of the given argument expressions.
     */
+    @Override
     public Predicate in(Expression<?>... values) {
-        In<X> result = new Expressions.In<X>(this);
+        In<X> result = new Expressions.In<>(this);
         for (Expression<?> e : values)
         	result.value((Expression<? extends X>)e);
         return result;
@@ -76,8 +79,9 @@ abstract class ExpressionImpl<X> extends SelectionImpl<X> implements Expression<
     /**
      * Create a predicate to test whether this expression is a member of the given collection element values.
      */
+    @Override
     public Predicate in(Collection<?> values) {
-        In<X> result = new Expressions.In<X>(this);
+        In<X> result = new Expressions.In<>(this);
         for (Object e : values)
         	result.value((X)e);
         return result;
@@ -86,8 +90,9 @@ abstract class ExpressionImpl<X> extends SelectionImpl<X> implements Expression<
     /**
      * Create a predicate to test whether this expression is a member of the given expression representing a collection.
      */
+    @Override
     public Predicate in(Expression<Collection<?>> values) {
-        In<X> result = new Expressions.In<X>(this);
+        In<X> result = new Expressions.In<>(this);
         result.value((Expression<? extends X>)values);
         return result;
     }
@@ -95,6 +100,7 @@ abstract class ExpressionImpl<X> extends SelectionImpl<X> implements Expression<
     /**
      *  Create a predicate to test whether this expression is not null.
      */
+    @Override
     public Predicate isNotNull() {
     	return new Expressions.IsNotNull(this);
     }
@@ -102,6 +108,7 @@ abstract class ExpressionImpl<X> extends SelectionImpl<X> implements Expression<
     /**
      *  Create a predicate to test whether this expression is null.
      */
+    @Override
     public Predicate isNull() {
     	return new Expressions.IsNull(this);
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java
index bad8b6853..d1ca11ded 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java
@@ -29,11 +29,11 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaBuilder.Trimspec;
 import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Subquery;
-import javax.persistence.criteria.CriteriaBuilder.Trimspec;
 
 import org.apache.openjpa.kernel.exps.ExpressionFactory;
 import org.apache.openjpa.kernel.exps.Literal;
@@ -165,7 +165,7 @@ class Expressions {
       * whose mutation do not impact the original list.
       */
      static <X> List<X> returnCopy(List<X> list) {
-         return list == null ? new ArrayList<X>() : new CopyOnWriteArrayList<X>(list);
+         return list == null ? new ArrayList<>() : new CopyOnWriteArrayList<>(list);
      }
 
      /**
@@ -173,7 +173,7 @@ class Expressions {
       * whose mutation do not impact the original list.
       */
      static <X> Set<X> returnCopy(Set<X> set) {
-         return set == null ? new HashSet<X>() : new CopyOnWriteArraySet<X>(set);
+         return set == null ? new HashSet<>() : new CopyOnWriteArraySet<>(set);
      }
 
      static org.apache.openjpa.kernel.exps.Expression and(ExpressionFactory factory,
@@ -202,6 +202,7 @@ class Expressions {
             this((Class<X>)e.getJavaType(), e);
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, e);
         }
@@ -225,6 +226,7 @@ class Expressions {
             e2 = (ExpressionImpl<?>)y;
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, e1, e2);
         }
@@ -250,6 +252,7 @@ class Expressions {
             }
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, args);
         }
@@ -270,6 +273,7 @@ class Expressions {
             e2 = (ExpressionImpl<?>)y;
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, e1, e2);
         }
@@ -288,6 +292,7 @@ class Expressions {
             return value;
         }
 
+        @Override
         public StringBuilder asValue(AliasContext q) {
             return Expressions.asValue(q, "ABS", OPEN_BRACE, e, CLOSE_BRACE);
         }
@@ -348,6 +353,7 @@ class Expressions {
             return value;
         }
 
+        @Override
         public StringBuilder asValue(AliasContext q) {
             return Expressions.asValue(q, "SQRT", OPEN_BRACE, e, CLOSE_BRACE);
         }
@@ -365,6 +371,7 @@ class Expressions {
             return value;
         }
 
+        @Override
         public StringBuilder asValue(AliasContext q) {
             return Expressions.asValue(q, "MAX", OPEN_BRACE, e, CLOSE_BRACE);
         }
@@ -382,6 +389,7 @@ class Expressions {
             return value;
         }
 
+        @Override
         public StringBuilder asValue(AliasContext q) {
             return Expressions.asValue(q, "MIN", OPEN_BRACE, e, CLOSE_BRACE);
         }
@@ -409,6 +417,7 @@ class Expressions {
             return result;
         }
 
+        @Override
         public StringBuilder asValue(AliasContext q) {
             return Expressions.asValue(q, "SIZE", OPEN_BRACE, e, CLOSE_BRACE);
         }
@@ -430,6 +439,7 @@ class Expressions {
                 new Expressions.ListArgument(resultType, args).toValue(factory, q));
         }
 
+        @Override
         public StringBuilder asValue(AliasContext q) {
             return Expressions.asValue(q, functionName, OPEN_BRACE, Expressions.asValue(q, args, COMMA), CLOSE_BRACE);
         }
@@ -474,11 +484,11 @@ class Expressions {
         }
 
         public Concat(Expression<String> x, String y) {
-            this(x, new Constant<String>(y));
+            this(x, new Constant<>(y));
         }
 
         public Concat(String x, Expression<String> y) {
-            this(new Constant<String>(x), y);
+            this(new Constant<>(x), y);
         }
 
         @Override
@@ -513,11 +523,11 @@ class Expressions {
         }
 
         public Substring(Expression<String> s, Integer from) {
-            this(s, new Constant<Integer>(from), null);
+            this(s, new Constant<>(from), null);
         }
 
         public Substring(Expression<String> s, Integer from, Integer len) {
-            this(s, new Constant<Integer>(from), new Constant<Integer>(len));
+            this(s, new Constant<>(from), new Constant<>(len));
         }
 
         @Override
@@ -528,6 +538,7 @@ class Expressions {
                 len == null ? null : len.toValue(factory, q));
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             super.acceptVisit(visitor);
             Expressions.acceptVisit(visitor, from, len);
@@ -556,15 +567,15 @@ class Expressions {
          }
 
         public Locate(Expression<String> path, String pattern) {
-            this(path, new Constant<String>(pattern), null);
+            this(path, new Constant<>(pattern), null);
         }
 
         public Locate(String path, Expression<String> pattern) {
-            this(new Constant<String>(path), pattern, null);
+            this(new Constant<>(path), pattern, null);
         }
 
         public Locate(Expression<String> path, String pattern, int from) {
-            this(path, new Constant<String>(pattern), new Constant<Integer>(from));
+            this(path, new Constant<>(pattern), new Constant<>(from));
         }
 
         @Override
@@ -578,6 +589,7 @@ class Expressions {
                     : factory.newArgumentList(locatePath, locateFromIndex));
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, pattern, from, path);
         }
@@ -589,7 +601,7 @@ class Expressions {
     }
 
     public static class Trim extends BinarayFunctionalExpression<String> {
-        static Expression<Character> defaultTrim = new Constant<Character>(Character.class, Character.valueOf(' '));
+        static Expression<Character> defaultTrim = new Constant<>(Character.class, Character.valueOf(' '));
         static Trimspec defaultSpec = Trimspec.BOTH;
         private Trimspec ts;
 
@@ -607,11 +619,11 @@ class Expressions {
         }
 
         public Trim(Expression<String> x, Character t) {
-            this(x, new Constant<Character>(Character.class, t), defaultSpec);
+            this(x, new Constant<>(Character.class, t), defaultSpec);
         }
 
         public Trim(Expression<String> x, Character t, Trimspec ts) {
-            this(x, new Constant<Character>(Character.class, t), ts);
+            this(x, new Constant<>(Character.class, t), ts);
         }
 
         public Trim(Expression<String> x, Trimspec ts) {
@@ -629,7 +641,7 @@ class Expressions {
                 }
             }
             Character t = (Character)((Constant<Character>)e2).arg;
-            Constant<String> e2 = new Constant<String>(String.class, t.toString());
+            Constant<String> e2 = new Constant<>(String.class, t.toString());
             return factory.trim(
                 Expressions.toValue(e1, factory, q),
                 Expressions.toValue(e2, factory, q), spec);
@@ -651,11 +663,11 @@ class Expressions {
         }
 
         public Sum(Expression<? extends Number> x, Number y) {
-            this(x, new Constant<Number>(Number.class, y));
+            this(x, new Constant<>(Number.class, y));
         }
 
         public Sum(Number x, Expression<? extends Number> y) {
-            this(new Constant<Number>(Number.class, x), y);
+            this(new Constant<>(Number.class, x), y);
         }
 
         @Override
@@ -683,11 +695,11 @@ class Expressions {
         }
 
         public Product(Expression<? extends Number> x, Number y) {
-            this(x, new Constant<Number>(Number.class, y));
+            this(x, new Constant<>(Number.class, y));
         }
 
         public Product(Number x, Expression<? extends Number> y) {
-            this(new Constant<Number>(Number.class, x), y);
+            this(new Constant<>(Number.class, x), y);
         }
 
         @Override
@@ -709,11 +721,11 @@ class Expressions {
         }
 
         public Diff(Expression<? extends Number> x, Number y) {
-            this(x, new Constant<Number>(Number.class, y));
+            this(x, new Constant<>(Number.class, y));
         }
 
         public Diff(Number x, Expression<? extends Number> y) {
-            this(new Constant<Number>(Number.class, x), y);
+            this(new Constant<>(Number.class, x), y);
         }
 
         @Override
@@ -738,11 +750,11 @@ class Expressions {
         }
 
         public Quotient(Expression<? extends Number> x, Number y) {
-            this(x, new Constant<Number>(y));
+            this(x, new Constant<>(y));
         }
 
         public Quotient(Number x, Expression<? extends Number> y) {
-            this(new Constant<Number>(x), y);
+            this(new Constant<>(x), y);
         }
 
         @Override
@@ -765,10 +777,10 @@ class Expressions {
             super(Integer.class, x,y);
         }
         public  Mod(Expression<Integer> x, Integer y) {
-            this(x,new Constant<Integer>(Integer.class, y));
+            this(x,new Constant<>(Integer.class, y));
         }
         public  Mod(Integer x, Expression<Integer> y) {
-            this(new Constant<Integer>(Integer.class, x),y);
+            this(new Constant<>(Integer.class, x),y);
         }
 
         @Override
@@ -1016,7 +1028,7 @@ class Expressions {
         }
 
         public Between(Expression<? extends Y> v, Y x, Y y) {
-            this(v, new Constant<Y>(x), new Constant<Y>(y));
+            this(v, new Constant<>(x), new Constant<>(y));
         }
 
         @Override
@@ -1069,10 +1081,12 @@ class Expressions {
             return factory.newLiteral(value, literalType);
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, arg instanceof Expression ? ((Expression)arg) : null);
         }
 
+        @Override
         public StringBuilder asValue(AliasContext q) {
             if (arg == null)
                 return new StringBuilder("NULL");
@@ -1119,6 +1133,7 @@ class Expressions {
             return factory.isEmpty(val);
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             super.acceptVisit(visitor);
             Expressions.acceptVisit(visitor, collection);
@@ -1154,6 +1169,7 @@ class Expressions {
             return factory.not(factory.isEmpty(val));
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             super.acceptVisit(visitor);
             Expressions.acceptVisit(visitor, collection);
@@ -1196,7 +1212,7 @@ class Expressions {
         }
 
         public IsMember(E element, Expression<?> collection) {
-            this(new Constant<E>(element), collection);
+            this(new Constant<>(element), collection);
         }
 
         @Override
@@ -1208,6 +1224,7 @@ class Expressions {
             return contains;
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             super.acceptVisit(visitor);
             Expressions.acceptVisit(visitor, collection, element);
@@ -1235,7 +1252,7 @@ class Expressions {
         }
 
         public Like(Expression<String> x, Expression<String> pat, char esc) {
-            this(x, pat, new Constant<Character>(Character.class, esc));
+            this(x, pat, new Constant<>(Character.class, esc));
         }
 
         public Like(Expression<String> x, Expression<String> pattern) {
@@ -1243,16 +1260,16 @@ class Expressions {
         }
 
         public Like(Expression<String> x, String pattern) {
-            this(x, new Constant<String>(pattern), null);
+            this(x, new Constant<>(pattern), null);
         }
 
         public Like(Expression<String> x, String pat,
             Expression<Character> esc) {
-            this(x, new Constant<String>(pat), esc);
+            this(x, new Constant<>(pat), esc);
         }
 
         public Like(Expression<String> x, String pat,  Character esc) {
-            this(x, new Constant<String>(pat), new Constant<Character>(esc));
+            this(x, new Constant<>(pat), new Constant<>(esc));
         }
 
         @Override
@@ -1268,6 +1285,7 @@ class Expressions {
                 MATCH_SINGLECHAR, MATCH_MULTICHAR, escapeStr);
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, str, pattern, escapeChar);
         }
@@ -1279,17 +1297,19 @@ class Expressions {
     }
 
     public static class Coalesce<T> extends ExpressionImpl<T> implements CriteriaBuilder.Coalesce<T> {
-        private final List<Expression<? extends T>> values = new ArrayList<Expression<? extends T>>();
+        private final List<Expression<? extends T>> values = new ArrayList<>();
 
         public Coalesce(Class<T> cls) {
             super(cls);
         }
 
+        @Override
         public Coalesce<T> value(T value) {
-            values.add(new Constant<T>(value));
+            values.add(new Constant<>(value));
             return this;
         }
 
+        @Override
         public Coalesce<T> value(Expression<? extends T> value) {
             values.add(value);
             return this;
@@ -1304,6 +1324,7 @@ class Expressions {
             return factory.coalesceExpression(vs);
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, values.toArray(new ExpressionImpl[values.size()]));
         }
@@ -1326,7 +1347,7 @@ class Expressions {
         }
 
         public Nullif(Expression<T> x, T y) {
-            this(x, new Constant<T>(y));
+            this(x, new Constant<>(y));
         }
 
         @Override
@@ -1336,6 +1357,7 @@ class Expressions {
             return factory.nullIfExpression(value1, value2);
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, val1, val2);
         }
@@ -1366,6 +1388,7 @@ class Expressions {
                 factory.getNull());
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             super.acceptVisit(visitor);
             Expressions.acceptVisit(visitor, e);
@@ -1397,6 +1420,7 @@ class Expressions {
                 factory.getNull());
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             super.acceptVisit(visitor);
             Expressions.acceptVisit(visitor, e);
@@ -1416,15 +1440,18 @@ class Expressions {
             this.e = (ExpressionImpl<T>)e;
         }
 
+        @Override
         public Expression<T> getExpression() {
             return e;
         }
 
+        @Override
         public In<T> value(T value) {
             add(new Expressions.Equal(e,value));
             return this;
         }
 
+        @Override
         public In<T> value(Expression<? extends T> value) {
             add(new Expressions.Equal(e,value));
             return this;
@@ -1432,7 +1459,7 @@ class Expressions {
 
         @Override
         public PredicateImpl not() {
-            In<T> notIn = new In<T>(e);
+            In<T> notIn = new In<>(e);
             notIn.markNegated();
             for (Predicate e : _exps) {
                 notIn.add(e);
@@ -1499,6 +1526,7 @@ class Expressions {
             return factory.and(inExpr, notNull.toKernelExpression(factory, q));
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             super.acceptVisit(visitor);
             Expressions.acceptVisit(visitor, this, e);
@@ -1515,31 +1543,35 @@ class Expressions {
     }
 
     public static class Case<T> extends ExpressionImpl<T> implements CriteriaBuilder.Case<T> {
-        private final List<Expression<? extends T>> thens = new ArrayList<Expression<? extends T>>();
-        private final List<Expression<Boolean>> whens = new ArrayList<Expression<Boolean>>();
+        private final List<Expression<? extends T>> thens = new ArrayList<>();
+        private final List<Expression<Boolean>> whens = new ArrayList<>();
         private Expression<? extends T> otherwise;
 
         public Case(Class<T> cls) {
             super(cls);
         }
 
+        @Override
         public Case<T> when(Expression<Boolean> when, Expression<? extends T> then) {
             whens.add(when);
             thens.add(then);
             return this;
         }
 
+        @Override
         public Case<T> when(Expression<Boolean> when, T then) {
-            return when(when, new Expressions.Constant<T>(then));
+            return when(when, new Expressions.Constant<>(then));
         }
 
+        @Override
         public Case<T> otherwise(Expression<? extends T> otherwise) {
             this.otherwise = otherwise;
             return this;
         }
 
+        @Override
         public Case<T> otherwise(T otherwise) {
-            return otherwise(new Expressions.Constant<T>(otherwise));
+            return otherwise(new Expressions.Constant<>(otherwise));
         }
 
         @Override
@@ -1557,6 +1589,7 @@ class Expressions {
             return factory.generalCaseExpression(exps, other);
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             visitor.enter(this);
             for (int i = 0; i < whens.size(); i++) {
@@ -1580,8 +1613,8 @@ class Expressions {
     }
 
     public static class SimpleCase<C,R> extends ExpressionImpl<R> implements CriteriaBuilder.SimpleCase<C,R> {
-        private final List<Expression<? extends R>> thens = new ArrayList<Expression<? extends R>>();
-        private final List<Expression<C>> whens = new ArrayList<Expression<C>>();
+        private final List<Expression<? extends R>> thens = new ArrayList<>();
+        private final List<Expression<C>> whens = new ArrayList<>();
         private Expression<? extends R> otherwise;
         private Expression<C> caseOperand;
 
@@ -1594,6 +1627,7 @@ class Expressions {
             this.caseOperand = expr;
         }
 
+        @Override
         public Expression<C> getExpression() {
             return caseOperand;
         }
@@ -1604,21 +1638,25 @@ class Expressions {
             return this;
         }
 
+        @Override
         public SimpleCase<C,R> when(C when, Expression<? extends R> then) {
-            return when(new Constant<C>(when), then);
+            return when(new Constant<>(when), then);
         }
 
+        @Override
         public SimpleCase<C,R> when(C when, R then) {
-            return when(when, new Expressions.Constant<R>(then));
+            return when(when, new Expressions.Constant<>(then));
         }
 
+        @Override
         public SimpleCase<C,R> otherwise(Expression<? extends R> otherwise) {
             this.otherwise = otherwise;
             return this;
         }
 
+        @Override
         public SimpleCase<C,R> otherwise(R otherwise) {
-            return otherwise(new Expressions.Constant<R>(otherwise));
+            return otherwise(new Expressions.Constant<>(otherwise));
         }
 
         @Override
@@ -1636,6 +1674,7 @@ class Expressions {
             return factory.simpleCaseExpression(caseOperandExpr, exps, other);
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             visitor.enter(this);
             Expressions.visitChildren(visitor, caseOperand);
@@ -1715,6 +1754,7 @@ class Expressions {
             e = (SubqueryImpl<X>)x;
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, e);
         }
@@ -1728,6 +1768,7 @@ class Expressions {
             e = (SubqueryImpl<X>)x;
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, e);
         }
@@ -1797,6 +1838,7 @@ class Expressions {
             return factory.not(e.toKernelExpression(factory, q));
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, e);
         }
@@ -1821,6 +1863,7 @@ class Expressions {
             return e;
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, actual);
         }
@@ -1855,6 +1898,7 @@ class Expressions {
             return e;
         }
 
+        @Override
         public void acceptVisit(CriteriaExpressionVisitor visitor) {
             Expressions.acceptVisit(visitor, this, _args);
         }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java
index 751cdf6c1..0fb90c762 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FetchPathImpl.java
@@ -52,6 +52,7 @@ class FetchPathImpl<Z,X> extends PathImpl<Z,X> implements Fetch<Z, X> {
         this.joinType = type;
     }
 
+    @Override
     public JoinType getJoinType() {
         return joinType;
     }
@@ -60,41 +61,50 @@ class FetchPathImpl<Z,X> extends PathImpl<Z,X> implements Fetch<Z, X> {
      * Return the metamodel attribute corresponding to the fetch join.
      * @return metamodel attribute for the join
      */
+    @Override
     public Attribute<Z, X> getAttribute() {
         return (Attribute<Z, X>)_member;
     }
 
+    @Override
     public FetchParent<?, Z> getParent() {
         return (FetchParent<?, Z>)_parent;
     }
 
+    @Override
     public <Y> Fetch<X, Y> fetch(SingularAttribute<? super X, Y> assoc) {
         return addFetch((Members.Member<? super X,Y>)assoc, JoinType.INNER);
     }
 
+    @Override
     public <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> assoc) {
         return addFetch((Members.Member<? super X,Y>)assoc, JoinType.INNER);
     }
 
+    @Override
     public <X,Y> Fetch<X, Y> fetch(String assocName) {
         return fetch(assocName, JoinType.INNER);
     }
 
+    @Override
     public <Y> Fetch<X, Y> fetch(SingularAttribute<? super X, Y> assoc, JoinType jt) {
         return addFetch((Members.Member<? super X,Y>)assoc, jt);
     }
 
+    @Override
     public <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> assoc, JoinType jt) {
         return addFetch((Members.Member<? super X,Y>)assoc, jt);
     }
 
+    @Override
     public <X,Y> Fetch<X, Y> fetch(String assocName, JoinType jt) {
         Attribute<? super X, ?> assoc = ((ManagedType<X>)_member.getType()).getAttribute(assocName);
         return addFetch((Members.Member<? super X,Y>)assoc, jt);
     }
 
+    @Override
     public Set<Fetch<X, ?>> getFetches() {
-        Set<Fetch<X,?>> result = new HashSet<Fetch<X,?>>();
+        Set<Fetch<X,?>> result = new HashSet<>();
         for (Fetch f : _fetches) {
             result.add(f);
         }
@@ -104,11 +114,12 @@ class FetchPathImpl<Z,X> extends PathImpl<Z,X> implements Fetch<Z, X> {
     private <X,Y> Fetch<X,Y> addFetch(Members.Member<? super X, Y> member, JoinType jt) {
         Fetch<X,Y> fetch = new FetchPathImpl(this, member, jt);
         if (_fetches == null)
-            _fetches = new HashSet<Fetch<?,?>>();
+            _fetches = new HashSet<>();
         _fetches.add(fetch);
         return fetch;
     }
 
+    @Override
     public StringBuilder asValue(AliasContext q) {
         return super.asValue(q).insert(0, " " + joinType + " JOIN FETCH ");
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java
index cf937cdf2..8a763ea3e 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/FromImpl.java
@@ -79,6 +79,7 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Return the joins that have been made from this receiver.
      */
+    @Override
     public java.util.Set<Join<X, ?>> getJoins() {
         return Expressions.returnCopy(_joins);
     }
@@ -86,6 +87,7 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given attribute using an inner join.
      */
+    @Override
     public <Y> Join<X, Y> join(SingularAttribute<? super X, Y> attribute) {
         return join(attribute, JoinType.INNER);
     }
@@ -93,8 +95,9 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given attribute using the given join type.
      */
+    @Override
     public <Y> Join<X, Y> join(SingularAttribute<? super X, Y> attribute, JoinType jt) {
-        Join<X, Y> join = new Joins.SingularJoin<X,Y>(this,
+        Join<X, Y> join = new Joins.SingularJoin<>(this,
                 (Members.SingularAttributeImpl<? super X, Y>) attribute, jt);
         addJoin(join);
 
@@ -104,6 +107,7 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given Collection-valued attribute using an inner join.
      */
+    @Override
     public <Y> CollectionJoin<X, Y> join(CollectionAttribute<? super X, Y> collection) {
         return join(collection, JoinType.INNER);
     }
@@ -112,9 +116,10 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
      *  Join to the given Collection-valued attribute using the given
      *  join type.
      */
+    @Override
     public <Y> CollectionJoin<X, Y> join(CollectionAttribute<? super X, Y> collection,
         JoinType jt) {
-        CollectionJoin<X, Y> join = new Joins.Collection<X, Y>(this,
+        CollectionJoin<X, Y> join = new Joins.Collection<>(this,
              (Members.CollectionAttributeImpl<? super X, Y>)collection, jt);
         addJoin(join);
 
@@ -124,6 +129,7 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given Set-valued attribute using an inner join.
      */
+    @Override
     public <Y> SetJoin<X,Y> join(SetAttribute<? super X, Y> set) {
         return join(set, JoinType.INNER);
     }
@@ -131,8 +137,9 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given Set-valued attribute using the given join type.
      */
+    @Override
     public <Y> SetJoin<X,Y> join(SetAttribute<? super X, Y> set, JoinType jt) {
-        SetJoin<X, Y> join = new Joins.Set<X, Y>(this, (Members.SetAttributeImpl<? super X, Y>)set, jt);
+        SetJoin<X, Y> join = new Joins.Set<>(this, (Members.SetAttributeImpl<? super X, Y>)set, jt);
         addJoin(join);
         return join;
     }
@@ -140,6 +147,7 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given List-valued attribute using an inner join.
      */
+    @Override
     public <Y> ListJoin<X,Y> join(ListAttribute<? super X, Y> list) {
         return join(list, JoinType.INNER);
     }
@@ -147,8 +155,9 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given List-valued attribute using the given join type.
      */
+    @Override
     public <Y> ListJoin<X,Y> join(ListAttribute<? super X, Y> list, JoinType jt) {
-        ListJoin<X, Y> join = new Joins.List<X, Y>(this, (Members.ListAttributeImpl<? super X, Y>)list, jt);
+        ListJoin<X, Y> join = new Joins.List<>(this, (Members.ListAttributeImpl<? super X, Y>)list, jt);
         addJoin(join);
         return join;
     }
@@ -156,6 +165,7 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given Map-valued attribute using an inner join.
      */
+    @Override
     public <K,V> MapJoin<X,K,V> join(MapAttribute<? super X,K,V> map) {
         return join(map, JoinType.INNER);
     }
@@ -163,18 +173,21 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     /**
      *  Join to the given Map-valued attribute using the given join type.
      */
+    @Override
     public <K,V> MapJoin<X,K,V> join(MapAttribute<? super X,K,V> map, JoinType jt) {
-        MapJoin<X,K,V> join = new Joins.Map<X,K,V>(this, (Members.MapAttributeImpl<? super X,K,V>)map, jt);
+        MapJoin<X,K,V> join = new Joins.Map<>(this, (Members.MapAttributeImpl<? super X,K,V>)map, jt);
         addJoin(join);
         return join;
     }
 
     // String based counterparts
 
+    @Override
     public <W,Y> Join<W,Y> join(String attr) {
         return join(attr, JoinType.INNER);
     }
 
+    @Override
     public <W,Y> Join<W,Y> join(String name, JoinType jt) {
         assertJoinable(type);
         ManagedType<X> mType = (ManagedType<X>)type;
@@ -196,41 +209,49 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
     }
 
 
+    @Override
     public <W,Y> CollectionJoin<W, Y> joinCollection(String attr) {
         assertJoinable(type);
         return (CollectionJoin<W,Y>)join(((ManagedType<X>)type).getCollection(attr), JoinType.INNER);
     }
 
+    @Override
     public <W,Y> CollectionJoin<W, Y> joinCollection(String attr, JoinType jt) {
         assertJoinable(type);
         return (CollectionJoin<W,Y>)join(((ManagedType<X>)type).getCollection(attr), jt);
     }
 
+    @Override
     public <W,Y> ListJoin<W, Y> joinList(String attr) {
         assertJoinable(type);
         return (ListJoin<W,Y>)join(((ManagedType<X>)type).getList(attr), JoinType.INNER);
     }
 
+    @Override
     public <W,Y> ListJoin<W,Y> joinList(String attr, JoinType jt) {
         assertJoinable(type);
         return (ListJoin<W,Y>)join(((ManagedType<X>)type).getList(attr), jt);
     }
 
+    @Override
     public <W,K,V> MapJoin<W,K,V> joinMap(String attr) {
         assertJoinable(type);
         return (MapJoin<W,K,V>)join(((ManagedType<X>)type).getMap(attr));
     }
 
+    @Override
     public <W,K,V> MapJoin<W,K,V>  joinMap(String attr, JoinType jt) {
         assertJoinable(type);
         return (MapJoin<W,K,V>)join(((ManagedType<X>)type).getMap(attr));
     }
 
+    @Override
     public <W,Y> SetJoin<W, Y>  joinSet(String attr) {
         assertJoinable(type);
         return (SetJoin<W, Y>)join(((ManagedType<X>)type).getSet(attr));
     }
 
+    @Override
     public <W,Y> SetJoin<W, Y>  joinSet(String attr, JoinType jt) {
         assertJoinable(type);
         return (SetJoin<W, Y>)join(((ManagedType<X>)type).getSet(attr), jt);
@@ -244,34 +265,40 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
 
     private void addJoin(Join<X,?> join) {
         if (_joins == null)
-            _joins = new HashSet<Join<X,?>>();
+            _joins = new HashSet<>();
          _joins.add(join);
     }
 
 
+    @Override
     public <Y> Fetch<X, Y> fetch(SingularAttribute<? super X, Y> assoc, JoinType jt) {
         return addFetch((Members.Member<? super X, Y>)assoc, jt);
     }
 
+    @Override
     public <Y> Fetch<X,Y> fetch(SingularAttribute<? super X, Y> assoc) {
         return fetch(assoc, JoinType.INNER);
     }
 
+    @Override
     public <Y> Fetch<X, Y> fetch(PluralAttribute<? super X, ?, Y> assoc,
         JoinType jt) {
         return addFetch((Members.Member<? super X, Y>)assoc, jt);
     }
 
+    @Override
     public <Y> Fetch<X,Y> fetch(PluralAttribute<? super X, ?, Y> assoc) {
         return fetch(assoc, JoinType.INNER);
     }
 
     //String-based:
 
+    @Override
     public <X,Y> Fetch<X, Y> fetch(String assocName) {
         return fetch(assocName, JoinType.INNER);
     }
 
+    @Override
     public <X,Y> Fetch<X, Y> fetch(String name, JoinType jt) {
         assertJoinable(type);
         Attribute<? super X,?> attr = ((ManagedType<X>)type).getAttribute(name);
@@ -282,6 +309,7 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
         }
     }
 
+    @Override
     public java.util.Set<Fetch<X, ?>> getFetches() {
         return Expressions.returnCopy(_fetches);
     }
@@ -290,16 +318,18 @@ class FromImpl<Z,X> extends PathImpl<Z,X> implements From<Z,X> {
             JoinType jt) {
         Fetch<X,Y> fetch = new FetchPathImpl(this, member, jt);
         if (_fetches == null)
-            _fetches = new HashSet<Fetch<X,?>>();
+            _fetches = new HashSet<>();
         _fetches.add(fetch);
         return fetch;
     }
 
+    @Override
     public void acceptVisit(CriteriaExpressionVisitor visitor) {
         Expressions.acceptVisit(visitor, this,
             _joins == null ? null : _joins.toArray(new ExpressionImpl<?>[_joins.size()]));
     }
 
+    @Override
     public From<Z,X> getCorrelationParent() {
         return (From<Z,X>)getCorrelatedPath();
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java
index 93d4916aa..484cee87a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Joins.java
@@ -63,8 +63,8 @@ import org.apache.openjpa.persistence.meta.Members.Member;
 abstract class Joins {
 
     static Join clone(Join join) {
-        java.util.List<Members.Member> members = new ArrayList<Members.Member>();
-        java.util.List<JoinType> jts = new ArrayList<JoinType>();
+        java.util.List<Members.Member> members = new ArrayList<>();
+        java.util.List<JoinType> jts = new ArrayList<>();
         FromImpl<?, ?> root = getMembers((PathImpl)join, members, jts);
         Members.Member<?, ?> member = members.get(0);
         JoinType jt = jts.get(0);
@@ -128,14 +128,17 @@ abstract class Joins {
             allowNull = joinType != JoinType.INNER;
         }
 
+        @Override
         public JoinType getJoinType() {
             return joinType;
         }
 
+        @Override
         public FromImpl<?, Z> getParent() {
             return (FromImpl<?, Z>) _parent;
         }
 
+        @Override
         public Member<? extends Z, X> getMember() {
             return (Member<? extends Z, X>) _member;
         }
@@ -159,6 +162,7 @@ abstract class Joins {
          * Return the metamodel attribute corresponding to the join.
          * @return metamodel attribute type corresponding to the join
          */
+        @Override
         public Attribute<? super Z, ?> getAttribute() {
             return  (Attribute<? super Z, ?> )_member;
         }
@@ -340,6 +344,7 @@ abstract class Joins {
             allowNull = joinType != JoinType.INNER;
         }
 
+        @Override
         public final JoinType getJoinType() {
             return joinType;
         }
@@ -347,14 +352,17 @@ abstract class Joins {
         /**
          * Gets the parent of this join.
          */
+        @Override
         public final FromImpl<?, Z> getParent() {
             return (FromImpl<?, Z>) _parent;
         }
 
+        @Override
         public Attribute<? super Z, E> getAttribute() {
             return (Member<? super Z, E>)_member;
         }
 
+        @Override
         public PluralAttribute<? super Z, C, E> getModel() {
             return (PluralAttribute<? super Z, C, E>) _member.getType();
         }
@@ -527,6 +535,7 @@ abstract class Joins {
             throw new UnsupportedOperationException("JPA 2.1");
         }
 
+        @Override
         public CollectionAttribute<? super Z, E> getModel() {
             return (CollectionAttribute<? super Z, E>)_member;
         }
@@ -559,6 +568,7 @@ abstract class Joins {
             throw new UnsupportedOperationException("JPA 2.1");
         }
 
+        @Override
         public SetAttribute<? super Z, E> getModel() {
             return (SetAttribute<? super Z, E>)_member;
         }
@@ -593,10 +603,12 @@ abstract class Joins {
             throw new UnsupportedOperationException("JPA 2.1");
         }
 
+        @Override
         public ListAttribute<? super Z, E> getModel() {
             return (ListAttribute<? super Z, E>)_member;
         }
 
+        @Override
         public Expression<Integer> index() {
             return new Expressions.Index(this);
         }
@@ -633,6 +645,7 @@ abstract class Joins {
             throw new UnsupportedOperationException("JPA 2.1");
         }
 
+        @Override
         public MapAttribute<? super Z, K,V> getModel() {
             return (MapAttribute<? super Z, K,V>) _member;
         }
@@ -649,19 +662,22 @@ abstract class Joins {
             AbstractManagedType<java.util.Map<K,V>> pseudoOwner = (AbstractManagedType<java.util.Map<K,V>>)
                _member.owner.model.getType(getModel().getJavaType());
             KeyAttributeImpl<java.util.Map<K,V>, K> keyAttr =
-              new Members.KeyAttributeImpl<java.util.Map<K,V>, K>(pseudoOwner, _member.fmd);
-            _keyJoin = new KeyJoin<K, V>((FromImpl<?,java.util.Map<K,V>>)this, keyAttr, jt);
+              new Members.KeyAttributeImpl<>(pseudoOwner, _member.fmd);
+            _keyJoin = new KeyJoin<>((FromImpl<?,java.util.Map<K,V>>)this, keyAttr, jt);
             return _keyJoin;
         }
 
+        @Override
         public Expression<java.util.Map.Entry<K, V>> entry() {
-            return new MapEntry<K,V>(this);
+            return new MapEntry<>(this);
         }
 
+        @Override
         public Path<K> key() {
-            return new MapKey<Z,K>(this);
+            return new MapKey<>(this);
         }
 
+        @Override
         public Path<V> value() {
             return this;
         }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java
index 9fd423a15..1e5cdac74 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaBuilder.java
@@ -19,9 +19,9 @@
 package org.apache.openjpa.persistence.criteria;
 
 import javax.persistence.Tuple;
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.From;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.Metamodel;
 
@@ -36,7 +36,7 @@ public interface OpenJPACriteriaBuilder extends CriteriaBuilder {
     /**
      * The mnemonic to identify the query language.
      */
-    public static final String LANG_CRITERIA = "javax.persistence.criteria";
+    String LANG_CRITERIA = "javax.persistence.criteria";
 
     /**
      * Create a predicate based upon the attribute values of a given
@@ -61,37 +61,38 @@ public interface OpenJPACriteriaBuilder extends CriteriaBuilder {
      *
      * @return a predicate
      */
-    public <T> Predicate qbe(From<?, T> from, T example, ComparisonStyle style, Attribute<?,?>... excludes);
+    <T> Predicate qbe(From<?, T> from, T example, ComparisonStyle style, Attribute<?,?>... excludes);
 
     /**
      * Overloaded with no extra attribute to exclude.
      */
-    public <T> Predicate qbe(From<?, T> from, T example, ComparisonStyle style);
+    <T> Predicate qbe(From<?, T> from, T example, ComparisonStyle style);
 
     /**
      * Overloaded with default comparison style.
      */
-    public <T> Predicate qbe(From<?, T> from, T example, Attribute<?,?>... excludes);
+    <T> Predicate qbe(From<?, T> from, T example, Attribute<?,?>... excludes);
 
     /**
      * Overloaded with default comparison style and no extra attribute to exclude.
      */
-    public <T> Predicate qbe(From<?, T> from, T example);
+    <T> Predicate qbe(From<?, T> from, T example);
 
     /**
      * Create a mutable style to apply on query-by-example.
      */
-    public ComparisonStyle qbeStyle();
+    ComparisonStyle qbeStyle();
 
     /**
      * Gets the metamodel for the managed, persistent domain entities.
      */
-    public Metamodel getMetamodel();
+    Metamodel getMetamodel();
 
     /**
      *  Create a <code>CriteriaQuery</code> object.
      *  @return criteria query object
      */
+    @Override
     OpenJPACriteriaQuery<Object> createQuery();
 
     /**
@@ -100,6 +101,7 @@ public interface OpenJPACriteriaBuilder extends CriteriaBuilder {
      *  @param resultClass  type of the query result
      *  @return criteria query object
      */
+    @Override
     <T> OpenJPACriteriaQuery<T> createQuery(Class<T> resultClass);
 
     /**
@@ -107,6 +109,7 @@ public interface OpenJPACriteriaBuilder extends CriteriaBuilder {
      *  objects as its result.
      *  @return criteria query object
      */
+    @Override
     OpenJPACriteriaQuery<Tuple> createTupleQuery();
 
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaQuery.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaQuery.java
index f896b7039..4327e55e3 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaQuery.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OpenJPACriteriaQuery.java
@@ -35,13 +35,13 @@ public interface OpenJPACriteriaQuery<T> extends CriteriaQuery<T> {
      *
      * @return a JPQL-like string.
      */
-    public String toCQL();
+    String toCQL();
 
     /**
      * Compile the query.
      *
      * @return the same instance compiled.
      */
-    public OpenJPACriteriaQuery<T> compile();
+    OpenJPACriteriaQuery<T> compile();
 }
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java
index 26c1fcde0..2000501e5 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/OrderImpl.java
@@ -40,19 +40,23 @@ class OrderImpl implements Order, CriteriaExpression {
 		this(e, true);
 	}
 
-	public ExpressionImpl<?> getExpression() {
+	@Override
+    public ExpressionImpl<?> getExpression() {
 		return e;
 	}
 
-	public boolean isAscending() {
+	@Override
+    public boolean isAscending() {
 		return _ascending;
 	}
 
-	public Order reverse() {
+	@Override
+    public Order reverse() {
 		_ascending = !_ascending;
 		return this;
 	}
 
+    @Override
     public void acceptVisit(CriteriaExpressionVisitor visitor) {
         if (!visitor.isVisited(this)) {
             visitor.enter(this);
@@ -60,15 +64,18 @@ class OrderImpl implements Order, CriteriaExpression {
         }
     }
 
+    @Override
     public StringBuilder asValue(AliasContext q) {
         return (e.isAutoAliased() ? e.asValue(q) : new StringBuilder(e.getAlias()))
             .append(_ascending ? "" : " DESC");
     }
 
+    @Override
     public StringBuilder asProjection(AliasContext q) {
         throw new IllegalStateException(this + " can not be rendered as projection");
     }
 
+    @Override
     public StringBuilder asVariable(AliasContext q) {
         throw new IllegalStateException(this + " can not be rendered as variable");
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java
index 60a3044ba..064cfd5c0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/ParameterExpressionImpl.java
@@ -61,6 +61,7 @@ class ParameterExpressionImpl<T> extends ExpressionImpl<T>
      * Gets the name of this parameter.
      * The name can be null.
      */
+    @Override
     public final String getName() {
         return _name;
     }
@@ -69,6 +70,7 @@ class ParameterExpressionImpl<T> extends ExpressionImpl<T>
      * Raises an internal exception because parameters of CriteriaQuery
      * are not positional.
      */
+    @Override
     public final Integer getPosition() {
         throw new InternalException(this + " must not be asked for its position");
     }
@@ -77,6 +79,7 @@ class ParameterExpressionImpl<T> extends ExpressionImpl<T>
         _index = index;
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder("ParameterExpression");
         buf.append("<" + getJavaType().getSimpleName() + ">");
@@ -114,6 +117,7 @@ class ParameterExpressionImpl<T> extends ExpressionImpl<T>
         return Expressions.asValue(q, ":", _name == null ? "param" : _name);
     }
 
+    @Override
     public Class<T> getParameterType() {
         return getJavaType();
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
index 4854d6ab0..6ab55c92c 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PathImpl.java
@@ -89,6 +89,7 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
      *
      * @throws IllegalArgumentException if this path is not bindable
      */
+    @Override
     public Bindable<X> getModel() {
         if (_member instanceof Bindable<?> == false) {
             throw new IllegalArgumentException(this + " represents a basic path and not a bindable");
@@ -99,6 +100,7 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
     /**
      *  Gets the parent of this path or null if this path is the root.
      */
+    @Override
     public final Path<Z> getParentPath() {
         return _parent;
     }
@@ -241,31 +243,34 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
     /**
      *  Gets a new path that represents the given single-valued attribute from this path.
      */
+    @Override
     public <Y> Path<Y> get(SingularAttribute<? super X, Y> attr) {
     	if (getType() != attr.getDeclaringType()) {
     		attr = (SingularAttribute)((ManagedType)getType()).getAttribute(attr.getName());
     	}
-        return new PathImpl<X,Y>(this, (Members.SingularAttributeImpl<? super X, Y>)attr, attr.getJavaType());
+        return new PathImpl<>(this, (Members.SingularAttributeImpl<? super X, Y>)attr, attr.getJavaType());
     }
 
     /**
      *  Gets a new path that represents the given multi-valued attribute from this path.
      */
+    @Override
     public <E, C extends java.util.Collection<E>> Expression<C>  get(PluralAttribute<X, C, E> coll) {
     	if (getType() != coll.getDeclaringType()) {
     		coll = (PluralAttribute)((ManagedType)getType()).getAttribute(coll.getName());
     	}
-        return new PathImpl<X,C>(this, (Members.PluralAttributeImpl<? super X, C, E>)coll, coll.getJavaType());
+        return new PathImpl<>(this, (Members.PluralAttributeImpl<? super X, C, E>)coll, coll.getJavaType());
     }
 
     /**
      *  Gets a new path that represents the given map-valued attribute from this path.
      */
+    @Override
     public <K, V, M extends java.util.Map<K, V>> Expression<M> get(MapAttribute<X, K, V> map) {
     	if (getType() != map.getDeclaringType()) {
     		map = (MapAttribute)((ManagedType)getType()).getAttribute(map.getName());
     	}
-        return new PathImpl<X,M>(this, (Members.MapAttributeImpl<? super X,K,V>)map, (Class<M>)map.getJavaType());
+        return new PathImpl<>(this, (Members.MapAttributeImpl<? super X,K,V>)map, (Class<M>)map.getJavaType());
     }
 
     /**
@@ -274,6 +279,7 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
      * @exception IllegalArgumentException if this path represents a basic attribute that is can not be traversed
      * further.
      */
+    @Override
     public <Y> Path<Y> get(String attName) {
         Type<?> type = this.getType();
         if (type.getPersistenceType() == PersistenceType.BASIC) {
@@ -282,7 +288,7 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
 
         Members.Member<? super X, Y> next = (Members.Member<? super X, Y>)
            ((ManagedType<? super X>)type).getAttribute(attName);
-        return new PathImpl<X,Y>(this, next, next.getJavaType());
+        return new PathImpl<>(this, next, next.getJavaType());
     }
 
     public Type<?> getType() {
@@ -297,10 +303,12 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
     /**
      * Get the type() expression corresponding to this path.
      */
+    @Override
     public Expression<Class<? extends X>> type() {
-        return new Expressions.Type<Class<? extends X>>(this);
+        return new Expressions.Type<>(this);
     }
 
+    @Override
     public StringBuilder asValue(AliasContext q) {
         StringBuilder buffer = new StringBuilder();
         if (_parent != null) {
@@ -313,6 +321,7 @@ class PathImpl<Z,X> extends ExpressionImpl<X> implements Path<X> {
         return buffer;
     }
 
+    @Override
     public StringBuilder asVariable(AliasContext q) {
         Value var = q.getRegisteredVariable(this);
         return asValue(q).append(" ").append(var == null ? "?" : var.getName());
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java
index 5ee4f7bf9..9c6f34a36 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/PredicateImpl.java
@@ -89,14 +89,16 @@ abstract class PredicateImpl extends ExpressionImpl<Boolean> implements Predicat
         return this;
     }
 
+    @Override
     public List<Expression<Boolean>> getExpressions() {
-        List<Expression<Boolean>> result = new CopyOnWriteArrayList<Expression<Boolean>>();
+        List<Expression<Boolean>> result = new CopyOnWriteArrayList<>();
         if (_exps.isEmpty())
             return result;
         result.addAll(_exps);
         return result;
     }
 
+    @Override
     public final BooleanOperator getOperator() {
         return _op;
     }
@@ -108,6 +110,7 @@ abstract class PredicateImpl extends ExpressionImpl<Boolean> implements Predicat
     /**
      * Is this predicate created by negating another predicate?
      */
+    @Override
     public final boolean isNegated() {
         return _negated;
     }
@@ -120,6 +123,7 @@ abstract class PredicateImpl extends ExpressionImpl<Boolean> implements Predicat
      * Derived predicates can return the inverse expression, if exists.
      * For example, NotEqual for Equal or LessThan for GreaterThanEqual etc.
      */
+    @Override
     public PredicateImpl not() {
         return new Expressions.Not(this).markNegated();
     }
@@ -131,7 +135,7 @@ abstract class PredicateImpl extends ExpressionImpl<Boolean> implements Predicat
 
     public static Predicate TRUE() {
     	if (TRUE == null) {
-    	    ExpressionImpl<Integer> ONE  = new Expressions.Constant<Integer>(1);
+    	    ExpressionImpl<Integer> ONE  = new Expressions.Constant<>(1);
     		TRUE = new Expressions.Equal(ONE, ONE);
     	}
     	return TRUE;
@@ -139,7 +143,7 @@ abstract class PredicateImpl extends ExpressionImpl<Boolean> implements Predicat
 
     public static Predicate FALSE() {
     	if (FALSE == null) {
-    	    ExpressionImpl<Integer> ONE  = new Expressions.Constant<Integer>(1);
+    	    ExpressionImpl<Integer> ONE  = new Expressions.Constant<>(1);
     		FALSE = new Expressions.NotEqual(ONE, ONE);
     	}
     	return FALSE;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java
index b11c70be4..debfcce67 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/RootImpl.java
@@ -49,6 +49,7 @@ class RootImpl<X> extends FromImpl<X,X> implements Root<X> {
         _entity = type;
     }
 
+    @Override
     public  EntityType<X> getModel() {
         return _entity;
     }
@@ -101,6 +102,7 @@ class RootImpl<X> extends FromImpl<X,X> implements Root<X> {
         return factory.bindVariable(var, path);
     }
 
+    @Override
     public StringBuilder asValue(AliasContext q) {
         Value v = q.getRegisteredRootVariable(this);
         if (v != null)
@@ -113,6 +115,7 @@ class RootImpl<X> extends FromImpl<X,X> implements Root<X> {
         return new StringBuilder().append(Character.toLowerCase(_entity.getName().charAt(0)));
     }
 
+    @Override
     public StringBuilder asVariable(AliasContext q) {
         return new StringBuilder(_entity.getName()).append(" ").append(asValue(q));
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java
index 6bbef81b5..71ff300ae 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SelectionImpl.java
@@ -50,6 +50,7 @@ abstract class SelectionImpl<X> implements Selection<X>, CriteriaExpression {
     /**
      * Gets the immutable type represented by this selection term.
      */
+    @Override
     public Class<X> getJavaType() {
         return _cls;
     }
@@ -57,6 +58,7 @@ abstract class SelectionImpl<X> implements Selection<X>, CriteriaExpression {
     /**
      * Gets the alias set of this selection term.
      */
+    @Override
     public String getAlias() {
         return _alias;
     }
@@ -65,6 +67,7 @@ abstract class SelectionImpl<X> implements Selection<X>, CriteriaExpression {
      * Sets the alias on this selection term.
      * Alias can only be set once.
      */
+    @Override
     public Selection<X> alias(String alias) {
         assertValidName(alias);
         if (isAliased())
@@ -105,6 +108,7 @@ abstract class SelectionImpl<X> implements Selection<X>, CriteriaExpression {
     /**
      * Throws IllegalStateException because a selection term, by default, consists of single value.
      */
+    @Override
     public List<Selection<?>> getCompoundSelectionItems() {
         throw new IllegalStateException(this + " is not a compound selection");
     }
@@ -112,6 +116,7 @@ abstract class SelectionImpl<X> implements Selection<X>, CriteriaExpression {
     /**
      * Returns false because a selection term, by default, consists of single value.
      */
+    @Override
     public boolean isCompoundSelection() {
         return false;
     }
@@ -130,19 +135,23 @@ abstract class SelectionImpl<X> implements Selection<X>, CriteriaExpression {
     //  Contract for CriteriaExpression implemented mostly as a no-op for easier derivation.
     //  ------------------------------------------------------------------------------------
 
+    @Override
     public StringBuilder asValue(AliasContext q) {
         throw new IllegalStateException(this.getClass().getSimpleName() + " can not be rendered as value");
     }
 
+    @Override
     public StringBuilder asVariable(AliasContext q) {
         throw new IllegalStateException(this.getClass().getSimpleName() + " can not be rendered as variable");
     }
 
+    @Override
     public StringBuilder asProjection(AliasContext q) {
         String as = (isAutoAliased() ? "" : " AS " + getAlias());
         return asValue(q).append(as);
     }
 
+    @Override
     public void acceptVisit(CriteriaExpressionVisitor visitor) {
         Expressions.acceptVisit(visitor, this, (Expression<?>[])null);
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
index 229096ad0..58a56712f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/SubqueryImpl.java
@@ -85,13 +85,14 @@ class SubqueryImpl<T> extends ExpressionImpl<T> implements Subquery<T> {
         } else {
             _model = null;
         }
-        _delegate = new CriteriaQueryImpl<T>(_model, this);
+        _delegate = new CriteriaQueryImpl<>(_model, this);
     }
 
     /**
      * Gets the parent query of this subquery.
      * Can be a query or another subquery.
      */
+    @Override
     public AbstractQuery<?> getParent() {
         return _parent;
     }
@@ -124,23 +125,28 @@ class SubqueryImpl<T> extends ExpressionImpl<T> implements Subquery<T> {
             _parent : ((SubqueryImpl<?>)_parent).getInnermostParent());
     }
 
+    @Override
     public Subquery<T> select(Expression<T> expression) {
         _delegate.select(expression);
         return this;
     }
 
+    @Override
     public Expression<T> getSelection() {
         return (Expression<T>)_delegate.getSelection();
     }
 
+    @Override
     public <X> Root<X> from(EntityType<X> entity) {
         return _delegate.from(entity);
     }
 
+    @Override
     public <X> Root<X> from(Class<X> entityClass) {
         return _delegate.from(entityClass);
     }
 
+    @Override
     public Set<Root<?>> getRoots() {
         return _delegate.getRoots();
     }
@@ -149,72 +155,86 @@ class SubqueryImpl<T> extends ExpressionImpl<T> implements Subquery<T> {
         return _delegate.getRoot(false);
     }
 
+    @Override
     public Subquery<T> where(Expression<Boolean> restriction) {
         _delegate.where(restriction);
         return this;
     }
 
+    @Override
     public Subquery<T> where(Predicate... restrictions) {
         _delegate.where(restrictions);
         return this;
     }
 
+    @Override
     public Subquery<T> groupBy(Expression<?>... grouping) {
         _delegate.groupBy(grouping);
         return this;
     }
 
+    @Override
     public Subquery<T> groupBy(List<Expression<?>> grouping) {
         _delegate.groupBy(grouping);
         return this;
     }
 
+    @Override
     public Subquery<T> having(Expression<Boolean> restriction) {
         _delegate.having(restriction);
         return this;
     }
 
+    @Override
     public Subquery<T> having(Predicate... restrictions) {
         _delegate.having(restrictions);
         return this;
     }
 
+    @Override
     public Subquery<T> distinct(boolean distinct) {
         _delegate.distinct(distinct);
         return this;
     }
 
+    @Override
     public List<Expression<?>> getGroupList() {
         return _delegate.getGroupList();
     }
 
+    @Override
     public Predicate getRestriction() {
         return _delegate.getRestriction();
     }
 
+    @Override
     public Predicate getGroupRestriction() {
         return _delegate.getGroupRestriction();
     }
 
+    @Override
     public boolean isDistinct() {
         return _delegate.isDistinct();
     }
 
+    @Override
     public <U> Subquery<U> subquery(Class<U> type) {
-        return new SubqueryImpl<U>(type, this);
+        return new SubqueryImpl<>(type, this);
     }
 
     /**
      * Correlate this subquery with the given root.
      */
+    @Override
     public <Y> Root<Y> correlate(Root<Y> root) {
         Types.Entity<Y> entity = (Types.Entity<Y>)root.getModel();
-        RootImpl<Y> corrRoot = new RootImpl<Y>(entity);
+        RootImpl<Y> corrRoot = new RootImpl<>(entity);
         corrRoot.setCorrelatedPath((RootImpl<Y>)root);
         _delegate.addRoot(corrRoot);
         return corrRoot;
     }
 
+    @Override
     public Set<Join<?,?>> getCorrelatedJoins() {
         return _corrJoins == null ? Collections.emptySet() : new CopyOnWriteArraySet(_corrJoins);
     }
@@ -222,11 +242,12 @@ class SubqueryImpl<T> extends ExpressionImpl<T> implements Subquery<T> {
     /**
      * Correlate this subquery with the given join.
      */
+    @Override
     public <X,Y> Join<X,Y> correlate(Join<X,Y> parentJoin) {
         Join<?,?> corrJoin = Joins.clone(parentJoin);
         ((PathImpl<?,?>)corrJoin).setCorrelatedPath((PathImpl<?,?>)parentJoin);
         if (_corrJoins == null)
-            _corrJoins = new ArrayList<Join<?,?>>();
+            _corrJoins = new ArrayList<>();
         _corrJoins.add(corrJoin);
         return (Join<X,Y>)corrJoin;
     }
@@ -238,38 +259,42 @@ class SubqueryImpl<T> extends ExpressionImpl<T> implements Subquery<T> {
         return _corrJoins != null;
     }
 
+    @Override
     public <X,Y> CollectionJoin<X,Y> correlate(CollectionJoin<X,Y> parentJoin) {
         Join corrJoin = Joins.clone((Joins.Collection)parentJoin);
         ((PathImpl<?,?>)corrJoin).setCorrelatedPath((PathImpl<?,?>)parentJoin);
         if (_corrJoins == null)
-            _corrJoins = new ArrayList<Join<?,?>>();
+            _corrJoins = new ArrayList<>();
         _corrJoins.add(corrJoin);
         return (CollectionJoin<X,Y>)corrJoin;
     }
 
+    @Override
     public <X,Y> SetJoin<X,Y> correlate(SetJoin<X,Y> parentJoin) {
         Join corrJoin = Joins.clone((Joins.Set)parentJoin);
         ((PathImpl<?,?>)corrJoin).setCorrelatedPath((PathImpl<?,?>)parentJoin);
         if (_corrJoins == null)
-            _corrJoins = new ArrayList<Join<?,?>>();
+            _corrJoins = new ArrayList<>();
         _corrJoins.add(corrJoin);
         return (SetJoin<X,Y>)corrJoin;
     }
 
+    @Override
     public <X,Y> ListJoin<X,Y> correlate(ListJoin<X,Y> parentJoin) {
         Join corrJoin = Joins.clone((Joins.List)parentJoin);
         ((PathImpl<?,?>)corrJoin).setCorrelatedPath((PathImpl<?,?>)parentJoin);
         if (_corrJoins == null)
-            _corrJoins = new ArrayList<Join<?,?>>();
+            _corrJoins = new ArrayList<>();
         _corrJoins.add(corrJoin);
         return (ListJoin<X,Y>)corrJoin;
     }
 
+    @Override
     public <X,K,V> MapJoin<X,K,V> correlate(MapJoin<X,K,V> parentJoin) {
         Join corrJoin = Joins.clone((Joins.Map)parentJoin);
         ((PathImpl<?,?>)corrJoin).setCorrelatedPath((PathImpl<?,?>)parentJoin);
         if (_corrJoins == null)
-            _corrJoins = new ArrayList<Join<?,?>>();
+            _corrJoins = new ArrayList<>();
         _corrJoins.add(corrJoin);
         return (MapJoin<X,K,V>)corrJoin;
     }
@@ -358,16 +383,19 @@ class SubqueryImpl<T> extends ExpressionImpl<T> implements Subquery<T> {
     }
 
 
+    @Override
     public Class<T> getResultType() {
         return getJavaType();
     }
 
+    @Override
     public StringBuilder asValue(AliasContext q) {
         StringBuilder buffer = new StringBuilder();
         _delegate.render(buffer, _delegate.getRoots(), _corrJoins);
         return buffer;
     }
 
+    @Override
     public StringBuilder asVariable(AliasContext q) {
         return asValue(q);
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java
index ca983df6e..56b0a3702 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AbstractManagedType.java
@@ -35,9 +35,9 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.ManagedType;
 import javax.persistence.metamodel.MapAttribute;
 import javax.persistence.metamodel.PluralAttribute;
+import javax.persistence.metamodel.PluralAttribute.CollectionType;
 import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.PluralAttribute.CollectionType;
 
 import org.apache.openjpa.conf.Compatibility;
 import org.apache.openjpa.kernel.Filters;
@@ -63,7 +63,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
     public final MetamodelImpl model;
     public final ClassMetaData meta;
 
-    private java.util.Set<Attribute<? super X, ?>> attrs = new HashSet<Attribute<? super X, ?>>();
+    private java.util.Set<Attribute<? super X, ?>> attrs = new HashSet<>();
 
     private final DeclaredAttributeFilter<X> declaredAttributeFilter;
     private final SingularAttributeFilter<X> singularAttributeFilter;
@@ -190,8 +190,8 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
                         f.getFullName(false), decCode).getMessage());
             }
         }
-        declaredAttributeFilter = new DeclaredAttributeFilter<X>(this);
-        singularAttributeFilter = new SingularAttributeFilter<X>();
+        declaredAttributeFilter = new DeclaredAttributeFilter<>(this);
+        singularAttributeFilter = new SingularAttributeFilter<>();
         pluralAttributeFilter = new SingularAttributeFilter<X>().inverse();
     }
 
@@ -199,6 +199,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      * Returns all the attributes of the managed type including attributes of the super type.
      *
      */
+    @Override
     public java.util.Set<Attribute<? super X, ?>> getAttributes() {
         return Collections.unmodifiableSet(attrs);
     }
@@ -207,6 +208,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      * Returns all the attributes declared by this managed type only.
      *
      */
+    @Override
     public java.util.Set<Attribute<X, ?>> getDeclaredAttributes() {
         return filter(attrs, new TreeSet<Attribute<X, ?>>(),
                 declaredAttributeFilter);
@@ -216,6 +218,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      * Returns the single-valued attributes of the managed type.
      *
      */
+    @Override
     public java.util.Set<SingularAttribute<? super X, ?>> getSingularAttributes() {
         return filter(attrs, new TreeSet<SingularAttribute<? super X, ?>>(),
                 singularAttributeFilter);
@@ -225,6 +228,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      * Returns the single-valued attributes declared by the managed type.
      *
      */
+    @Override
     public java.util.Set<SingularAttribute<X, ?>> getDeclaredSingularAttributes() {
         return filter(attrs, new TreeSet<SingularAttribute<X, ?>>(),
                 declaredAttributeFilter,
@@ -251,6 +255,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <Y> SingularAttribute<? super X, Y> getSingularAttribute(String name, Class<Y> type) {
         Attribute<? super X, ?> result = pick(attrs,
                 new AttributeNameFilter<X>(name),
@@ -283,6 +288,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(String name, Class<Y> type) {
         Attribute<? super X, ?> result = pick(attrs,
                 new AttributeNameFilter<X>(name),
@@ -299,6 +305,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      * Returns all collection-valued attributes of the managed type.
      *
      */
+    @Override
     public java.util.Set<PluralAttribute<? super X, ?, ?>> getPluralAttributes() {
         return filter(attrs, new HashSet<PluralAttribute<? super X, ?, ?>>(),
                 pluralAttributeFilter);
@@ -308,6 +315,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      * Return all collection-valued attributes declared by the managed type.
      *
      */
+    @Override
     public java.util.Set<PluralAttribute<X, ?, ?>> getDeclaredPluralAttributes() {
         return filter(attrs, new HashSet<PluralAttribute<X, ?, ?>>(),
                 declaredAttributeFilter,
@@ -320,6 +328,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <E> CollectionAttribute<? super X, E> getCollection(String name, Class<E> elementType) {
         Attribute<? super X, ?> result = pick(attrs,
                 new PluralCategoryFilter<X>(CollectionType.COLLECTION),
@@ -337,6 +346,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <E> SetAttribute<? super X, E> getSet(String name, Class<E> elementType) {
         Attribute<? super X, ?> result = pick(attrs,
                 new PluralCategoryFilter<X>(CollectionType.SET),
@@ -354,6 +364,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <E> ListAttribute<? super X, E> getList(String name, Class<E> elementType) {
         Attribute<? super X, ?> result = pick(attrs,
                 new PluralCategoryFilter<X>(CollectionType.LIST),
@@ -371,6 +382,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <K, V> MapAttribute<? super X, K, V> getMap(String name, Class<K> keyType,
         Class<V> valueType) {
         Attribute<? super X, ?> result = pick(attrs,
@@ -389,6 +401,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <E> CollectionAttribute<X, E> getDeclaredCollection(String name,  Class<E> elementType) {
         Attribute<? super X, ?> result = pick(attrs,
                 declaredAttributeFilter,
@@ -407,6 +420,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <E> SetAttribute<X, E> getDeclaredSet(String name, Class<E> elementType) {
         Attribute<? super X, ?> result = pick(attrs,
                 declaredAttributeFilter,
@@ -424,6 +438,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <E> ListAttribute<X, E> getDeclaredList(String name, Class<E> elementType) {
         Attribute<? super X, ?> result = pick(attrs,
                 declaredAttributeFilter,
@@ -442,6 +457,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public <K, V> MapAttribute<X, K, V> getDeclaredMap(String name, Class<K> keyType,
         Class<V> valueType) {
         Attribute<? super X, ?> result = pick(attrs,
@@ -464,6 +480,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public Attribute<? super X, ?> getAttribute(String name) {
         return getAttribute(name, null);
     }
@@ -473,6 +490,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public Attribute<X, ?> getDeclaredAttribute(String name) {
         return getDeclaredAttribute(name, null);
     }
@@ -482,6 +500,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public SingularAttribute<? super X, ?> getSingularAttribute(String name) {
         return getSingularAttribute(name, null);
     }
@@ -491,6 +510,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public SingularAttribute<X, ?> getDeclaredSingularAttribute(String name) {
         return getDeclaredSingularAttribute(name, null);
     }
@@ -500,6 +520,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public CollectionAttribute<? super X, ?> getCollection(String name) {
         return getCollection(name, null);
     }
@@ -509,6 +530,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public SetAttribute<? super X, ?> getSet(String name) {
         return getSet(name, null);
     }
@@ -518,6 +540,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public ListAttribute<? super X, ?> getList(String name) {
         return getList(name, null);
     }
@@ -527,6 +550,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public MapAttribute<? super X, ?, ?> getMap(String name) {
         return getMap(name, null, null);
     }
@@ -536,6 +560,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public CollectionAttribute<X, ?> getDeclaredCollection(String name) {
         return getDeclaredCollection(name, null);
     }
@@ -545,6 +570,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public SetAttribute<X, ?> getDeclaredSet(String name) {
         return getDeclaredSet(name, null);
     }
@@ -554,6 +580,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public ListAttribute<X, ?> getDeclaredList(String name) {
         return getDeclaredList(name, null);
     }
@@ -563,6 +590,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      *
      * @throws IllegalArgumentException  if no such attribute exists
      */
+    @Override
     public MapAttribute<X, ?, ?> getDeclaredMap(String name) {
         return getDeclaredMap(name, null, null);
     }
@@ -754,7 +782,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
      * Affirms if a given element satisfy a condition.
      *
      */
-    public static interface Filter<T> {
+    public interface Filter<T> {
         boolean selects(T attr);
 
         Filter<T> inverse();
@@ -838,12 +866,14 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             return _invert ? attr.isCollection() : !attr.isCollection();
         }
 
+        @Override
         public SingularAttributeFilter<X> inverse() {
-            return new SingularAttributeFilter<X>(!_invert);
+            return new SingularAttributeFilter<>(!_invert);
         }
     }
 
@@ -861,13 +891,15 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             return _invert ? attr.getDeclaringType() != owner : attr
                     .getDeclaringType() == owner;
         }
 
+        @Override
         public DeclaredAttributeFilter<X> inverse() {
-            return new DeclaredAttributeFilter<X>(owner, !_invert);
+            return new DeclaredAttributeFilter<>(owner, !_invert);
         }
     }
 
@@ -888,13 +920,15 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             boolean result = _type == null || Filters.canConvert(attr.getJavaType(), _type, false);
             return _invert ? !result : result;
         }
 
+        @Override
         public AttributeTypeFilter<X, Y> inverse() {
-            return new AttributeTypeFilter<X, Y>(_type, !_invert);
+            return new AttributeTypeFilter<>(_type, !_invert);
         }
     }
 
@@ -912,13 +946,15 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             return _invert ? !attr.getName().equals(_name) : attr.getName()
                     .equals(_name);
         }
 
+        @Override
         public AttributeNameFilter<X> inverse() {
-            return new AttributeNameFilter<X>(_name, !_invert);
+            return new AttributeNameFilter<>(_name, !_invert);
         }
     }
 
@@ -936,14 +972,16 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             boolean result = (attr instanceof PluralAttribute<?, ?, ?>)
                     && ((PluralAttribute<?, ?, ?>) attr).getCollectionType() == _category;
             return _invert ? !result : result;
         }
 
+        @Override
         public PluralCategoryFilter<X> inverse() {
-            return new PluralCategoryFilter<X>(_category, !_invert);
+            return new PluralCategoryFilter<>(_category, !_invert);
         }
     }
 
@@ -965,6 +1003,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             boolean result = (attr instanceof PluralAttribute<?, ?, ?>)
                     && (_elementType == null
@@ -973,8 +1012,9 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             return _invert ? !result : result;
         }
 
+        @Override
         public ElementTypeFilter<X, E> inverse() {
-            return new ElementTypeFilter<X, E>(_elementType, !_invert);
+            return new ElementTypeFilter<>(_elementType, !_invert);
         }
     }
 
@@ -994,6 +1034,7 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             boolean result = (attr instanceof MapAttribute<?, ?, ?>)
                     && (_keyType == null
@@ -1003,8 +1044,9 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             return _invert ? !result : result;
         }
 
+        @Override
         public EntryTypeFilter<X, K, V> inverse() {
-            return new EntryTypeFilter<X, K, V>(_keyType, _valueType, !_invert);
+            return new EntryTypeFilter<>(_keyType, _valueType, !_invert);
         }
     }
 
@@ -1020,13 +1062,15 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             boolean result = ((Members.Member<?, ?>) attr).fmd.isPrimaryKey();
             return _invert ? !result : result;
         }
 
+        @Override
         public IdAttributeFilter<X> inverse() {
-            return new IdAttributeFilter<X>(!_invert);
+            return new IdAttributeFilter<>(!_invert);
         }
     }
 
@@ -1041,14 +1085,16 @@ public abstract class AbstractManagedType<X> extends Types.BaseType<X>
             _invert = inverted;
         }
 
+        @Override
         public boolean selects(Attribute<? super X, ?> attr) {
             FieldMetaData fmd = ((Members.Member<?, ?>) attr).fmd;
             boolean result = fmd.isVersion();
             return _invert ? !result : result;
         }
 
+        @Override
         public IdAttributeFilter<X> inverse() {
-            return new IdAttributeFilter<X>(!_invert);
+            return new IdAttributeFilter<>(!_invert);
         }
     }
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
index da2e556a2..d9d521a05 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
@@ -107,7 +107,7 @@ public class AnnotationProcessor6 extends AbstractProcessor {
     private MetaDataFactory factory;
     private int generatedSourceVersion = 6;
     private CompileTimeLogger logger;
-    private List<String> header = new ArrayList<String>();
+    private List<String> header = new ArrayList<>();
     private boolean active;
     private static Localizer _loc =  Localizer.forPackage(AnnotationProcessor6.class);
     private SourceVersion supportedSourceVersion;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java
index 283edc829..c55d8a3ab 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Members.java
@@ -72,6 +72,7 @@ public class Members {
         /**
          *  Returns the managed type which declared this attribute.
          */
+        @Override
         @SuppressWarnings("unchecked")
         public final ManagedType<X> getDeclaringType() {
             return (ManagedType<X>)owner.model.managedType(fmd.getDeclaringType());
@@ -80,6 +81,7 @@ public class Members {
         /**
          *  Returns the java.lang.reflect.Member for this attribute.
          */
+        @Override
         public final java.lang.reflect.Member getJavaMember() {
             return fmd.getBackingMember();
         }
@@ -87,6 +89,7 @@ public class Members {
         /**
          *  Gets the Java type of this attribute.
          */
+        @Override
         @SuppressWarnings("unchecked")
         public final Class<Y> getJavaType() {
             return (Class<Y>)fmd.getDeclaredType();
@@ -95,6 +98,7 @@ public class Members {
         /**
          * Gets the name of this attribute.
          */
+        @Override
         public final String getName() {
             return fmd.getName();
         }
@@ -112,6 +116,7 @@ public class Members {
         /**
          * Affirms if this attribute is an association.
          */
+        @Override
         public final boolean isAssociation() {
             return fmd.isDeclaredTypePC();
         }
@@ -119,6 +124,7 @@ public class Members {
         /**
          * Affirms if this attribute is a collection.
          */
+        @Override
         public final boolean isCollection() {
             int typeCode = fmd.getDeclaredTypeCode();
             return  typeCode == JavaTypes.COLLECTION
@@ -129,6 +135,7 @@ public class Members {
         /**
          *  Returns the persistent category for the attribute.
          */
+        @Override
         public PersistentAttributeType getPersistentAttributeType() {
             if (fmd.isEmbeddedPC())
                 return PersistentAttributeType.EMBEDDED;
@@ -137,10 +144,12 @@ public class Members {
             return PersistentAttributeType.BASIC;
         }
 
+        @Override
         public int compareTo(Member<X, Y> o) {
             return fmd.getName().compareTo(o.fmd.getName());
         }
 
+        @Override
         public String toString() {
         	return fmd.getFullName(true);
         }
@@ -163,6 +172,7 @@ public class Members {
         /**
          *  Affirms if this attribute is an id attribute.
          */
+        @Override
         public boolean isId() {
             return fmd.isPrimaryKey();
         }
@@ -170,6 +180,7 @@ public class Members {
         /**
          *  Affirms if this attribute represents a version attribute.
          */
+        @Override
         public boolean isVersion() {
             return fmd.isVersion();
         }
@@ -177,6 +188,7 @@ public class Members {
         /**
          *  Affirms if this attribute can be null.
          */
+        @Override
         public boolean isOptional() {
             return fmd.getNullValue() != FieldMetaData.NULL_EXCEPTION;
         }
@@ -184,7 +196,8 @@ public class Members {
         /**
          *  Categorizes bindable type represented by this attribute.
          */
-        public final BindableType getBindableType() {
+        @Override
+        public BindableType getBindableType() {
             return fmd.isDeclaredTypePC()
                 ? BindableType.ENTITY_TYPE
                 : BindableType.SINGULAR_ATTRIBUTE;
@@ -197,15 +210,17 @@ public class Members {
          * is returned. If the bindable type is SINGULAR_ATTRIBUTE or ENTITY_TYPE, the Java type
          * of the represented entity or attribute is returned.
          */
+        @Override
         @SuppressWarnings("unchecked")
-        public final Class<T> getBindableJavaType() {
+        public Class<T> getBindableJavaType() {
             return fmd.getElement().getDeclaredType();
         }
 
         /**
          * Categorizes the attribute.
          */
-        public final PersistentAttributeType getPersistentAttributeType() {
+        @Override
+        public PersistentAttributeType getPersistentAttributeType() {
             if (!fmd.isDeclaredTypePC())
                 return super.getPersistentAttributeType();
             if (fmd.getValue().isEmbedded() && fmd.getAssociationType() == 0) {
@@ -235,6 +250,7 @@ public class Members {
         /**
          * Returns the type representing the element type of the collection.
          */
+        @Override
         public final Type<E> getElementType() {
             return owner.model.getType(getBindableJavaType());
         }
@@ -242,6 +258,7 @@ public class Members {
         /**
          *  Returns the bindable category of this attribute.
          */
+        @Override
         public final BindableType getBindableType() {
             return BindableType.PLURAL_ATTRIBUTE;
         }
@@ -251,12 +268,14 @@ public class Members {
          *
          * For PLURAL_ATTRIBUTE, the Java element type is returned.
          */
+        @Override
         @SuppressWarnings("unchecked")
         public Class<E> getBindableJavaType() {
             return fmd.getElement().getDeclaredType();
         }
 
 
+        @Override
         public PersistentAttributeType getPersistentAttributeType() {
             return PersistentAttributeType.ONE_TO_MANY;
         }
@@ -273,6 +292,7 @@ public class Members {
             super(owner, fmd);
         }
 
+        @Override
         public CollectionType getCollectionType() {
             return CollectionType.COLLECTION;
         }
@@ -289,6 +309,7 @@ public class Members {
             super(owner, fmd);
         }
 
+        @Override
         public CollectionType getCollectionType() {
             return CollectionType.LIST;
         }
@@ -305,6 +326,7 @@ public class Members {
             super(owner, fmd);
         }
 
+        @Override
         public CollectionType getCollectionType() {
             return CollectionType.SET;
         }
@@ -322,6 +344,7 @@ public class Members {
             super(owner, fmd);
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public Class<K> getBindableJavaType() {
             return (Class<K>)fmd.getKey().getDeclaredType();
@@ -339,19 +362,23 @@ public class Members {
             super(owner, fmd);
         }
 
+        @Override
         public CollectionType getCollectionType() {
             return CollectionType.MAP;
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public Class<K> getKeyJavaType() {
             return fmd.getKey().getDeclaredType();
         }
 
+        @Override
         public Type<K> getKeyType() {
             return owner.model.getType(getKeyJavaType());
         }
 
+        @Override
         public PersistentAttributeType getPersistentAttributeType() {
             return PersistentAttributeType.MANY_TO_MANY;
         }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetadataProcessor.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetadataProcessor.java
index 80965f090..4260c987b 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetadataProcessor.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetadataProcessor.java
@@ -21,6 +21,11 @@ package org.apache.openjpa.persistence.meta;
 import java.util.List;
 import java.util.Set;
 
+import javax.lang.model.element.TypeElement;
+
+import org.apache.openjpa.meta.ClassMetaData;
+import org.apache.openjpa.meta.FieldMetaData;
+
 /**
  * Collection of generic utility functions for extracting persistence related
  * metadata from user specified metadata available in various source
@@ -50,7 +55,7 @@ public interface MetadataProcessor<T,M> {
 	 * @return an integer denoting the type of access. The integer value
 	 * corresponds to {@linkplain ClassMetaData#getAccessType()}.
 	 */
-	public int determineTypeAccess(T t);
+	int determineTypeAccess(T t);
 
 	/**
 	 * Determine the access type of the given member.
@@ -58,26 +63,26 @@ public interface MetadataProcessor<T,M> {
 	 * @return an integer denoting the type of access. The integer value
 	 * corresponds to {@linkplain FieldMetaData#getAccessType()}.
 	 */
-	public int determineMemberAccess(M m);
+	int determineMemberAccess(M m);
 
 	/**
 	 * Get the persistent members of the given type.
 	 *
 	 */
-	public Set<M> getPersistentMembers(T t);
+	Set<M> getPersistentMembers(T t);
 
 	/**
 	 * Gets the violations, if any.
 	 *
 	 * @return null or empty list if no exceptions.
 	 */
-	public List<Exception> validateAccess(T t);
+	List<Exception> validateAccess(T t);
 
 	/**
      * Affirms if the members of given type are using both field and property
 	 * based access.
 	 */
-	public boolean isMixedAccess(T t);
+	boolean isMixedAccess(T t);
 
-	public T getPersistentSupertype(T t);
+	T getPersistentSupertype(T t);
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java
index aea4a32e7..6a1f76e9b 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/MetamodelImpl.java
@@ -34,15 +34,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.EmbeddableType;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.ManagedType;
 import javax.persistence.metamodel.MappedSuperclassType;
-import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.Metamodel;
-import javax.persistence.metamodel.Type;
-import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.metamodel.PluralAttribute.CollectionType;
+import javax.persistence.metamodel.StaticMetamodel;
+import javax.persistence.metamodel.Type;
 import javax.persistence.metamodel.Type.PersistenceType;
 
 import org.apache.openjpa.conf.OpenJPAConfiguration;
@@ -66,12 +66,12 @@ import org.apache.openjpa.util.InternalException;
  */
 public class MetamodelImpl implements Metamodel, Resolver {
     private final MetaDataRepository repos;
-    private Map<Class<?>, Type<?>> _basics = new HashMap<Class<?>, Type<?>>();
-    private Map<Class<?>, EntityType<?>> _entities = new HashMap<Class<?>, EntityType<?>>();
+    private Map<Class<?>, Type<?>> _basics = new HashMap<>();
+    private Map<Class<?>, EntityType<?>> _entities = new HashMap<>();
     private Set<EntityType<?>> _entitiesOnlySet = null;
-    private Map<Class<?>, EmbeddableType<?>> _embeddables = new HashMap<Class<?>, EmbeddableType<?>>();
-    private Map<Class<?>, MappedSuperclassType<?>> _mappedsupers = new HashMap<Class<?>, MappedSuperclassType<?>>();
-    private Map<Class<?>, Types.PseudoEntity<?>> _pseudos = new HashMap<Class<?>, Types.PseudoEntity<?>>();
+    private Map<Class<?>, EmbeddableType<?>> _embeddables = new HashMap<>();
+    private Map<Class<?>, MappedSuperclassType<?>> _mappedsupers = new HashMap<>();
+    private Map<Class<?>, Types.PseudoEntity<?>> _pseudos = new HashMap<>();
 
     private static Localizer _loc = Localizer.forPackage(MetamodelImpl.class);
 
@@ -113,6 +113,7 @@ public class MetamodelImpl implements Metamodel, Resolver {
      *  @return the metamodel embeddable type
      *  @throws IllegalArgumentException if not an embeddable class
      */
+    @Override
     public <X> EmbeddableType<X> embeddable(Class<X> clazz) {
         return (EmbeddableType<X>)find(clazz, _embeddables, EMBEDDABLE, false);
     }
@@ -123,6 +124,7 @@ public class MetamodelImpl implements Metamodel, Resolver {
      *  @return the metamodel entity type
      *  @throws IllegalArgumentException if not an entity
      */
+    @Override
     public <X> EntityType<X> entity(Class<X> clazz) {
         return (EntityType<X>) find(clazz, _entities, ENTITY, false);
     }
@@ -136,7 +138,7 @@ public class MetamodelImpl implements Metamodel, Resolver {
      */
     private Collection<EntityType<?>> getEntityValuesOnly() {
         if (_entitiesOnlySet == null) {
-            _entitiesOnlySet = new HashSet<EntityType<?>>();
+            _entitiesOnlySet = new HashSet<>();
             for (Class<?> cls : _entities.keySet()) {
                 // if key indicates it is a embeddable, do not add to the _entitiesOnlySet.
                 if (!_embeddables.containsKey(cls)) {
@@ -151,6 +153,7 @@ public class MetamodelImpl implements Metamodel, Resolver {
      * Return the metamodel embeddable types.
      * @return the metamodel embeddable types
      */
+    @Override
     public Set<EmbeddableType<?>> getEmbeddables() {
         return unmodifiableSet(_embeddables.values());
     }
@@ -159,6 +162,7 @@ public class MetamodelImpl implements Metamodel, Resolver {
      * Return the metamodel entity types.
      * @return the metamodel entity types
      */
+    @Override
     public Set<EntityType<?>> getEntities() {
         return unmodifiableSet(getEntityValuesOnly());
     }
@@ -167,8 +171,9 @@ public class MetamodelImpl implements Metamodel, Resolver {
      *  Return the metamodel managed types.
      *  @return the metamodel managed types
      */
+    @Override
     public Set<ManagedType<?>> getManagedTypes() {
-        Set<ManagedType<?>> result = new HashSet<ManagedType<?>>();
+        Set<ManagedType<?>> result = new HashSet<>();
         result.addAll(getEntityValuesOnly());
         result.addAll(_embeddables.values());
         result.addAll(_mappedsupers.values());
@@ -182,6 +187,7 @@ public class MetamodelImpl implements Metamodel, Resolver {
      *  @return the metamodel managed type
      *  @throws IllegalArgumentException if not a managed class
      */
+    @Override
     public <X> ManagedType<X> managedType(Class<X> clazz) {
         if (_embeddables.containsKey(clazz))
             return (EmbeddableType<X>) _embeddables.get(clazz);
@@ -215,7 +221,7 @@ public class MetamodelImpl implements Metamodel, Resolver {
                 _pseudos.put(cls, new Types.PseudoEntity(cls, this));
                 return pseudo;
             } else {
-                Type<X> basic = new Types.Basic<X>(cls);
+                Type<X> basic = new Types.Basic<>(cls);
                 _basics.put(cls, basic);
                 return basic;
             }
@@ -269,18 +275,18 @@ public class MetamodelImpl implements Metamodel, Resolver {
         }
         switch (actual) {
         case EMBEDDABLE:
-            Types.Embeddable<X> embedded = new Types.Embeddable<X>(meta, this);
+            Types.Embeddable<X> embedded = new Types.Embeddable<>(meta, this);
             _embeddables.put(cls, embedded);
             populate(embedded);
             // no break : embeddables are stored as both entity and embeddable containers
         case ENTITY:
-        	Types.Entity<X> entity = new Types.Entity<X>(meta, this);
+        	Types.Entity<X> entity = new Types.Entity<>(meta, this);
             _entities.put(cls, entity);
             _entitiesOnlySet = null;
             populate(entity);
             break;
         case MAPPED_SUPERCLASS:
-            Types.MappedSuper<X> mapped = new Types.MappedSuper<X>(meta, this);
+            Types.MappedSuper<X> mapped = new Types.MappedSuper<>(meta, this);
             _mappedsupers.put(cls, mapped);
             populate(mapped);
             break;
@@ -290,7 +296,7 @@ public class MetamodelImpl implements Metamodel, Resolver {
     }
 
     public <T> Set<T> unmodifiableSet(Collection<T> coll) {
-        HashSet<T> result = new HashSet<T>();
+        HashSet<T> result = new HashSet<>();
         for (T t : coll)
             result.add(t);
         return result;
@@ -421,22 +427,27 @@ public class MetamodelImpl implements Metamodel, Resolver {
                     mField, owner).getMessage());
     }
 
+    @Override
     public Class classForName(String name, String[] imports) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public AggregateListener getAggregateListener(String tag) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public OpenJPAConfiguration getConfiguration() {
         return repos.getConfiguration();
     }
 
+    @Override
     public FilterListener getFilterListener(String tag) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public QueryContext getQueryContext() {
         throw new UnsupportedOperationException();
     }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java
index 6f5dec182..504066397 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/SourceAnnotationHandler.java
@@ -27,8 +27,8 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
@@ -89,7 +89,7 @@ public class SourceAnnotationHandler
     protected GetterFilter getterFilter = new GetterFilter();
     protected SetterFilter setterFilter = new SetterFilter();
 
-    protected static List<Class<? extends Annotation>> mappingAnnos = new ArrayList<Class<? extends Annotation>>();
+    protected static List<Class<? extends Annotation>> mappingAnnos = new ArrayList<>();
     static {
         mappingAnnos.add(OneToOne.class);
         mappingAnnos.add(OneToMany.class);
@@ -110,7 +110,8 @@ public class SourceAnnotationHandler
 		this.logger = logger;
 	}
 
-	public int determineTypeAccess(TypeElement type) {
+	@Override
+    public int determineTypeAccess(TypeElement type) {
         AccessType access = getExplicitAccessType(type);
         boolean isExplicit = access != null;
         return isExplicit ? access == AccessType.FIELD
@@ -119,15 +120,18 @@ public class SourceAnnotationHandler
                 : getImplicitAccessType(type);
 	}
 
-	public int determineMemberAccess(Element m) {
+	@Override
+    public int determineMemberAccess(Element m) {
 		return 0;
 	}
 
-	public List<Exception> validateAccess(TypeElement t) {
+	@Override
+    public List<Exception> validateAccess(TypeElement t) {
 		return null;
 	}
 
-	public boolean isMixedAccess(TypeElement t) {
+	@Override
+    public boolean isMixedAccess(TypeElement t) {
 		return false;
 	}
     /**
@@ -137,6 +141,7 @@ public class SourceAnnotationHandler
      * specification to determine the candidate set of field/methods.
      */
 
+    @Override
     public Set<Element> getPersistentMembers(TypeElement type) {
         int access = determineTypeAccess(type);
         if (AccessCode.isExplicit(access)) {
@@ -183,7 +188,7 @@ public class SourceAnnotationHandler
 
     private Set<Element> getDefaultAccessPersistentMembers(TypeElement type,
         int access) {
-        Set<Element> result = new HashSet<Element>();
+        Set<Element> result = new HashSet<>();
         List<? extends Element> allMembers = type.getEnclosedElements();
         if (AccessCode.isField(access)) {
             Set<VariableElement> allFields = (Set<VariableElement>)
@@ -230,7 +235,7 @@ public class SourceAnnotationHandler
     }
 
     Set<Element> merge(Set<? extends Element> a, Set<? extends Element> b) {
-    	Set<Element> result = new HashSet<Element>();
+    	Set<Element> result = new HashSet<>();
     	result.addAll(a);
     	for (Element e1 : b) {
     		boolean hide = false;
@@ -254,7 +259,7 @@ public class SourceAnnotationHandler
      */
     private Set<ExecutableElement> matchGetterAndSetter(
         Set<ExecutableElement> getters,  Set<ExecutableElement> setters) {
-        Collection<ExecutableElement> unmatched =  new ArrayList<ExecutableElement>();
+        Collection<ExecutableElement> unmatched =  new ArrayList<>();
 
         for (ExecutableElement getter : getters) {
             String getterName = getter.getSimpleName().toString();
@@ -289,7 +294,7 @@ public class SourceAnnotationHandler
      * Inclusive element filtering predicate.
      *
      */
-    private static interface InclusiveFilter<T extends Element> {
+    private interface InclusiveFilter<T extends Element> {
         /**
          * Return true to include the given element.
          */
@@ -302,7 +307,7 @@ public class SourceAnnotationHandler
      */
     <T extends Element> Set<T> filter(Collection<T> coll,
         InclusiveFilter... filters) {
-        Set<T> result = new HashSet<T>();
+        Set<T> result = new HashSet<>();
         for (T e : coll) {
             boolean include = true;
             for (InclusiveFilter f : filters) {
@@ -324,6 +329,7 @@ public class SourceAnnotationHandler
      *
      */
     static class GetterFilter implements InclusiveFilter<ExecutableElement> {
+        @Override
         public boolean includes(ExecutableElement method) {
             return isGetter(method);
         }
@@ -335,6 +341,7 @@ public class SourceAnnotationHandler
      *
      */
     static class SetterFilter implements InclusiveFilter<ExecutableElement> {
+        @Override
         public boolean includes(ExecutableElement method) {
             return isSetter(method);
         }
@@ -352,6 +359,7 @@ public class SourceAnnotationHandler
             this.target = target;
         }
 
+        @Override
         public boolean includes(Element obj) {
             Object value = getAnnotationValue(obj, Access.class);
             return equalsByValue(target, value);
@@ -369,6 +377,7 @@ public class SourceAnnotationHandler
             this.target = target;
         }
 
+        @Override
         public boolean includes(Element obj) {
             return obj.getKind() == target;
         }
@@ -378,6 +387,7 @@ public class SourceAnnotationHandler
      * Selects all non-transient element.
      */
     static class TransientFilter implements InclusiveFilter<Element> {
+        @Override
         public boolean includes(Element obj) {
             Set<Modifier> modifiers = obj.getModifiers();
             boolean isTransient = isAnnotatedWith(obj, Transient.class)
@@ -390,6 +400,7 @@ public class SourceAnnotationHandler
      * Selects all annotated element.
      */
     static class AnnotatedFilter implements InclusiveFilter<Element> {
+        @Override
         public boolean includes(Element obj) {
             return isAnnotated(obj);
         }
@@ -650,6 +661,7 @@ public class SourceAnnotationHandler
         return param;
     }
 
+    @Override
     public TypeElement getPersistentSupertype(TypeElement cls) {
     	if (cls == null) return null;
         TypeMirror sup = cls.getSuperclass();
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java
index 767eb2338..3589313d6 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/Types.java
@@ -57,10 +57,12 @@ public class Types {
             this.cls = cls;
         }
 
+        @Override
         public final Class<X> getJavaType() {
             return cls;
         }
 
+        @Override
         public String toString() {
             return cls.getName();
         }
@@ -79,6 +81,7 @@ public class Types {
             super(cls);
         }
 
+        @Override
         public PersistenceType getPersistenceType() {
             return PersistenceType.BASIC;
         }
@@ -103,6 +106,7 @@ public class Types {
          *  @return boolean indicating whether or not the identifiable
          *          type has a version attribute
          */
+        @Override
         public boolean hasVersionAttribute() {
             return meta.getVersionField() != null;
         }
@@ -114,6 +118,7 @@ public class Types {
          *  or mapped superclass.
          *  @return super type of identifiable type or null if no such super type
          */
+        @Override
         public IdentifiableType<? super X> getSupertype() {
             ClassMetaData superMeta = meta.getPCSuperclassMetaData();
             if (superMeta == null)
@@ -133,6 +138,7 @@ public class Types {
          *  @return boolean indicating whether or not the identifiable
          *          type represents its persistent identity via a single identifier attribute.
          */
+        @Override
         public boolean hasSingleIdAttribute() {
             return meta.getPrimaryKeyFields().length == 1;
         }
@@ -141,6 +147,7 @@ public class Types {
          *  Return the type that represents the type of the id.
          *  @return type of identifier
          */
+        @Override
         public Type<?> getIdType() {
             Class<?> idType = hasSingleIdAttribute()
                      ? meta.getPrimaryKeyFields()[0].getDeclaredType() : meta.getObjectIdType();
@@ -161,6 +168,7 @@ public class Types {
             super(meta, model);
         }
 
+        @Override
         public PersistenceType getPersistenceType() {
             return PersistenceType.EMBEDDABLE;
         }
@@ -180,6 +188,7 @@ public class Types {
             super(meta, model);
         }
 
+        @Override
         public PersistenceType getPersistenceType() {
             return PersistenceType.MAPPED_SUPERCLASS;
         }
@@ -200,10 +209,12 @@ public class Types {
             super(meta, model);
         }
 
+        @Override
         public PersistenceType getPersistenceType() {
             return PersistenceType.ENTITY;
         }
 
+        @Override
         public String getName() {
         	return meta.getTypeAlias();
         }
@@ -211,6 +222,7 @@ public class Types {
          *  Return the bindable type of the represented object.
          *  @return bindable type
          */
+        @Override
         public BindableType getBindableType() {
             return BindableType.ENTITY_TYPE;
         }
@@ -223,6 +235,7 @@ public class Types {
          * represented entity or attribute is returned.
          * @return Java type
          */
+        @Override
         public Class<X> getBindableJavaType() {
             return getJavaType();
         }
@@ -238,6 +251,7 @@ public class Types {
             super(cls, model);
         }
 
+        @Override
         public javax.persistence.metamodel.Type.PersistenceType getPersistenceType() {
             return PersistenceType.ENTITY;
         }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/osgi/PersistenceActivator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/osgi/PersistenceActivator.java
index 28885f047..260c7cc7a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/osgi/PersistenceActivator.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/osgi/PersistenceActivator.java
@@ -45,10 +45,11 @@ public class PersistenceActivator implements BundleActivator {
     /* (non-Javadoc)
      * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
      */
+    @Override
     public void start(BundleContext ctx) throws Exception {
-        this.ctx = ctx;
+        PersistenceActivator.ctx = ctx;
         PersistenceProvider provider = new PersistenceProviderImpl();
-        Hashtable<String, String> props = new Hashtable<String, String>();
+        Hashtable<String, String> props = new Hashtable<>();
         // Aries queries for service providers by property "javax.persistence.provider"
         props.put(PERSISTENCE_PROVIDER_ARIES, OSGI_PERSISTENCE_PROVIDER);
         // The persistence service tracker in the geronimo spec api bundle examines
@@ -64,6 +65,7 @@ public class PersistenceActivator implements BundleActivator {
     /* (non-Javadoc)
      * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
      */
+    @Override
     public void stop(BundleContext ctx) throws Exception {
 
         OSGiManagedRuntime.deregisterServiceListener(ctx);
@@ -72,7 +74,7 @@ public class PersistenceActivator implements BundleActivator {
             svcReg.unregister();
             svcReg = null;
         }
-        this.ctx = null;
+        PersistenceActivator.ctx = null;
     }
 
     /* (non-Javadoc)
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbsExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbsExpression.java
index 2bd28a953..bc3deb7f6 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbsExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbsExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class AbsExpression extends UnaryOperatorExpression {
-	public AbsExpression(ExpressionImpl op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public AbsExpression(ExpressionImpl op) {
 		super(op, UnaryFunctionalOperator.ABS);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java
index 83028d2d4..dc66582e9 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java
@@ -32,7 +32,10 @@ import java.util.List;
 public abstract class AbstractDomainObject extends AbstractPath
 	implements DomainObject {
 
-	protected AbstractDomainObject(QueryDefinitionImpl owner,
+	
+    private static final long serialVersionUID = 1L;
+
+    protected AbstractDomainObject(QueryDefinitionImpl owner,
 		AbstractPath parent, PathOperator op, Object part2) {
 		super(owner, parent, op, part2);
 	}
@@ -40,21 +43,24 @@ public abstract class AbstractDomainObject extends AbstractPath
 	/**
 	 * Adding a root adds a root domain to the owning query.
 	 */
-	public DomainObject addRoot(Class cls) {
+	@Override
+    public DomainObject addRoot(Class cls) {
 		return _owner.addRoot(cls);
 	}
 
 	/**
 	 * Adding a query root adds a subquery to the owning query.
 	 */
-	public DomainObject addSubqueryRoot(PathExpression path) {
+	@Override
+    public DomainObject addSubqueryRoot(PathExpression path) {
 		return _owner.addSubqueryRoot(path);
 	}
 
 	/**
 	 * Derives a path from this path by navigating through the given field.
 	 */
-	public PathExpression get(String attr) {
+	@Override
+    public PathExpression get(String attr) {
 		return new NavigationPath(_owner, this, attr);
 	}
 
@@ -62,7 +68,8 @@ public abstract class AbstractDomainObject extends AbstractPath
 	 * Derives a path from this path by joining the given field.
 	 * Also the joined path becomes a domain of the owning query.
 	 */
-	public DomainObject join(String attr) {
+	@Override
+    public DomainObject join(String attr) {
         return _owner.addDomain(new JoinPath(this, PathOperator.INNER, attr));
 	}
 
@@ -70,14 +77,16 @@ public abstract class AbstractDomainObject extends AbstractPath
 	 * Derives a path from this path by outer joining the given field.
 	 * Also the joined path becomes a domain of the owning query.
 	 */
-	public DomainObject leftJoin(String attr) {
+	@Override
+    public DomainObject leftJoin(String attr) {
         return _owner.addDomain(new JoinPath(this, PathOperator.OUTER, attr));
 	}
 
 	/**
 	 * Derives a path from this path by fetch joining the given field.
 	 */
-	public FetchJoinObject joinFetch(String attr) {
+	@Override
+    public FetchJoinObject joinFetch(String attr) {
         return _owner.addDomain(new FetchPath(this, PathOperator.FETCH_INNER,
 			attr));
 	}
@@ -85,7 +94,8 @@ public abstract class AbstractDomainObject extends AbstractPath
 	/**
 	 * Derives a path from this path by fetch joining the given field.
 	 */
-	public FetchJoinObject leftJoinFetch(String attr) {
+	@Override
+    public FetchJoinObject leftJoinFetch(String attr) {
         return _owner.addDomain(new FetchPath(this, PathOperator.FETCH_OUTER,
 			attr));
 	}
@@ -93,232 +103,284 @@ public abstract class AbstractDomainObject extends AbstractPath
 	/**
 	 * Derives by KEY() operation on this path.
 	 */
-	public PathExpression key() {
+	@Override
+    public PathExpression key() {
 		return new KeyExpression(this);
 	}
 
 	/**
 	 * Derives by ENTRY() operation on this path.
 	 */
-	public SelectItem entry() {
+	@Override
+    public SelectItem entry() {
 		return new EntryExpression(this);
 	}
 
 	/**
 	 * Derives by INDEX() operation on this path.
 	 */
-	public Expression index() {
+	@Override
+    public Expression index() {
 		return new IndexExpression(this);
 	}
 
 	/**
 	 * Derives a path by VALUE() operation on this path.
 	 */
-	public PathExpression value() {
+	@Override
+    public PathExpression value() {
 		return new ValueExpression(this);
 	}
 
 	/**
 	 * Derives this path as ALL(subquery) to its owning query.
 	 */
-	public Subquery all() {
+	@Override
+    public Subquery all() {
 		return _owner.all();
 	}
 
 	/**
 	 * Adds this path as ANY(subquery) to its owning query.
 	 */
-	public Subquery any() {
+	@Override
+    public Subquery any() {
 		return _owner.any();
 	}
 
 	/**
 	 * Adds this path as SOME(subquery) to its owning query.
 	 */
-	public Subquery some() {
+	@Override
+    public Subquery some() {
 		return _owner.some();
 	}
 
 	/**
 	 * Adds this path as EXISTS(subquery) to its owning query.
 	*/
-	public Predicate exists() {
+	@Override
+    public Predicate exists() {
 		return _owner.exists();
 	}
 
-	public Expression coalesce(Expression... exp) {
+	@Override
+    public Expression coalesce(Expression... exp) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression coalesce(String... exp) {
+	@Override
+    public Expression coalesce(String... exp) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression coalesce(Date... exp) {
+	@Override
+    public Expression coalesce(Date... exp) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression coalesce(Calendar... exp) {
+	@Override
+    public Expression coalesce(Calendar... exp) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression currentDate() {
+	@Override
+    public Expression currentDate() {
 		return _owner.currentDate();
 	}
 
-	public Expression currentTime() {
+	@Override
+    public Expression currentTime() {
 		return _owner.currentTime();
 	}
 
-	public Expression currentTimestamp() {
+	@Override
+    public Expression currentTimestamp() {
 		return _owner.currentTimestamp();
 	}
 
-	public CaseExpression generalCase() {
+	@Override
+    public CaseExpression generalCase() {
 		return _owner.generalCase();
 	}
 
-	public QueryDefinition groupBy(PathExpression... pathExprs) {
+	@Override
+    public QueryDefinition groupBy(PathExpression... pathExprs) {
 		return _owner.groupBy(pathExprs);
 	}
 
-	public QueryDefinition groupBy(List<PathExpression> pathExprList) {
+	@Override
+    public QueryDefinition groupBy(List<PathExpression> pathExprList) {
 		return _owner.groupBy(pathExprList);
 	}
 
-	public QueryDefinition having(Predicate predicate) {
+	@Override
+    public QueryDefinition having(Predicate predicate) {
 		return _owner.having(predicate);
 	}
 
-	public Expression literal(String s) {
+	@Override
+    public Expression literal(String s) {
 		return _owner.literal(s);
 	}
 
-	public Expression literal(Number n) {
+	@Override
+    public Expression literal(Number n) {
 		return _owner.literal(n);
 	}
 
-	public Expression literal(boolean b) {
+	@Override
+    public Expression literal(boolean b) {
 		return _owner.literal(b);
 	}
 
-	public Expression literal(Calendar c) {
+	@Override
+    public Expression literal(Calendar c) {
 		return _owner.literal(c);
 	}
 
-	public Expression literal(Date d) {
+	@Override
+    public Expression literal(Date d) {
 		return _owner.literal(d);
 	}
 
-	public Expression literal(char c) {
+	@Override
+    public Expression literal(char c) {
 		return _owner.literal(c);
 	}
 
-	public Expression literal(Class cls) {
+	@Override
+    public Expression literal(Class cls) {
 		return _owner.literal(cls);
 	}
 
-	public Expression literal(Enum<?> e) {
+	@Override
+    public Expression literal(Enum<?> e) {
 		return _owner.literal(e);
 	}
 
-	public SelectItem newInstance(Class cls, SelectItem... args) {
+	@Override
+    public SelectItem newInstance(Class cls, SelectItem... args) {
 		return _owner.newInstance(cls, args);
 	}
 
-	public Expression nullLiteral() {
+	@Override
+    public Expression nullLiteral() {
 		return _owner.nullLiteral();
 	}
 
-	public Expression nullif(Expression exp1, Expression exp2) {
+	@Override
+    public Expression nullif(Expression exp1, Expression exp2) {
 		return _owner.nullif(exp1, exp2);
 	}
 
-	public Expression nullif(Number arg1, Number arg2) {
+	@Override
+    public Expression nullif(Number arg1, Number arg2) {
 		return _owner.nullif(arg1, arg2);
 	}
 
-	public Expression nullif(String arg1, String arg2) {
+	@Override
+    public Expression nullif(String arg1, String arg2) {
 		return _owner.nullif(arg1, arg2);
 	}
 
-	public Expression nullif(Date arg1, Date arg2) {
+	@Override
+    public Expression nullif(Date arg1, Date arg2) {
 		return _owner.nullif(arg1, arg2);
 	}
 
-	public Expression nullif(Calendar arg1, Calendar arg2) {
+	@Override
+    public Expression nullif(Calendar arg1, Calendar arg2) {
 		return _owner.nullif(arg1, arg2);
 	}
 
-	public Expression nullif(Class arg1, Class arg2) {
+	@Override
+    public Expression nullif(Class arg1, Class arg2) {
 		return _owner.nullif(arg1, arg2);
 	}
 
-	public Expression nullif(Enum<?> arg1, Enum<?> arg2) {
+	@Override
+    public Expression nullif(Enum<?> arg1, Enum<?> arg2) {
 		return _owner.nullif(arg1, arg2);
 	}
 
-	public QueryDefinition orderBy(OrderByItem... orderByItems) {
+	@Override
+    public QueryDefinition orderBy(OrderByItem... orderByItems) {
 		return _owner.orderBy(orderByItems);
 	}
 
-	public QueryDefinition orderBy(List<OrderByItem> orderByItemList) {
+	@Override
+    public QueryDefinition orderBy(List<OrderByItem> orderByItemList) {
 		return _owner.orderBy(orderByItemList);
 	}
 
-	public Expression param(String name) {
+	@Override
+    public Expression param(String name) {
 		return _owner.param(name);
 	}
 
-	public Predicate predicate(boolean b) {
+	@Override
+    public Predicate predicate(boolean b) {
 		return _owner.predicate(b);
 	}
 
-	public QueryDefinition select(SelectItem... selectItems) {
+	@Override
+    public QueryDefinition select(SelectItem... selectItems) {
 		return _owner.select(selectItems);
 	}
 
-	public QueryDefinition select(List<SelectItem> selectItemList) {
+	@Override
+    public QueryDefinition select(List<SelectItem> selectItemList) {
 		return _owner.select(selectItemList);
 	}
 
-	public QueryDefinition selectDistinct(SelectItem... selectItems) {
+	@Override
+    public QueryDefinition selectDistinct(SelectItem... selectItems) {
 		return _owner.selectDistinct(selectItems);
 	}
 
-	public QueryDefinition selectDistinct(List<SelectItem> selectItemList) {
+	@Override
+    public QueryDefinition selectDistinct(List<SelectItem> selectItemList) {
 		return _owner.selectDistinct(selectItemList);
 	}
 
-	public CaseExpression simpleCase(Expression caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Expression caseOperand) {
 		return _owner.simpleCase(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Number caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Number caseOperand) {
 		return _owner.simpleCase(caseOperand);
 	}
 
-	public CaseExpression simpleCase(String caseOperand) {
+	@Override
+    public CaseExpression simpleCase(String caseOperand) {
 		return _owner.simpleCase(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Date caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Date caseOperand) {
 		return _owner.simpleCase(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Calendar caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Calendar caseOperand) {
 		return _owner.simpleCase(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Class caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Class caseOperand) {
 		return _owner.simpleCase(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Enum<?> caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Enum<?> caseOperand) {
 		return _owner.simpleCase(caseOperand);
 	}
 
-	public QueryDefinition where(Predicate predicate) {
+	@Override
+    public QueryDefinition where(Predicate predicate) {
 		return _owner.where(predicate);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java
index 35bb3aa84..8f69ec675 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java
@@ -39,7 +39,9 @@ import java.util.LinkedList;
  */
 abstract class AbstractPath extends ExpressionImpl implements
 		PathExpression {
-	protected final AbstractPath  _parent;
+	
+    private static final long serialVersionUID = 1L;
+    protected final AbstractPath  _parent;
 	protected final Object 		  _part2;
 	protected final PathOperator  _operator;
 	protected final QueryDefinitionImpl _owner;
@@ -85,35 +87,43 @@ abstract class AbstractPath extends ExpressionImpl implements
     // -----------------------------------------------------------------------
     // Implementation of PathExpression
     // -----------------------------------------------------------------------
-	public Aggregate avg() {
+	@Override
+    public Aggregate avg() {
 		return new AverageExpression(this);
 	}
 
-	public Aggregate count() {
+	@Override
+    public Aggregate count() {
 		return new CountExpression(this);
 	}
 
-	public Predicate isEmpty() {
+	@Override
+    public Predicate isEmpty() {
 		return new IsEmptyExpression(this);
 	}
 
-	public Aggregate max() {
+	@Override
+    public Aggregate max() {
 		return new MaxExpression(this);
 	}
 
-	public Aggregate min() {
+	@Override
+    public Aggregate min() {
 		return new MinExpression(this);
 	}
 
-	public Expression size() {
+	@Override
+    public Expression size() {
 		return new SizeExpression(this);
 	}
 
-	public Aggregate sum() {
+	@Override
+    public Aggregate sum() {
 		return new SumExpression(this);
 	}
 
-	public Expression type() {
+	@Override
+    public Expression type() {
 		return new TypeExpression(this);
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java
index 3ed0fbc72..a5c6c88ab 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java
@@ -26,25 +26,31 @@ package org.apache.openjpa.persistence.query;
  *
  */
 abstract class AbstractVisitable implements Visitable {
-	public static final String SPACE = " ";
+	
+    private static final long serialVersionUID = 1L;
+    public static final String SPACE = " ";
 	public static final String OPEN_BRACE = "(";
 	public static final String CLOSE_BRACE = ")";
 	public static final String COMMA = ",";
 	public static final String EMPTY = "";
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
         throw new UnsupportedOperationException(this.getClass().getName());
 	}
 
-	public String asProjection(AliasContext ctx) {
+	@Override
+    public String asProjection(AliasContext ctx) {
         throw new UnsupportedOperationException(this.getClass().getName());
 	}
 
-	public String getAliasHint(AliasContext ctx) {
+	@Override
+    public String getAliasHint(AliasContext ctx) {
         throw new UnsupportedOperationException(this.getClass().getName());
 	}
 
-	public String asJoinable(AliasContext ctx) {
+	@Override
+    public String asJoinable(AliasContext ctx) {
         throw new UnsupportedOperationException(this.getClass().getName());
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java
index 1773edd5c..ac2a12c4e 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java
@@ -25,9 +25,9 @@ import java.util.Stack;
 import org.apache.openjpa.meta.MetaDataRepository;
 
 class AliasContext {
-	private Stack<Object> _operating = new Stack<Object>();
+	private Stack<Object> _operating = new Stack<>();
 	private Map<ExpressionImpl, String> _aliases =
-		new HashMap<ExpressionImpl, String>();
+		new HashMap<>();
 	private final MetaDataRepository _repos;
 
 	public AliasContext(MetaDataRepository repos) {
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AllExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AllExpression.java
index 5722cde93..903cc6179 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AllExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AllExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 class AllExpression extends QueryExpression implements Subquery {
-	public AllExpression(QueryDefinitionImpl sub) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public AllExpression(QueryDefinitionImpl sub) {
 		super(sub, UnaryFunctionalOperator.ALL);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AndPredicate.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AndPredicate.java
index 9a7874a96..5b35f4bfa 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AndPredicate.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AndPredicate.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.query;
 
-import static org.apache.openjpa.persistence.query.ConditionalOperator.*;
+import static org.apache.openjpa.persistence.query.ConditionalOperator.AND;
+import static org.apache.openjpa.persistence.query.ConditionalOperator.OR;
 
 /**
  * Denotes (e1 AND e2) predicate.
@@ -27,7 +28,10 @@ import static org.apache.openjpa.persistence.query.ConditionalOperator.*;
  *
  */
 public class AndPredicate extends LogicalPredicate {
-	public AndPredicate(Predicate p1, Predicate p2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public AndPredicate(Predicate p1, Predicate p2) {
 		super(p1, AND, OR, p2);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AnyExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AnyExpression.java
index 012f9eedb..bc37a9eea 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AnyExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AnyExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 class AnyExpression extends UnaryOperatorExpression implements Subquery {
-	public AnyExpression(QueryDefinitionImpl sub) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public AnyExpression(QueryDefinitionImpl sub) {
 		super(sub, UnaryFunctionalOperator.ANY);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java
index aaf5b895d..d5c756c49 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java
@@ -28,7 +28,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class ArrayExpression extends ExpressionImpl {
-	private final Object[] _values;
+	
+    private static final long serialVersionUID = 1L;
+    private final Object[] _values;
 
 	public ArrayExpression(Object[] values) {
 		_values = values;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AverageExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AverageExpression.java
index 3f08d8d7b..39a40519f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AverageExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AverageExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class AverageExpression extends UnaryOperatorExpression {
-	public AverageExpression(ExpressionImpl op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public AverageExpression(ExpressionImpl op) {
 		super(op, UnaryFunctionalOperator.AVG);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BetweenExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BetweenExpression.java
index aedffd04c..e2e3430db 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BetweenExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BetweenExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class BetweenExpression extends BinaryExpressionPredicate {
-	public BetweenExpression(Expression arg1, RangeExpression arg2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public BetweenExpression(Expression arg1, RangeExpression arg2) {
 		super(arg1, BinaryConditionalOperator.BETWEEN,
 			BinaryConditionalOperator.BETWEEN_NOT, arg2);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryConditionalOperator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryConditionalOperator.java
index b07b32d5d..fd6fdf2e8 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryConditionalOperator.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryConditionalOperator.java
@@ -49,7 +49,8 @@ public enum BinaryConditionalOperator {
 		_symbol = symbol;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return _symbol;
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java
index 8ee18d785..36ec6d94f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java
@@ -26,7 +26,9 @@ package org.apache.openjpa.persistence.query;
  */
 class BinaryExpressionPredicate extends AbstractVisitable
     implements Predicate, Visitable {
-	protected final Expression _e1;
+	
+    private static final long serialVersionUID = 1L;
+    protected final Expression _e1;
 	protected final Expression _e2;
 	protected final BinaryConditionalOperator   _op;
 	private final BinaryConditionalOperator   _nop;
@@ -52,21 +54,25 @@ class BinaryExpressionPredicate extends AbstractVisitable
 		return _op;
 	}
 
-	public Predicate and(Predicate predicate) {
+	@Override
+    public Predicate and(Predicate predicate) {
 		return new AndPredicate(this, predicate);
 	}
 
-	public Predicate or(Predicate predicate) {
+	@Override
+    public Predicate or(Predicate predicate) {
 		return new OrPredicate(this, predicate);
 	}
 
-	public Predicate not() {
+	@Override
+    public Predicate not() {
 		if (  _nop == null)
             throw new UnsupportedOperationException(this.toString());
 		return new BinaryExpressionPredicate(_e1, _nop, _op, _e2);
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
 		return asExpression((Visitable)_e1, ctx)
 		     + SPACE + _op + SPACE
 		     + asExpression((Visitable)_e2, ctx);
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryFunctionalOperator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryFunctionalOperator.java
index 255b14bd8..1f44b7772 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryFunctionalOperator.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryFunctionalOperator.java
@@ -42,7 +42,8 @@ public enum BinaryFunctionalOperator {
 		_symbol = symbol;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return _symbol;
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java
index 28657d6ef..23a1dbc49 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java
@@ -25,7 +25,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class BinaryOperatorExpression extends ExpressionImpl {
-	protected final Expression _e1;
+	
+    private static final long serialVersionUID = 1L;
+    protected final Expression _e1;
 	protected final Expression _e2;
 	protected final BinaryFunctionalOperator   _op;
 
@@ -48,13 +50,15 @@ public class BinaryOperatorExpression extends ExpressionImpl {
 		return _op;
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
 		return ((Visitable)_e1).asExpression(ctx)
 			+ _op
 		    + ((Visitable)_e2).asExpression(ctx);
 	}
 
-	public String asProjection(AliasContext ctx) {
+	@Override
+    public String asProjection(AliasContext ctx) {
 		return ((Visitable)_e1).asProjection(ctx)
 			 + _op
 		     + (((Visitable)_e2).asProjection(ctx))
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java
index ad2591fb6..1d495fc8f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java
@@ -23,7 +23,9 @@ import java.util.Date;
 import java.util.LinkedList;
 
 public class CaseExpressionImpl implements CaseExpression, Visitable {
-	private LinkedList<WhenClause> _whens = new LinkedList<WhenClause>();
+	
+    private static final long serialVersionUID = 1L;
+    private LinkedList<WhenClause> _whens = new LinkedList<>();
 	private final Object _caseOperand;
 
 	public CaseExpressionImpl() {
@@ -34,126 +36,148 @@ public class CaseExpressionImpl implements CaseExpression, Visitable {
 		_caseOperand = caseOperand;
 	}
 
-	public Expression elseCase(Expression arg) {
+	@Override
+    public Expression elseCase(Expression arg) {
 		return new ElseExpression(this, arg);
 	}
 
-	public Expression elseCase(String arg) {
+	@Override
+    public Expression elseCase(String arg) {
 		return new ElseExpression(this, new ConstantExpression(arg));
 	}
 
-	public Expression elseCase(Number arg) {
+	@Override
+    public Expression elseCase(Number arg) {
 		return new ElseExpression(this, new ConstantExpression(arg));
 	}
 
-	public Expression elseCase(Date arg) {
+	@Override
+    public Expression elseCase(Date arg) {
 		return new ElseExpression(this, new ConstantExpression(arg));
 	}
 
-	public Expression elseCase(Calendar arg) {
+	@Override
+    public Expression elseCase(Calendar arg) {
 		return new ElseExpression(this, new ConstantExpression(arg));
 	}
 
-	public Expression elseCase(Class arg) {
+	@Override
+    public Expression elseCase(Class arg) {
 		return new ElseExpression(this, new ConstantExpression(arg));
 	}
 
-	public Expression elseCase(Enum<?> arg) {
+	@Override
+    public Expression elseCase(Enum<?> arg) {
 		return new ElseExpression(this, new ConstantExpression(arg));
 	}
 
-	public CaseExpression then(Expression then) {
+	@Override
+    public CaseExpression then(Expression then) {
 		assertThenState();
 		_whens.getLast().setThen(then);
 		return this;
 	}
 
-	public CaseExpression then(Number then) {
+	@Override
+    public CaseExpression then(Number then) {
 		assertThenState();
 		_whens.getLast().setThen(then);
 		return this;
 	}
 
-	public CaseExpression then(String then) {
+	@Override
+    public CaseExpression then(String then) {
 		assertThenState();
 		_whens.getLast().setThen(then);
 		return this;
 	}
 
-	public CaseExpression then(Date then) {
+	@Override
+    public CaseExpression then(Date then) {
 		assertThenState();
 		_whens.getLast().setThen(then);
 		return this;
 	}
 
-	public CaseExpression then(Calendar then) {
+	@Override
+    public CaseExpression then(Calendar then) {
 		assertThenState();
 		_whens.getLast().setThen(then);
 		return this;
 	}
 
-	public CaseExpression then(Class then) {
+	@Override
+    public CaseExpression then(Class then) {
 		assertThenState();
 		_whens.getLast().setThen(then);
 		return this;
 	}
 
-	public CaseExpression then(Enum<?> then) {
+	@Override
+    public CaseExpression then(Enum<?> then) {
 		assertThenState();
 		_whens.getLast().setThen(then);
 		return this;
 	}
 
-	public CaseExpression when(Predicate when) {
+	@Override
+    public CaseExpression when(Predicate when) {
 		assertWhenState();
 		WhenClause clause = new WhenClause(when);
 		_whens.add(clause);
 		return this;
 	}
 
-	public CaseExpression when(Expression when) {
+	@Override
+    public CaseExpression when(Expression when) {
 		assertWhenState();
 		WhenClause clause = new WhenClause(when);
 		_whens.add(clause);
 		return this;
 	}
 
-	public CaseExpression when(Number when) {
+	@Override
+    public CaseExpression when(Number when) {
 		assertWhenState();
 		WhenClause clause = new WhenClause(when);
 		_whens.add(clause);
 		return this;
 	}
 
-	public CaseExpression when(String when) {
+	@Override
+    public CaseExpression when(String when) {
 		assertWhenState();
 		WhenClause clause = new WhenClause(when);
 		_whens.add(clause);
 		return this;
 	}
 
-	public CaseExpression when(Date when) {
+	@Override
+    public CaseExpression when(Date when) {
 		assertWhenState();
 		WhenClause clause = new WhenClause(when);
 		_whens.add(clause);
 		return this;
 	}
 
-	public CaseExpression when(Calendar when) {
+	@Override
+    public CaseExpression when(Calendar when) {
 		assertWhenState();
 		WhenClause clause = new WhenClause(when);
 		_whens.add(clause);
 		return this;
 	}
 
-	public CaseExpression when(Class when) {
+	@Override
+    public CaseExpression when(Class when) {
 		assertWhenState();
 		WhenClause clause = new WhenClause(when);
 		_whens.add(clause);
 		return this;
 	}
 
-	public CaseExpression when(Enum<?> when) {
+	@Override
+    public CaseExpression when(Enum<?> when) {
 		assertWhenState();
 		WhenClause clause = new WhenClause(when);
 		_whens.add(clause);
@@ -172,7 +196,8 @@ public class CaseExpressionImpl implements CaseExpression, Visitable {
             throw new IllegalStateException("then() can not be called now");
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
 		StringBuilder tmp = new StringBuilder("CASE ");
 		if (_caseOperand != null) {
 			tmp.append(toJPQL(ctx, _caseOperand));
@@ -183,15 +208,18 @@ public class CaseExpressionImpl implements CaseExpression, Visitable {
 		return tmp.toString();
 	}
 
-	public String asProjection(AliasContext ctx) {
+	@Override
+    public String asProjection(AliasContext ctx) {
 		return asExpression(ctx);
 	}
 
-	public String asJoinable(AliasContext ctx) {
+	@Override
+    public String asJoinable(AliasContext ctx) {
 		throw new UnsupportedOperationException();
 	}
 
-	public String getAliasHint(AliasContext ctx) {
+	@Override
+    public String getAliasHint(AliasContext ctx) {
 		throw new UnsupportedOperationException();
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ConcatExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ConcatExpression.java
index e171d6a49..ac7001653 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ConcatExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ConcatExpression.java
@@ -26,7 +26,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class ConcatExpression extends UnaryOperatorExpression {
-	public ConcatExpression(VarArgsExpression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public ConcatExpression(VarArgsExpression op) {
 		super(op, UnaryFunctionalOperator.CONCAT);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ConstantExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ConstantExpression.java
index c957f7b2f..e82bd0a5b 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ConstantExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ConstantExpression.java
@@ -25,7 +25,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 class ConstantExpression extends ExpressionImpl {
-	private final Object _value;
+	
+    private static final long serialVersionUID = 1L;
+    private final Object _value;
 
 	public ConstantExpression(Object value) {
 		_value = value;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CountExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CountExpression.java
index 8e9eef1fa..2b7d47235 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CountExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CountExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class CountExpression extends UnaryOperatorExpression {
-	public CountExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public CountExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.COUNT);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java
index 7117e582d..009221eaa 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java
@@ -28,7 +28,10 @@ import java.util.Date;
  *
  */
 public class CurrentTimeExpression extends ExpressionImpl {
-	private static enum Now {
+	
+    private static final long serialVersionUID = 1L;
+
+    private static enum Now {
 		CURRENT_DATE,
 		CURRENT_TIME,
 		CURRENT_TIMESTAMP
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DistinctExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DistinctExpression.java
index 31e40a35e..bc870b75a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DistinctExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DistinctExpression.java
@@ -26,7 +26,10 @@ package org.apache.openjpa.persistence.query;
  */
 public class DistinctExpression extends UnaryOperatorExpression {
 
-	public DistinctExpression(Expression expr) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public DistinctExpression(Expression expr) {
 		super(expr, UnaryFunctionalOperator.DISTINCT);
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DividedByExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DividedByExpression.java
index 98a818a5b..93a9e3988 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DividedByExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DividedByExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class DividedByExpression extends BinaryOperatorExpression {
-	public DividedByExpression(Expression op1, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public DividedByExpression(Expression op1, Expression op2) {
 		super(op1, BinaryFunctionalOperator.DIVIDE, op2);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ElseExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ElseExpression.java
index 96a9c5e71..693e732cd 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ElseExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ElseExpression.java
@@ -25,7 +25,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class ElseExpression extends ExpressionImpl {
-	private final CaseExpressionImpl _caseClause;
+	
+    private static final long serialVersionUID = 1L;
+    private final CaseExpressionImpl _caseClause;
 	private final Expression _elseClause;
 
 	public ElseExpression(CaseExpressionImpl owner, Expression op) {
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/EntryExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/EntryExpression.java
index f242f68d5..6a8eb5f65 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/EntryExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/EntryExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class EntryExpression extends OperatorPath {
-	public EntryExpression(AbstractDomainObject expr) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public EntryExpression(AbstractDomainObject expr) {
 		super(expr, PathOperator.ENTRY);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/EqualExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/EqualExpression.java
index e4ef7ab51..7953cc422 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/EqualExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/EqualExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class EqualExpression extends BinaryExpressionPredicate {
-	public EqualExpression(Expression op1, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public EqualExpression(Expression op1, Expression op2) {
 		super(op1,
 		    BinaryConditionalOperator.EQUAL,
 		    BinaryConditionalOperator.EQUAL_NOT,
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExistsExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExistsExpression.java
index f4d663be6..1421e3274 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExistsExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExistsExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class ExistsExpression extends UnaryExpressionPredicate {
-	public ExistsExpression(QueryDefinitionImpl op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public ExistsExpression(QueryDefinitionImpl op) {
 		super(op, UnaryConditionalOperator.EXISTS,
 			UnaryConditionalOperator.EXISTS_NOT);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java
index c9b27ae09..ba4612455 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java
@@ -31,434 +31,539 @@ import java.util.Date;
 abstract class ExpressionImpl extends AbstractVisitable
    implements Expression, Visitable {
 
-	public Expression abs() {
+	
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public Expression abs() {
 		return new AbsExpression(this);
 	}
 
-	public Expression concat(String... str) {
+	@Override
+    public Expression concat(String... str) {
 		ConstantExpression[] exprs = new ConstantExpression[str.length];
 		for (int i = 0; i < str.length; i++)
 			exprs[i] = new ConstantExpression(str[i]);
 		return new ConcatExpression(new VarArgsExpression(exprs));
 	}
 
-	public Expression concat(Expression... exprs) {
+	@Override
+    public Expression concat(Expression... exprs) {
 		return new ConcatExpression(new VarArgsExpression(exprs));
 	}
 
-	public Expression dividedBy(Number num) {
+	@Override
+    public Expression dividedBy(Number num) {
         return new DividedByExpression(this, new ConstantExpression(num));
 	}
 
-	public Expression dividedBy(Expression expr) {
+	@Override
+    public Expression dividedBy(Expression expr) {
 		return new DividedByExpression(this, expr);
 	}
 
-	public Predicate in(String... strings) {
+	@Override
+    public Predicate in(String... strings) {
 		return new InExpression(this, new ArrayExpression(strings));
 	}
 
-	public Predicate in(Number... nums) {
+	@Override
+    public Predicate in(Number... nums) {
 		return new InExpression(this, new ArrayExpression(nums));
 	}
 
-	public Predicate in(Enum<?>... enums) {
+	@Override
+    public Predicate in(Enum<?>... enums) {
 		return new InExpression(this, new ArrayExpression(enums));
 	}
 
-	public Predicate in(Class... classes) {
+	@Override
+    public Predicate in(Class... classes) {
 		return new InExpression(this, new ArrayExpression(classes));
 	}
 
-	public Predicate in(Expression... params) {
+	@Override
+    public Predicate in(Expression... params) {
 		return new InExpression(this, new ArrayExpression(params));
 	}
 
-	public Predicate in(Subquery subquery) {
+	@Override
+    public Predicate in(Subquery subquery) {
 		return new InExpression(this, (Expression)subquery);
 	}
 
-	public Predicate isNull() {
+	@Override
+    public Predicate isNull() {
 		return new IsNullExpression(this);
 	}
 
-	public Expression length() {
+	@Override
+    public Expression length() {
 		return new LengthExpression(this);
 	}
 
-	public Expression locate(String str) {
+	@Override
+    public Expression locate(String str) {
 		return new LocateExpression(this, str, 0);
 	}
 
-	public Expression locate(Expression expr) {
+	@Override
+    public Expression locate(Expression expr) {
 		return new LocateExpression(this, expr, 1);
 	}
 
-	public Expression locate(String str, int position) {
+	@Override
+    public Expression locate(String str, int position) {
 		return new LocateExpression(this, str, position);
 	}
 
-	public Expression locate(String str, Expression position) {
+	@Override
+    public Expression locate(String str, Expression position) {
 		return new LocateExpression(this, str, position);
 	}
 
-	public Expression locate(Expression str, int position) {
+	@Override
+    public Expression locate(Expression str, int position) {
 		return new LocateExpression(this, str, position);
 	}
 
-	public Expression locate(Expression str, Expression position) {
+	@Override
+    public Expression locate(Expression str, Expression position) {
 		return new LocateExpression(this, str, position);
 	}
 
-	public Expression lower() {
+	@Override
+    public Expression lower() {
 		return new LowerExpression(this);
 	}
 
-	public Predicate member(PathExpression arg) {
+	@Override
+    public Predicate member(PathExpression arg) {
 		return new MemberOfExpression(this, arg);
 	}
 
-	public Expression minus() {
+	@Override
+    public Expression minus() {
 		return new UnaryMinusExpression(this);
 	}
 
-	public Expression minus(Number num) {
+	@Override
+    public Expression minus(Number num) {
 		return new MinusExpression(this, new ConstantExpression(num));
 	}
 
-	public Expression minus(Expression expr) {
+	@Override
+    public Expression minus(Expression expr) {
 		return new MinusExpression(this, expr);
 	}
 
-	public Expression mod(int num) {
+	@Override
+    public Expression mod(int num) {
 		return new ModExpression(this, new ConstantExpression(num));
 	}
 
-	public Expression mod(Expression expr) {
+	@Override
+    public Expression mod(Expression expr) {
 		return new MinusExpression(this, expr);
 	}
 
-	public Expression plus(Number num) {
+	@Override
+    public Expression plus(Number num) {
 		return new PlusExpression(this, new ConstantExpression(num));
 	}
 
-	public Expression plus(Expression expr) {
+	@Override
+    public Expression plus(Expression expr) {
 		return new PlusExpression(this, expr);
 	}
 
-	public Expression sqrt() {
+	@Override
+    public Expression sqrt() {
 		return new SquareRootExpression(this);
 	}
 
-	public Expression substring(int start) {
+	@Override
+    public Expression substring(int start) {
 		return new SubStringExpression(this, start);
 	}
 
-	public Expression substring(Expression start) {
+	@Override
+    public Expression substring(Expression start) {
 		return new SubStringExpression(this, start);
 	}
 
-	public Expression substring(int start, int len) {
+	@Override
+    public Expression substring(int start, int len) {
 		return new SubStringExpression(this, start, len);
 	}
 
-	public Expression substring(int start, Expression len) {
+	@Override
+    public Expression substring(int start, Expression len) {
         return new SubStringExpression(this, new ConstantExpression(start),
                 len);
 	}
 
-	public Expression substring(Expression start, int len) {
+	@Override
+    public Expression substring(Expression start, int len) {
         return new SubStringExpression(this, start,
                 new ConstantExpression(len));
 	}
 
-	public Expression substring(Expression start, Expression len) {
+	@Override
+    public Expression substring(Expression start, Expression len) {
 		return new SubStringExpression(this, start, len);
 	}
 
-	public Expression times(Number num) {
+	@Override
+    public Expression times(Number num) {
 		return new TimesExpression(this, new ConstantExpression(num));
 	}
 
-	public Expression times(Expression expr) {
+	@Override
+    public Expression times(Expression expr) {
 		return new TimesExpression(this, expr);
 	}
 
-	public Expression trim() {
+	@Override
+    public Expression trim() {
 		return new TrimExpression(this, null, null);
 	}
 
-	public Expression trim(TrimSpec spec) {
+	@Override
+    public Expression trim(TrimSpec spec) {
 		return new TrimExpression(this, null, spec);
 	}
 
-	public Expression trim(char c) {
+	@Override
+    public Expression trim(char c) {
 		return new TrimExpression(this, c, null);
 	}
 
-	public Expression trim(char c, TrimSpec spec) {
+	@Override
+    public Expression trim(char c, TrimSpec spec) {
 		return new TrimExpression(this, c, spec);
 	}
 
-	public Expression trim(Expression expr) {
+	@Override
+    public Expression trim(Expression expr) {
 		return new TrimExpression(this, expr, null);
 	}
 
-	public Expression trim(Expression expr, TrimSpec spec) {
+	@Override
+    public Expression trim(Expression expr, TrimSpec spec) {
 		return new TrimExpression(this, expr, spec);
 	}
 
-	public Expression upper() {
+	@Override
+    public Expression upper() {
 		return new UpperExpression(this);
 	}
 
-	public OrderByItem asc() {
+	@Override
+    public OrderByItem asc() {
 		return new OrderableItem(this, true);
 	}
 
-	public OrderByItem desc() {
+	@Override
+    public OrderByItem desc() {
 		return new OrderableItem(this, false);
 	}
 
-	public Predicate between(PredicateOperand arg1, PredicateOperand arg2) {
+	@Override
+    public Predicate between(PredicateOperand arg1, PredicateOperand arg2) {
 		return new BetweenExpression(this, new RangeExpression(
 			(Expression)arg1, (Expression)arg2));
 	}
 
-	public Predicate between(PredicateOperand arg1, Number arg2) {
+	@Override
+    public Predicate between(PredicateOperand arg1, Number arg2) {
 		return new BetweenExpression(this, new RangeExpression(
 			(Expression)arg1, new ConstantExpression(arg2)));
 	}
 
-	public Predicate between(Number arg1, PredicateOperand arg2) {
+	@Override
+    public Predicate between(Number arg1, PredicateOperand arg2) {
 		return new BetweenExpression(this, new RangeExpression(
 			new ConstantExpression(arg1), (Expression)arg2));
 	}
 
-	public Predicate between(Number arg1, Number arg2) {
+	@Override
+    public Predicate between(Number arg1, Number arg2) {
 		return new BetweenExpression(this, new RangeExpression(
             new ConstantExpression(arg1), new ConstantExpression(arg2)));
 	}
 
-	public Predicate between(PredicateOperand arg1, String arg2) {
+	@Override
+    public Predicate between(PredicateOperand arg1, String arg2) {
         return new BetweenExpression(this, new RangeExpression((Expression)arg1,
 			new ConstantExpression(arg2)));
 	}
 
-	public Predicate between(String arg1, PredicateOperand arg2) {
+	@Override
+    public Predicate between(String arg1, PredicateOperand arg2) {
 		return new BetweenExpression(this, new RangeExpression(
 			new ConstantExpression(arg1), (Expression)arg2));
 	}
 
-	public Predicate between(String arg1, String arg2) {
+	@Override
+    public Predicate between(String arg1, String arg2) {
 		return new BetweenExpression(this, new RangeExpression(
             new ConstantExpression(arg1), new ConstantExpression(arg2)));
 	}
 
-	public Predicate between(PredicateOperand arg1, Date arg2) {
+	@Override
+    public Predicate between(PredicateOperand arg1, Date arg2) {
 		return new BetweenExpression(this, new RangeExpression(
             (Expression)arg1, new ConstantExpression(arg2)));
 	}
 
-	public Predicate between(Date arg1, PredicateOperand arg2) {
+	@Override
+    public Predicate between(Date arg1, PredicateOperand arg2) {
 		return new BetweenExpression(this, new RangeExpression(
             new ConstantExpression(arg1), (Expression)arg2));
 	}
 
-	public Predicate between(Date arg1, Date arg2) {
+	@Override
+    public Predicate between(Date arg1, Date arg2) {
 		return new BetweenExpression(this, new RangeExpression(
             new ConstantExpression(arg1), new ConstantExpression(arg2)));
 	}
 
-	public Predicate between(PredicateOperand arg1, Calendar arg2) {
+	@Override
+    public Predicate between(PredicateOperand arg1, Calendar arg2) {
 		return new BetweenExpression(this, new RangeExpression(
 			(Expression)arg1, new ConstantExpression(arg2)));
 	}
 
-	public Predicate between(Calendar arg1, PredicateOperand arg2) {
+	@Override
+    public Predicate between(Calendar arg1, PredicateOperand arg2) {
 		return new BetweenExpression(this, new RangeExpression(
 			new ConstantExpression(arg1), (Expression)arg2));
 	}
 
-	public Predicate between(Calendar arg1, Calendar arg2) {
+	@Override
+    public Predicate between(Calendar arg1, Calendar arg2) {
 		return new BetweenExpression(this, new RangeExpression(
             new ConstantExpression(arg1), new ConstantExpression(arg2)));
 	}
 
-	public Predicate equal(PredicateOperand arg) {
+	@Override
+    public Predicate equal(PredicateOperand arg) {
 		return new EqualExpression(this, (Expression)arg);
 	}
 
-	public Predicate equal(Class cls) {
+	@Override
+    public Predicate equal(Class cls) {
 		return new EqualExpression(this, new ConstantExpression(cls));
 	}
 
-	public Predicate equal(Number arg) {
+	@Override
+    public Predicate equal(Number arg) {
 		return new EqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate equal(String arg) {
+	@Override
+    public Predicate equal(String arg) {
 		return new EqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate equal(boolean arg) {
+	@Override
+    public Predicate equal(boolean arg) {
 		return new EqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate equal(Date arg) {
+	@Override
+    public Predicate equal(Date arg) {
 		return new EqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate equal(Calendar arg) {
+	@Override
+    public Predicate equal(Calendar arg) {
 		return new EqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate equal(Enum<?> e) {
+	@Override
+    public Predicate equal(Enum<?> e) {
 		return new EqualExpression(this, new ConstantExpression(e));
 	}
 
-	public Predicate greaterEqual(PredicateOperand arg) {
+	@Override
+    public Predicate greaterEqual(PredicateOperand arg) {
         return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate greaterEqual(Number arg) {
+	@Override
+    public Predicate greaterEqual(Number arg) {
         return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate greaterEqual(String arg) {
+	@Override
+    public Predicate greaterEqual(String arg) {
         return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate greaterEqual(Date arg) {
+	@Override
+    public Predicate greaterEqual(Date arg) {
         return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate greaterEqual(Calendar arg) {
+	@Override
+    public Predicate greaterEqual(Calendar arg) {
         return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate greaterThan(PredicateOperand arg) {
+	@Override
+    public Predicate greaterThan(PredicateOperand arg) {
         return new GreaterThanExpression(this, (Expression)arg);
 	}
 
-	public Predicate greaterThan(Number arg) {
+	@Override
+    public Predicate greaterThan(Number arg) {
         return new GreaterThanExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate greaterThan(String arg) {
+	@Override
+    public Predicate greaterThan(String arg) {
         return new GreaterThanExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate greaterThan(Date arg) {
+	@Override
+    public Predicate greaterThan(Date arg) {
         return new GreaterThanExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate greaterThan(Calendar arg) {
+	@Override
+    public Predicate greaterThan(Calendar arg) {
         return new GreaterThanExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessEqual(PredicateOperand arg) {
+	@Override
+    public Predicate lessEqual(PredicateOperand arg) {
         return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessEqual(Number arg) {
+	@Override
+    public Predicate lessEqual(Number arg) {
         return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessEqual(String arg) {
+	@Override
+    public Predicate lessEqual(String arg) {
         return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessEqual(Date arg) {
+	@Override
+    public Predicate lessEqual(Date arg) {
         return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessEqual(Calendar arg) {
+	@Override
+    public Predicate lessEqual(Calendar arg) {
         return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessThan(PredicateOperand arg) {
+	@Override
+    public Predicate lessThan(PredicateOperand arg) {
         return new LessThanExpression(this, (Expression)arg);
 	}
 
-	public Predicate lessThan(Number arg) {
+	@Override
+    public Predicate lessThan(Number arg) {
         return new LessThanExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessThan(String arg) {
+	@Override
+    public Predicate lessThan(String arg) {
         return new LessThanExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessThan(Date arg) {
+	@Override
+    public Predicate lessThan(Date arg) {
         return new LessThanExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate lessThan(Calendar arg) {
+	@Override
+    public Predicate lessThan(Calendar arg) {
         return new LessThanExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate like(PredicateOperand pattern) {
+	@Override
+    public Predicate like(PredicateOperand pattern) {
 		return new LikeExpression(this, (Expression)pattern);
 	}
 
+    @Override
     public Predicate like(PredicateOperand pattern, PredicateOperand escChar) {
 		return new LikeExpression(this, (Expression)pattern, escChar);
 	}
 
-	public Predicate like(PredicateOperand pattern, char escapeChar) {
+	@Override
+    public Predicate like(PredicateOperand pattern, char escapeChar) {
         return new LikeExpression(this, (Expression)pattern, escapeChar);
 	}
 
-	public Predicate like(String pattern) {
+	@Override
+    public Predicate like(String pattern) {
         return new LikeExpression(this, new ConstantExpression(pattern));
 	}
 
-	public Predicate like(String pattern, PredicateOperand escapeChar) {
+	@Override
+    public Predicate like(String pattern, PredicateOperand escapeChar) {
         return new LikeExpression(this, new ConstantExpression(pattern),
 			escapeChar);
 	}
 
-	public Predicate like(String pattern, char escChar) {
+	@Override
+    public Predicate like(String pattern, char escChar) {
         return new LikeExpression(this, new ConstantExpression(pattern),
 			escChar);
 	}
 
-	public Predicate notEqual(PredicateOperand arg) {
+	@Override
+    public Predicate notEqual(PredicateOperand arg) {
 		return new NotEqualExpression(this, (Expression)arg);
 	}
 
-	public Predicate notEqual(Class cls) {
+	@Override
+    public Predicate notEqual(Class cls) {
         return new NotEqualExpression(this, new ConstantExpression(cls));
 	}
 
-	public Predicate notEqual(Number arg) {
+	@Override
+    public Predicate notEqual(Number arg) {
         return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate notEqual(String arg) {
+	@Override
+    public Predicate notEqual(String arg) {
         return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate notEqual(boolean arg) {
+	@Override
+    public Predicate notEqual(boolean arg) {
         return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate notEqual(Date arg) {
+	@Override
+    public Predicate notEqual(Date arg) {
         return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate notEqual(Calendar arg) {
+	@Override
+    public Predicate notEqual(Calendar arg) {
         return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
-	public Predicate notEqual(Enum<?> e) {
+	@Override
+    public Predicate notEqual(Enum<?> e) {
 		return new NotEqualExpression(this, new ConstantExpression(e));
 	}
 
 	//
 	// Visitable/Selectable implementation
 	//
-	public String getAliasHint(AliasContext ctx) {
+	@Override
+    public String getAliasHint(AliasContext ctx) {
 		return "o";
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java
index bfaef8f97..26fa5e33b 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java
@@ -28,6 +28,9 @@ import static org.apache.openjpa.persistence.query.PathOperator.NAVIGATION;
  */
 public class FetchPath extends AbstractDomainObject
     implements FetchJoinObject, Visitable {
+    
+    private static final long serialVersionUID = 1L;
+
     FetchPath(AbstractDomainObject parent, PathOperator joinType, String attr) {
 		super(parent.getOwner(), parent, joinType, attr);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterEqualExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterEqualExpression.java
index 95e044888..5fcf33c98 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterEqualExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterEqualExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class GreaterEqualExpression extends BinaryExpressionPredicate {
-	public GreaterEqualExpression(Expression op1, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public GreaterEqualExpression(Expression op1, Expression op2) {
 		super(op1,
 		    BinaryConditionalOperator.GREATEREQUAL,
 		    BinaryConditionalOperator.LESS,
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java
index dfc8ece88..e276bb533 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class GreaterThanExpression extends BinaryExpressionPredicate {
-	public GreaterThanExpression(Expression op1, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public GreaterThanExpression(Expression op1, Expression op2) {
         super(op1, BinaryConditionalOperator.GREATER,
                 BinaryConditionalOperator.LESSEQUAL, op2);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/InExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/InExpression.java
index 4921dc712..c40cce716 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/InExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/InExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class InExpression extends BinaryExpressionPredicate  {
-	public InExpression(Expression op, ArrayExpression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public InExpression(Expression op, ArrayExpression op2) {
 		super(op, BinaryConditionalOperator.IN,
 			BinaryConditionalOperator.IN_NOT, op2);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IndexExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IndexExpression.java
index 92dd0a63f..88eae23ea 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IndexExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IndexExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class IndexExpression extends UnaryOperatorExpression {
-	public IndexExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public IndexExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.INDEX);
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IsEmptyExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IsEmptyExpression.java
index 01ceb0f1f..de49c50ce 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IsEmptyExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IsEmptyExpression.java
@@ -19,7 +19,10 @@
 package org.apache.openjpa.persistence.query;
 
 public class IsEmptyExpression extends UnaryExpressionPredicate {
-	public IsEmptyExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public IsEmptyExpression(Expression op) {
 		super(op, UnaryConditionalOperator.ISEMPTY,
 			UnaryConditionalOperator.ISEMPTY_NOT);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IsNullExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IsNullExpression.java
index 0e0942a48..6e23c6fca 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IsNullExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/IsNullExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class IsNullExpression extends UnaryExpressionPredicate {
-	public IsNullExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public IsNullExpression(Expression op) {
 		super(op, UnaryConditionalOperator.ISNULL,
 			UnaryConditionalOperator.ISNULL_NOT);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java
index a87278f8c..476c884b0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java
@@ -27,6 +27,9 @@ import static org.apache.openjpa.persistence.query.PathOperator.NAVIGATION;
  *
  */
 public class JoinPath extends AbstractDomainObject implements DomainObject {
+    
+    private static final long serialVersionUID = 1L;
+
     public JoinPath(AbstractDomainObject parent, PathOperator join, String attr)
     {
 		super(parent.getOwner(), parent, join, attr);
@@ -75,7 +78,8 @@ public class JoinPath extends AbstractDomainObject implements DomainObject {
 		       + getLastSegment();
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
         return getOperator() + getParent().toString() + "*" + getLastSegment();
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/KeyExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/KeyExpression.java
index 51224a172..63e6ea244 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/KeyExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/KeyExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class KeyExpression extends OperatorPath {
-	public KeyExpression(AbstractDomainObject expr) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public KeyExpression(AbstractDomainObject expr) {
 		super(expr, PathOperator.KEY);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LengthExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LengthExpression.java
index 3f051bade..853a8bec7 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LengthExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LengthExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class LengthExpression extends UnaryOperatorExpression {
-	public LengthExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public LengthExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.LENGTH);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LessEqualExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LessEqualExpression.java
index c8eda9607..20879d46f 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LessEqualExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LessEqualExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class LessEqualExpression extends BinaryExpressionPredicate {
-	public LessEqualExpression(Expression op1, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public LessEqualExpression(Expression op1, Expression op2) {
 		super(op1, BinaryConditionalOperator.LESSEQUAL,
 			BinaryConditionalOperator.GREATER, op2);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LessThanExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LessThanExpression.java
index e7eab8bbe..b9fd76039 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LessThanExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LessThanExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class LessThanExpression extends BinaryExpressionPredicate {
-	public LessThanExpression(Expression op1, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public LessThanExpression(Expression op1, Expression op2) {
 		super(op1, BinaryConditionalOperator.LESS,
 			BinaryConditionalOperator.GREATEREQUAL, op2);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java
index 053dd1ba4..f7ab30236 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java
@@ -25,7 +25,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class LikeExpression extends BinaryExpressionPredicate {
-	private final Object  _echar;
+	
+    private static final long serialVersionUID = 1L;
+    private final Object  _echar;
 	private final boolean _escaped;
 
 	public LikeExpression(Expression e, Expression pattern, Object echar) {
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LiteralExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LiteralExpression.java
index bfd376225..971d561f2 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LiteralExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LiteralExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class LiteralExpression extends ConstantExpression {
-	public LiteralExpression(Object literal) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public LiteralExpression(Object literal) {
 		super(literal);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java
index b84f658a9..1a4f95100 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java
@@ -28,7 +28,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class LocateExpression extends BinaryOperatorExpression  {
-	private final Expression _start;
+	
+    private static final long serialVersionUID = 1L;
+    private final Expression _start;
 
 	public LocateExpression(Expression key, String str, int start) {
         super(key, BinaryFunctionalOperator.LOCATE,
@@ -52,7 +54,8 @@ public class LocateExpression extends BinaryOperatorExpression  {
 		_start = start;
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
         String start = _start == null ? EMPTY : COMMA +
                 ((Visitable)_start).asExpression(ctx);
 		return new StringBuilder(_op.toString())
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java
index ca76bd668..48b0bfa35 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java
@@ -26,6 +26,8 @@ package org.apache.openjpa.persistence.query;
  */
 public class LogicalPredicate extends AbstractVisitable
     implements Predicate, Visitable {
+    
+    private static final long serialVersionUID = 1L;
     private final Predicate _p1;
     private final Predicate _p2;
     private final ConditionalOperator _op;
@@ -39,18 +41,22 @@ public class LogicalPredicate extends AbstractVisitable
         _nop = nop;
     }
 
+    @Override
     public Predicate and(Predicate predicate) {
         return new AndPredicate(this, predicate);
     }
 
+    @Override
     public Predicate or(Predicate predicate) {
         return new OrPredicate(this, predicate);
     }
 
+    @Override
     public Predicate not() {
         return new LogicalPredicate(_p1.not(), _nop, _op, _p2.not());
     }
 
+    @Override
     public String asExpression(AliasContext ctx) {
         return OPEN_BRACE + ((Visitable)_p1).asExpression(ctx) + SPACE + _op +
                SPACE + ((Visitable)_p2).asExpression(ctx) + CLOSE_BRACE;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LowerExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LowerExpression.java
index 8f973588b..35a390681 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LowerExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LowerExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class LowerExpression extends UnaryOperatorExpression {
-	public LowerExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public LowerExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.LOWER);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MaxExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MaxExpression.java
index 5ef4cde63..1168bc596 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MaxExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MaxExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class MaxExpression extends UnaryOperatorExpression {
-	public MaxExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public MaxExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.MAX);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MemberOfExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MemberOfExpression.java
index a9a72f796..dbb477dd4 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MemberOfExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MemberOfExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class MemberOfExpression extends BinaryExpressionPredicate {
-	public MemberOfExpression(Expression op, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public MemberOfExpression(Expression op, Expression op2) {
 		super(op, BinaryConditionalOperator.MEMBER,
 			BinaryConditionalOperator.MEMBER_NOT, op2);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MinExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MinExpression.java
index fcacce77f..928186af0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MinExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MinExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class MinExpression extends UnaryOperatorExpression {
-	public MinExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public MinExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.MIN);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MinusExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MinusExpression.java
index 3ef71edf5..74fac4ef9 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MinusExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/MinusExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class MinusExpression extends BinaryOperatorExpression {
-	public MinusExpression(Expression op, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public MinusExpression(Expression op, Expression op2) {
 		super(op, BinaryFunctionalOperator.MINUS, op2);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ModExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ModExpression.java
index 9357b2d1e..e68cfdf07 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ModExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ModExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 class ModExpression extends BinaryOperatorExpression {
-	public ModExpression(ExpressionImpl op, ExpressionImpl op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public ModExpression(ExpressionImpl op, ExpressionImpl op2) {
 		super(op, BinaryFunctionalOperator.MOD, op2);
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java
index 781749ded..788034efd 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java
@@ -26,6 +26,9 @@ import static org.apache.openjpa.persistence.query.PathOperator.NAVIGATION;
  *
  */
 class NavigationPath extends AbstractDomainObject implements PathExpression {
+    
+    private static final long serialVersionUID = 1L;
+
     protected NavigationPath(QueryDefinitionImpl owner, AbstractPath parent,
 		String attr) {
 		super(owner, parent, NAVIGATION, attr);
@@ -64,7 +67,8 @@ class NavigationPath extends AbstractDomainObject implements PathExpression {
 		return asProjection(ctx) + SPACE + ctx.getAlias(this);
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return getParent().toString()+ NAVIGATION +getLastSegment();
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java
index 6f0e4c57c..c475ac4d7 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java
@@ -29,7 +29,9 @@ import java.util.List;
  */
 public class NewInstance extends AbstractVisitable
 	implements SelectItem, Visitable {
-	private final Class _cls;
+	
+    private static final long serialVersionUID = 1L;
+    private final Class _cls;
 	private List<SelectItem> _args;
 	NewInstance(Class cls, SelectItem...args) {
 		_cls = cls;
@@ -38,16 +40,19 @@ public class NewInstance extends AbstractVisitable
 		}
 	}
 
-	public OrderByItem asc() {
+	@Override
+    public OrderByItem asc() {
 		throw new UnsupportedOperationException();
 	}
 
-	public OrderByItem desc() {
+	@Override
+    public OrderByItem desc() {
 		throw new UnsupportedOperationException();
 	}
 
 
-	public String asProjection(AliasContext ctx) {
+	@Override
+    public String asProjection(AliasContext ctx) {
             StringBuilder tmp = new StringBuilder("NEW ").append(_cls.getName())
 		    .append("(");
 		if (_args == null || _args.isEmpty())
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NotEqualExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NotEqualExpression.java
index 9494e59e6..20655dd44 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NotEqualExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NotEqualExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class NotEqualExpression extends BinaryExpressionPredicate {
-	public NotEqualExpression(Expression op1, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public NotEqualExpression(Expression op1, Expression op2) {
 		super(op1, BinaryConditionalOperator.EQUAL_NOT,
 			BinaryConditionalOperator.EQUAL, op2);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OpenJPAQueryBuilder.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OpenJPAQueryBuilder.java
index 11795912d..861a04263 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OpenJPAQueryBuilder.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OpenJPAQueryBuilder.java
@@ -31,15 +31,15 @@ public interface OpenJPAQueryBuilder extends QueryBuilder {
 	/**
 	 * Create a QueryDefinition from the given JPQL String.
 	 */
-	public QueryDefinition createQueryDefinition(String jpql);
+	QueryDefinition createQueryDefinition(String jpql);
 
 	/**
 	 * Create a QueryDefinition from the given OpenJPA Query instance.
 	 */
-	public QueryDefinition createQueryDefinition(Query jpql);
+	QueryDefinition createQueryDefinition(Query jpql);
 
 	/**
 	 * Gets equivalent JPQL String for the given QueryDefinition.
 	 */
-	public String toJPQL(QueryDefinition qdef);
+	String toJPQL(QueryDefinition qdef);
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java
index cae4748e3..4453386f0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java
@@ -27,6 +27,9 @@ import org.apache.openjpa.util.InternalException;
  *
  */
 public class OperatorPath extends AbstractDomainObject {
+    
+    private static final long serialVersionUID = 1L;
+
     public OperatorPath(AbstractDomainObject operand, PathOperator operator) {
 		super(operand.getOwner(), operand, operator, null);
 	}
@@ -56,7 +59,8 @@ public class OperatorPath extends AbstractDomainObject {
 		throw new UnsupportedOperationException();
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return getOperator() + "(" + getParent().toString() + ")";
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrPredicate.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrPredicate.java
index d57df0ac6..76e7c1f3a 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrPredicate.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrPredicate.java
@@ -18,7 +18,8 @@
  */
 package org.apache.openjpa.persistence.query;
 
-import static org.apache.openjpa.persistence.query.ConditionalOperator.*;
+import static org.apache.openjpa.persistence.query.ConditionalOperator.AND;
+import static org.apache.openjpa.persistence.query.ConditionalOperator.OR;
 
 /**
  * Denotes (e1 OR e2) predicate.
@@ -28,7 +29,10 @@ import static org.apache.openjpa.persistence.query.ConditionalOperator.*;
  */
 public class OrPredicate extends LogicalPredicate {
 
-	public OrPredicate(Predicate p1, Predicate p2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public OrPredicate(Predicate p1, Predicate p2) {
 		super(p1, OR, AND, p2);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java
index a9021fd22..36c46aaea 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java
@@ -26,7 +26,9 @@ package org.apache.openjpa.persistence.query;
  */
 public class OrderableItem extends AbstractVisitable
     implements OrderByItem, Visitable {
-	private final Boolean _asc;
+	
+    private static final long serialVersionUID = 1L;
+    private final Boolean _asc;
 	private final ExpressionImpl _e;
 
 	OrderableItem(ExpressionImpl path) {
@@ -43,7 +45,8 @@ public class OrderableItem extends AbstractVisitable
 		this._e = path;
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
         return (ctx.hasAlias(_e) ? ctx.getAlias(_e) : _e.asExpression(ctx))
 		    + (_asc == null ? "" : (_asc ? " ASC " : " DESC"));
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ParameterExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ParameterExpression.java
index b92e2784f..5a4ff67b0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ParameterExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ParameterExpression.java
@@ -25,7 +25,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class ParameterExpression extends ExpressionImpl {
-	private final String _name;
+	
+    private static final long serialVersionUID = 1L;
+    private final String _name;
 	public ParameterExpression(String name) {
 		_name = ":" + name;
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PathOperator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PathOperator.java
index 476a461c3..b24d2048d 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PathOperator.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PathOperator.java
@@ -42,7 +42,8 @@ public enum PathOperator {
 		_symbol = symbol;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return _symbol;
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PlusExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PlusExpression.java
index d85ebebed..2d3c8e5e4 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PlusExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PlusExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class PlusExpression extends BinaryOperatorExpression {
-	public PlusExpression(Expression op, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public PlusExpression(Expression op, Expression op2) {
 		super(op, BinaryFunctionalOperator.PLUS, op2);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java
index 3c690b2cd..8d3fe22c4 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java
@@ -39,14 +39,16 @@ public class QueryBuilderImpl implements OpenJPAQueryBuilder {
 	/**
 	 * Creates a QueryDefinition without a domain.
 	 */
-	public QueryDefinition createQueryDefinition() {
+	@Override
+    public QueryDefinition createQueryDefinition() {
 		return new QueryDefinitionImpl(this);
 	}
 
 	/**
 	 * Creates a QueryDefinition with given class as domain.
 	 */
-	public DomainObject createQueryDefinition(Class root) {
+	@Override
+    public DomainObject createQueryDefinition(Class root) {
 		return new QueryDefinitionImpl(this).addRoot(root);
 	}
 
@@ -54,11 +56,13 @@ public class QueryBuilderImpl implements OpenJPAQueryBuilder {
 	 * Creates a QueryDefinition that can be used a correlated subquery
 	 * with the given path as domain.
 	 */
-	public DomainObject createSubqueryDefinition(PathExpression path) {
+	@Override
+    public DomainObject createSubqueryDefinition(PathExpression path) {
 		return new QueryDefinitionImpl(this).addSubqueryRoot(path);
 	}
 
-	public String toJPQL(QueryDefinition query) {
+	@Override
+    public String toJPQL(QueryDefinition query) {
 		MetaDataRepository repos = _emf.getConfiguration()
 			.getMetaDataRepositoryInstance();
 		AliasContext ctx = new AliasContext(repos);
@@ -67,11 +71,13 @@ public class QueryBuilderImpl implements OpenJPAQueryBuilder {
 		return ((QueryDefinitionImpl)query).asExpression(ctx);
 	}
 
-	public QueryDefinition createQueryDefinition(String jpql) {
+	@Override
+    public QueryDefinition createQueryDefinition(String jpql) {
 		throw new UnsupportedOperationException();
 	}
 
-	public QueryDefinition createQueryDefinition(Query jpql) {
+	@Override
+    public QueryDefinition createQueryDefinition(Query jpql) {
 		throw new UnsupportedOperationException();
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryDefinitionImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryDefinitionImpl.java
index 416f9b4b5..b643eff14 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryDefinitionImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryDefinitionImpl.java
@@ -39,7 +39,9 @@ import org.apache.openjpa.lib.util.Localizer;
  */
 public class QueryDefinitionImpl extends ExpressionImpl
     implements QueryDefinition, Expression  {
-	private final QueryBuilderImpl _builder;
+	
+    private static final long serialVersionUID = 1L;
+    private final QueryBuilderImpl _builder;
 	private List<AbstractDomainObject> _domains;
 	private List<PathExpression> _groupBys;
 	private List<OrderableItem> _orderBys;
@@ -64,13 +66,15 @@ public class QueryDefinitionImpl extends ExpressionImpl
 	/**
 	 * Root domain object has no parent, no path but a non-null Class.
 	 */
-	public DomainObject addRoot(Class cls) {
+	@Override
+    public DomainObject addRoot(Class cls) {
 		RootPath root = new RootPath(this, cls);
 		addDomain(root);
 		return root;
 	}
 
-	public DomainObject addSubqueryRoot(PathExpression path) {
+	@Override
+    public DomainObject addSubqueryRoot(PathExpression path) {
 		AbstractPath impl = (AbstractPath)path;
 		LinkedList<AbstractPath> paths = impl.split();
 		QueryDefinitionImpl owner = impl.getOwner();
@@ -97,58 +101,70 @@ public class QueryDefinitionImpl extends ExpressionImpl
 
 	protected <T extends AbstractDomainObject> T addDomain(T path) {
 		if (_domains == null)
-			_domains = new ArrayList<AbstractDomainObject>();
+			_domains = new ArrayList<>();
 		_domains.add(path);
 		return path;
 	}
 
-	public Subquery all() {
+	@Override
+    public Subquery all() {
 		return new AllExpression(this);
 	}
 
-	public Subquery any() {
+	@Override
+    public Subquery any() {
 		return new AnyExpression(this);
 	}
 
-	public Expression coalesce(Expression... exp) {
+	@Override
+    public Expression coalesce(Expression... exp) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression coalesce(String... exp) {
+	@Override
+    public Expression coalesce(String... exp) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression coalesce(Date... exp) {
+	@Override
+    public Expression coalesce(Date... exp) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression coalesce(Calendar... exp) {
+	@Override
+    public Expression coalesce(Calendar... exp) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression currentDate() {
+	@Override
+    public Expression currentDate() {
 		return new CurrentTimeExpression(Date.class);
 	}
 
-	public Expression currentTime() {
+	@Override
+    public Expression currentTime() {
 		return new CurrentTimeExpression(Time.class);
 	}
 
-	public Expression currentTimestamp() {
+	@Override
+    public Expression currentTimestamp() {
 		return new CurrentTimeExpression(Timestamp.class);
 	}
 
-	public Predicate exists() {
+	@Override
+    public Predicate exists() {
 		return new ExistsExpression(this);
 	}
 
-	public CaseExpression generalCase() {
+	@Override
+    public CaseExpression generalCase() {
 		return new CaseExpressionImpl();
 	}
 
-	public QueryDefinition groupBy(PathExpression... pathExprs) {
+	@Override
+    public QueryDefinition groupBy(PathExpression... pathExprs) {
 		if (_groupBys == null) {
-			_groupBys = new ArrayList<PathExpression>();
+			_groupBys = new ArrayList<>();
 		} else {
 			_groupBys.clear();
 		}
@@ -157,9 +173,10 @@ public class QueryDefinitionImpl extends ExpressionImpl
 		return this;
 	}
 
-	public QueryDefinition groupBy(List<PathExpression> pathExprList) {
+	@Override
+    public QueryDefinition groupBy(List<PathExpression> pathExprList) {
 		if (_groupBys == null) {
-			_groupBys = new ArrayList<PathExpression>();
+			_groupBys = new ArrayList<>();
 		} else {
 			_groupBys.clear();
 		}
@@ -168,82 +185,101 @@ public class QueryDefinitionImpl extends ExpressionImpl
 		return this;
 	}
 
-	public QueryDefinition having(Predicate predicate) {
+	@Override
+    public QueryDefinition having(Predicate predicate) {
 		_having = predicate;
 		return this;
 	}
 
-	public Expression literal(String s) {
+	@Override
+    public Expression literal(String s) {
 		return new LiteralExpression(s);
 	}
 
-	public Expression literal(Number n) {
+	@Override
+    public Expression literal(Number n) {
 		return new LiteralExpression(n);
 	}
 
-	public Expression literal(boolean b) {
+	@Override
+    public Expression literal(boolean b) {
 		return new LiteralExpression(b);
 	}
 
-	public Expression literal(Calendar c) {
+	@Override
+    public Expression literal(Calendar c) {
 		return new LiteralExpression(c);
 	}
 
-	public Expression literal(Date d) {
+	@Override
+    public Expression literal(Date d) {
 		return new LiteralExpression(d);
 	}
 
-	public Expression literal(char c) {
+	@Override
+    public Expression literal(char c) {
 		return new LiteralExpression(c);
 	}
 
-	public Expression literal(Class cls) {
+	@Override
+    public Expression literal(Class cls) {
 		return new LiteralExpression(cls);
 	}
 
-	public Expression literal(Enum<?> e) {
+	@Override
+    public Expression literal(Enum<?> e) {
 		return new LiteralExpression(e);
 	}
 
-	public Expression nullLiteral() {
+	@Override
+    public Expression nullLiteral() {
 		return new LiteralExpression(null);
 	}
 
-	public SelectItem newInstance(Class cls, SelectItem... args) {
+	@Override
+    public SelectItem newInstance(Class cls, SelectItem... args) {
 		return new NewInstance(cls, args);
 	}
 
-	public Expression nullif(Expression exp1, Expression exp2) {
+	@Override
+    public Expression nullif(Expression exp1, Expression exp2) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression nullif(Number arg1, Number arg2) {
+	@Override
+    public Expression nullif(Number arg1, Number arg2) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression nullif(String arg1, String arg2) {
+	@Override
+    public Expression nullif(String arg1, String arg2) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression nullif(Date arg1, Date arg2) {
+	@Override
+    public Expression nullif(Date arg1, Date arg2) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression nullif(Calendar arg1, Calendar arg2) {
+	@Override
+    public Expression nullif(Calendar arg1, Calendar arg2) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression nullif(Class arg1, Class arg2) {
+	@Override
+    public Expression nullif(Class arg1, Class arg2) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Expression nullif(Enum<?> arg1, Enum<?> arg2) {
+	@Override
+    public Expression nullif(Enum<?> arg1, Enum<?> arg2) {
 		throw new UnsupportedOperationException();
 	}
 
-	public QueryDefinition orderBy(OrderByItem... orderByItems) {
+	@Override
+    public QueryDefinition orderBy(OrderByItem... orderByItems) {
 		if (_orderBys == null)
-			_orderBys = new ArrayList<OrderableItem>();
+			_orderBys = new ArrayList<>();
 		else
 			_orderBys.clear();
 		for (OrderByItem i : orderByItems) {
@@ -255,9 +291,10 @@ public class QueryDefinitionImpl extends ExpressionImpl
 		return this;
 	}
 
-	public QueryDefinition orderBy(List<OrderByItem> orderByItemList) {
+	@Override
+    public QueryDefinition orderBy(List<OrderByItem> orderByItemList) {
 		if (_orderBys == null)
-			_orderBys = new ArrayList<OrderableItem>();
+			_orderBys = new ArrayList<>();
 		else
 			_orderBys.clear();
 		for (OrderByItem i : orderByItemList) {
@@ -269,33 +306,39 @@ public class QueryDefinitionImpl extends ExpressionImpl
 		return this;
 	}
 
-	public Expression param(String name) {
+	@Override
+    public Expression param(String name) {
 		return new ParameterExpression(name);
 	}
 
-	public Predicate predicate(boolean b) {
+	@Override
+    public Predicate predicate(boolean b) {
 		return null;
 	}
 
-	public QueryDefinition select(SelectItem... items) {
+	@Override
+    public QueryDefinition select(SelectItem... items) {
         return select(items == null ? null : Arrays.asList(items), false);
 	}
 
-	public QueryDefinition select(List<SelectItem> items) {
+	@Override
+    public QueryDefinition select(List<SelectItem> items) {
 		return select(items, false);
 	}
 
-	public QueryDefinition selectDistinct(SelectItem... items) {
+	@Override
+    public QueryDefinition selectDistinct(SelectItem... items) {
         return select(items == null ? null : Arrays.asList(items), true);
 	}
 
-	public QueryDefinition selectDistinct(List<SelectItem> items) {
+	@Override
+    public QueryDefinition selectDistinct(List<SelectItem> items) {
 		return select(items, true);
 	}
 
     private QueryDefinition select(List<SelectItem> items, boolean isDistinct) {
 		if (_projections == null) {
-			_projections = new ArrayList<SelectItem>();
+			_projections = new ArrayList<>();
 		} else {
 			_projections.clear();
 		}
@@ -305,46 +348,55 @@ public class QueryDefinitionImpl extends ExpressionImpl
 		return this;
 	}
 
-	public CaseExpression simpleCase(Expression caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Expression caseOperand) {
 		return new CaseExpressionImpl(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Number caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Number caseOperand) {
 		return new CaseExpressionImpl(caseOperand);
 	}
 
-	public CaseExpression simpleCase(String caseOperand) {
+	@Override
+    public CaseExpression simpleCase(String caseOperand) {
 		return new CaseExpressionImpl(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Date caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Date caseOperand) {
 		return new CaseExpressionImpl(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Calendar caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Calendar caseOperand) {
 		return new CaseExpressionImpl(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Class caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Class caseOperand) {
 		return new CaseExpressionImpl(caseOperand);
 	}
 
-	public CaseExpression simpleCase(Enum<?> caseOperand) {
+	@Override
+    public CaseExpression simpleCase(Enum<?> caseOperand) {
 		return new CaseExpressionImpl(caseOperand);
 	}
 
-	public Subquery some() {
+	@Override
+    public Subquery some() {
 		return new SomeExpression(this);
 	}
 
-	public QueryDefinition where(Predicate predicate) {
+	@Override
+    public QueryDefinition where(Predicate predicate) {
 		_where = predicate;
 		return this;
 	}
 
 	private List<SelectItem> getProjections() {
 		if (_projections == null) {
-            List<SelectItem> defaultProjection = new ArrayList<SelectItem>();
+            List<SelectItem> defaultProjection = new ArrayList<>();
 			defaultProjection.add(_domains.get(0));
 			return defaultProjection;
 		}
@@ -367,7 +419,8 @@ public class QueryDefinitionImpl extends ExpressionImpl
 		return buffer.toString();
 	}
 
-	public String asProjection(AliasContext ctx) {
+	@Override
+    public String asProjection(AliasContext ctx) {
 		return asExpression(ctx);
 	}
 
@@ -426,6 +479,7 @@ public class QueryDefinitionImpl extends ExpressionImpl
                 RootPath.class, NavigationPath.class, OperatorPath.class,
 				JoinPath.class, FetchPath.class, } );
 
+        @Override
         public int compare(AbstractDomainObject a, AbstractDomainObject b) {
             return _order.indexOf(a.getClass()) - _order.indexOf(b.getClass());
 		}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryExpression.java
index 23e476e1c..a0eaff9c8 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryExpression.java
@@ -27,6 +27,9 @@ package org.apache.openjpa.persistence.query;
  */
 abstract class QueryExpression extends UnaryOperatorExpression
     implements Subquery {
+    
+    private static final long serialVersionUID = 1L;
+
     public QueryExpression(QueryDefinitionImpl q, UnaryFunctionalOperator op) {
 		super(q, op);
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RangeExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RangeExpression.java
index 3b8192e1d..a38c5bca0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RangeExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RangeExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class RangeExpression extends BinaryOperatorExpression {
-	public RangeExpression(Expression e1, Expression e2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public RangeExpression(Expression e1, Expression e2) {
 		super(e1, BinaryFunctionalOperator.RANGE, e2);
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RootPath.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RootPath.java
index 269e45fee..f84d113b2 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RootPath.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RootPath.java
@@ -26,7 +26,10 @@ package org.apache.openjpa.persistence.query;
  */
 public class RootPath extends AbstractDomainObject implements DomainObject {
 
-	public RootPath(QueryDefinitionImpl owner, Class cls) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public RootPath(QueryDefinitionImpl owner, Class cls) {
 		super(owner, null, PathOperator.ROOT, cls);
 	}
 
@@ -55,7 +58,8 @@ public class RootPath extends AbstractDomainObject implements DomainObject {
 		return ctx.getAlias(this);
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return getLastSegment().getSimpleName();
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SizeExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SizeExpression.java
index 8d6074537..9fbf697bf 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SizeExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SizeExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class SizeExpression extends UnaryOperatorExpression  {
-	public SizeExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public SizeExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.SIZE);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SomeExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SomeExpression.java
index e82e6297c..b3500e466 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SomeExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SomeExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 class SomeExpression extends UnaryOperatorExpression implements Subquery {
-	public SomeExpression(QueryDefinitionImpl sub) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public SomeExpression(QueryDefinitionImpl sub) {
 		super(sub, UnaryFunctionalOperator.SOME);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SquareRootExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SquareRootExpression.java
index 89529fad4..2701c0a30 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SquareRootExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SquareRootExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class SquareRootExpression extends UnaryOperatorExpression {
-	public SquareRootExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public SquareRootExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.SQRT);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SubStringExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SubStringExpression.java
index 5d9a6f09d..05f830801 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SubStringExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SubStringExpression.java
@@ -25,7 +25,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class SubStringExpression extends UnaryOperatorExpression {
-	private final Expression _start;
+	
+    private static final long serialVersionUID = 1L;
+    private final Expression _start;
 	private final Expression _length;
 	public SubStringExpression(Expression op, Expression start) {
 		super(op, UnaryFunctionalOperator.SUBSTR);
@@ -51,7 +53,8 @@ public class SubStringExpression extends UnaryOperatorExpression {
 		_length = new ConstantExpression(l);
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
 		return _op + "(" + ((Visitable)_e).asExpression(ctx)
 			 + "," + ((Visitable)_start).asExpression(ctx)
              + (_length == null ? "" : ","
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SumExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SumExpression.java
index a2922801e..ce8821928 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SumExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SumExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class SumExpression extends UnaryOperatorExpression  {
-	public SumExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public SumExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.SUM);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TimesExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TimesExpression.java
index 931a4e4f5..7f952332b 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TimesExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TimesExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class TimesExpression extends BinaryOperatorExpression {
-	public TimesExpression(Expression op1, Expression op2) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public TimesExpression(Expression op1, Expression op2) {
 		super(op1, BinaryFunctionalOperator.TIMES, op2);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TrimExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TrimExpression.java
index 8fb8a9d84..eb0c866a0 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TrimExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TrimExpression.java
@@ -25,7 +25,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class TrimExpression extends UnaryOperatorExpression {
-	private final Expression _trimChar;
+	
+    private static final long serialVersionUID = 1L;
+    private final Expression _trimChar;
 	private final TrimSpec _trimSpec;
 	private static final String DEFAULT_TRIM_CHAR = "' '";
 	private static final String DEFAULT_TRIM_SPEC = EMPTY;
@@ -42,7 +44,8 @@ public class TrimExpression extends UnaryOperatorExpression {
 		_trimSpec = spec;
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
 		String trimChar = _trimChar == null ? DEFAULT_TRIM_CHAR
 			: ((Visitable)_trimChar).asExpression(ctx);
 		String trimSpec = _trimSpec == null ? DEFAULT_TRIM_SPEC :
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TypeExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TypeExpression.java
index 99d01ec86..22e3c18db 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TypeExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/TypeExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class TypeExpression extends UnaryOperatorExpression {
-	public TypeExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public TypeExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.TYPE);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryConditionalOperator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryConditionalOperator.java
index 079b8f6b8..4298cceec 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryConditionalOperator.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryConditionalOperator.java
@@ -43,7 +43,8 @@ public enum UnaryConditionalOperator {
 		_symbol = symbol;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return _symbol;
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryExpressionPredicate.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryExpressionPredicate.java
index ac261ca75..440f76945 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryExpressionPredicate.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryExpressionPredicate.java
@@ -26,7 +26,9 @@ package org.apache.openjpa.persistence.query;
  */
 class UnaryExpressionPredicate extends AbstractVisitable
 	implements Predicate, Visitable {
-	protected final Expression _e;
+	
+    private static final long serialVersionUID = 1L;
+    protected final Expression _e;
 	protected final UnaryConditionalOperator _op;
 	private final UnaryConditionalOperator _nop;
 
@@ -45,21 +47,25 @@ class UnaryExpressionPredicate extends AbstractVisitable
 		return _op;
 	}
 
-	public Predicate and(Predicate predicate) {
+	@Override
+    public Predicate and(Predicate predicate) {
 		return new AndPredicate(this, predicate);
 	}
 
-	public Predicate or(Predicate predicate) {
+	@Override
+    public Predicate or(Predicate predicate) {
 		return new OrPredicate(this, predicate);
 	}
 
-	public Predicate not() {
+	@Override
+    public Predicate not() {
 		if (_nop == null)
             throw new UnsupportedOperationException(this.toString());
 		return new UnaryExpressionPredicate(_e, _nop, _op);
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
 		return _op + "(" + ((ExpressionImpl)_e).asExpression(ctx) + ")";
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryFunctionalOperator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryFunctionalOperator.java
index 9258b70a6..176b2114e 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryFunctionalOperator.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryFunctionalOperator.java
@@ -58,7 +58,8 @@ public enum UnaryFunctionalOperator {
 		_symbol = symbol;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return _symbol;
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryMinusExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryMinusExpression.java
index f3ea61d8a..af23d26ab 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryMinusExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryMinusExpression.java
@@ -26,7 +26,10 @@ package org.apache.openjpa.persistence.query;
  */
 public class UnaryMinusExpression extends UnaryOperatorExpression {
 
-	public UnaryMinusExpression(Expression expr) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public UnaryMinusExpression(Expression expr) {
 		super(expr, UnaryFunctionalOperator.MINUS);
 	}
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperator.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperator.java
index 57466103c..a7394aff9 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperator.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperator.java
@@ -59,7 +59,8 @@ public enum UnaryOperator {
 		_symbol = symbol;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return _symbol;
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperatorExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperatorExpression.java
index 7e8fadbe9..f68dade99 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperatorExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperatorExpression.java
@@ -19,7 +19,9 @@
 package org.apache.openjpa.persistence.query;
 
 class UnaryOperatorExpression extends ExpressionImpl implements Aggregate {
-	protected final Expression _e;
+	
+    private static final long serialVersionUID = 1L;
+    protected final Expression _e;
 	protected final UnaryFunctionalOperator   _op;
 
     public UnaryOperatorExpression(Expression e, UnaryFunctionalOperator op) {
@@ -35,15 +37,18 @@ class UnaryOperatorExpression extends ExpressionImpl implements Aggregate {
 		return _op;
 	}
 
-	public Expression distinct() {
+	@Override
+    public Expression distinct() {
 		return new DistinctExpression(this);
 	}
 
-	public String asExpression(AliasContext ctx) {
+	@Override
+    public String asExpression(AliasContext ctx) {
 		return _op + "(" + ((Visitable)_e).asExpression(ctx) + ")";
 	}
 
-	public String asProjection(AliasContext ctx) {
+	@Override
+    public String asProjection(AliasContext ctx) {
 		return _op + "(" + ((Visitable)_e).asProjection(ctx) + ")" +
 		    (ctx.hasAlias(this) ? " " + ctx.getAlias(this) : "");
 	}
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UpperExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UpperExpression.java
index 166213eec..28e2fc1fc 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UpperExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UpperExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class UpperExpression extends UnaryOperatorExpression {
-	public UpperExpression(Expression op) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public UpperExpression(Expression op) {
 		super(op, UnaryFunctionalOperator.UPPER);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ValueExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ValueExpression.java
index 0c5db76e9..a7243912b 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ValueExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ValueExpression.java
@@ -25,7 +25,10 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class ValueExpression extends OperatorPath {
-	public ValueExpression(AbstractDomainObject expr) {
+	
+    private static final long serialVersionUID = 1L;
+
+    public ValueExpression(AbstractDomainObject expr) {
 		super(expr, PathOperator.VALUE);
 	}
 }
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/VarArgsExpression.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/VarArgsExpression.java
index 73b95bffa..fc815cb42 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/VarArgsExpression.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/VarArgsExpression.java
@@ -27,7 +27,9 @@ package org.apache.openjpa.persistence.query;
  *
  */
 public class VarArgsExpression extends ExpressionImpl {
-	private final Expression[] _values;
+	
+    private static final long serialVersionUID = 1L;
+    private final Expression[] _values;
 
 	public VarArgsExpression(Expression[] values) {
 		_values = values;
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/ReservedWords.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/ReservedWords.java
index 794493d89..4f6e1c1a1 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/ReservedWords.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/ReservedWords.java
@@ -32,7 +32,7 @@ import java.util.Set;
  *
  */
 public class ReservedWords {
-    public static final Set<String> KEYWORDS = new HashSet<String>();
+    public static final Set<String> KEYWORDS = new HashSet<>();
     static {
         KEYWORDS.addAll(Arrays.asList(
             "ABS", "ALL", "AND", "ANY", "AS", "ASC", "AVG",
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java
index be265e7c0..d746f1ece 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/util/SourceCode.java
@@ -20,7 +20,13 @@
 package org.apache.openjpa.persistence.util;
 
 import java.io.PrintWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
 
 import org.apache.openjpa.lib.util.Localizer;
 
@@ -44,8 +50,8 @@ public class SourceCode {
 	/**
 	 * List of Java Keywords and primitive types. Populated statically.
 	 */
-    private static final ArrayList<String> reserved = new ArrayList<String>();
-    private static final ArrayList<String> knownTypes = new ArrayList<String>();
+    private static final ArrayList<String> reserved = new ArrayList<>();
+    private static final ArrayList<String> knownTypes = new ArrayList<>();
 
 	private static int TABSIZE                = 4;
 	private static final String SPACE         = " ";
@@ -63,7 +69,7 @@ public class SourceCode {
 	private List<Comment> comments;
 	private final Package pkg;
 	private final Class   cls;
-    private final Set<Import> imports = new TreeSet<Import>();
+    private final Set<Import> imports = new TreeSet<>();
 
 
 	/**
@@ -140,7 +146,7 @@ public class SourceCode {
 	    if (lines == null)
 	        return this;
 		if (comments == null)
-		    comments = new ArrayList<Comment>();
+		    comments = new ArrayList<>();
 		Comment comment = new Comment();
 		comments.add(comment);
 		comment.makeInline(inline);
@@ -193,7 +199,7 @@ public class SourceCode {
      */
     public static String[] wrap(String longLine, int width) {
         String[] words = longLine.split("\\ ");
-        List<String> lines = new ArrayList<String>();
+        List<String> lines = new ArrayList<>();
         StringBuilder line = new StringBuilder();
         for (int i = 0; i < words.length; i++) {
             String w = words[i];
@@ -250,7 +256,7 @@ public class SourceCode {
 
 	static LinkedList<String> tokenize(String s, String delim) {
 	    StringTokenizer tokenizer = new StringTokenizer(s, delim, false);
-		LinkedList<String> tokens = new LinkedList<String>();
+		LinkedList<String> tokens = new LinkedList<>();
 		while (tokenizer.hasMoreTokens())
 			tokens.add(tokenizer.nextToken());
 		return tokens;
@@ -283,8 +289,8 @@ public class SourceCode {
 		protected boolean isStatic;
 		protected boolean isFinal;
 		protected Comment comment;
-		protected List<ClassName> params = new ArrayList<ClassName>();
-		protected List<Annotation> annos = new ArrayList<Annotation>();
+		protected List<ClassName> params = new ArrayList<>();
+		protected List<Annotation> annos = new ArrayList<>();
 
         protected Element(String name, ClassName type) {
             this.name = name;
@@ -306,7 +312,8 @@ public class SourceCode {
 		    return this;
 		}
 
-		public int compareTo(Element<T> other) {
+		@Override
+        public int compareTo(Element<T> other) {
 			return name.compareTo(other.name);
 		}
 
@@ -364,10 +371,10 @@ public class SourceCode {
         private boolean isAbstract;
 		private boolean isFinal;
 		private ClassName superCls;
-		private List<ClassName> interfaces = new ArrayList<ClassName>();
-	    private Set<Field> fields   = new TreeSet<Field>();
-	    private Set<Method> methods = new TreeSet<Method>();
-	    private Set<Constructor> constructors = new TreeSet<Constructor>();
+		private List<ClassName> interfaces = new ArrayList<>();
+	    private Set<Field> fields   = new TreeSet<>();
+	    private Set<Method> methods = new TreeSet<>();
+	    private Set<Constructor> constructors = new TreeSet<>();
 
 		public Class(String name) {
 			super(name, getOrCreateImport(name));
@@ -392,6 +399,7 @@ public class SourceCode {
             return this;
         }
 
+        @Override
         public Class makeFinal() {
             if (isAbstract)
                 throw new IllegalArgumentException(_loc.get("src-invalid-modifier").toString());
@@ -456,7 +464,8 @@ public class SourceCode {
 	                    "src-duplicate-constructor", c, this).toString());
 	            return c;
 	    }
-	    public void write(PrintWriter out, int tab) {
+	    @Override
+        public void write(PrintWriter out, int tab) {
 			super.write(out, tab);
 			if (isAbstract)
 			    out.append("abstract ");
@@ -479,7 +488,8 @@ public class SourceCode {
 	        out.println(BLOCK_DELIMITER.end);
 		}
 
-	    public String toString() {
+	    @Override
+        public String toString() {
 	    	return getType().fullName;
 	    }
 	}
@@ -518,7 +528,7 @@ public class SourceCode {
 		public Field addSetter() {
 			owner.addMethod("set"+ capitalize(name), "void")
 			     .makePublic()
-                 .addArgument(new Argument<ClassName,String>(type, name,SPACE))
+                 .addArgument(new Argument<>(type, name,SPACE))
 			     .addCodeLine("this."+ name + " = " + name);
 			return this;
 		}
@@ -531,11 +541,13 @@ public class SourceCode {
             isTransient = true;
         }
 
-		public String toString() {
+		@Override
+        public String toString() {
 			return type + SPACE + name;
 		}
 
-		public void write(PrintWriter out, int tab) {
+		@Override
+        public void write(PrintWriter out, int tab) {
 			super.write(out, tab);
 			if (isVolatile) out.print("volatile ");
 			if (isTransient) out.print("transient ");
@@ -544,7 +556,8 @@ public class SourceCode {
 			out.println(SPACE + name + SEMICOLON);
 		}
 
-		public boolean equals(Object other) {
+		@Override
+        public boolean equals(Object other) {
 			if (other instanceof Field) {
 				Field that = (Field)other;
 				return name.equals(that.name);
@@ -560,8 +573,8 @@ public class SourceCode {
 	 */
 	public class Method extends Element<Method> {
 		private boolean isAbstract;
-		private List<Argument<ClassName,String>> args = new ArrayList<Argument<ClassName,String>>();
-		private List<String> codeLines = new ArrayList<String>();
+		private List<Argument<ClassName,String>> args = new ArrayList<>();
+		private List<String> codeLines = new ArrayList<>();
 		int tabCount = 0;
 		String tab = "";
 
@@ -581,7 +594,7 @@ public class SourceCode {
 
 		public Method addArgument(String className, String argName){
 		    ClassName cn = getOrCreateImport(className);
-		    args.add(new Argument<ClassName, String>(cn, argName," "));
+		    args.add(new Argument<>(cn, argName," "));
 		    return this;
 		}
 
@@ -629,11 +642,13 @@ public class SourceCode {
 		}
 
 
-		public String toString() {
+		@Override
+        public String toString() {
 			return type + SPACE + name;
 		}
 
-		public void write(PrintWriter out, int tab) {
+		@Override
+        public void write(PrintWriter out, int tab) {
 			out.println(BLANK);
 			super.write(out, tab);
 			if (isAbstract) out.append("abstract ");
@@ -652,7 +667,8 @@ public class SourceCode {
 			out.println(BLOCK_DELIMITER.end);
 		}
 
-		public boolean equals(Object other) {
+		@Override
+        public boolean equals(Object other) {
 			if (other instanceof Method) {
 				Method that = (Method)other;
                 return name.equals(that.name) && args.equals(that.args);
@@ -662,8 +678,8 @@ public class SourceCode {
 	}
 
 	public class Constructor extends Element<Constructor> {
-	    private List<Argument<ClassName,String>> args = new ArrayList<Argument<ClassName,String>>();
-        private List<String> codeLines = new ArrayList<String>();
+	    private List<Argument<ClassName,String>> args = new ArrayList<>();
+        private List<String> codeLines = new ArrayList<>();
         int tabCount = 0;
         String tab = "";
 
@@ -679,7 +695,7 @@ public class SourceCode {
 
         public Constructor addArgument(String className, String argName) {
             ClassName cn = getOrCreateImport(className);
-            args.add(new Argument<ClassName, String>(cn, argName, " "));
+            args.add(new Argument<>(cn, argName, " "));
             return this;
         }
 
@@ -741,7 +757,8 @@ public class SourceCode {
 			this.name = name;
 		}
 
-		public int compareTo(Import other) {
+		@Override
+        public int compareTo(Import other) {
 			return name.compareTo(other.name);
 		}
 
@@ -754,7 +771,8 @@ public class SourceCode {
 		    out.println("import "+ name.fullName + SEMICOLON);
 		}
 
-		public boolean equals(Object other) {
+		@Override
+        public boolean equals(Object other) {
 			if (other instanceof Import) {
 				Import that = (Import)other;
 				return name.equals(that.name);
@@ -782,6 +800,7 @@ public class SourceCode {
 			this.connector = connector;
 		}
 
+        @Override
         public String toString() {
 			return key + connector + value;
 		}
@@ -793,14 +812,14 @@ public class SourceCode {
 	 */
 	public class Annotation {
 		private String name;
-        private List<Argument<?,?>> args = new ArrayList<Argument<?,?>>();
+        private List<Argument<?,?>> args = new ArrayList<>();
 
 		Annotation(String n) {
 			name = n;
 		}
 
         public Annotation addArgument(String key, String v, boolean quote) {
-            return addArgument(new Argument<String,String>(key,
+            return addArgument(new Argument<>(key,
                 quote ? quote(v) : v, EQUAL));
         }
 
@@ -849,7 +868,7 @@ public class SourceCode {
 	}
 
 	class Comment {
-		List<String> lines = new ArrayList<String>();
+		List<String> lines = new ArrayList<>();
 		private boolean inline = false;
 
 		public void append(String line) {
@@ -944,14 +963,16 @@ public class SourceCode {
 	    /**
 	     * Gets the full or simple name of this receiver based on useFullName flag.
 	     */
-	    public String toString() {
+	    @Override
+        public String toString() {
 	        return (useFullName ? fullName : simpleName) + arrayMarker;
 	    }
 
 	    /**
 	     * Compares by fully-qualified name.
 	     */
-	    public int compareTo(ClassName other) {
+	    @Override
+        public int compareTo(ClassName other) {
 	        return getFullName().compareTo(other.getFullName());
 	    }
 
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java
index 08dc94e46..c4f1b13a4 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java
@@ -20,8 +20,8 @@ import java.lang.annotation.ElementType;
 
 import javax.persistence.spi.LoadState;
 import javax.validation.Path;
-import javax.validation.TraversableResolver;
 import javax.validation.Path.Node;
+import javax.validation.TraversableResolver;
 
 import org.apache.openjpa.persistence.OpenJPAPersistenceUtil;
 
@@ -43,6 +43,7 @@ public class TraversableResolverImpl implements TraversableResolver {
      *      javax.validation.Path.Node, java.lang.Class, javax.validation.Path,
      *      java.lang.annotation.ElementType)
      */
+    @Override
     public boolean isReachable(Object traversableObject,
         Node traversableProperty, Class<?> rootBeanType,
         Path pathToTraversableObject, ElementType elementType) {
@@ -67,6 +68,7 @@ public class TraversableResolverImpl implements TraversableResolver {
      *      javax.validation.Path.Node, java.lang.Class, javax.validation.Path,
      *      java.lang.annotation.ElementType)
      */
+    @Override
     public boolean isCascadable(Object traversableObject,
         Node traversableProperty, Class<?> rootBeanType,
         Path pathToTraversableObject, ElementType elementType) {
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java
index 6ae303a75..453e0fb06 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java
@@ -24,19 +24,19 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.persistence.ValidationMode;
-import javax.validation.metadata.BeanDescriptor;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
+import javax.validation.metadata.BeanDescriptor;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.event.LifecycleEvent;
 import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.persistence.JPAProperties;
 import org.apache.openjpa.validation.AbstractValidator;
 import org.apache.openjpa.validation.ValidationException;
@@ -52,10 +52,10 @@ public class ValidatorImpl extends AbstractValidator {
     private transient Log _log = null;
 
     // A map storing the validation groups to use for a particular event type
-    private Map<Integer, Class<?>[]> _validationGroups = new HashMap<Integer,Class<?>[]>();
+    private Map<Integer, Class<?>[]> _validationGroups = new HashMap<>();
 
     // Lookup table for event to group property mapping
-    private static HashMap<String, Integer> _vgMapping = new HashMap<String, Integer> ();
+    private static HashMap<String, Integer> _vgMapping = new HashMap<> ();
 
     static {
         _vgMapping.put(JPAProperties.VALIDATE_PRE_PERSIST, LifecycleEvent.BEFORE_PERSIST);
diff --git a/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java b/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
index ea2a7fe8f..c873f381d 100644
--- a/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
+++ b/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
@@ -20,14 +20,15 @@ package org.apache.openjpa.persistence;
 
 import java.util.EnumSet;
 
-import junit.framework.TestCase;
-import org.apache.openjpa.kernel.ConnectionRetainModes;
-import org.apache.openjpa.kernel.DetachState;
-import org.apache.openjpa.kernel.RestoreState;
+import org.apache.openjpa.event.CallbackModes;
 import org.apache.openjpa.kernel.AutoClear;
 import org.apache.openjpa.kernel.AutoDetach;
+import org.apache.openjpa.kernel.ConnectionRetainModes;
+import org.apache.openjpa.kernel.DetachState;
 import org.apache.openjpa.kernel.QueryOperations;
-import org.apache.openjpa.event.CallbackModes;
+import org.apache.openjpa.kernel.RestoreState;
+
+import junit.framework.TestCase;
 
 public class TestEnumToKernelConstantMappings
     extends TestCase {
diff --git a/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestPersistenceProductDerivation.java b/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestPersistenceProductDerivation.java
index 59a39d21a..db3848259 100644
--- a/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestPersistenceProductDerivation.java
+++ b/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestPersistenceProductDerivation.java
@@ -36,14 +36,14 @@ import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
-import junit.framework.TestCase;
-
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
 import org.apache.openjpa.lib.conf.ConfigurationProvider;
 import org.apache.openjpa.lib.encryption.EncryptionProvider;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 
+import junit.framework.TestCase;
+
 public class TestPersistenceProductDerivation extends TestCase {
     private File sourceFile;
     private File targetFile;
@@ -51,6 +51,7 @@ public class TestPersistenceProductDerivation extends TestCase {
     ClassLoader originalLoader = null;
     ClassLoader tempLoader = null;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         String currentDir = System.getProperty("user.dir");
@@ -81,6 +82,7 @@ public class TestPersistenceProductDerivation extends TestCase {
             .setContextClassLoaderAction(tempLoader));
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         // Restore the original classloader.
@@ -303,7 +305,8 @@ public class TestPersistenceProductDerivation extends TestCase {
 		 *
 		 * @see EncryptionProvider#decrypt(String)
 		 */
-		public String decrypt(String password) {
+		@Override
+        public String decrypt(String password) {
 			encryptedPassword = password;
 
 			return decryptedPassword;
@@ -312,7 +315,8 @@ public class TestPersistenceProductDerivation extends TestCase {
 		/**
 		 * @see EncryptionProvider#encrypt(String)
 		 */
-		public String encrypt(String password) {
+		@Override
+        public String encrypt(String password) {
 			return password;
 		}
 	}
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBroker.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBroker.java
index 7176399a1..2d79846e0 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBroker.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBroker.java
@@ -38,5 +38,6 @@ public interface DistributedBroker extends Broker {
     /**
      * Gets the covariant fetch configuration that is aware of targets.
      */
+    @Override
     TargetFetchConfiguration getFetchConfiguration();
 }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerFactory.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerFactory.java
index 93dc01e04..6e19179a7 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerFactory.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerFactory.java
@@ -43,5 +43,5 @@ public interface DistributedBrokerFactory extends BrokerFactory {
      *
      * @see DistributedConfiguration#addSlice(String, Map)
      */
-    public Slice addSlice(String name, Map properties);
+    Slice addSlice(String name, Map properties);
 }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerImpl.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerImpl.java
index b81e75ed9..823d4f6c9 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerImpl.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerImpl.java
@@ -38,8 +38,8 @@ import org.apache.openjpa.util.OpenJPAId;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class DistributedBrokerImpl extends FinalizingBrokerImpl implements DistributedBroker {
+    private static final long serialVersionUID = 1L;
     private transient String _rootSlice;
     private transient DistributedConfiguration _conf;
     private final ReentrantSliceLock _lock;
@@ -51,6 +51,7 @@ public class DistributedBrokerImpl extends FinalizingBrokerImpl implements Distr
         _lock = new ReentrantSliceLock();
     }
 
+    @Override
     public DistributedConfiguration getConfiguration() {
         if (_conf == null) {
             _conf = (DistributedConfiguration) super.getConfiguration();
@@ -58,10 +59,12 @@ public class DistributedBrokerImpl extends FinalizingBrokerImpl implements Distr
         return _conf;
     }
 
+    @Override
     public DistributedStoreManager getDistributedStoreManager() {
         return (DistributedStoreManager) getStoreManager().getInnermostDelegate();
     }
 
+    @Override
     public TargetFetchConfiguration getFetchConfiguration() {
         return (TargetFetchConfiguration) super.getFetchConfiguration();
     }
@@ -125,6 +128,7 @@ public class DistributedBrokerImpl extends FinalizingBrokerImpl implements Distr
     /**
      * Create a new query.
      */
+    @Override
     protected QueryImpl newQueryImpl(String lang, StoreQuery sq) {
         return new DistributedQueryImpl(this, lang, sq);
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedQueryImpl.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedQueryImpl.java
index 6aaa9aa2e..ff41a0b19 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedQueryImpl.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedQueryImpl.java
@@ -32,8 +32,8 @@ import org.apache.openjpa.slice.jdbc.TargetFetchConfiguration;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class DistributedQueryImpl extends QueryImpl {
+    private static final long serialVersionUID = 1L;
     private final ReentrantSliceLock _lock;
     private DistributedConfiguration _conf;
 
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedStoreManager.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedStoreManager.java
index eb5c237ab..b5090aa9e 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedStoreManager.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedStoreManager.java
@@ -43,6 +43,6 @@ public interface DistributedStoreManager extends StoreManager {
      * @return the store manager for the newly added slice.
      *
      */
-    public SliceStoreManager addSlice(Slice slice);
+    SliceStoreManager addSlice(Slice slice);
 
 }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributionPolicy.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributionPolicy.java
index c600c2ca2..b37216ddd 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributionPolicy.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributionPolicy.java
@@ -64,6 +64,7 @@ public interface DistributionPolicy {
 	 */
 	public static class Default implements DistributionPolicy {
 		private static Random RNG = new Random();
+        @Override
         public String distribute(Object pc, List<String> slices, Object ctx) {
 			return slices.get(RNG.nextInt(slices.size()));
 		}
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/ProductDerivation.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/ProductDerivation.java
index ab2c42d49..6f55ffcb9 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/ProductDerivation.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/ProductDerivation.java
@@ -50,19 +50,23 @@ public class ProductDerivation extends AbstractProductDerivation implements
      */
     public static final String HINT_TARGET  = "openjpa.hint.slice.Target";
 
-	@SuppressWarnings("unchecked")
+	@Override
+    @SuppressWarnings("unchecked")
 	public void putBrokerFactoryAliases(Map m) {
 		m.put("slice", DistributedJDBCBrokerFactory.class.getName());
 	}
 
-	public String getConfigurationPrefix() {
+	@Override
+    public String getConfigurationPrefix() {
 		return PREFIX_SLICE;
 	}
 
-	public int getType() {
+	@Override
+    public int getType() {
 		return TYPE_STORE;
 	}
 
+    @Override
     public Set<String> getSupportedQueryHints() {
         return Collections.singleton(HINT_TARGET);
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReentrantSliceLock.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReentrantSliceLock.java
index 745cbcaba..85b6a5285 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReentrantSliceLock.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReentrantSliceLock.java
@@ -26,8 +26,8 @@ import java.util.concurrent.locks.ReentrantLock;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class ReentrantSliceLock extends ReentrantLock {
+    private static final long serialVersionUID = 1L;
 
     public ReentrantSliceLock() {
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReplicationPolicy.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReplicationPolicy.java
index 9753822cf..b0efb3bdb 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReplicationPolicy.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReplicationPolicy.java
@@ -55,7 +55,8 @@ public interface ReplicationPolicy {
 	 *
 	 */
 	public static class Default implements ReplicationPolicy {
-		public String[] replicate(Object pc, List<String> slices,
+		@Override
+        public String[] replicate(Object pc, List<String> slices,
 			Object context) {
 			return slices.toArray(new String[slices.size()]);
 		}
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/Slice.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/Slice.java
index aa908abba..ac2712c53 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/Slice.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/Slice.java
@@ -29,8 +29,9 @@ import org.apache.openjpa.conf.OpenJPAConfiguration;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class Slice implements Comparable<Slice>,Serializable {
+    private static final long serialVersionUID = 1L;
+
     public enum Status {
         NOT_INITIALIZED,
         ACTIVE,
@@ -74,10 +75,12 @@ public class Slice implements Comparable<Slice>,Serializable {
         return status == Status.ACTIVE;
     }
 
+    @Override
     public String toString() {
         return name;
     }
 
+    @Override
     public int compareTo(Slice other) {
         return name.compareTo(other.name);
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceInfo.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceInfo.java
index 64c786cbe..4e5cd208e 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceInfo.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceInfo.java
@@ -32,9 +32,9 @@ import org.apache.openjpa.util.InternalException;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class SliceInfo implements Serializable {
-	private final boolean  _isReplicated;
+    private static final long serialVersionUID = 1L;
+    private final boolean  _isReplicated;
 	private String[] _slices;
 
 	private static transient Localizer _loc = Localizer.forPackage(SliceInfo.class);
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceThread.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceThread.java
index e1575a45d..6ba6efb46 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceThread.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceThread.java
@@ -65,6 +65,7 @@ public class SliceThread extends Thread {
 
     private static class SliceThreadFactory implements ThreadFactory {
         int n = 0;
+        @Override
         public Thread newThread(Runnable r) {
             Thread parent = Thread.currentThread();
             return new SliceThread(parent.getName()+"-slice-"+n++, parent, r);
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedConnection.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedConnection.java
index 9cc9539c1..a4d1836d7 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedConnection.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedConnection.java
@@ -60,22 +60,26 @@ public class DistributedConnection implements Connection {
 		return real.contains(c);
 	}
 
-	public void clearWarnings() throws SQLException {
+	@Override
+    public void clearWarnings() throws SQLException {
 		for (Connection c : real)
 			c.clearWarnings();
 	}
 
-	public void close() throws SQLException {
+	@Override
+    public void close() throws SQLException {
 		for (Connection c : real)
 			c.close();
 	}
 
-	public void commit() throws SQLException {
+	@Override
+    public void commit() throws SQLException {
 		for (Connection c : real)
 			c.commit();
 	}
 
-	public Statement createStatement() throws SQLException {
+	@Override
+    public Statement createStatement() throws SQLException {
 		DistributedStatement ret = new DistributedStatement(this);
 		for (Connection c : real) {
 			ret.add(c.createStatement());
@@ -83,6 +87,7 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
+    @Override
     public Statement createStatement(int arg0, int arg1) throws SQLException {
 		DistributedStatement ret = new DistributedStatement(this);
 		for (Connection c : real) {
@@ -91,7 +96,8 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
-	public Statement createStatement(int arg0, int arg1, int arg2)
+	@Override
+    public Statement createStatement(int arg0, int arg1, int arg2)
 			throws SQLException {
 		DistributedStatement ret = new DistributedStatement(this);
 		for (Connection c : real) {
@@ -100,35 +106,43 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
-	public boolean getAutoCommit() throws SQLException {
+	@Override
+    public boolean getAutoCommit() throws SQLException {
 		return master.getAutoCommit();
 	}
 
-	public String getCatalog() throws SQLException {
+	@Override
+    public String getCatalog() throws SQLException {
 		return master.getCatalog();
 	}
 
-	public int getHoldability() throws SQLException {
+	@Override
+    public int getHoldability() throws SQLException {
 		return master.getHoldability();
 	}
 
-	public DatabaseMetaData getMetaData() throws SQLException {
+	@Override
+    public DatabaseMetaData getMetaData() throws SQLException {
 		return master.getMetaData();
 	}
 
-	public int getTransactionIsolation() throws SQLException {
+	@Override
+    public int getTransactionIsolation() throws SQLException {
 		return master.getTransactionIsolation();
 	}
 
-	public Map<String, Class<?>> getTypeMap() throws SQLException {
+	@Override
+    public Map<String, Class<?>> getTypeMap() throws SQLException {
 		return master.getTypeMap();
 	}
 
-	public SQLWarning getWarnings() throws SQLException {
+	@Override
+    public SQLWarning getWarnings() throws SQLException {
 		return master.getWarnings();
 	}
 
-	public boolean isClosed() throws SQLException {
+	@Override
+    public boolean isClosed() throws SQLException {
 		boolean ret = true;
 		for (Connection c : real) {
 			ret &= c.isClosed();
@@ -136,7 +150,8 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
-	public boolean isReadOnly() throws SQLException {
+	@Override
+    public boolean isReadOnly() throws SQLException {
 		boolean ret = true;
 		for (Connection c : real) {
 			ret &= c.isReadOnly();
@@ -144,24 +159,29 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
-	public String nativeSQL(String arg0) throws SQLException {
+	@Override
+    public String nativeSQL(String arg0) throws SQLException {
 		return master.nativeSQL(arg0);
 	}
 
-	public CallableStatement prepareCall(String arg0) throws SQLException {
+	@Override
+    public CallableStatement prepareCall(String arg0) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public CallableStatement prepareCall(String arg0, int arg1, int arg2)
+	@Override
+    public CallableStatement prepareCall(String arg0, int arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public CallableStatement prepareCall(String arg0, int arg1, int arg2,
+	@Override
+    public CallableStatement prepareCall(String arg0, int arg1, int arg2,
 			int arg3) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+    @Override
     public PreparedStatement prepareStatement(String arg0) throws SQLException {
 		// TODO: Big hack
         if (arg0.indexOf("OPENJPA_SEQUENCE_TABLE") != -1) {
@@ -174,7 +194,8 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
-	public PreparedStatement prepareStatement(String arg0, int arg1)
+	@Override
+    public PreparedStatement prepareStatement(String arg0, int arg1)
 			throws SQLException {
 		DistributedPreparedStatement ret = new DistributedPreparedStatement(this);
 		for (Connection c : real) {
@@ -183,7 +204,8 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
-	public PreparedStatement prepareStatement(String arg0, int[] arg1)
+	@Override
+    public PreparedStatement prepareStatement(String arg0, int[] arg1)
 			throws SQLException {
 		DistributedPreparedStatement ret = new DistributedPreparedStatement(this);
 		for (Connection c : real) {
@@ -192,7 +214,8 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
-	public PreparedStatement prepareStatement(String arg0, String[] arg1)
+	@Override
+    public PreparedStatement prepareStatement(String arg0, String[] arg1)
 			throws SQLException {
 		DistributedPreparedStatement ret = new DistributedPreparedStatement(this);
 		for (Connection c : real) {
@@ -201,6 +224,7 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
+    @Override
     public PreparedStatement prepareStatement(String arg0, int arg1, int arg2)
 			throws SQLException {
 		DistributedPreparedStatement ret = new DistributedPreparedStatement(this);
@@ -210,6 +234,7 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
+    @Override
     public PreparedStatement prepareStatement(String arg0, int arg1, int arg2,
 			int arg3) throws SQLException {
 		DistributedPreparedStatement ret = new DistributedPreparedStatement(this);
@@ -219,55 +244,66 @@ public class DistributedConnection implements Connection {
 		return ret;
 	}
 
-	public void releaseSavepoint(Savepoint arg0) throws SQLException {
+	@Override
+    public void releaseSavepoint(Savepoint arg0) throws SQLException {
 		for (Connection c : real)
 			c.releaseSavepoint(arg0);
 	}
 
-	public void rollback() throws SQLException {
+	@Override
+    public void rollback() throws SQLException {
 		for (Connection c : real)
 			c.rollback();
 	}
 
-	public void rollback(Savepoint arg0) throws SQLException {
+	@Override
+    public void rollback(Savepoint arg0) throws SQLException {
 		for (Connection c : real)
 			c.rollback(arg0);
 	}
 
-	public void setAutoCommit(boolean arg0) throws SQLException {
+	@Override
+    public void setAutoCommit(boolean arg0) throws SQLException {
 		for (Connection c : real)
 			c.setAutoCommit(arg0);
 	}
 
-	public void setCatalog(String arg0) throws SQLException {
+	@Override
+    public void setCatalog(String arg0) throws SQLException {
 		for (Connection c : real)
 			c.setCatalog(arg0);
 	}
 
-	public void setHoldability(int arg0) throws SQLException {
+	@Override
+    public void setHoldability(int arg0) throws SQLException {
 		for (Connection c : real)
 			c.setHoldability(arg0);
 	}
 
-	public void setReadOnly(boolean arg0) throws SQLException {
+	@Override
+    public void setReadOnly(boolean arg0) throws SQLException {
 		for (Connection c : real)
 			c.setReadOnly(arg0);
 	}
 
-	public Savepoint setSavepoint() throws SQLException {
+	@Override
+    public Savepoint setSavepoint() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public Savepoint setSavepoint(String arg0) throws SQLException {
+	@Override
+    public Savepoint setSavepoint(String arg0) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void setTransactionIsolation(int arg0) throws SQLException {
+	@Override
+    public void setTransactionIsolation(int arg0) throws SQLException {
 		for (Connection c : real)
 			c.setTransactionIsolation(arg0);
 	}
 
-	public void setTypeMap(Map<String, Class<?>> arg0) throws SQLException {
+	@Override
+    public void setTypeMap(Map<String, Class<?>> arg0) throws SQLException {
 		for (Connection c : real)
 			c.setTypeMap(arg0);
 	}
@@ -340,22 +376,27 @@ public class DistributedConnection implements Connection {
 
     // Java 7 methods follow
 
+    @Override
     public void abort(Executor executor) throws SQLException {
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public int getNetworkTimeout() throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public String getSchema() throws SQLException {
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void setSchema(String schema)throws SQLException {
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedDataSource.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedDataSource.java
index f682be617..c109d6ad6 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedDataSource.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedDataSource.java
@@ -40,7 +40,7 @@ import org.apache.openjpa.lib.jdbc.DecoratingDataSource;
  */
 public class DistributedDataSource extends DecoratingDataSource implements
 		Iterable<DataSource> {
-	private List<DataSource> real = new ArrayList<DataSource>();
+	private List<DataSource> real = new ArrayList<>();
 	private DataSource master;
 
 	public DistributedDataSource(List<DataSource> dataSources) {
@@ -73,42 +73,50 @@ public class DistributedDataSource extends DecoratingDataSource implements
 		return ds.getConnection(user, pwd);
 	}
 
-	public Iterator<DataSource> iterator() {
+	@Override
+    public Iterator<DataSource> iterator() {
 		return real.iterator();
 	}
 
-	public Connection getConnection() throws SQLException {
-		List<Connection> c = new ArrayList<Connection>();
+	@Override
+    public Connection getConnection() throws SQLException {
+		List<Connection> c = new ArrayList<>();
 		for (DataSource ds : real)
 			c.add(ds.getConnection());
 		return new DistributedConnection(c);
 	}
 
-	public Connection getConnection(String username, String password)
+	@Override
+    public Connection getConnection(String username, String password)
 			throws SQLException {
-		List<Connection> c = new ArrayList<Connection>();
+		List<Connection> c = new ArrayList<>();
 		for (DataSource ds : real)
 			c.add(ds.getConnection(username, password));
 		return new DistributedConnection(c);
 	}
 
-	public PrintWriter getLogWriter() throws SQLException {
+	@Override
+    public PrintWriter getLogWriter() throws SQLException {
 		return master.getLogWriter();
 	}
 
-	public int getLoginTimeout() throws SQLException {
+	@Override
+    public int getLoginTimeout() throws SQLException {
 		return master.getLoginTimeout();
 	}
 
-	public void setLogWriter(PrintWriter out) throws SQLException {
+	@Override
+    public void setLogWriter(PrintWriter out) throws SQLException {
 		for (DataSource ds:real)
 			ds.setLogWriter(out);
 	}
 
-	public void setLoginTimeout(int seconds) throws SQLException {
+	@Override
+    public void setLoginTimeout(int seconds) throws SQLException {
 		for (DataSource ds:real)
 			ds.setLoginTimeout(seconds);
 	}
+    @Override
     public Logger getParentLogger() throws SQLFeatureNotSupportedException {
         throw new SQLFeatureNotSupportedException();
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCBrokerFactory.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCBrokerFactory.java
index 5f1aa9d97..6dc245155 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCBrokerFactory.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCBrokerFactory.java
@@ -42,10 +42,10 @@ import org.apache.openjpa.slice.Slice;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class DistributedJDBCBrokerFactory extends JDBCBrokerFactory
     implements DistributedBrokerFactory {
-	private static final Localizer _loc = Localizer.forPackage(DistributedJDBCBrokerFactory.class);
+    private static final long serialVersionUID = 1L;
+    private static final Localizer _loc = Localizer.forPackage(DistributedJDBCBrokerFactory.class);
 
 	/**
      * Factory method for constructing a factory from properties. Invoked from
@@ -97,7 +97,8 @@ public class DistributedJDBCBrokerFactory extends JDBCBrokerFactory
 	    return (DistributedJDBCConfiguration)super.getConfiguration();
 	}
 
-	public Slice addSlice(String name, Map properties) {
+	@Override
+    public Slice addSlice(String name, Map properties) {
 	    Slice slice = ((DistributedJDBCConfigurationImpl)getConfiguration()).addSlice(name, properties);
         ClassLoader loader = AccessController.doPrivileged(J2DoPrivHelper.getContextClassLoaderAction());
         synchronizeMappings(loader, (JDBCConfiguration)slice.getConfiguration());
@@ -118,6 +119,7 @@ public class DistributedJDBCBrokerFactory extends JDBCBrokerFactory
         return new DistributedBrokerImpl();
     }
 
+    @Override
     protected void synchronizeMappings(ClassLoader loader) {
         List<Slice> slices = getConfiguration().getSlices(Slice.Status.ACTIVE);
         for (Slice slice : slices) {
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCConfigurationImpl.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCConfigurationImpl.java
index ec1fd17ef..0f42ecfa1 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCConfigurationImpl.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCConfigurationImpl.java
@@ -71,7 +71,7 @@ import org.apache.openjpa.util.UserException;
 public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         implements DistributedJDBCConfiguration {
 
-    private final List<Slice> _slices = new ArrayList<Slice>();
+    private final List<Slice> _slices = new ArrayList<>();
     private Slice _master;
 
     private DistributedDataSource virtualDataSource;
@@ -154,8 +154,9 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
     /**
      * Gets the name of the active slices.
      */
+    @Override
     public List<String> getActiveSliceNames() {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         for (Slice slice : _slices) {
            if (slice.isActive() && !result.contains(slice.getName()))
               result.add(slice.getName());
@@ -166,8 +167,9 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
     /**
      * Gets the name of the available slices.
      */
+    @Override
     public List<String> getAvailableSliceNames() {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         for (Slice slice : _slices)
             result.add(slice.getName());
         return result;
@@ -176,10 +178,11 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
     /**
      * Gets the slices of given status. Null returns all irrespective of status.
      */
+    @Override
     public List<Slice> getSlices(Slice.Status...statuses) {
         if (statuses == null)
             return _slices == null ? Collections.EMPTY_LIST : Collections.unmodifiableList(_slices);
-        List<Slice> result = new ArrayList<Slice>();
+        List<Slice> result = new ArrayList<>();
         for (Slice slice:_slices) {
             for (Slice.Status status:statuses)
                 if (slice.getStatus().equals(status))
@@ -189,6 +192,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
     }
 
 
+    @Override
     public Slice getSlice(String name) {
         return getSlice(name, false);
     }
@@ -210,6 +214,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return null;
     }
 
+    @Override
     public DistributionPolicy getDistributionPolicyInstance() {
         if (distributionPolicyPlugin.get() == null) {
             distributionPolicyPlugin.instantiate(DistributionPolicy.class,
@@ -218,6 +223,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return (DistributionPolicy) distributionPolicyPlugin.get();
     }
 
+    @Override
     public String getDistributionPolicy() {
         if (distributionPolicyPlugin.get() == null) {
             distributionPolicyPlugin.instantiate(DistributionPolicy.class,
@@ -226,14 +232,17 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return distributionPolicyPlugin.getString();
     }
 
+    @Override
     public void setDistributionPolicyInstance(DistributionPolicy policy) {
         distributionPolicyPlugin.set(policy);
     }
 
+    @Override
     public void setDistributionPolicy(String policy) {
         distributionPolicyPlugin.setString(policy);
     }
 
+    @Override
     public ReplicationPolicy getReplicationPolicyInstance() {
         if (replicationPolicyPlugin.get() == null) {
             replicationPolicyPlugin.instantiate(ReplicationPolicy.class,
@@ -242,6 +251,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return (ReplicationPolicy) replicationPolicyPlugin.get();
     }
 
+    @Override
     public String getReplicationPolicy() {
         if (replicationPolicyPlugin.get() == null) {
             replicationPolicyPlugin.instantiate(ReplicationPolicy.class,
@@ -250,14 +260,17 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return replicationPolicyPlugin.getString();
     }
 
+    @Override
     public void setReplicationPolicyInstance(ReplicationPolicy policy) {
         replicationPolicyPlugin.set(policy);
     }
 
+    @Override
     public void setReplicationPolicy(String policy) {
         replicationPolicyPlugin.setString(policy);
     }
 
+    @Override
     public QueryTargetPolicy getQueryTargetPolicyInstance() {
         if (queryTargetPolicyPlugin.get() == null) {
             queryTargetPolicyPlugin.instantiate(QueryTargetPolicy.class,
@@ -266,6 +279,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return (QueryTargetPolicy) queryTargetPolicyPlugin.get();
     }
 
+    @Override
     public String getQueryTargetPolicy() {
         if (queryTargetPolicyPlugin.get() == null) {
             queryTargetPolicyPlugin.instantiate(QueryTargetPolicy.class,
@@ -274,14 +288,17 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return queryTargetPolicyPlugin.getString();
     }
 
+    @Override
     public void setQueryTargetPolicyInstance(QueryTargetPolicy policy) {
         queryTargetPolicyPlugin.set(policy);
     }
 
+    @Override
     public void setQueryTargetPolicy(String policy) {
         queryTargetPolicyPlugin.setString(policy);
     }
 
+    @Override
     public FinderTargetPolicy getFinderTargetPolicyInstance() {
         if (finderTargetPolicyPlugin.get() == null) {
             finderTargetPolicyPlugin.instantiate(FinderTargetPolicy.class,
@@ -290,6 +307,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return (FinderTargetPolicy) finderTargetPolicyPlugin.get();
     }
 
+    @Override
     public String getFinderTargetPolicy() {
         if (finderTargetPolicyPlugin.get() == null) {
             finderTargetPolicyPlugin.instantiate(FinderTargetPolicy.class,
@@ -298,14 +316,17 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return finderTargetPolicyPlugin.getString();
     }
 
+    @Override
     public void setFinderTargetPolicyInstance(FinderTargetPolicy policy) {
         finderTargetPolicyPlugin.set(policy);
     }
 
+    @Override
     public void setFinderTargetPolicy(String policy) {
         finderTargetPolicyPlugin.setString(policy);
     }
 
+    @Override
     public DistributedDataSource getConnectionFactory() {
         if (virtualDataSource == null) {
             virtualDataSource = createDistributedDataStore();
@@ -330,6 +351,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
     /**
      * Gets the master slice.
      */
+    @Override
     public Slice getMasterSlice() {
         if (_master == null) {
             String value = masterPlugin.get();
@@ -348,7 +370,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
      * connected.
      */
     private DistributedDataSource createDistributedDataStore() {
-        List<DataSource> dataSources = new ArrayList<DataSource>();
+        List<DataSource> dataSources = new ArrayList<>();
         boolean isXA = true;
         for (Slice slice : _slices) {
             try {
@@ -483,7 +505,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
      * are then ordered alphabetically by their identifier.
      */
     private List<String> findSlices(Map p) {
-        List<String> sliceNames = new ArrayList<String>();
+        List<String> sliceNames = new ArrayList<>();
 
         Log log = getConfigurationLog();
         String key = namesPlugin.getProperty();
@@ -512,7 +534,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
      * to determine the names of all available slices.
      */
     private List<String> scanForSliceNames(Map p) {
-        List<String> sliceNames = new ArrayList<String>();
+        List<String> sliceNames = new ArrayList<>();
         for (Object o : p.keySet()) {
             String key = o.toString();
             if (key.startsWith(PREFIX_SLICE) && getPartCount(key) > 3) {
@@ -627,6 +649,7 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
         return virtualDataSource;
     }
 
+    @Override
     public boolean isReplicated(Class<?> cls) {
         if (_replicationRepos == null) {
             _replicationRepos = new ReplicatedTypeRepository(getMetaDataRepositoryInstance(),
@@ -643,8 +666,8 @@ public class DistributedJDBCConfigurationImpl extends JDBCConfigurationImpl
      *
      */
     private static class ReplicatedTypeRepository {
-        private Set<Class<?>> _replicatedTypes = new HashSet<Class<?>>();
-        private Set<Class<?>> _nonreplicatedTypes = new HashSet<Class<?>>();
+        private Set<Class<?>> _replicatedTypes = new HashSet<>();
+        private Set<Class<?>> _nonreplicatedTypes = new HashSet<>();
 
 
         List<String> names;
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java
index 0e2aff1aa..b8c6bfba1 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java
@@ -91,7 +91,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
     public DistributedJDBCStoreManager(DistributedJDBCConfiguration conf) {
         super();
         _conf = conf;
-        _slices = new ArrayList<SliceStoreManager>();
+        _slices = new ArrayList<>();
         List<Slice> slices = conf.getSlices(Slice.Status.ACTIVE);
         Slice masterSlice = conf.getMasterSlice();
         for (Slice slice : slices) {
@@ -103,6 +103,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
         }
     }
 
+    @Override
     public DistributedJDBCConfiguration getConfiguration() {
         return _conf;
     }
@@ -111,6 +112,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
     	return _slices.get(i);
     }
 
+    @Override
     public SliceStoreManager addSlice(Slice slice) {
         SliceStoreManager result = new SliceStoreManager(slice);
         result.setContext(getContext(), (JDBCConfiguration)slice.getConfiguration());
@@ -189,25 +191,30 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
         return null;
     }
 
+    @Override
     public boolean assignField(OpenJPAStateManager sm, int field,
             boolean preFlush) {
         return selectStore(sm, null).assignField(sm, field, preFlush);
     }
 
+    @Override
     public boolean assignObjectId(OpenJPAStateManager sm, boolean preFlush) {
         return _master.assignObjectId(sm, preFlush);
     }
 
+    @Override
     public void beforeStateChange(OpenJPAStateManager sm, PCState fromState,
             PCState toState) {
         _master.beforeStateChange(sm, fromState, toState);
     }
 
+    @Override
     public void beginOptimistic() {
         for (SliceStoreManager slice : _slices)
             slice.beginOptimistic();
     }
 
+    @Override
     public boolean cancelAll() {
         boolean ret = true;
         for (SliceStoreManager slice : _slices)
@@ -215,14 +222,17 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
         return ret;
     }
 
+    @Override
     public int compareVersion(OpenJPAStateManager sm, Object v1, Object v2) {
         return selectStore(sm, null).compareVersion(sm, v1, v2);
     }
 
+    @Override
     public Object copyDataStoreId(Object oid, ClassMetaData meta) {
         return _master.copyDataStoreId(oid, meta);
     }
 
+    @Override
     public ResultObjectProvider executeExtent(ClassMetaData meta,
             boolean subclasses, FetchConfiguration fetch) {
         int i = 0;
@@ -234,6 +244,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
         return new MergedResultObjectProvider(tmp);
     }
 
+    @Override
     public boolean exists(OpenJPAStateManager sm, Object edata) {
     	String origin = null;
         for (SliceStoreManager slice : _slices) {
@@ -252,12 +263,13 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
      * Flush the given StateManagers after binning them to respective physical
      * slices.
      */
+    @Override
     public Collection flush(Collection sms) {
         Collection exceptions = new ArrayList();
-        List<Future<Collection>> futures = new ArrayList<Future<Collection>>();
+        List<Future<Collection>> futures = new ArrayList<>();
         Map<String, StateManagerSet> subsets = bin(sms, null);
         Collection<StateManagerSet> remaining =
-            new ArrayList<StateManagerSet>(subsets.values());
+            new ArrayList<>(subsets.values());
         ExecutorService threadPool = SliceThread.getPool();
         for (int i = 0; i < _slices.size(); i++) {
             SliceStoreManager slice = _slices.get(i);
@@ -313,7 +325,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
     private Map<OpenJPAStateManager, Object> cacheVersion(
         List<OpenJPAStateManager> sms) {
         Map<OpenJPAStateManager, Object> result =
-            new HashMap<OpenJPAStateManager, Object>();
+            new HashMap<>();
         for (OpenJPAStateManager sm : sms)
             result.put(sm, sm.getVersion());
         return result;
@@ -348,7 +360,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
      * by the associated slice identifier of each StateManager.
      */
     private Map<String, StateManagerSet> bin(Collection sms, Object edata) {
-        Map<String, StateManagerSet> subsets =  new HashMap<String, StateManagerSet>();
+        Map<String, StateManagerSet> subsets =  new HashMap<>();
         for (SliceStoreManager slice : _slices) {
             subsets.put(slice.getName(), new StateManagerSet(_conf));
         }
@@ -362,26 +374,32 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
         return subsets;
     }
 
+    @Override
     public Object getClientConnection() {
         return _master.getClientConnection();
     }
 
+    @Override
     public Seq getDataStoreIdSequence(ClassMetaData forClass) {
         return _master.getDataStoreIdSequence(forClass);
     }
 
+    @Override
     public Class<?> getDataStoreIdType(ClassMetaData meta) {
         return _master.getDataStoreIdType(meta);
     }
 
+    @Override
     public Class<?> getManagedType(Object oid) {
         return _master.getManagedType(oid);
     }
 
+    @Override
     public Seq getValueSequence(FieldMetaData forField) {
         return _master.getValueSequence(forField);
     }
 
+    @Override
     public boolean initialize(OpenJPAStateManager sm, PCState state,
             FetchConfiguration fetch, Object edata) {
         if (edata instanceof ConnectionInfo) {
@@ -404,11 +422,13 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
         return false;
     }
 
+    @Override
     public boolean load(OpenJPAStateManager sm, BitSet fields,
             FetchConfiguration fetch, int lockLevel, Object edata) {
         return selectStore(sm, edata).load(sm, fields, fetch, lockLevel, edata);
     }
 
+    @Override
     public Collection loadAll(Collection sms, PCState state, int load,
             FetchConfiguration fetch, Object edata) {
         Map<String, StateManagerSet> subsets = bin(sms, edata);
@@ -424,6 +444,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
         return result;
     }
 
+    @Override
     public Object newDataStoreId(Object oidVal, ClassMetaData meta) {
         return _master.newDataStoreId(oidVal, meta);
     }
@@ -431,6 +452,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
     /**
      * Construct a distributed query to be executed against all the slices.
      */
+    @Override
     public StoreQuery newQuery(String language) {
     	if (QueryLanguages.LANG_SQL.equals(language)) {
     		DistributedSQLStoreQuery ret = new DistributedSQLStoreQuery(this);
@@ -460,6 +482,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
     /**
      * Sets the context for this receiver and all its underlying slices.
      */
+    @Override
     public void setContext(StoreContext ctx) {
         super.setContext(ctx);
         for (SliceStoreManager store : _slices) {
@@ -475,6 +498,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
         return null;
     }
 
+    @Override
     public boolean syncVersion(OpenJPAStateManager sm, Object edata) {
     	String[] targets = findSliceNames(sm, edata).getSlices();
     	boolean sync = true;
@@ -487,7 +511,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
 
     @Override
     protected RefCountConnection connectInternal() throws SQLException {
-        List<Connection> list = new ArrayList<Connection>();
+        List<Connection> list = new ArrayList<>();
         for (SliceStoreManager slice : _slices)
             list.add(slice.getConnection());
         DistributedConnection con = new DistributedConnection(list);
@@ -510,7 +534,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
             return _slices;
         String[] targetNames = hint instanceof String
                 ? new String[]{hint.toString()} : (String[])hint;
-        List<SliceStoreManager> targets = new ArrayList<SliceStoreManager>();
+        List<SliceStoreManager> targets = new ArrayList<>();
         for (SliceStoreManager slice : _slices) {
             for (String name : targetNames) {
                 if (slice.getName().equals(name)) {
@@ -532,6 +556,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
             this.toFlush = toFlush;
         }
 
+        @Override
         public Collection call() throws Exception {
         	return store.flush(toFlush);
         }
@@ -543,6 +568,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
      *
      */
     private static class StateManagerSet extends HashSet<OpenJPAStateManager> {
+        private static final long serialVersionUID = 1L;
         private final DistributedConfiguration conf;
         List<OpenJPAStateManager> replicated;
 
@@ -554,7 +580,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
             boolean isReplicated =  conf.isReplicated(sm.getMetaData().getDescribedType());
             if (isReplicated) {
                 if (replicated == null)
-                    replicated = new ArrayList<OpenJPAStateManager>();
+                    replicated = new ArrayList<>();
                 replicated.add(sm);
             }
             return super.add(sm);
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedPreparedStatement.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedPreparedStatement.java
index 1c7f73b14..4f4bc7129 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedPreparedStatement.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedPreparedStatement.java
@@ -54,199 +54,236 @@ public class DistributedPreparedStatement
 		super(c);
 	}
 
-	public void clearParameters() throws SQLException {
+	@Override
+    public void clearParameters() throws SQLException {
 		for (PreparedStatement s : this)
 			s.clearParameters();
 	}
 
-	public boolean execute() throws SQLException {
+	@Override
+    public boolean execute() throws SQLException {
 		boolean ret = true;
 		for (PreparedStatement s : this)
 			ret = s.execute() & ret;
 		return ret;
 	}
 
-	public ResultSet executeQuery() throws SQLException {
+	@Override
+    public ResultSet executeQuery() throws SQLException {
 		DistributedResultSet mrs = new DistributedResultSet();
 		for (PreparedStatement t : this)
 			mrs.add(t.executeQuery());
 		return mrs;
 	}
 
-	public int executeUpdate() throws SQLException {
+	@Override
+    public int executeUpdate() throws SQLException {
 		int ret = 0;
 		for (PreparedStatement t : this)
 			ret += t.executeUpdate();
 		return ret;
 	}
 
-	public ResultSetMetaData getMetaData() throws SQLException {
+	@Override
+    public ResultSetMetaData getMetaData() throws SQLException {
 		return master.getMetaData();
 	}
 
-	public ParameterMetaData getParameterMetaData() throws SQLException {
+	@Override
+    public ParameterMetaData getParameterMetaData() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void setArray(int i, Array x) throws SQLException {
+	@Override
+    public void setArray(int i, Array x) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setArray(i, x);
 	}
 
-	public void setAsciiStream(int arg0, InputStream arg1, int arg2)
+	@Override
+    public void setAsciiStream(int arg0, InputStream arg1, int arg2)
 			throws SQLException {
 		for (PreparedStatement t : this)
 			t.setAsciiStream(arg0, arg1, arg2);
 	}
 
+    @Override
     public void setBigDecimal(int arg0, BigDecimal arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setBigDecimal(arg0, arg1);
 	}
 
-	public void setBinaryStream(int arg0, InputStream arg1, int arg2)
+	@Override
+    public void setBinaryStream(int arg0, InputStream arg1, int arg2)
 			throws SQLException {
 		for (PreparedStatement t : this)
 			t.setBinaryStream(arg0, arg1, arg2);
 	}
 
-	public void setBlob(int arg0, Blob arg1) throws SQLException {
+	@Override
+    public void setBlob(int arg0, Blob arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setBlob(arg0, arg1);
 	}
 
-	public void setBoolean(int arg0, boolean arg1) throws SQLException {
+	@Override
+    public void setBoolean(int arg0, boolean arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setBoolean(arg0, arg1);
 	}
 
-	public void setByte(int arg0, byte arg1) throws SQLException {
+	@Override
+    public void setByte(int arg0, byte arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setByte(arg0, arg1);
 	}
 
-	public void setBytes(int arg0, byte[] arg1) throws SQLException {
+	@Override
+    public void setBytes(int arg0, byte[] arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setBytes(arg0, arg1);
 	}
 
-	public void setCharacterStream(int arg0, Reader arg1, int arg2)
+	@Override
+    public void setCharacterStream(int arg0, Reader arg1, int arg2)
 			throws SQLException {
 		for (PreparedStatement t : this)
 			t.setCharacterStream(arg0, arg1, arg2);
 	}
 
-	public void setClob(int arg0, Clob arg1) throws SQLException {
+	@Override
+    public void setClob(int arg0, Clob arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setClob(arg0, arg1);
 	}
 
-	public void setDate(int arg0, Date arg1) throws SQLException {
+	@Override
+    public void setDate(int arg0, Date arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setDate(arg0, arg1);
 	}
 
+    @Override
     public void setDate(int arg0, Date arg1, Calendar arg2) throws SQLException
     {
 		for (PreparedStatement t : this)
 			t.setDate(arg0, arg1, arg2);
 	}
 
-	public void setDouble(int arg0, double arg1) throws SQLException {
+	@Override
+    public void setDouble(int arg0, double arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setDouble(arg0, arg1);
 	}
 
-	public void setFloat(int arg0, float arg1) throws SQLException {
+	@Override
+    public void setFloat(int arg0, float arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setFloat(arg0, arg1);
 	}
 
-	public void setInt(int arg0, int arg1) throws SQLException {
+	@Override
+    public void setInt(int arg0, int arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setInt(arg0, arg1);
 	}
 
-	public void setLong(int arg0, long arg1) throws SQLException {
+	@Override
+    public void setLong(int arg0, long arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setLong(arg0, arg1);
 	}
 
-	public void setNull(int arg0, int arg1) throws SQLException {
+	@Override
+    public void setNull(int arg0, int arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setNull(arg0, arg1);
 	}
 
+    @Override
     public void setNull(int arg0, int arg1, String arg2) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setNull(arg0, arg1, arg2);
 	}
 
-	public void setObject(int arg0, Object arg1) throws SQLException {
+	@Override
+    public void setObject(int arg0, Object arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setObject(arg0, arg1);
 	}
 
+    @Override
     public void setObject(int arg0, Object arg1, int arg2) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setObject(arg0, arg1, arg2);
 	}
 
-	public void setObject(int arg0, Object arg1, int arg2, int arg3)
+	@Override
+    public void setObject(int arg0, Object arg1, int arg2, int arg3)
 			throws SQLException {
 		for (PreparedStatement t : this)
 			t.setObject(arg0, arg1, arg2, arg3);
 	}
 
-	public void setRef(int arg0, Ref arg1) throws SQLException {
+	@Override
+    public void setRef(int arg0, Ref arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setRef(arg0, arg1);
 	}
 
-	public void setShort(int arg0, short arg1) throws SQLException {
+	@Override
+    public void setShort(int arg0, short arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setShort(arg0, arg1);
 	}
 
-	public void setString(int arg0, String arg1) throws SQLException {
+	@Override
+    public void setString(int arg0, String arg1) throws SQLException {
 		for (PreparedStatement t : this)
 			t.setString(arg0, arg1);
 	}
 
-	 public void setTime(int arg0, Time arg1) throws SQLException {
+	 @Override
+    public void setTime(int arg0, Time arg1) throws SQLException {
 			for (PreparedStatement t : this)
 				t.setTime(arg0, arg1);
 	 }
 
-	 public void setTime(int arg0, Time arg1, Calendar arg2) throws
+	 @Override
+    public void setTime(int arg0, Time arg1, Calendar arg2) throws
 	 SQLException {
 			for (PreparedStatement t : this)
 				t.setTime(arg0, arg1, arg2);
 	 }
 
-     public void setTimestamp(int arg0, Timestamp arg1) throws SQLException {
+     @Override
+    public void setTimestamp(int arg0, Timestamp arg1) throws SQLException {
 			for (PreparedStatement t : this)
 				t.setTimestamp(arg0, arg1);
 	 }
 
-	 public void setTimestamp(int arg0, Timestamp arg1, Calendar arg2)
+	 @Override
+    public void setTimestamp(int arg0, Timestamp arg1, Calendar arg2)
 	 throws SQLException {
 			for (PreparedStatement t : this)
 				t.setTimestamp(arg0, arg1, arg2);
 	 }
 
-	 public void setURL(int arg0, URL arg1) throws SQLException {
+	 @Override
+    public void setURL(int arg0, URL arg1) throws SQLException {
 			for (PreparedStatement t : this)
 				t.setURL(arg0, arg1);
 	 }
 
-	 public void setUnicodeStream(int arg0, InputStream arg1, int arg2)
+	 @Override
+    public void setUnicodeStream(int arg0, InputStream arg1, int arg2)
 	     throws SQLException {
 			for (PreparedStatement t : this)
 				t.setUnicodeStream(arg0, arg1, arg2);
 	 }
 
-	 public void addBatch() throws SQLException {
+	 @Override
+    public void addBatch() throws SQLException {
 		for (PreparedStatement t:this)
 		    t.addBatch();
 	 }
@@ -348,10 +385,12 @@ public class DistributedPreparedStatement
 
     // Java 7 methods follow
 
+    @Override
     public boolean isCloseOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void closeOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedResultSet.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedResultSet.java
index 87d103a30..7f8c9d0e9 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedResultSet.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedResultSet.java
@@ -51,7 +51,7 @@ import java.util.Map;
  */
 public class DistributedResultSet implements ResultSet {
 
-	private LinkedList<ResultSet> comps = new LinkedList<ResultSet>();
+	private LinkedList<ResultSet> comps = new LinkedList<>();
 	private ResultSet current;
 	private int cursor = -1;
 
@@ -69,43 +69,52 @@ public class DistributedResultSet implements ResultSet {
 		}
 	}
 
-	public boolean absolute(int arg0) throws SQLException {
+	@Override
+    public boolean absolute(int arg0) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void afterLast() throws SQLException {
+	@Override
+    public void afterLast() throws SQLException {
 		current = null;
 		cursor  = comps.size();
 	}
 
-	public void beforeFirst() throws SQLException {
+	@Override
+    public void beforeFirst() throws SQLException {
 		current = null;
 		cursor  = -1;
 	}
 
-	public void cancelRowUpdates() throws SQLException {
+	@Override
+    public void cancelRowUpdates() throws SQLException {
 		current.cancelRowUpdates();
 	}
 
-	public void clearWarnings() throws SQLException {
+	@Override
+    public void clearWarnings() throws SQLException {
 		for (ResultSet rs : comps)
 			rs.clearWarnings();
 	}
 
-	public void close() throws SQLException {
+	@Override
+    public void close() throws SQLException {
 		for (ResultSet rs : comps)
 			rs.close();
 	}
 
-	public void deleteRow() throws SQLException {
+	@Override
+    public void deleteRow() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public int findColumn(String arg0) throws SQLException {
+	@Override
+    public int findColumn(String arg0) throws SQLException {
 		return current.findColumn(arg0);
 	}
 
-	public boolean first() throws SQLException {
+	@Override
+    public boolean first() throws SQLException {
 		if (comps.isEmpty())
 			return false;
 		cursor = 0;
@@ -113,290 +122,361 @@ public class DistributedResultSet implements ResultSet {
 		return true;
 	}
 
-	public Array getArray(int arg0) throws SQLException {
+	@Override
+    public Array getArray(int arg0) throws SQLException {
 		return current.getArray(arg0);
 	}
 
-	public Array getArray(String arg0) throws SQLException {
+	@Override
+    public Array getArray(String arg0) throws SQLException {
 		return current.getArray(arg0);
 	}
 
-	public InputStream getAsciiStream(int arg0) throws SQLException {
+	@Override
+    public InputStream getAsciiStream(int arg0) throws SQLException {
 		return current.getAsciiStream(arg0);
 	}
 
-	public InputStream getAsciiStream(String arg0) throws SQLException {
+	@Override
+    public InputStream getAsciiStream(String arg0) throws SQLException {
 		return current.getAsciiStream(arg0);
 	}
 
-	public BigDecimal getBigDecimal(int arg0) throws SQLException {
+	@Override
+    public BigDecimal getBigDecimal(int arg0) throws SQLException {
 		return current.getBigDecimal(arg0);
 	}
 
-	public BigDecimal getBigDecimal(String arg0) throws SQLException {
+	@Override
+    public BigDecimal getBigDecimal(String arg0) throws SQLException {
 		return current.getBigDecimal(arg0);
 	}
 
+    @Override
     public BigDecimal getBigDecimal(int arg0, int arg1) throws SQLException {
 		return current.getBigDecimal(arg0, arg1);
 	}
 
+    @Override
     public BigDecimal getBigDecimal(String arg0, int arg1) throws SQLException {
 		return current.getBigDecimal(arg0, arg1);
 	}
 
-	public InputStream getBinaryStream(int arg0) throws SQLException {
+	@Override
+    public InputStream getBinaryStream(int arg0) throws SQLException {
 		return current.getBinaryStream(arg0);
 	}
 
-	public InputStream getBinaryStream(String arg0) throws SQLException {
+	@Override
+    public InputStream getBinaryStream(String arg0) throws SQLException {
 		return current.getBinaryStream(arg0);
 	}
 
-	public Blob getBlob(int arg0) throws SQLException {
+	@Override
+    public Blob getBlob(int arg0) throws SQLException {
 		return current.getBlob(arg0);
 	}
 
-	public Blob getBlob(String arg0) throws SQLException {
+	@Override
+    public Blob getBlob(String arg0) throws SQLException {
 		return current.getBlob(arg0);
 	}
 
-	public boolean getBoolean(int arg0) throws SQLException {
+	@Override
+    public boolean getBoolean(int arg0) throws SQLException {
 		return current.getBoolean(arg0);
 	}
 
-	public boolean getBoolean(String arg0) throws SQLException {
+	@Override
+    public boolean getBoolean(String arg0) throws SQLException {
 		return current.getBoolean(arg0);
 	}
 
-	public byte getByte(int arg0) throws SQLException {
+	@Override
+    public byte getByte(int arg0) throws SQLException {
 		return current.getByte(arg0);
 	}
 
-	public byte getByte(String arg0) throws SQLException {
+	@Override
+    public byte getByte(String arg0) throws SQLException {
 		return current.getByte(arg0);
 	}
 
-	public byte[] getBytes(int arg0) throws SQLException {
+	@Override
+    public byte[] getBytes(int arg0) throws SQLException {
 		return current.getBytes(arg0);
 	}
 
-	public byte[] getBytes(String arg0) throws SQLException {
+	@Override
+    public byte[] getBytes(String arg0) throws SQLException {
 		return current.getBytes(arg0);
 	}
 
-	public Reader getCharacterStream(int arg0) throws SQLException {
+	@Override
+    public Reader getCharacterStream(int arg0) throws SQLException {
 		return current.getCharacterStream(arg0);
 	}
 
-	public Reader getCharacterStream(String arg0) throws SQLException {
+	@Override
+    public Reader getCharacterStream(String arg0) throws SQLException {
 		return current.getCharacterStream(arg0);
 	}
 
-	public Clob getClob(int arg0) throws SQLException {
+	@Override
+    public Clob getClob(int arg0) throws SQLException {
 		return current.getClob(arg0);
 	}
 
-	public Clob getClob(String arg0) throws SQLException {
+	@Override
+    public Clob getClob(String arg0) throws SQLException {
 		return current.getClob(arg0);
 	}
 
-	public int getConcurrency() throws SQLException {
+	@Override
+    public int getConcurrency() throws SQLException {
 		return current.getConcurrency();
 	}
 
-	public String getCursorName() throws SQLException {
+	@Override
+    public String getCursorName() throws SQLException {
 		return current.getCursorName();
 	}
 
-	public Date getDate(int arg0) throws SQLException {
+	@Override
+    public Date getDate(int arg0) throws SQLException {
 		return current.getDate(arg0);
 	}
 
-	public Date getDate(String arg0) throws SQLException {
+	@Override
+    public Date getDate(String arg0) throws SQLException {
 		return current.getDate(arg0);
 	}
 
-	public Date getDate(int arg0, Calendar arg1) throws SQLException {
+	@Override
+    public Date getDate(int arg0, Calendar arg1) throws SQLException {
 		return current.getDate(arg0, arg1);
 	}
 
-	public Date getDate(String arg0, Calendar arg1) throws SQLException {
+	@Override
+    public Date getDate(String arg0, Calendar arg1) throws SQLException {
 		return current.getDate(arg0, arg1);
 	}
 
-	public double getDouble(int arg0) throws SQLException {
+	@Override
+    public double getDouble(int arg0) throws SQLException {
 		return current.getDouble(arg0);
 	}
 
-	public double getDouble(String arg0) throws SQLException {
+	@Override
+    public double getDouble(String arg0) throws SQLException {
 		return current.getDouble(arg0);
 	}
 
-	public int getFetchDirection() throws SQLException {
+	@Override
+    public int getFetchDirection() throws SQLException {
 		return current.getFetchDirection();
 	}
 
-	public int getFetchSize() throws SQLException {
+	@Override
+    public int getFetchSize() throws SQLException {
 		return current.getFetchSize();
 	}
 
-	public float getFloat(int arg0) throws SQLException {
+	@Override
+    public float getFloat(int arg0) throws SQLException {
 		return current.getFloat(arg0);
 	}
 
-	public float getFloat(String arg0) throws SQLException {
+	@Override
+    public float getFloat(String arg0) throws SQLException {
 		return current.getFloat(arg0);
 	}
 
-	public int getInt(int arg0) throws SQLException {
+	@Override
+    public int getInt(int arg0) throws SQLException {
 		return current.getInt(arg0);
 	}
 
-	public int getInt(String arg0) throws SQLException {
+	@Override
+    public int getInt(String arg0) throws SQLException {
 		return current.getInt(arg0);
 	}
 
-	public long getLong(int arg0) throws SQLException {
+	@Override
+    public long getLong(int arg0) throws SQLException {
 		return current.getLong(arg0);
 	}
 
-	public long getLong(String arg0) throws SQLException {
+	@Override
+    public long getLong(String arg0) throws SQLException {
 		return current.getLong(arg0);
 	}
 
-	public ResultSetMetaData getMetaData() throws SQLException {
+	@Override
+    public ResultSetMetaData getMetaData() throws SQLException {
 		return current.getMetaData();
 	}
 
-	public Object getObject(int arg0) throws SQLException {
+	@Override
+    public Object getObject(int arg0) throws SQLException {
 		return current.getObject(arg0);
 	}
 
-	public Object getObject(String arg0) throws SQLException {
+	@Override
+    public Object getObject(String arg0) throws SQLException {
 		return current.getObject(arg0);
 	}
 
-	public Object getObject(int arg0, Map<String, Class<?>> arg1)
+	@Override
+    public Object getObject(int arg0, Map<String, Class<?>> arg1)
 			throws SQLException {
 		return current.getObject(arg0, arg1);
 	}
 
-	public Object getObject(String arg0, Map<String, Class<?>> arg1)
+	@Override
+    public Object getObject(String arg0, Map<String, Class<?>> arg1)
 			throws SQLException {
 		return current.getObject(arg0, arg1);
 	}
 
-	public Ref getRef(int arg0) throws SQLException {
+	@Override
+    public Ref getRef(int arg0) throws SQLException {
 		return current.getRef(arg0);
 	}
 
-	public Ref getRef(String arg0) throws SQLException {
+	@Override
+    public Ref getRef(String arg0) throws SQLException {
 		return current.getRef(arg0);
 	}
 
-	public int getRow() throws SQLException {
+	@Override
+    public int getRow() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public short getShort(int arg0) throws SQLException {
+	@Override
+    public short getShort(int arg0) throws SQLException {
 		return current.getShort(arg0);
 	}
 
-	public short getShort(String arg0) throws SQLException {
+	@Override
+    public short getShort(String arg0) throws SQLException {
 		return current.getShort(arg0);
 	}
 
-	public Statement getStatement() throws SQLException {
+	@Override
+    public Statement getStatement() throws SQLException {
 		return current.getStatement();
 	}
 
-	public String getString(int arg0) throws SQLException {
+	@Override
+    public String getString(int arg0) throws SQLException {
 		return current.getString(arg0);
 	}
 
-	public String getString(String arg0) throws SQLException {
+	@Override
+    public String getString(String arg0) throws SQLException {
 		return current.getString(arg0);
 	}
 
-	public Time getTime(int arg0) throws SQLException {
+	@Override
+    public Time getTime(int arg0) throws SQLException {
 		return current.getTime(arg0);
 	}
 
-	public Time getTime(String arg0) throws SQLException {
+	@Override
+    public Time getTime(String arg0) throws SQLException {
 		return current.getTime(arg0);
 	}
 
-	public Time getTime(int arg0, Calendar arg1) throws SQLException {
+	@Override
+    public Time getTime(int arg0, Calendar arg1) throws SQLException {
 		return current.getTime(arg0, arg1);
 	}
 
-	public Time getTime(String arg0, Calendar arg1) throws SQLException {
+	@Override
+    public Time getTime(String arg0, Calendar arg1) throws SQLException {
 		return current.getTime(arg0, arg1);
 	}
 
-	public Timestamp getTimestamp(int arg0) throws SQLException {
+	@Override
+    public Timestamp getTimestamp(int arg0) throws SQLException {
 		return current.getTimestamp(arg0);
 	}
 
-	public Timestamp getTimestamp(String arg0) throws SQLException {
+	@Override
+    public Timestamp getTimestamp(String arg0) throws SQLException {
 		return current.getTimestamp(arg0);
 	}
 
+    @Override
     public Timestamp getTimestamp(int arg0, Calendar arg1) throws SQLException {
 		return current.getTimestamp(arg0, arg1);
 	}
 
-	public Timestamp getTimestamp(String arg0, Calendar arg1)
+	@Override
+    public Timestamp getTimestamp(String arg0, Calendar arg1)
 			throws SQLException {
 		return current.getTimestamp(arg0, arg1);
 	}
 
-	public int getType() throws SQLException {
+	@Override
+    public int getType() throws SQLException {
 		return current.getType();
 	}
 
-	public URL getURL(int arg0) throws SQLException {
+	@Override
+    public URL getURL(int arg0) throws SQLException {
 		return current.getURL(arg0);
 	}
 
-	public URL getURL(String arg0) throws SQLException {
+	@Override
+    public URL getURL(String arg0) throws SQLException {
 		return current.getURL(arg0);
 	}
 
-	public InputStream getUnicodeStream(int arg0) throws SQLException {
+	@Override
+    public InputStream getUnicodeStream(int arg0) throws SQLException {
 		return current.getUnicodeStream(arg0);
 	}
 
-	public InputStream getUnicodeStream(String arg0) throws SQLException {
+	@Override
+    public InputStream getUnicodeStream(String arg0) throws SQLException {
 		return current.getUnicodeStream(arg0);
 	}
 
-	public SQLWarning getWarnings() throws SQLException {
+	@Override
+    public SQLWarning getWarnings() throws SQLException {
 		return current.getWarnings();
 	}
 
-	public void insertRow() throws SQLException {
+	@Override
+    public void insertRow() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean isAfterLast() throws SQLException {
+	@Override
+    public boolean isAfterLast() throws SQLException {
 		return current == null && cursor >= comps.size();
 	}
 
-	public boolean isBeforeFirst() throws SQLException {
+	@Override
+    public boolean isBeforeFirst() throws SQLException {
 		return current == null && cursor < 0;
 	}
 
-	public boolean isFirst() throws SQLException {
+	@Override
+    public boolean isFirst() throws SQLException {
 		return current != null && current.isFirst() && cursor == 0;
 	}
 
-	public boolean isLast() throws SQLException {
+	@Override
+    public boolean isLast() throws SQLException {
         return current != null && current.isLast() && cursor == comps.size()-1;
 	}
 
-	public boolean last() throws SQLException {
+	@Override
+    public boolean last() throws SQLException {
 		if (comps.isEmpty())
 			return false;
 		cursor = comps.size()-1;
@@ -404,15 +484,18 @@ public class DistributedResultSet implements ResultSet {
 		return current.last();
 	}
 
-	public void moveToCurrentRow() throws SQLException {
+	@Override
+    public void moveToCurrentRow() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void moveToInsertRow() throws SQLException {
+	@Override
+    public void moveToInsertRow() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean next() throws SQLException {
+	@Override
+    public boolean next() throws SQLException {
 		if (comps.isEmpty())
 			return false;
 		if (current == null) {
@@ -429,7 +512,8 @@ public class DistributedResultSet implements ResultSet {
 		return false;
 	}
 
-	public boolean previous() throws SQLException {
+	@Override
+    public boolean previous() throws SQLException {
 		if (comps.isEmpty())
 			return false;
 		if (current.previous())
@@ -442,11 +526,13 @@ public class DistributedResultSet implements ResultSet {
 		return false;
 	}
 
-	public void refreshRow() throws SQLException {
+	@Override
+    public void refreshRow() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean relative(int arg0) throws SQLException {
+	@Override
+    public boolean relative(int arg0) throws SQLException {
 		if (arg0 == 0)
 			return current != null;
 		boolean forward = arg0 > 0;
@@ -464,227 +550,280 @@ public class DistributedResultSet implements ResultSet {
 		return false;
 	}
 
-	public boolean rowDeleted() throws SQLException {
+	@Override
+    public boolean rowDeleted() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean rowInserted() throws SQLException {
+	@Override
+    public boolean rowInserted() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean rowUpdated() throws SQLException {
+	@Override
+    public boolean rowUpdated() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void setFetchDirection(int arg0) throws SQLException {
+	@Override
+    public void setFetchDirection(int arg0) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void setFetchSize(int arg0) throws SQLException {
+	@Override
+    public void setFetchSize(int arg0) throws SQLException {
 		for (ResultSet rs : comps)
 			rs.setFetchSize(arg0);
 	}
 
-	public void updateArray(int arg0, Array arg1) throws SQLException {
+	@Override
+    public void updateArray(int arg0, Array arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateArray(String arg0, Array arg1) throws SQLException {
+	@Override
+    public void updateArray(String arg0, Array arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateAsciiStream(int arg0, InputStream arg1, int arg2)
+	@Override
+    public void updateAsciiStream(int arg0, InputStream arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateAsciiStream(String arg0, InputStream arg1, int arg2)
+	@Override
+    public void updateAsciiStream(String arg0, InputStream arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+    @Override
     public void updateBigDecimal(int arg0, BigDecimal arg1) throws SQLException
     {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateBigDecimal(String arg0, BigDecimal arg1)
+	@Override
+    public void updateBigDecimal(String arg0, BigDecimal arg1)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateBinaryStream(int arg0, InputStream arg1, int arg2)
+	@Override
+    public void updateBinaryStream(int arg0, InputStream arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateBinaryStream(String arg0, InputStream arg1, int arg2)
+	@Override
+    public void updateBinaryStream(String arg0, InputStream arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateBlob(int arg0, Blob arg1) throws SQLException {
+	@Override
+    public void updateBlob(int arg0, Blob arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateBlob(String arg0, Blob arg1) throws SQLException {
+	@Override
+    public void updateBlob(String arg0, Blob arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateBoolean(int arg0, boolean arg1) throws SQLException {
+	@Override
+    public void updateBoolean(int arg0, boolean arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+    @Override
     public void updateBoolean(String arg0, boolean arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateByte(int arg0, byte arg1) throws SQLException {
+	@Override
+    public void updateByte(int arg0, byte arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateByte(String arg0, byte arg1) throws SQLException {
+	@Override
+    public void updateByte(String arg0, byte arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateBytes(int arg0, byte[] arg1) throws SQLException {
+	@Override
+    public void updateBytes(int arg0, byte[] arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateBytes(String arg0, byte[] arg1) throws SQLException {
+	@Override
+    public void updateBytes(String arg0, byte[] arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateCharacterStream(int arg0, Reader arg1, int arg2)
+	@Override
+    public void updateCharacterStream(int arg0, Reader arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateCharacterStream(String arg0, Reader arg1, int arg2)
+	@Override
+    public void updateCharacterStream(String arg0, Reader arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateClob(int arg0, Clob arg1) throws SQLException {
+	@Override
+    public void updateClob(int arg0, Clob arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateClob(String arg0, Clob arg1) throws SQLException {
+	@Override
+    public void updateClob(String arg0, Clob arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateDate(int arg0, Date arg1) throws SQLException {
+	@Override
+    public void updateDate(int arg0, Date arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateDate(String arg0, Date arg1) throws SQLException {
+	@Override
+    public void updateDate(String arg0, Date arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateDouble(int arg0, double arg1) throws SQLException {
+	@Override
+    public void updateDouble(int arg0, double arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateDouble(String arg0, double arg1) throws SQLException {
+	@Override
+    public void updateDouble(String arg0, double arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateFloat(int arg0, float arg1) throws SQLException {
+	@Override
+    public void updateFloat(int arg0, float arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateFloat(String arg0, float arg1) throws SQLException {
+	@Override
+    public void updateFloat(String arg0, float arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateInt(int arg0, int arg1) throws SQLException {
+	@Override
+    public void updateInt(int arg0, int arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateInt(String arg0, int arg1) throws SQLException {
+	@Override
+    public void updateInt(String arg0, int arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateLong(int arg0, long arg1) throws SQLException {
+	@Override
+    public void updateLong(int arg0, long arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateLong(String arg0, long arg1) throws SQLException {
+	@Override
+    public void updateLong(String arg0, long arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateNull(int arg0) throws SQLException {
+	@Override
+    public void updateNull(int arg0) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateNull(String arg0) throws SQLException {
+	@Override
+    public void updateNull(String arg0) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateObject(int arg0, Object arg1) throws SQLException {
+	@Override
+    public void updateObject(int arg0, Object arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateObject(String arg0, Object arg1) throws SQLException {
+	@Override
+    public void updateObject(String arg0, Object arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateObject(int arg0, Object arg1, int arg2)
+	@Override
+    public void updateObject(int arg0, Object arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateObject(String arg0, Object arg1, int arg2)
+	@Override
+    public void updateObject(String arg0, Object arg1, int arg2)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateRef(int arg0, Ref arg1) throws SQLException {
+	@Override
+    public void updateRef(int arg0, Ref arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateRef(String arg0, Ref arg1) throws SQLException {
+	@Override
+    public void updateRef(String arg0, Ref arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateRow() throws SQLException {
+	@Override
+    public void updateRow() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateShort(int arg0, short arg1) throws SQLException {
+	@Override
+    public void updateShort(int arg0, short arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateShort(String arg0, short arg1) throws SQLException {
+	@Override
+    public void updateShort(String arg0, short arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateString(int arg0, String arg1) throws SQLException {
+	@Override
+    public void updateString(int arg0, String arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateString(String arg0, String arg1) throws SQLException {
+	@Override
+    public void updateString(String arg0, String arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateTime(int arg0, Time arg1) throws SQLException {
+	@Override
+    public void updateTime(int arg0, Time arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateTime(String arg0, Time arg1) throws SQLException {
+	@Override
+    public void updateTime(String arg0, Time arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+    @Override
     public void updateTimestamp(int arg0, Timestamp arg1) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public void updateTimestamp(String arg0, Timestamp arg1)
+	@Override
+    public void updateTimestamp(String arg0, Timestamp arg1)
 			throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean wasNull() throws SQLException {
+	@Override
+    public boolean wasNull() throws SQLException {
 		return current.wasNull();
 	}
     @Override
@@ -912,10 +1051,12 @@ public class DistributedResultSet implements ResultSet {
 
     // Java 7 methods follow
 
+    @Override
     public <T>T getObject(String columnLabel, Class<T> type) throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T>T getObject(int columnIndex, Class<T> type) throws SQLException{
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedSQLStoreQuery.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedSQLStoreQuery.java
index a26aedba3..b891b3dfe 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedSQLStoreQuery.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedSQLStoreQuery.java
@@ -47,9 +47,9 @@ import org.apache.openjpa.util.StoreException;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 class DistributedSQLStoreQuery extends SQLStoreQuery {
-	private List<StoreQuery> _queries = new ArrayList<StoreQuery>();
+    private static final long serialVersionUID = 1L;
+    private List<StoreQuery> _queries = new ArrayList<>();
 
 	public DistributedSQLStoreQuery(JDBCStore store) {
 		super(store);
@@ -63,7 +63,8 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
 		return (DistributedJDBCStoreManager) getStore();
 	}
 
-	public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs) {
+	@Override
+    public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs) {
 		boolean parallel = !getContext().getStoreContext().getBroker()
 			.getMultithreaded();
         ParallelExecutor ex = new ParallelExecutor(this, meta, parallel);
@@ -73,7 +74,8 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
 		return ex;
 	}
 
-	public void setContext(QueryContext ctx) {
+	@Override
+    public void setContext(QueryContext ctx) {
 		super.setContext(ctx);
 		for (StoreQuery q : _queries)
 			q.setContext(ctx);
@@ -87,7 +89,7 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
 	 */
 	public static class ParallelExecutor extends
 			SQLStoreQuery.SQLExecutor {
-		private List<Executor> executors = new ArrayList<Executor>();
+		private List<Executor> executors = new ArrayList<>();
 		private DistributedSQLStoreQuery owner = null;
 
         public ParallelExecutor(DistributedSQLStoreQuery dsq, ClassMetaData meta, boolean p) {
@@ -103,13 +105,14 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
          * Each child query must be executed with slice context and not the
 		 * given query context.
 		 */
-		public ResultObjectProvider executeQuery(StoreQuery q,
+		@Override
+        public ResultObjectProvider executeQuery(StoreQuery q,
 				final Object[] params, final Range range) {
 			List<Future<ResultObjectProvider>> futures =
-				new ArrayList<Future<ResultObjectProvider>>();
-            final List<Executor> usedExecutors = new ArrayList<Executor>();
+				new ArrayList<>();
+            final List<Executor> usedExecutors = new ArrayList<>();
 			final List<ResultObjectProvider> rops =
-				new ArrayList<ResultObjectProvider>();
+				new ArrayList<>();
 			List<SliceStoreManager> targets = findTargets();
 			QueryContext ctx = q.getContext();
 			boolean isReplicated = containsReplicated(ctx);
@@ -187,14 +190,15 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
 			return false;
 		}
 
-		public Number executeDelete(StoreQuery q, Object[] params) {
+		@Override
+        public Number executeDelete(StoreQuery q, Object[] params) {
 			Iterator<StoreQuery> qs = owner._queries.iterator();
 			List<Future<Number>> futures = null;
 			int result = 0;
             ExecutorService threadPool = SliceThread.getPool();
 			for (Executor ex : executors) {
 				if (futures == null)
-                    futures = new ArrayList<Future<Number>>();
+                    futures = new ArrayList<>();
 				DeleteExecutor call = new DeleteExecutor();
 				call.executor = ex;
 				call.query = qs.next();
@@ -215,14 +219,15 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
 			return result;
 		}
 
-		public Number executeUpdate(StoreQuery q, Object[] params) {
+		@Override
+        public Number executeUpdate(StoreQuery q, Object[] params) {
 			Iterator<StoreQuery> qs = owner._queries.iterator();
 			List<Future<Number>> futures = null;
 			int result = 0;
             ExecutorService threadPool = SliceThread.getPool();
 			for (Executor ex : executors) {
 				if (futures == null)
-                    futures = new ArrayList<Future<Number>>();
+                    futures = new ArrayList<>();
 				UpdateExecutor call = new UpdateExecutor();
 				call.executor = ex;
 				call.query = qs.next();
@@ -256,7 +261,8 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
 		Object[] params;
 		Range range;
 
-		public ResultObjectProvider call() throws Exception {
+		@Override
+        public ResultObjectProvider call() throws Exception {
 			return executor.executeQuery(query, params, range);
 		}
 	}
@@ -266,7 +272,8 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
 		Executor executor;
 		Object[] params;
 
-		public Number call() throws Exception {
+		@Override
+        public Number call() throws Exception {
 			return executor.executeDelete(query, params);
 		}
 	}
@@ -276,7 +283,8 @@ class DistributedSQLStoreQuery extends SQLStoreQuery {
 		Executor executor;
 		Object[] params;
 
-		public Number call() throws Exception {
+		@Override
+        public Number call() throws Exception {
 		    return executor.executeUpdate(query, params);
 		}
 	}
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreQuery.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreQuery.java
index e74dec02f..71df0de65 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreQuery.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreQuery.java
@@ -49,9 +49,9 @@ import org.apache.openjpa.util.StoreException;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 class DistributedStoreQuery extends JDBCStoreQuery {
-	private List<StoreQuery> _queries = new ArrayList<StoreQuery>();
+    private static final long serialVersionUID = 1L;
+    private List<StoreQuery> _queries = new ArrayList<>();
 	private ExpressionParser _parser;
 
 	public DistributedStoreQuery(JDBCStore store, ExpressionParser parser) {
@@ -67,7 +67,8 @@ class DistributedStoreQuery extends JDBCStoreQuery {
 		return (DistributedJDBCStoreManager) getStore();
 	}
 
-	public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs) {
+	@Override
+    public Executor newDataStoreExecutor(ClassMetaData meta, boolean subs) {
 		boolean parallel = !getContext().getStoreContext().getBroker()
 			.getMultithreaded();
         ParallelExecutor ex = new ParallelExecutor(this, meta, subs, _parser,
@@ -78,7 +79,8 @@ class DistributedStoreQuery extends JDBCStoreQuery {
 		return ex;
 	}
 
-	public void setContext(QueryContext ctx) {
+	@Override
+    public void setContext(QueryContext ctx) {
 		super.setContext(ctx);
 		for (StoreQuery q : _queries)
 			q.setContext(ctx);
@@ -92,7 +94,8 @@ class DistributedStoreQuery extends JDBCStoreQuery {
 	 */
 	public static class ParallelExecutor extends
 			ExpressionStoreQuery.DataStoreExecutor {
-		private List<Executor> executors = new ArrayList<Executor>();
+        private static final long serialVersionUID = 1L;
+        private List<Executor> executors = new ArrayList<>();
 		private DistributedStoreQuery owner = null;
 
         public ParallelExecutor(DistributedStoreQuery dsq, ClassMetaData meta,
@@ -110,11 +113,12 @@ class DistributedStoreQuery extends JDBCStoreQuery {
          * Each child query must be executed with slice context and not the
 		 * given query context.
 		 */
-		public ResultObjectProvider executeQuery(StoreQuery q,
+		@Override
+        public ResultObjectProvider executeQuery(StoreQuery q,
 				final Object[] params, final Range range) {
-			List<Future<ResultObjectProvider>> futures = new ArrayList<Future<ResultObjectProvider>>();
-            final List<Executor> usedExecutors = new ArrayList<Executor>();
-			final List<ResultObjectProvider> rops = new ArrayList<ResultObjectProvider>();
+			List<Future<ResultObjectProvider>> futures = new ArrayList<>();
+            final List<Executor> usedExecutors = new ArrayList<>();
+			final List<ResultObjectProvider> rops = new ArrayList<>();
 			List<SliceStoreManager> targets = findTargets();
 			QueryContext ctx = q.getContext();
 			boolean isReplicated = containsReplicated(ctx);
@@ -186,8 +190,9 @@ class DistributedStoreQuery extends JDBCStoreQuery {
 			return false;
 		}
 
-		public Number executeDelete(StoreQuery q, Object[] params) {
-			List<Future<Number>> futures = new ArrayList<Future<Number>>();
+		@Override
+        public Number executeDelete(StoreQuery q, Object[] params) {
+			List<Future<Number>> futures = new ArrayList<>();
 			int result = 0;
             ExecutorService threadPool = SliceThread.getPool();
 			List<SliceStoreManager> targets = findTargets();
@@ -216,14 +221,15 @@ class DistributedStoreQuery extends JDBCStoreQuery {
 			return result;
 		}
 
-		public Number executeUpdate(StoreQuery q, Object[] params) {
+		@Override
+        public Number executeUpdate(StoreQuery q, Object[] params) {
 			Iterator<StoreQuery> qs = owner._queries.iterator();
 			List<Future<Number>> futures = null;
 			int result = 0;
             ExecutorService threadPool = SliceThread.getPool();
 			for (Executor ex : executors) {
 				if (futures == null)
-                    futures = new ArrayList<Future<Number>>();
+                    futures = new ArrayList<>();
 				UpdateExecutor call = new UpdateExecutor();
 				call.executor = ex;
 				call.query = qs.next();
@@ -256,7 +262,8 @@ class DistributedStoreQuery extends JDBCStoreQuery {
 		Object[] params;
 		Range range;
 
-		public ResultObjectProvider call() throws Exception {
+		@Override
+        public ResultObjectProvider call() throws Exception {
 			return executor.executeQuery(query, params, range);
 		}
 	}
@@ -266,7 +273,8 @@ class DistributedStoreQuery extends JDBCStoreQuery {
 		Executor executor;
 		Object[] params;
 
-		public Number call() throws Exception {
+		@Override
+        public Number call() throws Exception {
 			return executor.executeDelete(query, params);
 		}
 	}
@@ -276,7 +284,8 @@ class DistributedStoreQuery extends JDBCStoreQuery {
 		Executor executor;
 		Object[] params;
 
-		public Number call() throws Exception {
+		@Override
+        public Number call() throws Exception {
 		    return executor.executeUpdate(query, params);
 		}
 	}
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedTemplate.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedTemplate.java
index dd81f1cbb..8a4f4ac81 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedTemplate.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedTemplate.java
@@ -37,7 +37,7 @@ public class DistributedTemplate<T extends Statement>
 	implements Statement, Iterable<T> {
 
 
-    protected List<T> stmts = new ArrayList<T>();
+    protected List<T> stmts = new ArrayList<>();
 	protected final DistributedConnection con;
 	protected T master;
 
@@ -45,7 +45,8 @@ public class DistributedTemplate<T extends Statement>
 		con = c;
 	}
 
-	public Iterator<T> iterator() {
+	@Override
+    public Iterator<T> iterator() {
 		return stmts.iterator();
 	}
 
@@ -62,60 +63,70 @@ public class DistributedTemplate<T extends Statement>
 		}
 	}
 
-	public void addBatch(String sql) throws SQLException {
+	@Override
+    public void addBatch(String sql) throws SQLException {
 		for (T s:this)
 			s.addBatch(sql);
 	}
 
-	public void cancel() throws SQLException {
+	@Override
+    public void cancel() throws SQLException {
 		for (T s:this)
 			s.cancel();
 	}
 
-	public void clearBatch() throws SQLException {
+	@Override
+    public void clearBatch() throws SQLException {
 		for (T s:this)
 			s.clearBatch();
 	}
 
-	public void clearWarnings() throws SQLException {
+	@Override
+    public void clearWarnings() throws SQLException {
 		for (T s:this)
 			s.clearWarnings();
 	}
 
-	public void close() throws SQLException {
+	@Override
+    public void close() throws SQLException {
 		for (T s:this)
 			s.close();
 	}
 
-	public boolean execute(String arg0) throws SQLException {
+	@Override
+    public boolean execute(String arg0) throws SQLException {
 		boolean ret = true;
 		for (T s:this)
 			ret = s.execute(arg0) & ret;
 		return ret;
 	}
 
-	public boolean execute(String arg0, int arg1) throws SQLException {
+	@Override
+    public boolean execute(String arg0, int arg1) throws SQLException {
 		boolean ret = true;
 		for (T s:this)
 			ret = s.execute(arg0, arg1) & ret;
 		return ret;
 	}
 
-	public boolean execute(String arg0, int[] arg1) throws SQLException {
+	@Override
+    public boolean execute(String arg0, int[] arg1) throws SQLException {
 		boolean ret = true;
 		for (T s:this)
 			ret = s.execute(arg0, arg1) & ret;
 		return ret;
 	}
 
-	public boolean execute(String arg0, String[] arg1) throws SQLException {
+	@Override
+    public boolean execute(String arg0, String[] arg1) throws SQLException {
 		boolean ret = true;
 		for (T s:this)
 			ret = s.execute(arg0, arg1) & ret;
 		return ret;
 	}
 
-	public int[] executeBatch() throws SQLException {
+	@Override
+    public int[] executeBatch() throws SQLException {
 		int[] ret = new int[0];
 		for (Statement s:this) {
 			int[] tmp = s.executeBatch();
@@ -132,34 +143,39 @@ public class DistributedTemplate<T extends Statement>
 		return rs;
 	}
 
-	public ResultSet executeQuery(String arg0) throws SQLException {
+	@Override
+    public ResultSet executeQuery(String arg0) throws SQLException {
 		DistributedResultSet rs = new DistributedResultSet();
 		for (T s:this)
 			rs.add(s.executeQuery(arg0));
 		return rs;
 	}
 
-	public int executeUpdate(String arg0) throws SQLException {
+	@Override
+    public int executeUpdate(String arg0) throws SQLException {
 		int ret = 0;
 		for (T s:this)
 			ret += s.executeUpdate(arg0);
 		return ret;
 	}
 
-	public int executeUpdate(String arg0, int arg1) throws SQLException {
+	@Override
+    public int executeUpdate(String arg0, int arg1) throws SQLException {
 		int ret = 0;
 		for (T s:this)
 			ret += s.executeUpdate(arg0, arg1);
 		return ret;
 	}
 
-	public int executeUpdate(String arg0, int[] arg1) throws SQLException {
+	@Override
+    public int executeUpdate(String arg0, int[] arg1) throws SQLException {
 		int ret = 0;
 		for (T s:this)
 			ret += s.executeUpdate(arg0, arg1);
 		return ret;
 	}
 
+    @Override
     public int executeUpdate(String arg0, String[] arg1) throws SQLException {
 		int ret = 0;
 		for (T s:this)
@@ -167,109 +183,131 @@ public class DistributedTemplate<T extends Statement>
 		return ret;
 	}
 
-	public Connection getConnection() throws SQLException {
+	@Override
+    public Connection getConnection() throws SQLException {
 		return con;
 	}
 
-	public int getFetchDirection() throws SQLException {
+	@Override
+    public int getFetchDirection() throws SQLException {
 		return master.getFetchDirection();
 	}
 
-	public int getFetchSize() throws SQLException {
+	@Override
+    public int getFetchSize() throws SQLException {
 		return master.getFetchSize();
 	}
 
-	public ResultSet getGeneratedKeys() throws SQLException {
+	@Override
+    public ResultSet getGeneratedKeys() throws SQLException {
 		DistributedResultSet mrs = new DistributedResultSet();
 		for (T s:this)
 			mrs.add(s.getGeneratedKeys());
 		return mrs;
 	}
 
-	public int getMaxFieldSize() throws SQLException {
+	@Override
+    public int getMaxFieldSize() throws SQLException {
 		return master.getMaxFieldSize();
 	}
 
-	public int getMaxRows() throws SQLException {
+	@Override
+    public int getMaxRows() throws SQLException {
 		return master.getMaxRows();
 	}
 
-	public boolean getMoreResults() throws SQLException {
+	@Override
+    public boolean getMoreResults() throws SQLException {
 		for (T s:this)
 			if (s.getMoreResults())
 				return true;
 		return false;
 	}
 
-	public boolean getMoreResults(int arg0) throws SQLException {
+	@Override
+    public boolean getMoreResults(int arg0) throws SQLException {
 		for (T s:this)
 			if (s.getMoreResults(arg0))
 				return true;
 		return false;
 	}
 
-	public int getQueryTimeout() throws SQLException {
+	@Override
+    public int getQueryTimeout() throws SQLException {
 		return master.getQueryTimeout();
 	}
 
-	public ResultSet getResultSet() throws SQLException {
+	@Override
+    public ResultSet getResultSet() throws SQLException {
 		DistributedResultSet rs = new DistributedResultSet();
 		for (T s:this)
 			rs.add(s.getResultSet());
 		return rs;
 	}
 
-	public int getResultSetConcurrency() throws SQLException {
+	@Override
+    public int getResultSetConcurrency() throws SQLException {
 		return master.getResultSetConcurrency();
 	}
 
-	public int getResultSetHoldability() throws SQLException {
+	@Override
+    public int getResultSetHoldability() throws SQLException {
 		return master.getResultSetHoldability();
 	}
 
-	public int getResultSetType() throws SQLException {
+	@Override
+    public int getResultSetType() throws SQLException {
 		return master.getResultSetType();
 	}
 
-	public int getUpdateCount() throws SQLException {
+	@Override
+    public int getUpdateCount() throws SQLException {
 		return master.getUpdateCount();
 	}
 
-	public SQLWarning getWarnings() throws SQLException {
+	@Override
+    public SQLWarning getWarnings() throws SQLException {
 		return master.getWarnings();
 	}
 
-	public void setCursorName(String name) throws SQLException {
+	@Override
+    public void setCursorName(String name) throws SQLException {
 		for (T s:this)
 			s.setCursorName(name);
 	}
 
-	public void setEscapeProcessing(boolean flag) throws SQLException {
+	@Override
+    public void setEscapeProcessing(boolean flag) throws SQLException {
 		for (T s:this)
 			s.setEscapeProcessing(flag);
 	}
 
-	public void setFetchDirection(int dir) throws SQLException {
+	@Override
+    public void setFetchDirection(int dir) throws SQLException {
 		for (T s:this)
 			s.setFetchDirection(dir);
 	}
 
-	public void setFetchSize(int size) throws SQLException {
+	@Override
+    public void setFetchSize(int size) throws SQLException {
 		for (T s:this)
 			s.setFetchSize(size);
 	}
 
-	public void setMaxFieldSize(int size) throws SQLException {
+	@Override
+    public void setMaxFieldSize(int size) throws SQLException {
 		for (T s:this)
 			s.setMaxFieldSize(size);
 	}
 
-	public void setMaxRows(int n) throws SQLException {
+	@Override
+    public void setMaxRows(int n) throws SQLException {
 		for (T s:this)
 			s.setMaxRows(n);
 	}
 
-	public void setQueryTimeout(int n) throws SQLException {
+	@Override
+    public void setQueryTimeout(int n) throws SQLException {
 		for (T s:this)
 			s.setQueryTimeout(n);
 	}
@@ -301,10 +339,12 @@ public class DistributedTemplate<T extends Statement>
 
     // Java 7 methods follow
 
+    @Override
     public boolean isCloseOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
 
+    @Override
     public void closeOnCompletion() throws SQLException{
     	throw new UnsupportedOperationException();
     }
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/TargetFetchConfiguration.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/TargetFetchConfiguration.java
index 4b1018c87..5c143a9c6 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/TargetFetchConfiguration.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/TargetFetchConfiguration.java
@@ -31,8 +31,8 @@ import org.apache.openjpa.util.UserException;
  * @author Pinaki Poddar
  *
  */
-@SuppressWarnings("serial")
 public class TargetFetchConfiguration extends JDBCFetchConfigurationImpl implements FetchConfiguration {
+    private static final long serialVersionUID = 1L;
     boolean _explicitTarget = false;
 
     public TargetFetchConfiguration() {
@@ -53,6 +53,7 @@ public class TargetFetchConfiguration extends JDBCFetchConfigurationImpl impleme
         _explicitTarget = SlicePersistence.HINT_TARGET.equals(key);
     }
 
+    @Override
     public void setHint(String key, Object value, Object original) {
         super.setHint(key, value, original);
         _explicitTarget = SlicePersistence.HINT_TARGET.equals(key);
@@ -94,6 +95,7 @@ public class TargetFetchConfiguration extends JDBCFetchConfigurationImpl impleme
         }
     }
 
+    @Override
     protected TargetFetchConfiguration newInstance(ConfigurationState state) {
         JDBCConfigurationState jstate = (state == null) ? null : _state;
         return new TargetFetchConfiguration(state, jstate);
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/UniqueResultObjectProvider.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/UniqueResultObjectProvider.java
index 001932a9b..51fa1d105 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/UniqueResultObjectProvider.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/UniqueResultObjectProvider.java
@@ -56,26 +56,31 @@ public class UniqueResultObjectProvider implements ResultObjectProvider {
         _exps = exps;
     }
 
+    @Override
     public boolean absolute(int pos) throws Exception {
         return false;
     }
 
+    @Override
     public void close() throws Exception {
         _opened = false;
         for (ResultObjectProvider rop:_rops)
             rop.close();
     }
 
+    @Override
     public Object getResultObject() throws Exception {
         if (!_opened)
             throw new InternalException(_loc.get("not-open"));
         return _single;
     }
 
+    @Override
     public void handleCheckedException(Exception e) {
         _rops[0].handleCheckedException(e);
     }
 
+    @Override
     public boolean next() throws Exception {
         if (!_opened) {
             open();
@@ -183,12 +188,14 @@ public class UniqueResultObjectProvider implements ResultObjectProvider {
         		"SUM()", (current == null ? other : current).getClass().getName()).toString());
     }
 
+    @Override
     public void open() throws Exception {
         for (ResultObjectProvider rop:_rops)
             rop.open();
         _opened = true;
     }
 
+    @Override
     public void reset() throws Exception {
         _single = null;
         for (ResultObjectProvider rop : _rops) {
@@ -196,10 +203,12 @@ public class UniqueResultObjectProvider implements ResultObjectProvider {
         }
     }
 
+    @Override
     public int size() throws Exception {
         return 1;
     }
 
+    @Override
     public boolean supportsRandomAccess() {
          return false;
     }
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Address.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Address.java
index 0ef1737d4..6a31f3774 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Address.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Address.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.slice;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
 
 @Entity
 public class Address {
@@ -79,6 +83,7 @@ public class Address {
         return id;
     }
 
+    @Override
     public String toString() {
         return city;
     }
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Car.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Car.java
index a15b77ec6..97771bb34 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Car.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Car.java
@@ -18,7 +18,11 @@
  */
 package org.apache.openjpa.slice;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class Car {
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/PersistenceTestCase.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/PersistenceTestCase.java
index a8fd11184..838523a68 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/PersistenceTestCase.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/PersistenceTestCase.java
@@ -20,21 +20,23 @@ package org.apache.openjpa.slice;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import junit.framework.TestCase;
-import junit.framework.TestResult;
 import org.apache.openjpa.kernel.AbstractBrokerFactory;
 import org.apache.openjpa.kernel.Broker;
 import org.apache.openjpa.meta.ClassMetaData;
-import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+
+import junit.framework.TestCase;
+import junit.framework.TestResult;
 
 /**
  * Base test class providing persistence utilities.
@@ -85,7 +87,7 @@ public abstract class PersistenceTestCase
     protected OpenJPAEntityManagerFactorySPI createNamedEMF(String pu,
         Object... props) {
         Map map = new HashMap(System.getProperties());
-        List<Class> types = new ArrayList<Class>();
+        List<Class> types = new ArrayList<>();
         boolean prop = false;
         for (int i = 0; i < props.length; i++) {
             if (prop) {
@@ -177,7 +179,7 @@ public abstract class PersistenceTestCase
         if (emf == null || types.length == 0)
             return;
 
-        List<ClassMetaData> metas = new ArrayList<ClassMetaData>(types.length);
+        List<ClassMetaData> metas = new ArrayList<>(types.length);
         for (Class c : types) {
             ClassMetaData meta = JPAFacadeHelper.getMetaData(emf, c);
             if (meta != null)
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Person.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Person.java
index 95ef74f8e..98b25d34d 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/Person.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/Person.java
@@ -18,7 +18,12 @@
  */
 package org.apache.openjpa.slice;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import javax.persistence.Version;
 
 @Entity
 public class Person {
@@ -63,7 +68,8 @@ public class Person {
 		return id;
 	}
 
-	public String toString() {
+	@Override
+    public String toString() {
 		return name;
 	}
 
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedParent.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedParent.java
index b3163fd65..47365505e 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedParent.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/ReplicatedParent.java
@@ -21,7 +21,10 @@ package org.apache.openjpa.slice;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 @Entity
 public class ReplicatedParent {
@@ -45,7 +48,7 @@ public class ReplicatedParent {
 
     public void addChild(ReplicatedChild child) {
         if (children == null)
-            children = new HashSet<ReplicatedChild>();
+            children = new HashSet<>();
         children.add(child);
         child.setParent(this);
     }
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/SingleEMFTestCase.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/SingleEMFTestCase.java
index ff788903b..3868a5323 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/SingleEMFTestCase.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/SingleEMFTestCase.java
@@ -31,6 +31,7 @@ public abstract class SingleEMFTestCase
      * set-up happens even if <code>setUp()</code> is not called from the
      * subclass.
      */
+    @Override
     public void setUp() throws Exception {
         setUp(new Object[0]);
     }
@@ -50,6 +51,7 @@ public abstract class SingleEMFTestCase
     /**
      * Closes the entity manager factory.
      */
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
 
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/SliceTestCase.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/SliceTestCase.java
index a80240a7f..d778eea3d 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/SliceTestCase.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/SliceTestCase.java
@@ -23,6 +23,7 @@ import javax.persistence.EntityManager;
 import org.apache.openjpa.slice.jdbc.DistributedJDBCConfiguration;
 
 public abstract class SliceTestCase extends SingleEMFTestCase {
+    @Override
     protected void setUp(Object... props) {
         super.setUp(props);
         assertTrue(emf.getClass() + " is not a slice configuration. Check" +
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java
index cfb3573dd..432341a0f 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBasic.java
@@ -40,11 +40,13 @@ public class TestBasic extends SliceTestCase {
      * Specify persistence unit name as System property <code>-Dunit</code> or
      * use the default value as <code>"slice"</code>.
      */
+    @Override
     protected String getPersistenceUnitName() {
         return System.getProperty("unit","slice");
     }
 
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(PObject.class, Person.class, Address.class, Country.class,
         	CLEAR_TABLES);
@@ -54,7 +56,7 @@ public class TestBasic extends SliceTestCase {
      * Persist N independent objects.
      */
     List<PObject> createIndependentObjects(int N) {
-        List<PObject> pcs = new ArrayList<PObject>();
+        List<PObject> pcs = new ArrayList<>();
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         for (int i = 0; i < N; i++) {
@@ -319,6 +321,7 @@ public class TestBasic extends SliceTestCase {
     public void testDynamicSlice() {
         DistributedConfiguration conf = (DistributedConfiguration)emf.getConfiguration();
         conf.setDistributionPolicyInstance(new DistributionPolicy() {
+            @Override
             public String distribute(Object pc, List<String> slices,
                     Object context) {
                 if (PObject.class.isInstance(pc)) {
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBulkDelete.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBulkDelete.java
index 11c0dbfb1..9ba45bed0 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBulkDelete.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestBulkDelete.java
@@ -22,8 +22,6 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-
-import org.apache.openjpa.slice.SlicePersistence;
 import org.apache.openjpa.slice.policy.UniformDistributionPolicy;
 
 /**
@@ -40,13 +38,15 @@ public class TestBulkDelete extends SliceTestCase {
 	protected String getPersistenceUnitName() {
 		return "slice";
 	}
-	public void setUp() throws Exception {
+	@Override
+    public void setUp() throws Exception {
 		super.setUp(PObject.class, CLEAR_TABLES,
 				"openjpa.slice.DistributionPolicy", UniformDistributionPolicy.class.getName());
 
 	}
 
-	public void tearDown() throws Exception {
+	@Override
+    public void tearDown() throws Exception {
 		System.err.println("Delete all instances from all slices");
 		EntityManager em = emf.createEntityManager();
 		em.getTransaction().begin();
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestConfiguration.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestConfiguration.java
index df7245b9b..cdf920556 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestConfiguration.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestConfiguration.java
@@ -35,6 +35,7 @@ import org.apache.openjpa.slice.jdbc.DistributedJDBCConfiguration;
  *
  */
 public class TestConfiguration extends SliceTestCase {
+    @Override
     protected String getPersistenceUnitName() {
         return "per-slice";
     }
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQuery.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQuery.java
index 560c1bf2a..7c8f27ed0 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQuery.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQuery.java
@@ -36,10 +36,12 @@ public class TestQuery extends SliceTestCase {
     private int VALUE_MIN = 100;
     private int VALUE_MAX = VALUE_MIN + POBJECT_COUNT - 1;
 
+    @Override
     protected String getPersistenceUnitName() {
         return "ordering";
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(PObject.class, Person.class, Address.class, Country.class,
                 Car.class, Manufacturer.class,
@@ -191,7 +193,7 @@ public class TestQuery extends SliceTestCase {
     }
 
     public void testHint() {
-        List<String> targets = new ArrayList<String>();
+        List<String> targets = new ArrayList<>();
         targets.add("Even");
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
@@ -206,7 +208,7 @@ public class TestQuery extends SliceTestCase {
     }
 
     public void testQueryTargetPolicy() {
-        List<String> targets = new ArrayList<String>();
+        List<String> targets = new ArrayList<>();
         targets.add("Even");
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryMultiThreaded.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryMultiThreaded.java
index 65ecbad1e..99a8c4d7b 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryMultiThreaded.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryMultiThreaded.java
@@ -53,10 +53,12 @@ public class TestQueryMultiThreaded extends SliceTestCase {
     private ExecutorService group;
     private Future[] futures;
 
+    @Override
     protected String getPersistenceUnitName() {
         return "ordering";
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(PObject.class, Person.class, Address.class, Country.class,
                 CLEAR_TABLES, "openjpa.Multithreaded", "true");
@@ -67,6 +69,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
         group = new ThreadPoolExecutor(THREADS, THREADS,
                 60, TimeUnit.SECONDS,
                 new SynchronousQueue<Runnable>(), new ThreadFactory() {
+                    @Override
                     public Thread newThread(Runnable r) {
                         return new Thread(r);
                     }
@@ -75,6 +78,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
         futures = new Future[THREADS];
     }
 
+    @Override
     public void tearDown()  throws Exception {
         group.shutdown();
         super.tearDown();
@@ -116,6 +120,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
                 "SELECT p.value,p FROM PObject p ORDER BY p.value ASC");
         for (int i = 0; i < THREADS; i++) {
             futures[i] = group.submit(new Callable<Object>() {
+                @Override
                 public Object call() {
                     List result = query.getResultList();
                     Integer old = Integer.MIN_VALUE;
@@ -147,6 +152,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
                 "SELECT MIN(p.value),MAX(p.value) FROM PObject p");
         for (int i = 0; i < THREADS; i++) {
             futures[i] = group.submit(new Callable<Object>() {
+                @Override
                 public Object call() {
                     Object count = countQ.getSingleResult();
                     Object max = maxQ.getSingleResult();
@@ -180,6 +186,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
                 "SELECT MAX(p.value) FROM PObject p WHERE MOD(p.value,2)=0");
         for (int i = 0; i < THREADS; i++) {
             futures[i] = group.submit(new Callable<Object>() {
+                @Override
                 public Object call() {
                     Object max = maxQ.getSingleResult();
                     assertEquals(VALUE_MAX, ((Number) max).intValue());
@@ -199,6 +206,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
                 "SELECT p.value,p FROM PObject p ORDER BY p.value ASC");
         for (int i = 0; i < THREADS; i++) {
             futures[i] = group.submit(new Callable<Object>() {
+                @Override
                 public Object call() {
                     List result = q.setMaxResults(limit).getResultList();
                     int i = 0;
@@ -221,6 +229,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
         Thread[] threads = new Thread[800];
         for (int i = 0; i < 800; i++) {
             Runnable r = new Runnable() {
+                @Override
                 public void run() {
                     EntityManager em = emf.createEntityManager();
                     em.getTransaction().begin();
@@ -246,7 +255,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
     }
 
     public void testHint() {
-        final List<String> targets = new ArrayList<String>();
+        final List<String> targets = new ArrayList<>();
         targets.add("Even");
         final EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
@@ -254,6 +263,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
         for (int i = 0; i < THREADS; i++) {
             futures[i] = group.submit(new Callable<Object>() {
 
+                @Override
                 public Object call() {
                     query.setHint(SlicePersistence.HINT_TARGET, "Even");
                     List result = query.getResultList();
@@ -277,6 +287,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
             em.createQuery("SELECT p FROM PObject p ORDER BY p.value");
         for (int i = 0; i < THREADS; i++) {
             futures[i] = group.submit(new Callable<Object>() {
+                @Override
                 public Object call() {
                     List result = query.getResultList();
                     return null;
@@ -294,6 +305,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
             em.createQuery("SELECT p FROM PObject p WHERE p.value > :v");
         for (int i = 0; i < THREADS; i++) {
             futures[i] = group.submit(new Callable<Object>() {
+                @Override
                 public Object call() {
                     query.setParameter("v", 200);
                     List result = query.getResultList();
@@ -316,6 +328,7 @@ public class TestQueryMultiThreaded extends SliceTestCase {
                 "SELECT p FROM Person p WHERE p.address = :a", Person.class);
         for (int i = 0; i < THREADS; i++) {
             futures[i] = group.submit(new Callable<Object>() {
+                @Override
                 public Object call() {
                     Address a = addressQ.setParameter("city", "Rome")
                         .getSingleResult();
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryTargetPolicy.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryTargetPolicy.java
index 44453fdc5..3049868d1 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryTargetPolicy.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestQueryTargetPolicy.java
@@ -34,10 +34,12 @@ public class TestQueryTargetPolicy extends SliceTestCase {
     private int POBJECT_COUNT = 2;
     private int VALUE_MIN = 100;
 
+    @Override
     protected String getPersistenceUnitName() {
         return "ordering";
     }
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(PObject.class, Person.class, Address.class, Country.class,
                 Car.class, Manufacturer.class,
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestReplication.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestReplication.java
index 383cd38b9..0e253cf7f 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestReplication.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestReplication.java
@@ -34,11 +34,13 @@ import javax.persistence.EntityManager;
 public class TestReplication extends SingleEMFTestCase {
     private static int CHILD_COUNT = 3;
 
+    @Override
     public void setUp() {
         super.setUp(CLEAR_TABLES);
         createData();
     }
 
+    @Override
     protected String getPersistenceUnitName() {
         return "replication";
     }
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestTransaction.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestTransaction.java
index 370188c16..8a203723d 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestTransaction.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestTransaction.java
@@ -39,11 +39,13 @@ public class TestTransaction extends SliceTestCase {
     private static final Random rng = new Random(System.currentTimeMillis());
     Manufacturer[] manufacturers;
 
+    @Override
     protected String getPersistenceUnitName() {
         return System.getProperty("unit","car");
     }
 
 
+    @Override
     public void setUp() throws Exception {
         super.setUp(CLEAR_TABLES,
                 Car.class, Manufacturer.class,
@@ -143,6 +145,7 @@ public class TestTransaction extends SliceTestCase {
      */
     @Ignore
     public static class CarDistributorPolicy implements DistributionPolicy {
+        @Override
         public String distribute(Object pc, List<String> slices, Object context) {
             if (pc instanceof Manufacturer) {
                 return ((Manufacturer)pc).getName();
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestXA.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestXA.java
index 898f17ddf..33da463d1 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestXA.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/TestXA.java
@@ -18,9 +18,10 @@
  */
 package org.apache.openjpa.slice;
 
-import javax.persistence.*;
+import javax.persistence.EntityManager;
 
 public class TestXA extends SliceTestCase {
+    @Override
     public void setUp() throws Exception {
         super.setUp(PObject.class, Person.class, Address.class, CLEAR_TABLES);
     }
@@ -48,6 +49,7 @@ public class TestXA extends SliceTestCase {
 		assertEquals(before+N, after);
 	}
 
+    @Override
     protected String getPersistenceUnitName() {
         return "XA";
     }
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/EvenOddDistributionPolicy.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/EvenOddDistributionPolicy.java
index 200632069..c0073a218 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/EvenOddDistributionPolicy.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/EvenOddDistributionPolicy.java
@@ -20,9 +20,14 @@ package org.apache.openjpa.slice.policy;
 
 import java.util.List;
 
-import org.apache.openjpa.slice.*;
+import org.apache.openjpa.slice.Car;
+import org.apache.openjpa.slice.DistributionPolicy;
+import org.apache.openjpa.slice.Manufacturer;
+import org.apache.openjpa.slice.PObject;
+import org.apache.openjpa.slice.Person;
 
 public class EvenOddDistributionPolicy implements DistributionPolicy {
+    @Override
     public String distribute(Object pc, List<String> slices, Object context) {
         if (pc instanceof PObject) {
             int v = ((PObject)pc).getValue();
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/SampleQueryTargetPolicy.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/SampleQueryTargetPolicy.java
index d78f40d1d..291d4d7b5 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/SampleQueryTargetPolicy.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/SampleQueryTargetPolicy.java
@@ -31,6 +31,7 @@ import org.apache.openjpa.slice.TestQueryTargetPolicy;
  *
  */
 public class SampleQueryTargetPolicy implements QueryTargetPolicy {
+    @Override
     public String[] getTargets(String query, Map<Object, Object> params,
             String language, List<String> slices,
             Object context) {
diff --git a/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/UserDistributionPolicy.java b/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/UserDistributionPolicy.java
index 200bb1277..ee3acafd0 100644
--- a/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/UserDistributionPolicy.java
+++ b/openjpa-slice/src/test/java/org/apache/openjpa/slice/policy/UserDistributionPolicy.java
@@ -21,7 +21,6 @@ package org.apache.openjpa.slice.policy;
 import java.util.List;
 
 import org.apache.openjpa.slice.DistributionPolicy;
-
 import org.apache.openjpa.slice.PObject;
 import org.apache.openjpa.slice.Person;
 
@@ -45,6 +44,7 @@ public class UserDistributionPolicy implements DistributionPolicy {
 	 * the same slice as its owner Person.
 	 *
 	 */
+    @Override
     public String distribute(Object pc, List<String> slices, Object context) {
 		assertValidSlices(slices);
 		if (pc instanceof PObject)
diff --git a/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatisticsAuxEnhancer.java b/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatisticsAuxEnhancer.java
index fba7306fb..a73df0bb4 100644
--- a/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatisticsAuxEnhancer.java
+++ b/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatisticsAuxEnhancer.java
@@ -20,10 +20,10 @@ package org.apache.openjpa.enhance.stats;
 
 import java.util.Locale;
 
-import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.enhance.PCEnhancer.AuxiliaryEnhancer;
 import org.apache.openjpa.lib.log.Log;
+import org.apache.openjpa.lib.util.StringUtil;
 import org.apache.openjpa.meta.AccessCode;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
@@ -41,10 +41,12 @@ public class FetchStatisticsAuxEnhancer implements AuxiliaryEnhancer {
     private final String IGNORE_METHODS_REGEX = "(pc(.)*GenericContext)?(pc(.)*StateManager)?"
         + "(pc(.)*DetachedState)?(pc(.)*EnhancementContractVersion)?(pc(.)*ManagedFieldCount)?(pc(.)*GetVersion)?";
 
+    @Override
     public void run(BCClass bcc, ClassMetaData cmd) {
         addEnhancement(bcc, cmd);
     };
 
+    @Override
     public boolean skipEnhance(BCMethod arg0) {
         return false;
     };
diff --git a/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatsCollector.java b/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatsCollector.java
index 420fc19bd..5411d5610 100644
--- a/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatsCollector.java
+++ b/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatsCollector.java
@@ -37,8 +37,8 @@ import org.apache.openjpa.meta.ClassMetaData;
  */
 public final class FetchStatsCollector {
     // Fully qualified persistent field name -> number of access
-    private static ConcurrentHashMap<String, AtomicInteger> _used = new ConcurrentHashMap<String, AtomicInteger>();
-    private static Set<String> _entities = new TreeSet<String>();
+    private static ConcurrentHashMap<String, AtomicInteger> _used = new ConcurrentHashMap<>();
+    private static Set<String> _entities = new TreeSet<>();
 
     private static Log _log;
     private static final Localizer _loc = Localizer.forPackage(FetchStatsCollector.class);
@@ -56,8 +56,10 @@ public final class FetchStatsCollector {
     static {
         Runtime.getRuntime().addShutdownHook(new Shutdown());
         AccessController.doPrivileged(new PrivilegedAction<Object>() {
+            @Override
             public Object run() {
                 TimerTask statsOutputTask = new TimerTask() {
+                    @Override
                     public void run() {
                         dump();
                     }
@@ -94,7 +96,7 @@ public final class FetchStatsCollector {
 
     public static Set<String> getStatistics() {
         // TreeSet for a sorted set.
-        Set<String> noAccess = new TreeSet<String>();
+        Set<String> noAccess = new TreeSet<>();
         for (Map.Entry<String, AtomicInteger> entry : _used.entrySet()) {
             if (entry.getValue().intValue() == 0) {
                 noAccess.add(entry.getKey());
diff --git a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/TestFetchStatistics.java b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/TestFetchStatistics.java
index 50dd7a2d1..2df0d2eb1 100644
--- a/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/TestFetchStatistics.java
+++ b/openjpa-tools/openjpa-fetch-statistics/src/test/java/org/apache/openjpa/enhance/stats/TestFetchStatistics.java
@@ -50,12 +50,14 @@ public class TestFetchStatistics extends TestCase {
         return new TestSuite(TestFetchStatistics.class);
     }
 
+    @Override
     public void setUp() {
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("fetchStatisticPU");
         emf.createEntityManager().close();
         FetchStatsCollector.clear();
     }
 
+    @Override
     public void tearDown() {
     }
 
@@ -163,6 +165,7 @@ public class TestFetchStatistics extends TestCase {
 
     // used for manual test of the output interval
     public void _testOutputInterval() throws InterruptedException {
-        Thread.currentThread().sleep(60 * 60 * 1000);
+        Thread.currentThread();
+        Thread.sleep(60 * 60 * 1000);
     }
 }
diff --git a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaEnhancerMojo.java b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaEnhancerMojo.java
index 4555b13aa..465896ea8 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaEnhancerMojo.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaEnhancerMojo.java
@@ -19,16 +19,15 @@
 package org.apache.openjpa.tools.maven;
 
 
+import java.io.File;
+import java.util.List;
+
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.codehaus.plexus.util.FileUtils;
-
 import org.apache.openjpa.enhance.PCEnhancer;
 import org.apache.openjpa.lib.util.Options;
-
-import java.io.File;
-import java.util.List;
+import org.codehaus.plexus.util.FileUtils;
 
 /**
  * The base class for all enhancement mojos.
@@ -79,6 +78,7 @@ public abstract class AbstractOpenJpaEnhancerMojo extends AbstractOpenJpaMojo {
      *
      * @see org.apache.maven.plugin.Mojo#execute()
      */
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         if (skipMojo()) {
             return;
@@ -98,6 +98,7 @@ public abstract class AbstractOpenJpaEnhancerMojo extends AbstractOpenJpaMojo {
      *
      * @return populated Options
      */
+    @Override
     protected Options getOptions() throws MojoExecutionException {
         // options
         Options opts = createOptions();
diff --git a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java
index 438865267..80595fb00 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java
@@ -68,6 +68,7 @@ public abstract class AbstractOpenJpaMappingToolMojo extends AbstractOpenJpaMojo
      *
      * @see org.apache.maven.plugin.Mojo#execute()
      */
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         if (skipMojo()) {
             return;
@@ -101,6 +102,7 @@ public abstract class AbstractOpenJpaMappingToolMojo extends AbstractOpenJpaMojo
 
         boolean ok = Configurations.runAgainstAllAnchors(opts,
                 new Configurations.Runnable() {
+                    @Override
                     public boolean run(Options opts) throws IOException, SQLException {
                         JDBCConfiguration conf = new JDBCConfigurationImpl();
                         try {
diff --git a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMojo.java b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMojo.java
index 655034415..e980c1f34 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMojo.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMojo.java
@@ -358,7 +358,7 @@ public abstract class AbstractOpenJpaMojo extends AbstractMojo
     protected void extendRealmClasspath()
         throws MojoExecutionException
     {
-        List<URL> urls = new ArrayList<URL>();
+        List<URL> urls = new ArrayList<>();
 
         for(String fileName: getClasspathElements()) {
             File pathElem = new File(fileName);
@@ -391,7 +391,7 @@ public abstract class AbstractOpenJpaMojo extends AbstractMojo
      */
     protected List<File> findEntityClassFiles() throws MojoExecutionException
     {
-        List<File> files = new ArrayList<File>();
+        List<File> files = new ArrayList<>();
 
         try
         {
diff --git a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java
index b6465b6d5..186bafff8 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java
@@ -73,6 +73,7 @@ public class OpenJpaSchemaMojo extends AbstractOpenJpaMappingToolMojo {
     /**
      * @return Options filled with all necessary plugin parameters
      */
+    @Override
     protected Options getOptions() throws MojoExecutionException {
         // options
         Options opts = createOptions();
diff --git a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java
index 74bfcfa3b..79c1fec55 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java
@@ -86,6 +86,7 @@ public class OpenJpaSqlMojo extends AbstractOpenJpaMappingToolMojo {
     /**
      * @return Options filled with all necessary plugin parameters
      */
+    @Override
     protected Options getOptions() throws MojoExecutionException {
         // options
         Options opts = createOptions();
diff --git a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java
index a92f87d6e..28d05e739 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java
@@ -65,6 +65,7 @@ public class OpenJpaTestEnhancerMojo extends AbstractOpenJpaEnhancerMojo {
      *
      * @return List of classpath elements for the test phase
      */
+    @Override
     protected List<String> getClasspathElements() {
         return testClasspathElements;
     }
@@ -75,10 +76,12 @@ public class OpenJpaTestEnhancerMojo extends AbstractOpenJpaEnhancerMojo {
      *
      * @return normaly the test entity classes are located in target/test-classes
      */
+    @Override
     protected File getEntityClasses() {
         return testClasses;
     }
 
+    @Override
     protected boolean skipMojo() {
         boolean skip = super.skipMojo();
 
diff --git a/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojoTest.java b/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojoTest.java
index aebd43d19..f91df4a80 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojoTest.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojoTest.java
@@ -22,7 +22,6 @@ import java.io.File;
 import java.util.ArrayList;
 
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.openjpa.tools.maven.OpenJpaEnhancerMojo;
 
 /**
  * @version $Id: OpenJpaEnhancerMojoTest.java 9348 2009-04-03 22:59:47Z struberg $
@@ -30,6 +29,7 @@ import org.apache.openjpa.tools.maven.OpenJpaEnhancerMojo;
  */
 public class OpenJpaEnhancerMojoTest extends AbstractMojoTestCase {
 
+    @Override
     public void setUp() throws Exception {
         super.setUp();
     }
@@ -42,7 +42,7 @@ public class OpenJpaEnhancerMojoTest extends AbstractMojoTestCase {
       assertNotNull( mojo );
 
       mojo.classes = new File( getBasedir(), "target/test-classes/" );
-      mojo.compileClasspathElements = new ArrayList<String>();
+      mojo.compileClasspathElements = new ArrayList<>();
       mojo.compileClasspathElements.add( mojo.classes.getAbsolutePath() );
 
       mojo.execute();
diff --git a/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/SampleEntity.java b/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/SampleEntity.java
index 937168daa..8133cf244 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/SampleEntity.java
+++ b/openjpa-tools/openjpa-maven-plugin/src/test/java/org/apache/openjpa/tools/maven/testentity/SampleEntity.java
@@ -54,7 +54,8 @@ public class SampleEntity
     this.string1 = string1;
   }
 
-  public String toString()  {
+  @Override
+public String toString()  {
     return xint1 + ":" + string1;
   }
 
diff --git a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java
index 6baa5b5f2..7bf9ada69 100644
--- a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java
+++ b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java
@@ -251,7 +251,7 @@ public final class ObjectData
         FieldMetaData[] fmds = _meta.getFields();
         for (int i = 0; i < fmds.length; i++) {
             if (sm.getDirty().get(i)
-                && fmds[i].getManagement() == fmds[i].MANAGE_PERSISTENT)
+                && fmds[i].getManagement() == FieldMetaData.MANAGE_PERSISTENT)
                 _data[i] = toStorable(fmds[i], sm.fetch(i), sm.getContext());
         }
     }
@@ -343,6 +343,7 @@ public final class ObjectData
     /**
      * Clone this data.
      */
+    @Override
     public Object clone() {
         ObjectData data = new ObjectData(_oid, _meta);
         data.setVersion(_version);
@@ -371,6 +372,7 @@ public final class ObjectData
         return data;
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
         buf.append("Class: (" + _meta.getDescribedType().getName() + ")\n");
diff --git a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
index 13e6cd2b3..16713f66f 100644
--- a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
+++ b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
@@ -39,11 +39,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
+
 import javax.xml.parsers.SAXParser;
 
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
 import org.apache.openjpa.enhance.PCRegistry;
 import org.apache.openjpa.lib.util.Base16Encoder;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
@@ -57,6 +55,9 @@ import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.StoreException;
 import org.apache.openjpa.util.UnsupportedException;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * Stores {@link ObjectData} objects by serializing a collection
@@ -187,7 +188,7 @@ public class XMLFileHandler {
             // run through each field writing out the value
             FieldMetaData[] fmds = meta.getFields();
             for (int i = 0; i < fmds.length; i++) {
-                if (fmds[i].getManagement() != fmds[i].MANAGE_PERSISTENT)
+                if (fmds[i].getManagement() != FieldMetaData.MANAGE_PERSISTENT)
                     continue;
 
                 out.write("<field name=\"");
@@ -339,6 +340,7 @@ public class XMLFileHandler {
             return _extent;
         }
 
+        @Override
         public void startElement(String uri, String localName, String qName,
             Attributes attrs)
             throws SAXException {
@@ -364,7 +366,7 @@ public class XMLFileHandler {
 
                     // construct the oid object
                     Object oid;
-                    if (meta.getIdentityType() == meta.ID_DATASTORE)
+                    if (meta.getIdentityType() == ClassMetaData.ID_DATASTORE)
                         oid = new Id(attrs.getValue("oid"), _conf, null);
                     else
                         oid = PCRegistry.newObjectId(meta.getDescribedType(),
@@ -404,6 +406,7 @@ public class XMLFileHandler {
             }
         }
 
+        @Override
         public void endElement(String uri, String localName, String qName)
             throws SAXException {
             try {
@@ -469,6 +472,7 @@ public class XMLFileHandler {
             _buf = null;
         }
 
+        @Override
         public void characters(char[] ch, int start, int length) {
             if (_buf != null)
                 _buf.append(ch, start, length);
diff --git a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java
index d54bb1dcc..be9603e30 100644
--- a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java
+++ b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java
@@ -54,6 +54,7 @@ public class XMLStoreManager
     private Collection _updates;
     private Collection _deletes;
 
+    @Override
     protected Collection getUnsupportedOptions() {
         Collection c = super.getUnsupportedOptions();
 
@@ -68,17 +69,20 @@ public class XMLStoreManager
         return c;
     }
 
+    @Override
     protected OpenJPAConfiguration newConfiguration() {
         // override to use our configuration type
         return new XMLConfiguration();
     }
 
+    @Override
     protected void open() {
         // cache operational state
         _conf = (XMLConfiguration) ctx.getConfiguration();
         _store = _conf.getStore();
     }
 
+    @Override
     public boolean exists(OpenJPAStateManager sm, Object context) {
         // see if the given object exists in the store
         return _store.getData(sm.getMetaData(), sm.getObjectId()) != null;
@@ -94,6 +98,7 @@ public class XMLStoreManager
         sm.setNextVersion(version);
     }
 
+    @Override
     public boolean initialize(OpenJPAStateManager sm, PCState state,
         FetchConfiguration fetch, Object context) {
         // we may already have looked up the backing ObjectData (see our extent
@@ -120,6 +125,7 @@ public class XMLStoreManager
         return true;
     }
 
+    @Override
     public boolean load(OpenJPAStateManager sm, BitSet fields,
         FetchConfiguration fetch, int lockLevel, Object context) {
         // we may already have looked up the backing ObjectData (see our extent
@@ -142,6 +148,7 @@ public class XMLStoreManager
         return true;
     }
 
+    @Override
     public boolean syncVersion(OpenJPAStateManager sm, Object context) {
         if (sm.getVersion() == null)
             return false;
@@ -171,10 +178,12 @@ public class XMLStoreManager
         return false;
     }
 
+    @Override
     public void begin() {
         _store.beginTransaction();
     }
 
+    @Override
     public void commit() {
         try {
             _store.endTransaction(_updates, _deletes);
@@ -184,12 +193,14 @@ public class XMLStoreManager
         }
     }
 
+    @Override
     public void rollback() {
         _updates = null;
         _deletes = null;
         _store.endTransaction(null, null);
     }
 
+    @Override
     protected Collection flush(Collection pNew, Collection pNewUpdated,
         Collection pNewFlushedDeleted, Collection pDirty, Collection pDeleted) {
         // we don't support incremental flushing, so pNewUpdated and
@@ -255,6 +266,7 @@ public class XMLStoreManager
         return exceps;
     }
 
+    @Override
     public ResultObjectProvider executeExtent(ClassMetaData meta,
         boolean subclasses, FetchConfiguration fetch) {
         // ask the store for all ObjectDatas for the given type; this
@@ -283,6 +295,7 @@ public class XMLStoreManager
         }
         return new ListResultObjectProvider(pcs);
     }
+    @Override
     public boolean isCached(List<Object> oids, BitSet edata) {
         // XMLStoreManager does not cache oids.
         return false;
diff --git a/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/AllFieldTypes.java b/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/AllFieldTypes.java
index 6c5c107e9..4ef6e68b2 100644
--- a/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/AllFieldTypes.java
+++ b/openjpa-xmlstore/src/test/java/org/apache/openjpa/xmlstore/simple/AllFieldTypes.java
@@ -21,15 +21,16 @@ package org.apache.openjpa.xmlstore.simple;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Set;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Set;
+
 import javax.persistence.Entity;
-import javax.persistence.OneToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 
 import org.apache.openjpa.persistence.PersistentCollection;
 
@@ -73,7 +74,7 @@ public class AllFieldTypes implements Serializable {
     private Serializable serializableField;
 
     // Additional types
-    private Set<String> setOfStrings = new HashSet<String>();
+    private Set<String> setOfStrings = new HashSet<>();
     private String[] arrayOfStrings;
 
     @PersistentCollection
@@ -83,7 +84,7 @@ public class AllFieldTypes implements Serializable {
     @OneToOne
     private AllFieldTypes selfOneOne;
     @OneToMany
-    private List<AllFieldTypes> selfOneMany = new ArrayList<AllFieldTypes>();
+    private List<AllFieldTypes> selfOneMany = new ArrayList<>();
 
     public void setShortField(short shortField) {
         this.shortField = shortField;