--- old/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java 2017-05-03 18:05:57.807094783 +0300 +++ new/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java 2017-05-03 18:05:57.667094787 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,374 +25,383 @@ package com.sun.xml.internal.ws.resources; +import java.util.Locale; +import java.util.ResourceBundle; +import javax.annotation.Generated; import com.sun.istack.internal.localization.Localizable; import com.sun.istack.internal.localization.LocalizableMessageFactory; +import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier; import com.sun.istack.internal.localization.Localizer; -import java.util.Locale; -import java.util.ResourceBundle; - /** * Defines string formatting method for each constant in the resource file * */ +@Generated("com.sun.istack.internal.maven.ResourceGenMojo") public final class AddressingMessages { - private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.addressing"; - private final static LocalizableMessageFactory messageFactory = - new LocalizableMessageFactory(BUNDLE_NAME, AddressingMessages::getResourceBundle); - private final static Localizer localizer = new Localizer(); - private static ResourceBundle getResourceBundle(Locale locale) { - return ResourceBundle.getBundle(BUNDLE_NAME, locale); - } + private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.addressing"; + private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new AddressingMessages.BundleSupplier()); + private final static Localizer LOCALIZER = new Localizer(); - public static Localizable localizableNON_ANONYMOUS_RESPONSE_ONEWAY() { - return messageFactory.getMessage("nonAnonymous.response.oneway"); + public static Localizable localizableADDRESSING_NOT_ENABLED(Object arg0) { + return MESSAGE_FACTORY.getMessage("addressing.notEnabled", arg0); } /** - * Ignoring non-anonymous response for one-way message + * Addressing is not enabled, {0} should not be included in the pipeline" * */ - public static String NON_ANONYMOUS_RESPONSE_ONEWAY() { - return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_ONEWAY()); + public static String ADDRESSING_NOT_ENABLED(Object arg0) { + return LOCALIZER.localize(localizableADDRESSING_NOT_ENABLED(arg0)); } - public static Localizable localizableNULL_WSA_HEADERS() { - return messageFactory.getMessage("null.wsa.headers"); + public static Localizable localizableWSAW_ANONYMOUS_PROHIBITED() { + return MESSAGE_FACTORY.getMessage("wsaw.anonymousProhibited"); } /** - * No WS-Addressing headers found processing the server inbound request + * Operation has "prohibited" value for wsaw:anonymous in the WSDL, Addressing must be disabled and SOAP message need to be hand-crafted * */ - public static String NULL_WSA_HEADERS() { - return localizer.localize(localizableNULL_WSA_HEADERS()); + public static String WSAW_ANONYMOUS_PROHIBITED() { + return LOCALIZER.localize(localizableWSAW_ANONYMOUS_PROHIBITED()); } - public static Localizable localizableUNKNOWN_WSA_HEADER() { - return messageFactory.getMessage("unknown.wsa.header"); + public static Localizable localizableNULL_SOAP_VERSION() { + return MESSAGE_FACTORY.getMessage("null.soap.version"); } /** - * Unknown WS-Addressing header + * Unexpected null SOAP version * */ - public static String UNKNOWN_WSA_HEADER() { - return localizer.localize(localizableUNKNOWN_WSA_HEADER()); + public static String NULL_SOAP_VERSION() { + return LOCALIZER.localize(localizableNULL_SOAP_VERSION()); } - public static Localizable localizableNULL_ACTION() { - return messageFactory.getMessage("null.action"); + public static Localizable localizableNULL_HEADERS() { + return MESSAGE_FACTORY.getMessage("null.headers"); } /** - * Populating request Addressing headers and found null Action + * No headers found when processing the server inbound request and WS-Addressing is required * */ - public static String NULL_ACTION() { - return localizer.localize(localizableNULL_ACTION()); + public static String NULL_HEADERS() { + return LOCALIZER.localize(localizableNULL_HEADERS()); } - public static Localizable localizableINVALID_WSAW_ANONYMOUS(Object arg0) { - return messageFactory.getMessage("invalid.wsaw.anonymous", arg0); + public static Localizable localizableFAULT_TO_CANNOT_PARSE() { + return MESSAGE_FACTORY.getMessage("faultTo.cannot.parse"); } /** - * Invalid value obtained from wsaw:Anonymous: "{0}" + * FaultTo header cannot be parsed * */ - public static String INVALID_WSAW_ANONYMOUS(Object arg0) { - return localizer.localize(localizableINVALID_WSAW_ANONYMOUS(arg0)); + public static String FAULT_TO_CANNOT_PARSE() { + return LOCALIZER.localize(localizableFAULT_TO_CANNOT_PARSE()); } - public static Localizable localizableNULL_SOAP_VERSION() { - return messageFactory.getMessage("null.soap.version"); + public static Localizable localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) { + return MESSAGE_FACTORY.getMessage("nonAnonymous.response.nullHeaders", arg0); } /** - * Unexpected null SOAP version + * No response headers found in non-anonymous response from "{0}" * */ - public static String NULL_SOAP_VERSION() { - return localizer.localize(localizableNULL_SOAP_VERSION()); + public static String NON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) { + return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(arg0)); } - public static Localizable localizableWSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) { - return messageFactory.getMessage("wsdlBoundOperation.notFound", arg0); + public static Localizable localizableUNKNOWN_WSA_HEADER() { + return MESSAGE_FACTORY.getMessage("unknown.wsa.header"); } /** - * Cannot find an operation in wsdl:binding for "{0}" + * Unknown WS-Addressing header * */ - public static String WSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) { - return localizer.localize(localizableWSDL_BOUND_OPERATION_NOT_FOUND(arg0)); + public static String UNKNOWN_WSA_HEADER() { + return LOCALIZER.localize(localizableUNKNOWN_WSA_HEADER()); } - public static Localizable localizableNON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) { - return messageFactory.getMessage("non.unique.operation.signature", arg0, arg1, arg2, arg3); + public static Localizable localizableINVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) { + return MESSAGE_FACTORY.getMessage("invalid.addressing.header.exception", arg0, arg1); } /** - * Operations in a port should have unique operation signature to successfuly identify a associated wsdl operation for a message. WSDL operation {0} and {1} have the same operation signature, wsa:Action "{2}" and request body block "{3}", Method dispatching may fail at runtime. Use unique wsa:Action for each operation + * Invalid WS-Addressing header: "{0}",Reason: "{1}" * */ - public static String NON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) { - return localizer.localize(localizableNON_UNIQUE_OPERATION_SIGNATURE(arg0, arg1, arg2, arg3)); + public static String INVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) { + return LOCALIZER.localize(localizableINVALID_ADDRESSING_HEADER_EXCEPTION(arg0, arg1)); } - public static Localizable localizableNON_ANONYMOUS_RESPONSE() { - return messageFactory.getMessage("nonAnonymous.response"); + public static Localizable localizableNULL_WSDL_PORT() { + return MESSAGE_FACTORY.getMessage("null.wsdlPort"); } /** - * Sending 202 and processing non-anonymous response + * Populating request Addressing headers and found null WSDLPort * */ - public static String NON_ANONYMOUS_RESPONSE() { - return localizer.localize(localizableNON_ANONYMOUS_RESPONSE()); + public static String NULL_WSDL_PORT() { + return LOCALIZER.localize(localizableNULL_WSDL_PORT()); } - public static Localizable localizableVALIDATION_SERVER_NULL_ACTION() { - return messageFactory.getMessage("validation.server.nullAction"); + public static Localizable localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) { + return MESSAGE_FACTORY.getMessage("nonAnonymous.unknown.protocol", arg0); } /** - * Validating inbound Addressing headers on server and found null Action + * Unknown protocol: "{0}" * */ - public static String VALIDATION_SERVER_NULL_ACTION() { - return localizer.localize(localizableVALIDATION_SERVER_NULL_ACTION()); + public static String NON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) { + return LOCALIZER.localize(localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(arg0)); } - public static Localizable localizableFAULT_TO_CANNOT_PARSE() { - return messageFactory.getMessage("faultTo.cannot.parse"); + public static Localizable localizableNON_ANONYMOUS_RESPONSE_SENDING(Object arg0) { + return MESSAGE_FACTORY.getMessage("nonAnonymous.response.sending", arg0); } /** - * FaultTo header cannot be parsed + * Sending non-anonymous reply to "{0}" * */ - public static String FAULT_TO_CANNOT_PARSE() { - return localizer.localize(localizableFAULT_TO_CANNOT_PARSE()); + public static String NON_ANONYMOUS_RESPONSE_SENDING(Object arg0) { + return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_SENDING(arg0)); } - public static Localizable localizableVALIDATION_CLIENT_NULL_ACTION() { - return messageFactory.getMessage("validation.client.nullAction"); + public static Localizable localizableNON_ANONYMOUS_RESPONSE() { + return MESSAGE_FACTORY.getMessage("nonAnonymous.response"); } /** - * Validating inbound Addressing headers on client and found null Action + * Sending 202 and processing non-anonymous response * */ - public static String VALIDATION_CLIENT_NULL_ACTION() { - return localizer.localize(localizableVALIDATION_CLIENT_NULL_ACTION()); + public static String NON_ANONYMOUS_RESPONSE() { + return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE()); } - public static Localizable localizableNULL_MESSAGE() { - return messageFactory.getMessage("null.message"); + public static Localizable localizableREPLY_TO_CANNOT_PARSE() { + return MESSAGE_FACTORY.getMessage("replyTo.cannot.parse"); } /** - * Null message found when processing the server inbound request and WS-Addressing is required + * ReplyTo header cannot be parsed * */ - public static String NULL_MESSAGE() { - return localizer.localize(localizableNULL_MESSAGE()); + public static String REPLY_TO_CANNOT_PARSE() { + return LOCALIZER.localize(localizableREPLY_TO_CANNOT_PARSE()); } - public static Localizable localizableACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) { - return messageFactory.getMessage("action.not.supported.exception", arg0); + public static Localizable localizableINVALID_WSAW_ANONYMOUS(Object arg0) { + return MESSAGE_FACTORY.getMessage("invalid.wsaw.anonymous", arg0); } /** - * Action: "{0}" not supported + * Invalid value obtained from wsaw:Anonymous: "{0}" * */ - public static String ACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) { - return localizer.localize(localizableACTION_NOT_SUPPORTED_EXCEPTION(arg0)); + public static String INVALID_WSAW_ANONYMOUS(Object arg0) { + return LOCALIZER.localize(localizableINVALID_WSAW_ANONYMOUS(arg0)); } - public static Localizable localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) { - return messageFactory.getMessage("nonAnonymous.response.nullHeaders", arg0); + public static Localizable localizableVALIDATION_CLIENT_NULL_ACTION() { + return MESSAGE_FACTORY.getMessage("validation.client.nullAction"); } /** - * No response headers found in non-anonymous response from "{0}" + * Validating inbound Addressing headers on client and found null Action * */ - public static String NON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) { - return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(arg0)); + public static String VALIDATION_CLIENT_NULL_ACTION() { + return LOCALIZER.localize(localizableVALIDATION_CLIENT_NULL_ACTION()); } - public static Localizable localizableNON_ANONYMOUS_RESPONSE_SENDING(Object arg0) { - return messageFactory.getMessage("nonAnonymous.response.sending", arg0); + public static Localizable localizableWSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) { + return MESSAGE_FACTORY.getMessage("wsdlBoundOperation.notFound", arg0); } /** - * Sending non-anonymous reply to "{0}" + * Cannot find an operation in wsdl:binding for "{0}" * */ - public static String NON_ANONYMOUS_RESPONSE_SENDING(Object arg0) { - return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_SENDING(arg0)); + public static String WSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) { + return LOCALIZER.localize(localizableWSDL_BOUND_OPERATION_NOT_FOUND(arg0)); } - public static Localizable localizableREPLY_TO_CANNOT_PARSE() { - return messageFactory.getMessage("replyTo.cannot.parse"); + public static Localizable localizableMISSING_HEADER_EXCEPTION(Object arg0) { + return MESSAGE_FACTORY.getMessage("missing.header.exception", arg0); } /** - * ReplyTo header cannot be parsed + * Missing WS-Addressing header: "{0}" * */ - public static String REPLY_TO_CANNOT_PARSE() { - return localizer.localize(localizableREPLY_TO_CANNOT_PARSE()); + public static String MISSING_HEADER_EXCEPTION(Object arg0) { + return LOCALIZER.localize(localizableMISSING_HEADER_EXCEPTION(arg0)); } - public static Localizable localizableINVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) { - return messageFactory.getMessage("invalid.addressing.header.exception", arg0, arg1); + public static Localizable localizableNULL_BINDING() { + return MESSAGE_FACTORY.getMessage("null.binding"); } /** - * Invalid WS-Addressing header: "{0}",Reason: "{1}" + * Populating request Addressing headers and found null Binding * */ - public static String INVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) { - return localizer.localize(localizableINVALID_ADDRESSING_HEADER_EXCEPTION(arg0, arg1)); + public static String NULL_BINDING() { + return LOCALIZER.localize(localizableNULL_BINDING()); } - public static Localizable localizableWSAW_ANONYMOUS_PROHIBITED() { - return messageFactory.getMessage("wsaw.anonymousProhibited"); + public static Localizable localizableNULL_WSA_HEADERS() { + return MESSAGE_FACTORY.getMessage("null.wsa.headers"); } /** - * Operation has "prohibited" value for wsaw:anonymous in the WSDL, Addressing must be disabled and SOAP message need to be hand-crafted + * No WS-Addressing headers found processing the server inbound request * */ - public static String WSAW_ANONYMOUS_PROHIBITED() { - return localizer.localize(localizableWSAW_ANONYMOUS_PROHIBITED()); + public static String NULL_WSA_HEADERS() { + return LOCALIZER.localize(localizableNULL_WSA_HEADERS()); } - public static Localizable localizableNULL_WSDL_PORT() { - return messageFactory.getMessage("null.wsdlPort"); + public static Localizable localizableNON_ANONYMOUS_RESPONSE_ONEWAY() { + return MESSAGE_FACTORY.getMessage("nonAnonymous.response.oneway"); } /** - * Populating request Addressing headers and found null WSDLPort + * Ignoring non-anonymous response for one-way message * */ - public static String NULL_WSDL_PORT() { - return localizer.localize(localizableNULL_WSDL_PORT()); + public static String NON_ANONYMOUS_RESPONSE_ONEWAY() { + return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_ONEWAY()); } - public static Localizable localizableADDRESSING_SHOULD_BE_ENABLED() { - return messageFactory.getMessage("addressing.should.be.enabled."); + public static Localizable localizableVALIDATION_SERVER_NULL_ACTION() { + return MESSAGE_FACTORY.getMessage("validation.server.nullAction"); } /** - * Addressing is not enabled + * Validating inbound Addressing headers on server and found null Action * */ - public static String ADDRESSING_SHOULD_BE_ENABLED() { - return localizer.localize(localizableADDRESSING_SHOULD_BE_ENABLED()); + public static String VALIDATION_SERVER_NULL_ACTION() { + return LOCALIZER.localize(localizableVALIDATION_SERVER_NULL_ACTION()); } - public static Localizable localizableNULL_ADDRESSING_VERSION() { - return messageFactory.getMessage("null.addressing.version"); + public static Localizable localizableWRONG_ADDRESSING_VERSION(Object arg0, Object arg1) { + return MESSAGE_FACTORY.getMessage("wrong.addressing.version", arg0, arg1); } /** - * Unexpected null Addressing version + * Expected "{0}" version of WS-Addressing but found "{1}" * */ - public static String NULL_ADDRESSING_VERSION() { - return localizer.localize(localizableNULL_ADDRESSING_VERSION()); + public static String WRONG_ADDRESSING_VERSION(Object arg0, Object arg1) { + return LOCALIZER.localize(localizableWRONG_ADDRESSING_VERSION(arg0, arg1)); } - public static Localizable localizableMISSING_HEADER_EXCEPTION(Object arg0) { - return messageFactory.getMessage("missing.header.exception", arg0); + public static Localizable localizableACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) { + return MESSAGE_FACTORY.getMessage("action.not.supported.exception", arg0); } /** - * Missing WS-Addressing header: "{0}" + * Action: "{0}" not supported * */ - public static String MISSING_HEADER_EXCEPTION(Object arg0) { - return localizer.localize(localizableMISSING_HEADER_EXCEPTION(arg0)); + public static String ACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) { + return LOCALIZER.localize(localizableACTION_NOT_SUPPORTED_EXCEPTION(arg0)); } - public static Localizable localizableNULL_PACKET() { - return messageFactory.getMessage("null.packet"); + public static Localizable localizableNULL_MESSAGE() { + return MESSAGE_FACTORY.getMessage("null.message"); } /** - * Populating request Addressing headers and found null Packet + * Null message found when processing the server inbound request and WS-Addressing is required * */ - public static String NULL_PACKET() { - return localizer.localize(localizableNULL_PACKET()); + public static String NULL_MESSAGE() { + return LOCALIZER.localize(localizableNULL_MESSAGE()); } - public static Localizable localizableWRONG_ADDRESSING_VERSION(Object arg0, Object arg1) { - return messageFactory.getMessage("wrong.addressing.version", arg0, arg1); + public static Localizable localizableADDRESSING_SHOULD_BE_ENABLED() { + return MESSAGE_FACTORY.getMessage("addressing.should.be.enabled."); } /** - * Expected "{0}" version of WS-Addressing but found "{1}" + * Addressing is not enabled * */ - public static String WRONG_ADDRESSING_VERSION(Object arg0, Object arg1) { - return localizer.localize(localizableWRONG_ADDRESSING_VERSION(arg0, arg1)); + public static String ADDRESSING_SHOULD_BE_ENABLED() { + return LOCALIZER.localize(localizableADDRESSING_SHOULD_BE_ENABLED()); } - public static Localizable localizableADDRESSING_NOT_ENABLED(Object arg0) { - return messageFactory.getMessage("addressing.notEnabled", arg0); + public static Localizable localizableNULL_PACKET() { + return MESSAGE_FACTORY.getMessage("null.packet"); } /** - * Addressing is not enabled, {0} should not be included in the pipeline" + * Populating request Addressing headers and found null Packet * */ - public static String ADDRESSING_NOT_ENABLED(Object arg0) { - return localizer.localize(localizableADDRESSING_NOT_ENABLED(arg0)); + public static String NULL_PACKET() { + return LOCALIZER.localize(localizableNULL_PACKET()); } - public static Localizable localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) { - return messageFactory.getMessage("nonAnonymous.unknown.protocol", arg0); + public static Localizable localizableNULL_ADDRESSING_VERSION() { + return MESSAGE_FACTORY.getMessage("null.addressing.version"); } /** - * Unknown protocol: "{0}" + * Unexpected null Addressing version * */ - public static String NON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) { - return localizer.localize(localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(arg0)); + public static String NULL_ADDRESSING_VERSION() { + return LOCALIZER.localize(localizableNULL_ADDRESSING_VERSION()); } - public static Localizable localizableNULL_HEADERS() { - return messageFactory.getMessage("null.headers"); + public static Localizable localizableNULL_ACTION() { + return MESSAGE_FACTORY.getMessage("null.action"); } /** - * No headers found when processing the server inbound request and WS-Addressing is required + * Populating request Addressing headers and found null Action * */ - public static String NULL_HEADERS() { - return localizer.localize(localizableNULL_HEADERS()); + public static String NULL_ACTION() { + return LOCALIZER.localize(localizableNULL_ACTION()); } - public static Localizable localizableNULL_BINDING() { - return messageFactory.getMessage("null.binding"); + public static Localizable localizableNON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) { + return MESSAGE_FACTORY.getMessage("non.unique.operation.signature", arg0, arg1, arg2, arg3); } /** - * Populating request Addressing headers and found null Binding + * Operations in a port should have unique operation signature to successfuly identify a associated wsdl operation for a message. WSDL operation {0} and {1} have the same operation signature, wsa:Action "{2}" and request body block "{3}", Method dispatching may fail at runtime. Use unique wsa:Action for each operation * */ - public static String NULL_BINDING() { - return localizer.localize(localizableNULL_BINDING()); + public static String NON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) { + return LOCALIZER.localize(localizableNON_UNIQUE_OPERATION_SIGNATURE(arg0, arg1, arg2, arg3)); + } + + private static class BundleSupplier + implements ResourceBundleSupplier + { + + + public ResourceBundle getResourceBundle(Locale locale) { + return ResourceBundle.getBundle(BUNDLE_NAME, locale); + } + } }