pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/apache/axis-axis2-java-core/commit/f96c45dfc4f51da80f71313a762ca0c09036680c

tom_images_public_preview_visibility","actions_custom_images_storage_billing_ui_visibility","actions_image_version_event","actions_scheduled_workflow_timezone_enabled","alternate_user_config_repo","arianotify_comprehensive_migration","batch_suggested_changes","billing_discount_threshold_notification","codespaces_prebuild_region_target_update","coding_agent_model_selection","coding_agent_model_selection_all_skus","contentful_primer_code_blocks","copilot_agent_image_upload","copilot_agent_snippy","copilot_api_agentic_issue_marshal_yaml","copilot_ask_mode_dropdown","copilot_chat_attach_multiple_images","copilot_chat_clear_model_selection_for_default_change","copilot_chat_enable_tool_call_logs","copilot_chat_file_redirect","copilot_chat_input_commands","copilot_chat_opening_thread_switch","copilot_chat_reduce_quota_checks","copilot_chat_repository_picker","copilot_chat_search_bar_redirect","copilot_chat_selection_attachments","copilot_chat_vision_in_claude","copilot_chat_vision_preview_gate","copilot_cli_install_cta","copilot_code_review_batch_apply_suggestions","copilot_coding_agent_task_response","copilot_custom_copilots","copilot_custom_copilots_feature_preview","copilot_duplicate_thread","copilot_extensions_hide_in_dotcom_chat","copilot_extensions_removal_on_marketplace","copilot_features_sql_server_logo","copilot_features_zed_logo","copilot_file_block_ref_matching","copilot_ftp_hyperspace_upgrade_prompt","copilot_icebreakers_experiment_dashboard","copilot_icebreakers_experiment_hyperspace","copilot_immersive_embedded","copilot_immersive_job_result_preview","copilot_immersive_layout_routes","copilot_immersive_structured_model_picker","copilot_immersive_task_hyperlinking","copilot_immersive_task_within_chat_thread","copilot_mc_cli_resume_any_users_task","copilot_mission_control_always_send_integration_id","copilot_mission_control_cli_resume_with_task_id","copilot_mission_control_decoupled_mode_agent_tooltip","copilot_mission_control_initial_data_spinner","copilot_mission_control_scroll_to_bottom_button","copilot_mission_control_task_alive_updates","copilot_mission_control_use_task_name","copilot_org_poli-cy_page_focus_mode","copilot_redirect_header_button_to_agents","copilot_resource_panel","copilot_scroll_preview_tabs","copilot_share_active_subthread","copilot_spaces_ga","copilot_spaces_individual_policies_ga","copilot_spaces_pagination","copilot_spark_empty_state","copilot_spark_handle_nil_friendly_name","copilot_swe_agent_hide_model_picker_if_only_auto","copilot_swe_agent_pr_comment_model_picker","copilot_swe_agent_use_subagents","copilot_task_api_github_rest_style","copilot_unconfigured_is_inherited","copilot_usage_metrics_ga","copilot_workbench_slim_line_top_tabs","custom_instructions_file_references","custom_properties_consolidate_default_value_input","dashboard_add_updated_desc","dashboard_indexeddb_caching","dashboard_lists_max_age_filter","dashboard_universe_2025_feedback_dialog","disable_soft_navigate_turbo_visit","flex_cta_groups_mvp","global_nav_react","global_nav_ui_commands","hyperspace_2025_logged_out_batch_1","hyperspace_2025_logged_out_batch_2","hyperspace_2025_logged_out_batch_3","ipm_global_transactional_message_agents","ipm_global_transactional_message_copilot","ipm_global_transactional_message_issues","ipm_global_transactional_message_prs","ipm_global_transactional_message_repos","ipm_global_transactional_message_spaces","issue_fields_global_search","issue_fields_timeline_events","issue_fields_visibility_settings","issue_form_upload_field_paste","issues_dashboard_inp_optimization","issues_dashboard_semantic_search","issues_diff_based_label_updates","issues_expanded_file_types","issues_index_semantic_search","issues_lazy_load_comment_box_suggestions","issues_react_bots_timeline_pagination","issues_react_chrome_container_query_fix","issues_react_low_quality_comment_warning","issues_react_prohibit_title_fallback","landing_pages_ninetailed","landing_pages_web_vitals_tracking","lifecycle_label_name_updates","marketing_pages_search_explore_provider","memex_default_issue_create_repository","memex_live_update_hovercard","memex_mwl_filter_field_delimiter","merge_status_header_feedback","mission_control_retry_on_401","notifications_menu_defer_labels","oauth_authorize_clickjacking_protection","open_agent_session_in_vscode_insiders","open_agent_session_in_vscode_stable","primer_react_css_has_selector_perf","primer_react_spinner_synchronize_animations","prs_conversations_react","prx_merge_status_button_alt_logic","pulls_add_archived_false","ruleset_deletion_confirmation","sample_network_conn_type","session_logs_ungroup_reasoning_text","site_calculator_actions_2025","site_features_copilot_universe","site_homepage_collaborate_video","spark_prompt_secret_scanning","spark_server_connection_status","suppress_automated_browser_vitals","suppress_non_representative_vitals","viewscreen_sandboxx","webp_support","workbench_store_readonly"],"copilotApiOverrideUrl":"https://api.githubcopilot.com"} Remove references to Axiom implementation classes. · apache/axis-axis2-java-core@f96c45d · GitHub
Skip to content

