Resolve review comments for DHFPROD-3136.

Author: lling

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/NodeOperation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 MarkLogic Corporation
+ * Copyright 2020 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/XMLSplitter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 MarkLogic Corporation
+ * Copyright 2020 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -271,8 +271,8 @@ public BasicElementVisitor(String nsUri, String localName) {
                 nsUri = "";
             }
 
-            if (localName == null) {
-                localName = "";
+            if (localName == null || localName.equals("")) {
+                throw new IllegalArgumentException("LocalName cannot be null");
             }
 
             this.nsUri = nsUri;
@@ -358,49 +358,62 @@ T getNextHandle() {
                 while (xmlStreamReader.hasNext()) {
                     int event = xmlStreamReader.next();
 
-                    if (event == XMLStreamReader.START_ELEMENT) {
-                        StartElementReaderImpl startElementReader = new StartElementReaderImpl(xmlStreamReader);
-                        NodeOperation nodeOperation = visitor.startElement(startElementReader);
-
-                        if (nodeOperation == null) {
-                            throw new IllegalStateException("No NodeOperation returned.");
-                        }
-
-                        switch (nodeOperation) {
-                            case DESCEND:
-                                break;
-
-                            case PROCESS:
-                                T handle = visitor.makeBufferedHandle(xmlStreamReader);
-                                if (handle != null) {
-                                    return handle;
-                                }
-                                break;
-
-                            case SKIP:
-                                int count = 0;
-                                while (xmlStreamReader.hasNext()) {
-                                    int next = xmlStreamReader.next();
-                                    if (next == XMLStreamReader.START_ELEMENT) {
-                                        count++;
-                                    }
+                    checkForHandle:
+                    switch (event) {
+                        case XMLStreamReader.START_ELEMENT:
+                            StartElementReaderImpl startElementReader = new StartElementReaderImpl(xmlStreamReader);
+                            NodeOperation nodeOperation = visitor.startElement(startElementReader);
+
+                            if (nodeOperation == null) {
+                                throw new IllegalStateException("No NodeOperation returned.");
+                            }
 
-                                    if (next == XMLStreamReader.END_ELEMENT) {
-                                        if (count == 0) {
-                                            break;
+                            switch (nodeOperation) {
+                                case DESCEND:
+                                    break checkForHandle;
+
+                                case PROCESS:
+                                    T handle = visitor.makeBufferedHandle(xmlStreamReader);
+                                    if (handle != null) {
+                                        return handle;
+                                    }
+                                    break checkForHandle;
+
+                                case SKIP:
+                                    int depth = 0;
+                                    while (xmlStreamReader.hasNext()) {
+                                        int next = xmlStreamReader.next();
+                                        skipCheck:
+                                        switch (next) {
+                                            case XMLStreamReader.START_ELEMENT:
+                                                depth++;
+                                                break skipCheck;
+
+                                            case XMLStreamReader.END_ELEMENT:
+                                                if (depth == 0) {
+                                                    break checkForHandle;
+                                                }
+                                                depth--;
+                                                break skipCheck;
+
+                                            default:
+                                                break skipCheck;
                                         }
-                                        count--;
                                     }
-                                }
-                                break;
-
-                            default:
-                                throw new IllegalStateException("Unknown state");
-                        }
-                    }else if (event == XMLStreamReader.END_ELEMENT) {
-                        visitor.endElement(
-                                xmlStreamReader.getNamespaceURI(),
-                                xmlStreamReader.getLocalName());
+                                    break checkForHandle;
+
+                                default:
+                                    throw new IllegalStateException("Unknown state");
+                            }
+
+                        case XMLStreamReader.END_ELEMENT:
+                            visitor.endElement(
+                                    xmlStreamReader.getNamespaceURI(),
+                                    xmlStreamReader.getLocalName());
+                            break checkForHandle;
+
+                        default:
+                            break checkForHandle;
                     }
                 }
 

marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/XMLSplitterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 MarkLogic Corporation
+ * Copyright 2020 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-client-api/src/test/resources/data/people.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2020 MarkLogic Corporation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
 <people xmlns="http://www.marklogic.com/people/">
 <person president="yes"><first>George</first><last>Washington</last></person>
 <person president="no"><first>Betsy</first><last>Ross</last></person>