CALL TRANSFORMATION: bugfix xml_header option (#900)

Author: larshp

src/conv/cl_abap_codepage.clas.abap

@@ -2,14 +2,14 @@ CLASS cl_abap_codepage DEFINITION PUBLIC.
   PUBLIC SECTION.
     CLASS-METHODS convert_to
       IMPORTING
-        codepage      TYPE string OPTIONAL
+        codepage      TYPE string DEFAULT 'UTF-8'
         source        TYPE string
       RETURNING
         VALUE(output) TYPE xstring.
 
     CLASS-METHODS convert_from
       IMPORTING
-        codepage      TYPE string OPTIONAL
+        codepage      TYPE string DEFAULT 'UTF-8'
         source        TYPE xstring
       RETURNING
         VALUE(output) TYPE string.
@@ -24,15 +24,15 @@ ENDCLASS.
 CLASS cl_abap_codepage IMPLEMENTATION.
   METHOD convert_to.
     DATA conv TYPE REF TO cl_abap_conv_out_ce.
-    conv = cl_abap_conv_out_ce=>create( encoding = 'UTF-8' ).
+    conv = cl_abap_conv_out_ce=>create( encoding = codepage ).
     conv->convert( EXPORTING data   = source
                    IMPORTING buffer = output ).
   ENDMETHOD.
 
   METHOD convert_from.
     DATA conv TYPE REF TO cl_abap_conv_in_ce.
     DATA data TYPE string.
-    conv = cl_abap_conv_in_ce=>create( encoding = 'UTF-8' ).
+    conv = cl_abap_conv_in_ce=>create( encoding = codepage ).
     conv->convert(
       EXPORTING input = source
       IMPORTING data = output ).

src/conv/cl_abap_conv_in_ce.clas.abap

@@ -105,7 +105,9 @@ CLASS cl_abap_conv_in_ce IMPLEMENTATION.
     WRITE '@KERNEL const td = new decoder(this.mv_js_encoding.get(), {fatal: this.mv_ignore_cerr.get() !== "X"});'.
     WRITE '@KERNEL try {'.
     WRITE '@KERNEL   data.set(td.decode(buf));'.
-    WRITE '@KERNEL } catch {'.
+    WRITE '@KERNEL } catch (e) {'.
+    WRITE '@KERNEL   console.dir(e);'.
+    WRITE '@KERNEL   console.dir(this.mv_js_encoding.get());'.
     lv_error = abap_true.
     WRITE '@KERNEL }'.
 

src/kernel/call_transformation/kernel_call_transformation.clas.abap

@@ -104,7 +104,9 @@ CLASS kernel_call_transformation IMPLEMENTATION.
     WRITE '@KERNEL   }'.
     WRITE '@KERNEL }'.
     IF lv_result = abap_true.
-      lv_result = lcl_string_to_string=>run( lv_dummy ).
+      lv_result = lcl_string_to_string=>run(
+        source  = lv_dummy
+        options = ms_options ).
       WRITE '@KERNEL   INPUT.resultXML.set(lv_result);'.
       RETURN.
     ENDIF.

src/kernel/call_transformation/kernel_call_transformation.clas.locals_imp.abap

@@ -541,6 +541,7 @@ CLASS lcl_string_to_string DEFINITION.
     CLASS-METHODS run
       IMPORTING
         source        TYPE any
+        options       TYPE kernel_call_transformation=>ty_options
       RETURNING
         VALUE(result) TYPE string.
 ENDCLASS.
@@ -549,5 +550,9 @@ CLASS lcl_string_to_string IMPLEMENTATION.
   METHOD run.
 * this is not right, but works for the unit test
     WRITE '@KERNEL result.set(INPUT.source.get());'.
+
+    IF options-xml_header = 'no'.
+      REPLACE FIRST OCCURRENCE OF REGEX '<?.*?>' IN result WITH ''.
+    ENDIF.
   ENDMETHOD.
 ENDCLASS.

src/kernel/call_transformation/kernel_call_transformation.clas.testclasses.abap

@@ -127,6 +127,7 @@ CLASS ltcl_call_transformation DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATI
     METHODS suppress2 FOR TESTING RAISING cx_static_check.
     METHODS suppress3 FOR TESTING RAISING cx_static_check.
     METHODS xml_to_xml FOR TESTING RAISING cx_static_check.
+    METHODS xml_to_xml_rm_header FOR TESTING RAISING cx_static_check.
 ENDCLASS.
 
 CLASS ltcl_call_transformation IMPLEMENTATION.
@@ -1090,8 +1091,7 @@ CLASS ltcl_call_transformation IMPLEMENTATION.
 
     CALL TRANSFORMATION id
       SOURCE XML lv_xml
-      RESULT XML lv_xml
-      OPTIONS xml_header = 'no'.
+      RESULT XML lv_xml.
 
 * there might be a byte order mark,
     cl_abap_unit_assert=>assert_char_cp(
@@ -1100,4 +1100,23 @@ CLASS ltcl_call_transformation IMPLEMENTATION.
 
   ENDMETHOD.
 
+  METHOD xml_to_xml_rm_header.
+
+    DATA lv_xml TYPE string.
+    DATA lv_bom TYPE xstring.
+
+    lv_xml = |<?xml version="1.0" encoding="UTF-8" standalone="yes" ?><foo>2</foo>|.
+    CALL TRANSFORMATION id SOURCE XML lv_xml RESULT XML lv_xml OPTIONS xml_header = 'no'.
+
+    lv_bom = cl_abap_char_utilities=>byte_order_mark_little.
+    REPLACE FIRST OCCURRENCE OF cl_abap_codepage=>convert_from(
+      source   = lv_bom
+      codepage = 'UTF-16' ) IN lv_xml WITH ''.
+
+    cl_abap_unit_assert=>assert_equals(
+      act = lv_xml
+      exp = '<foo>2</foo>' ).
+
+  ENDMETHOD.
+
 ENDCLASS.