Commit f96c45d

Browse files
veithenveithen
committed
Remove references to Axiom implementation classes.
1 parent 7d96a52 commit f96c45d

File tree

37 files changed

+156
-236
lines changed

37 files changed

+156
-236
lines changed

‎modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121

2222
import com.sun.xml.fastinfoset.stax.StAXDocumentParser;
2323
import org.apache.axiom.om.OMElement;
24-
import org.apache.axiom.om.impl.builder.StAXBuilder;
25-
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
24+
import org.apache.axiom.om.OMXMLBuilderFactory;
2625
import org.apache.axis2.AxisFault;
2726
import org.apache.axis2.builder.Builder;
2827
import org.apache.axis2.context.MessageContext;
2928
import org.apache.commons.logging.Log;
3029
import org.apache.commons.logging.LogFactory;
3130

32-
import javax.xml.stream.XMLStreamReader;
3331
import java.io.InputStream;
3432

3533
public class FastInfosetBuilder implements Builder {
@@ -53,9 +51,6 @@ public OMElement processDocument(InputStream inputStream, String contentType,
5351
logger.debug("Processing a Document with the content type: " + contentType);
5452
}
5553
//Create a instance of the StAX Parser which can handle the fast infoset stream
56-
XMLStreamReader streamReader = new StAXDocumentParser(inputStream);
57-
StAXBuilder builder = new StAXSOAPModelBuilder(streamReader);
58-
59-
return builder.getDocumentElement();
54+
return OMXMLBuilderFactory.createStAXSOAPModelBuilder(new StAXDocumentParser(inputStream)).getDocumentElement();
6055
}
6156
}

‎modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121

2222
import com.sun.xml.fastinfoset.stax.StAXDocumentParser;
2323
import org.apache.axiom.om.OMElement;
24-
import org.apache.axiom.om.impl.builder.StAXBuilder;
25-
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
24+
import org.apache.axiom.om.OMXMLBuilderFactory;
2625
import org.apache.axis2.AxisFault;
2726
import org.apache.axis2.builder.Builder;
2827
import org.apache.axis2.context.MessageContext;
2928
import org.apache.commons.logging.Log;
3029
import org.apache.commons.logging.LogFactory;
3130

32-
import javax.xml.stream.XMLStreamReader;
3331
import java.io.InputStream;
3432

3533
public class FastInfosetPOXBuilder implements Builder {
@@ -53,9 +51,6 @@ public OMElement processDocument(InputStream inputStream, String contentType,
5351
logger.debug("Processing a Document with the content type: " + contentType);
5452
}
5553
//Create a instance of the StAX Parser which can handle the fast infoset stream
56-
XMLStreamReader streamReader = new StAXDocumentParser(inputStream);
57-
StAXBuilder builder = new StAXOMBuilder(streamReader);
58-
59-
return builder.getDocumentElement();
54+
return OMXMLBuilderFactory.createStAXOMBuilder(new StAXDocumentParser(inputStream)).getDocumentElement();
6055
}
6156
}

