OPENJPA-2768 fix XMLStore xml handling

the SAXParser handler didn't properly distinguish between 'extent' and 'element'

openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java

@@ -357,8 +357,8 @@ public class XMLFileHandler {
 
         private void startElement(String qName, Attributes attrs)
             throws Exception {
-            switch (qName.charAt(0)) {
+
-                case 'o': // object
+            if ("object".equals(qName)) { // object
                 // get the metadata for the type we're reading
                 String type = attrs.getValue("class");
                 ClassMetaData meta = _conf.getMetaDataRepositoryInstance().
@@ -376,14 +376,12 @@ public class XMLFileHandler {
                 // for this instance, and set the version
                 _object = new ObjectData(oid, meta);
                 _object.setVersion(new Long(attrs.getValue("version")));
-                    break;
+            }
-
+            else if ("field".equals(qName)) { // field
-                case 'f': // field
                 // start parsing a field element: for container types,
                 // initialize the container; for other types, initialize a
                 // buffer
-                    _fmd =
+                _fmd = _object.getMetaData().getField(attrs.getValue("name"));
-                        _object.getMetaData().getField(attrs.getValue("name"));
                 switch (_fmd.getTypeCode()) {
                     case JavaTypes.COLLECTION:
                     case JavaTypes.ARRAY:
@@ -395,14 +393,13 @@ public class XMLFileHandler {
                     default:
                         _buf = new StringBuffer();
                 }
-                    break;
+            }
+            else if ("element".equals(qName) ||
+                     "key".equals(qName)     ||
+                     "value".equals(qName) ) { // field
 
-                case 'e': // element
-                case 'k': // key
-                case 'v': // value
                     // initialize a buffer for the element value
                     _buf = new StringBuffer();
-                    break;
             }
         }
 
@@ -423,12 +420,11 @@ public class XMLFileHandler {
         private void endElement(String qName)
             throws Exception {
             Object val;
-            switch (qName.charAt(0)) {
+            if ("object".equals(qName)) {
-                case 'o': // object
                 // add the object to our results
                 _extent.add(_object);
-
+            }
-                case 'f': // field
+            else if ("field".equals(qName)) {
                 switch (_fmd.getTypeCode()) {
                     case JavaTypes.COLLECTION:
                     case JavaTypes.ARRAY:
@@ -444,28 +440,24 @@ public class XMLFileHandler {
 
                 // set the field value into the object being parsed
                 _object.setField(_fmd.getIndex(), _fieldVal);
-                    break;
+            }
-
+            else if ("element".equals(qName)) {
-                case 'e': // element
                 // cache element value
                 val = fromXMLString(_fmd.getElement().getTypeCode(),
                         _fmd.getElement().getTypeMetaData(), _buf.toString());
                 ((Collection) _fieldVal).add(val);
-                    break;
+            }
-
+            else if ("key".equals(qName)) {
-                case 'k': // key
                 // cache key value
                 _keyVal = fromXMLString(_fmd.getKey().getTypeCode(),
                         _fmd.getKey().getTypeMetaData(), _buf.toString());
-                    break;
+            }
-
+            else if ("value".equals(qName)) {
-                case 'v': // value
                 // create value and put cached key and value into map
                 val = fromXMLString(_fmd.getElement().getTypeCode(),
                     _fmd.getElement().getTypeMetaData(), _buf.toString());
                 Map map = (Map) _fieldVal;
                 map.put(_keyVal, val);
-                    break;
             }
 
             // don't cache text between elements

openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStore.java

@@ -118,8 +118,8 @@ public class XMLStore {
      * @param updates {@link ObjectData} instances to insert or update
      * @param deletes {@link ObjectData} instances to delete
      */
-    public synchronized void endTransaction(Collection updates,
+    public synchronized void endTransaction(Collection<ObjectData> updates,
-        Collection deletes) {
+                                            Collection<ObjectData> deletes) {
         // track dirty types
         Set dirty = new HashSet();
         try {

openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLStoreManager.java

@@ -51,8 +51,8 @@ public class XMLStoreManager
     private XMLStore _store;
 
     // changed data within the current transaction
-    private Collection _updates;
+    private Collection<ObjectData> _updates;
-    private Collection _deletes;
+    private Collection<ObjectData> _deletes;
 
     @Override
     protected Collection getUnsupportedOptions() {
@@ -201,8 +201,8 @@ public class XMLStoreManager
     }
 
     @Override
-    protected Collection flush(Collection pNew, Collection pNewUpdated,
+    protected Collection flush(Collection<OpenJPAStateManager> pNew, Collection<OpenJPAStateManager> pNewUpdated,
-        Collection pNewFlushedDeleted, Collection pDirty, Collection pDeleted) {
+        Collection<OpenJPAStateManager> pNewFlushedDeleted, Collection<OpenJPAStateManager> pDirty, Collection<OpenJPAStateManager> pDeleted) {
         // we don't support incremental flushing, so pNewUpdated and
         // pNewFlushedDeleted should be empty; we ignore them here
 
@@ -210,8 +210,8 @@ public class XMLStoreManager
         Collection exceps = new LinkedList();
 
         // convert instances to ObjectDatas
-        _updates = new ArrayList(pNew.size() + pDirty.size());
+        _updates = new ArrayList<>(pNew.size() + pDirty.size());
-        _deletes = new ArrayList(pDeleted.size());
+        _deletes = new ArrayList<>(pDeleted.size());
 
         // convert additions
         for (Iterator itr = pNew.iterator(); itr.hasNext();) {