From 92a213acae4461a54397aa45c6a7308bcee4990f Mon Sep 17 00:00:00 2001
From: aserkes <andrii.serkes@oracle.com>
Date: Thu, 15 Sep 2022 18:41:03 +0200
Subject: [PATCH 1/3] handle Processing instructions in SimpleXmlParser

Signed-off-by: aserkes <andrii.serkes@oracle.com>
---
 .../build/common/xml/SimpleXMLParser.java     | 58 ++++++++++++++++++-
 .../build/common/xml/SimpleMXLParserTest.java | 20 +++++++
 common/xml/src/test/resources/test1.xml       |  3 +-
 3 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/common/xml/src/main/java/io/helidon/build/common/xml/SimpleXMLParser.java b/common/xml/src/main/java/io/helidon/build/common/xml/SimpleXMLParser.java
index 196ca9ffa..763953549 100644
--- a/common/xml/src/main/java/io/helidon/build/common/xml/SimpleXMLParser.java
+++ b/common/xml/src/main/java/io/helidon/build/common/xml/SimpleXMLParser.java
@@ -221,6 +221,15 @@ default List<String> readAttributeList(String name, String qName, Map<String, St
             Collections.addAll(values, value.split(","));
             return values;
         }
+
+        /**
+         * Receive notification of content data inside a Processing instructions element.
+         *
+         * @param data the content data of Processing instructions
+         * @throws XMLReaderException if any error occurs
+         */
+        default void processInstructionContent(String data) {
+        }
     }
 
     private enum STATE {
@@ -236,10 +245,14 @@ private enum STATE {
         ATTRIBUTE_VALUE,
         SINGLE_QUOTED_VALUE,
         DOUBLE_QUOTED_VALUE,
+        PI_TARGET,
+        PI_CONTENT
     }
 
-    private static final String PROLOG_START = "<?";
+    private static final String PROLOG_START = "<?xml";
     private static final String PROLOG_END = "?>";
+    private static final String PI_START = "<?";
+    private static final String PI_END = "?>";
     private static final String COMMENT_START = "<!--";
     private static final String COMMENT_END = "-->";
     private static final String ELEMENT_SELF_CLOSE = "/>";
@@ -367,6 +380,13 @@ private void processElement() throws IOException {
         } else if (hasToken(CLOSE_MARKUP_START)) {
             state = STATE.END_ELEMENT;
             position++;
+        } else if (hasToken(PI_START)) {
+            resumeState = STATE.PI_CONTENT;
+            state = STATE.PI_TARGET;
+            position += PI_START.length();
+        } else if (hasToken(PI_END)) {
+            state = STATE.END_ELEMENT;
+            position += PI_END.length();
         } else if (hasToken(MARKUP_START)) {
             resumeState = STATE.ATTRIBUTES;
             state = STATE.NAME;
@@ -511,6 +531,36 @@ private void processCdata() throws IOException {
         }
     }
 
+    private void processPIContent() throws IOException {
+        if (hasToken(PI_END)) {
+            position += PI_END.length();
+            state = STATE.ELEMENT;
+            String target = nameBuilder.toString();
+            reader.startElement(target, attributes);
+            reader.processInstructionContent(decode(textBuilder.toString()));
+            reader.endElement(target);
+            nameBuilder = new StringBuilder();
+            textBuilder = new StringBuilder();
+        } else {
+            position++;
+            textBuilder.append(c);
+        }
+    }
+
+    private void processPITarget() throws IOException {
+        if (hasToken(PI_END)) {
+            state = resumeState;
+        } else if (Character.isWhitespace(c)) {
+            position++;
+            state = resumeState;
+        } else {
+            validateNameChar(c, nameBuilder.length() == 0);
+            position++;
+            nameBuilder.append(c);
+        }
+    }
+
+
     /**
      * Start parsing.
      *
@@ -564,6 +614,12 @@ public void parse() throws IOException {
                     case CDATA:
                         processCdata();
                         break;
+                    case PI_TARGET:
+                        processPITarget();
+                        break;
+                    case PI_CONTENT:
+                        processPIContent();
+                        break;
                     default:
                         throw new IllegalStateException(String.format(
                                 "Unknown state: %s, line: %d, char: %d", state, lineNo, charNo));
diff --git a/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java b/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
index b8b52deb2..b8cd22ded 100644
--- a/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
+++ b/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
@@ -37,6 +37,15 @@
  */
 class SimpleMXLParserTest {
 
+    @Test
+    void testParseProcessInstruction() throws IOException {
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("test1.xml");
+        assertThat(inputStream, is(not(nullValue())));
+        Test1Reader reader = new Test1Reader();
+        SimpleXMLParser.parse(inputStream, reader);
+        assertThat(reader.m2e, is("execute onConfiguration,onIncremental"));
+    }
+
     @Test
     void testParse() throws IOException {
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("test1.xml");
@@ -117,6 +126,7 @@ private static final class Test1Reader implements Reader {
         String rootQName;
         String foo;
         String bob;
+        String m2e;
 
         @Override
         public void startElement(String name, Map<String, String> attributes) {
@@ -142,5 +152,15 @@ public void elementText(String data) {
                 }
             }
         }
+
+        @Override
+        public void processInstructionContent(String data) {
+            String target = stack.peek();
+            if (target != null) {
+                if ("m2e".equals(target)) {
+                    m2e = data;
+                }
+            }
+        }
     }
 }
diff --git a/common/xml/src/test/resources/test1.xml b/common/xml/src/test/resources/test1.xml
index 84dcb9709..c78bb3a56 100644
--- a/common/xml/src/test/resources/test1.xml
+++ b/common/xml/src/test/resources/test1.xml
@@ -19,7 +19,8 @@
 <document xmlns="http://acme.com/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://acme.com/1.0 http://acme.com/xsd/acme-1.0.xsd">
     <foo>bar</foo>
-    <bob>alice</bob>
+    <bob attribute="name">alice</bob>
+    <?m2e execute onConfiguration,onIncremental?>
     <bar/>
     <booh />
 </document>

From e4f8cacffb1a0fbbd6dd8994f1331cd654848f31 Mon Sep 17 00:00:00 2001
From: aserkes <andrii.serkes@oracle.com>
Date: Thu, 15 Sep 2022 19:18:39 +0200
Subject: [PATCH 2/3] fix copyright

Signed-off-by: aserkes <andrii.serkes@oracle.com>
---
 .../java/io/helidon/build/common/xml/SimpleMXLParserTest.java   | 2 +-
 common/xml/src/test/resources/test1.xml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java b/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
index b8cd22ded..38f5a7914 100644
--- a/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
+++ b/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/common/xml/src/test/resources/test1.xml b/common/xml/src/test/resources/test1.xml
index c78bb3a56..8da4b8864 100644
--- a/common/xml/src/test/resources/test1.xml
+++ b/common/xml/src/test/resources/test1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021 Oracle and/or its affiliates.
+    Copyright (c) 2021, 2022 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

From 4fdef43b16807893abb32b8fef9ee0118a0b61a4 Mon Sep 17 00:00:00 2001
From: aserkes <andrii.serkes@oracle.com>
Date: Fri, 16 Sep 2022 11:36:06 +0200
Subject: [PATCH 3/3] refactoring, change javadocs

Signed-off-by: aserkes <andrii.serkes@oracle.com>
---
 .../io/helidon/build/common/xml/SimpleXMLParser.java     | 9 +++++----
 .../io/helidon/build/common/xml/SimpleMXLParserTest.java | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/xml/src/main/java/io/helidon/build/common/xml/SimpleXMLParser.java b/common/xml/src/main/java/io/helidon/build/common/xml/SimpleXMLParser.java
index 763953549..bbde9005f 100644
--- a/common/xml/src/main/java/io/helidon/build/common/xml/SimpleXMLParser.java
+++ b/common/xml/src/main/java/io/helidon/build/common/xml/SimpleXMLParser.java
@@ -223,12 +223,13 @@ default List<String> readAttributeList(String name, String qName, Map<String, St
         }
 
         /**
-         * Receive notification of content data inside a Processing instructions element.
+         * Receive notification of content data inside a processing instruction element.
          *
-         * @param data the content data of Processing instructions
+         * @param data the content data of a processing instruction
+         * @param target the name of an application to which the instruction is directed
          * @throws XMLReaderException if any error occurs
          */
-        default void processInstructionContent(String data) {
+        default void processingInstruction(String target, String data) {
         }
     }
 
@@ -537,7 +538,7 @@ private void processPIContent() throws IOException {
             state = STATE.ELEMENT;
             String target = nameBuilder.toString();
             reader.startElement(target, attributes);
-            reader.processInstructionContent(decode(textBuilder.toString()));
+            reader.processingInstruction(target, decode(textBuilder.toString()));
             reader.endElement(target);
             nameBuilder = new StringBuilder();
             textBuilder = new StringBuilder();
diff --git a/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java b/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
index 38f5a7914..7ef5bb2e6 100644
--- a/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
+++ b/common/xml/src/test/java/io/helidon/build/common/xml/SimpleMXLParserTest.java
@@ -154,8 +154,7 @@ public void elementText(String data) {
         }
 
         @Override
-        public void processInstructionContent(String data) {
-            String target = stack.peek();
+        public void processingInstruction(String target, String data) {
             if (target != null) {
                 if ("m2e".equals(target)) {
                     m2e = data;