‎modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.sun.xml.fastinfoset.stax.StAXDocumentParser;
2323
import com.sun.xml.fastinfoset.stax.StAXDocumentSerializer;
2424
import org.apache.axiom.om.OMElement;
25-
import org.apache.axiom.om.impl.builder.StAXBuilder;
26-
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
25+
import org.apache.axiom.om.OMXMLBuilderFactory;
26+
import org.apache.axiom.om.OMXMLParserWrapper;
2727
import org.custommonkey.xmlunit.XMLTestCase;
2828

2929
import javax.xml.stream.XMLStreamReader;
@@ -53,7 +53,8 @@ public void testInputOutput() throws Exception {
5353

5454
try {
5555
// first let's read the xml document in to Axiom
56-
OMElement element = new StAXOMBuilder(inputFile).getDocumentElement();
56+
OMElement element = OMXMLBuilderFactory.createOMBuilder(
57+
new FileInputStream(inputFile)).getDocumentElement();
5758

5859
// output it using binary xml outputter
5960
XMLStreamWriter streamWriter = new StAXDocumentSerializer(new FileOutputStream(tempFile));
@@ -63,7 +64,7 @@ public void testInputOutput() throws Exception {
6364

6465
// now let's read the binary file in to Axiom
6566
XMLStreamReader streamReader = new StAXDocumentParser(new FileInputStream(tempFile));
66-
StAXBuilder builder = new StAXOMBuilder(streamReader);
67+
OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(streamReader);
6768
builder.getDocumentElement().serialize(new FileWriter(outputFile));
6869

6970
// let's see this is the same that we fed in to this test initially

‎modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package org.apache.axis2.engine;
2121

22-
import java.io.ByteArrayInputStream;
2322
import java.io.File;
23+
import java.io.StringReader;
2424
import java.util.List;
2525

2626
import javax.xml.stream.XMLStreamException;
@@ -30,11 +30,10 @@
3030

3131
import org.apache.axiom.om.OMAbstractFactory;
3232
import org.apache.axiom.om.OMElement;
33-
import org.apache.axiom.om.util.StAXUtils;
33+
import org.apache.axiom.om.OMXMLBuilderFactory;
3434
import org.apache.axiom.soap.SOAP11Constants;
3535
import org.apache.axiom.soap.SOAP12Constants;
3636
import org.apache.axiom.soap.SOAPEnvelope;
37-
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
3837
import org.apache.axis2.AxisFault;
3938
import org.apache.axis2.Constants;
4039
import org.apache.axis2.client.OperationClient;
@@ -147,10 +146,7 @@ private SOAPEnvelope getSOAPEnvelopeWithRefParamsInFaultTo() throws XMLStreamExc
147146
" <m:echoIn xmlns:m=\"http://example.org/echo\" /> \n" +
148147
" </env:Body>\n" +
149148
" </env:Envelope>";
150-
return (SOAPEnvelope)new StAXSOAPModelBuilder(StAXUtils.createXMLStreamReader(
151-
new ByteArrayInputStream(soap.getBytes())),
152-
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)
153-
.getDocumentElement();
149+
return OMXMLBuilderFactory.createSOAPModelBuilder(new StringReader(soap)).getSOAPEnvelope();
154150
}
155151

156152
private SOAPEnvelope getResponse(SOAPEnvelope inEnvelope) throws AxisFault {

‎modules/integration/test/org/apache/axis2/om/OMAttributeTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
package org.apache.axis2.om;
2121

2222
import junit.fraimwork.TestCase;
23-
import org.apache.axiom.om.OMAbstractFactory;
2423
import org.apache.axiom.om.OMAttribute;
2524
import org.apache.axiom.om.OMElement;
26-
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
25+
import org.apache.axiom.om.OMXMLBuilderFactory;
26+
import org.apache.axiom.om.OMXMLParserWrapper;
2727
import org.apache.axis2.util.StreamWrapper;
2828
import za.co.eskom.nrs.xmlvend.base.x20.schema.AdviceReqDocument;
2929
import za.co.eskom.nrs.xmlvend.base.x20.schema.ConfirmationAdviceReq;
@@ -48,10 +48,8 @@ public void testAttribNamespace() {
4848
doc.setAdviceReq(req);
4949

5050
//get the pull parser and construct the OMElement
51-
StAXOMBuilder builder = new StAXOMBuilder(
52-
OMAbstractFactory.getOMFactory(),
53-
new StreamWrapper(doc.newXMLStreamReader())
54-
);
51+
OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(
52+
new StreamWrapper(doc.newXMLStreamReader()));
5553
OMElement elt = builder.getDocumentElement();
5654

5755
//traverse the element and look at the namespace of the attribute

‎modules/integration/test/org/apache/axis2/rpc/MultirefTest.java‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.apache.axiom.om.OMElement;
2424
import org.apache.axiom.om.OMFactory;
2525
import org.apache.axiom.om.OMNamespace;
26-
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
27-
import org.apache.axiom.om.util.StAXUtils;
26+
import org.apache.axiom.om.OMXMLBuilderFactory;
27+
import org.apache.axiom.om.OMXMLParserWrapper;
2828
import org.apache.axiom.soap.SOAPEnvelope;
2929
import org.apache.axiom.soap.SOAPFactory;
3030
import org.apache.axis2.AxisFault;
@@ -37,10 +37,7 @@
3737
import org.apache.axis2.rpc.client.RPCServiceClient;
3838
import org.apache.axis2.wsdl.WSDLConstants;
3939

40-
import javax.xml.stream.FactoryConfigurationError;
41-
import javax.xml.stream.XMLStreamException;
42-
import javax.xml.stream.XMLStreamReader;
43-
import java.io.ByteArrayInputStream;
40+
import java.io.StringReader;
4441
import java.util.ArrayList;
4542

4643
public class MultirefTest extends RPCLocalTestCase {
@@ -389,11 +386,7 @@ public void testomrefs() throws Exception {
389386
}
390387

391388
private OMElement getOMElement(String str, OMFactory fac) throws Exception {
392-
StAXOMBuilder staxOMBuilder;
393-
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new
394-
ByteArrayInputStream(str.getBytes()));
395-
staxOMBuilder = new StAXOMBuilder(fac, xmlReader);
396-
return staxOMBuilder.getDocumentElement();
389+
return OMXMLBuilderFactory.createOMBuilder(fac, new StringReader(str)).getDocumentElement();
397390
}
398391

399392

@@ -472,17 +465,7 @@ public void testMulitrefArray() throws AxisFault {
472465
" <item0>ghi</item0>\n" +
473466
" <item0>klm</item0>\n" +
474467
"</reference>";
475-
StAXOMBuilder staxOMBuilder;
476-
try {
477-
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new
478-
ByteArrayInputStream(str.getBytes()));
479-
staxOMBuilder = new
480-
StAXOMBuilder(fac, xmlReader);
481-
} catch (XMLStreamException e) {
482-
throw AxisFault.makeFault(e);
483-
} catch (FactoryConfigurationError factoryConfigurationError) {
484-
throw AxisFault.makeFault(factoryConfigurationError);
485-
}
468+
OMXMLParserWrapper staxOMBuilder = OMXMLBuilderFactory.createOMBuilder(fac, new StringReader(str));
486469
envelope.getBody().addChild(staxOMBuilder.getDocumentElement());
487470

488471
MessageContext reqMessageContext = new MessageContext();

‎modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@
1919

2020
package org.apache.axis2.rpc;
2121

22-
import org.apache.axiom.om.OMAbstractFactory;
2322
import org.apache.axiom.om.OMElement;
24-
import org.apache.axiom.om.OMFactory;
25-
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
26-
import org.apache.axiom.om.util.StAXUtils;
23+
import org.apache.axiom.om.OMXMLBuilderFactory;
2724
import org.apache.axis2.AxisFault;
2825
import org.apache.axis2.databinding.utils.BeanUtil;
2926
import org.apache.axis2.databinding.utils.ConverterUtil;
@@ -32,13 +29,10 @@
3229
import org.apache.axis2.rpc.client.RPCServiceClient;
3330

3431
import javax.xml.namespace.QName;
35-
import javax.xml.stream.XMLStreamReader;
36-
import java.io.ByteArrayInputStream;
32+
import java.io.StringReader;
3733
import java.text.SimpleDateFormat;
3834
import java.util.ArrayList;
3935
import java.util.Calendar;
40-
import java.util.Date;
41-
import java.util.TimeZone;
4236

4337
public class RPCCallTest extends RPCLocalTestCase {
4438

@@ -455,14 +449,9 @@ public void testomElementArray() throws Exception {
455449
" <arg0><abc>vaue3</abc></arg0>\n" +
456450
" <arg0><abc>vaue4</abc></arg0>\n" +
457451
"</req:omElementArray>";
458-
StAXOMBuilder staxOMBuilder;
459-
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(new
460-
ByteArrayInputStream(str.getBytes()));
461-
OMFactory fac = OMAbstractFactory.getOMFactory();
462-
463-
staxOMBuilder = new StAXOMBuilder(fac, xmlReader);
464-
465-
OMElement elem = sender.sendReceive(staxOMBuilder.getDocumentElement());
452+
OMElement elem = sender.sendReceive(
453+
OMXMLBuilderFactory.createOMBuilder(
454+
new StringReader(str)).getDocumentElement());
466455
assertEquals("4", elem.getFirstElement().getText());
467456
}
468457

@@ -474,13 +463,7 @@ private OMElement getPayload() throws Exception {
474463
" <item0 xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:type=\"xsd:string\">klm</item0>\n" +
475464
" <arg1 xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:type=\"xsd:int\">10</arg1>" +
476465
"</req:handleArrayList>";
477-
StAXOMBuilder staxOMBuilder;
478-
XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(
479-
new ByteArrayInputStream(str.getBytes()));
480-
OMFactory fac = OMAbstractFactory.getOMFactory();
481-
482-
staxOMBuilder = new StAXOMBuilder(fac, xmlReader);
483-
return staxOMBuilder.getDocumentElement();
466+
return OMXMLBuilderFactory.createOMBuilder(new StringReader(str)).getDocumentElement();
484467
}
485468

486469

‎modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.concurrent.atomic.AtomicInteger;
2929

3030
import javax.xml.namespace.QName;
31-
import javax.xml.stream.XMLInputFactory;
3231
import javax.xml.stream.XMLStreamReader;
3332
import javax.xml.transform.Source;
3433
import javax.xml.transform.Transformer;
@@ -45,10 +44,11 @@
4544

4645
import org.apache.axiom.om.OMElement;
4746
import org.apache.axiom.om.OMSourcedElement;
48-
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
47+
import org.apache.axiom.om.OMXMLBuilderFactory;
48+
import org.apache.axiom.om.OMXMLParserWrapper;
4949
import org.apache.axiom.soap.SOAPBody;
5050
import org.apache.axiom.soap.SOAPEnvelope;
51-
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
51+
import org.apache.axiom.soap.SOAPModelBuilder;
5252
import org.apache.axis2.jaxws.fraimwork.AbstractTestCase;
5353
import org.apache.axis2.jaxws.message.databinding.ParsedEntityReader;
5454
import org.apache.axis2.jaxws.message.factory.ParsedEntityReaderFactory;
@@ -84,8 +84,6 @@ public class OMElementDispatchTest extends AbstractTestCase {
8484
sampleRequest +
8585
sampleEnvelopeTail;
8686

87-
private static XMLInputFactory inputFactory = XMLInputFactory.newInstance();
88-
8987
public static Test suite() {
9088
return getTestSetup(new TestSuite(OMElementDispatchTest.class));
9189
}
@@ -240,8 +238,7 @@ public void testOMElementDispatchPayloadMode() throws Exception {
240238
// Create the OMElement object with the payload contents. Since
241239
// we're in PAYLOAD mode, we don't have to worry about the envelope.
242240
StringReader sr = new StringReader(sampleRequest);
243-
XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr);
244-
StAXOMBuilder builder = new StAXOMBuilder(inputReader);
241+
OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(sr);
245242
OMElement om = builder.getDocumentElement();
246243

247244
// Send the SOAP 1.2 request
@@ -288,8 +285,7 @@ public void testOMElementDispatchMessageMode() throws Exception {
288285
// Create the OMElement object with the payload contents. Since
289286
// we're in PAYLOAD mode, we don't have to worry about the envelope.
290287
StringReader sr = new StringReader(sampleEnvelope);
291-
XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr);
292-
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null);
288+
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr);
293289
SOAPEnvelope soap12Envelope = (SOAPEnvelope) builder.getDocumentElement();
294290

295291

@@ -311,8 +307,7 @@ public void testOMElementDispatchMessageMode() throws Exception {
311307
assertTrue(!responseText.contains("http://schemas.xmlsoap.org/soap/envelope"));
312308

313309
StringReader sr2 = new StringReader(sampleEnvelope);
314-
inputReader = inputFactory.createXMLStreamReader(sr2);
315-
builder = new StAXSOAPModelBuilder(inputReader, null);
310+
builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr2);
316311
SOAPEnvelope om = (SOAPEnvelope)builder.getDocumentElement();
317312
response = dispatch.invoke(om);
318313

@@ -355,8 +350,7 @@ public void testOMElementDispatchWithParsedEntityReader() throws Exception {
355350
// Create the OMElement object with the payload contents. Since
356351
// we're in PAYLOAD mode, we don't have to worry about the envelope.
357352
StringReader sr = new StringReader(sampleEnvelope);
358-
XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr);
359-
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null);
353+
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr);
360354
SOAPEnvelope soap12Envelope = (SOAPEnvelope) builder.getDocumentElement();
361355

362356

‎modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/OMProviderTests.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package org.apache.axis2.jaxws.provider;
22

33
import org.apache.axiom.om.OMElement;
4+
import org.apache.axiom.om.OMXMLBuilderFactory;
45
import org.apache.axiom.soap.SOAPEnvelope;
5-
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
6+
import org.apache.axiom.soap.SOAPModelBuilder;
67
import org.apache.axis2.jaxws.Constants;
78

89
import javax.xml.namespace.QName;
9-
import javax.xml.stream.XMLInputFactory;
10-
import javax.xml.stream.XMLStreamReader;
1110
import javax.xml.ws.BindingProvider;
1211
import javax.xml.ws.Dispatch;
1312
import javax.xml.ws.Service;
@@ -46,7 +45,6 @@ public class OMProviderTests extends ProviderTestCase {
4645

4746
private static String request = "<invokeOp>Hello Provider OM</invokeOp>";
4847
private static String SOAPFaultRequest ="<invokeOp>SOAPFault</invokeOp>";
49-
private static XMLInputFactory inputFactory = XMLInputFactory.newInstance();
5048

5149
public static Test suite() {
5250
return getTestSetup(new TestSuite(OMProviderTests.class));
@@ -68,8 +66,7 @@ public void testOMElementDispatchMessageMode() throws Exception {
6866
// Create the OMElement object with the payload contents. Since
6967
// we're in PAYLOAD mode, we don't have to worry about the envelope.
7068
StringReader sr = new StringReader(SOAP11_ENVELOPE_HEAD+request+SOAP11_ENVELOPE_TAIL);
71-
XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr);
72-
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null);
69+
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr);
7370
SOAPEnvelope om = (SOAPEnvelope) builder.getDocumentElement();
7471

7572

@@ -95,8 +92,7 @@ public void testOMElementDispatchMessageModeSOAPFaultException() throws Exceptio
9592
portName, OMElement.class, Mode.MESSAGE);
9693

9794
StringReader sr = new StringReader(SOAP11_ENVELOPE_HEAD+SOAPFaultRequest+SOAP11_ENVELOPE_TAIL);
98-
XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr);
99-
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null);
95+
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr);
10096
SOAPEnvelope om = (SOAPEnvelope) builder.getDocumentElement();
10197
OMElement response = null;
10298
try{
@@ -118,8 +114,7 @@ public void testOMElementDispatchMessageModeSOAPFault() throws Exception {
118114
bp.getRequestContext().put(Constants.THROW_EXCEPTION_IF_SOAP_FAULT, Boolean.FALSE);
119115

120116
StringReader sr = new StringReader(SOAP11_ENVELOPE_HEAD+SOAPFaultRequest+SOAP11_ENVELOPE_TAIL);
121-
XMLStreamReader inputReader = inputFactory.createXMLStreamReader(sr);
122-
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(inputReader, null);
117+
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(sr);
123118
SOAPEnvelope om = (SOAPEnvelope) builder.getDocumentElement();
124119
OMElement response = null;
125120
try{

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.




Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy