--- old/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java 2017-06-01 18:21:12.957569629 +0100 +++ new/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java 2017-06-01 18:21:12.897569629 +0100 @@ -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,55 +25,64 @@ 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 ClientMessages { + private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.client"; - private final static LocalizableMessageFactory messageFactory = - new LocalizableMessageFactory(BUNDLE_NAME, ClientMessages::getResourceBundle); - private final static Localizer localizer = new Localizer(); + private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ClientMessages.BundleSupplier()); + private final static Localizer LOCALIZER = new Localizer(); - private static ResourceBundle getResourceBundle(Locale locale) { - return ResourceBundle.getBundle(BUNDLE_NAME, locale); + public static Localizable localizableINVALID_WSDL_URL(Object arg0) { + return MESSAGE_FACTORY.getMessage("invalid.wsdl.url", arg0); } - public static Localizable localizableFAILED_TO_PARSE(Object arg0, Object arg1) { - return messageFactory.getMessage("failed.to.parse", arg0, arg1); + /** + * Invalid WSDL URL: {0} + * + */ + public static String INVALID_WSDL_URL(Object arg0) { + return LOCALIZER.localize(localizableINVALID_WSDL_URL(arg0)); + } + + public static Localizable localizableINVALID_EPR_PORT_NAME(Object arg0, Object arg1) { + return MESSAGE_FACTORY.getMessage("invalid.epr.port.name", arg0, arg1); } /** - * Failed to access the WSDL at: {0}. It failed with: - * {1}. + * EndpointName specified in EPR {0} is not a WSDL port QName, valid Ports are {1} * */ - public static String FAILED_TO_PARSE(Object arg0, Object arg1) { - return localizer.localize(localizableFAILED_TO_PARSE(arg0, arg1)); + public static String INVALID_EPR_PORT_NAME(Object arg0, Object arg1) { + return LOCALIZER.localize(localizableINVALID_EPR_PORT_NAME(arg0, arg1)); } - public static Localizable localizableINVALID_BINDING_ID(Object arg0, Object arg1) { - return messageFactory.getMessage("invalid.binding.id", arg0, arg1); + public static Localizable localizableINVALID_SOAP_ROLE_NONE() { + return MESSAGE_FACTORY.getMessage("invalid.soap.role.none"); } /** - * Invalid binding id: {0}. Must be: {1} + * Cannot set SOAP 1.2 role "none" * */ - public static String INVALID_BINDING_ID(Object arg0, Object arg1) { - return localizer.localize(localizableINVALID_BINDING_ID(arg0, arg1)); + public static String INVALID_SOAP_ROLE_NONE() { + return LOCALIZER.localize(localizableINVALID_SOAP_ROLE_NONE()); } public static Localizable localizableEPR_WITHOUT_ADDRESSING_ON() { - return messageFactory.getMessage("epr.without.addressing.on"); + return MESSAGE_FACTORY.getMessage("epr.without.addressing.on"); } /** @@ -81,98 +90,98 @@ * */ public static String EPR_WITHOUT_ADDRESSING_ON() { - return localizer.localize(localizableEPR_WITHOUT_ADDRESSING_ON()); + return LOCALIZER.localize(localizableEPR_WITHOUT_ADDRESSING_ON()); } - public static Localizable localizableINVALID_SERVICE_NO_WSDL(Object arg0) { - return messageFactory.getMessage("invalid.service.no.wsdl", arg0); + public static Localizable localizableFAILED_TO_PARSE_WITH_MEX(Object arg0, Object arg1, Object arg2) { + return MESSAGE_FACTORY.getMessage("failed.to.parseWithMEX", arg0, arg1, arg2); } /** - * No wsdl metadata for service: {0}, can't create proxy! Try creating Service by providing a WSDL URL + * Failed to access the WSDL at: {0}. It failed with: + * {1}. + * Retrying with MEX gave: + * {2} * */ - public static String INVALID_SERVICE_NO_WSDL(Object arg0) { - return localizer.localize(localizableINVALID_SERVICE_NO_WSDL(arg0)); + public static String FAILED_TO_PARSE_WITH_MEX(Object arg0, Object arg1, Object arg2) { + return LOCALIZER.localize(localizableFAILED_TO_PARSE_WITH_MEX(arg0, arg1, arg2)); } - public static Localizable localizableINVALID_SOAP_ROLE_NONE() { - return messageFactory.getMessage("invalid.soap.role.none"); + public static Localizable localizableHTTP_STATUS_CODE(Object arg0, Object arg1) { + return MESSAGE_FACTORY.getMessage("http.status.code", arg0, arg1); } /** - * Cannot set SOAP 1.2 role "none" + * The server sent HTTP status code {0}: {1} * */ - public static String INVALID_SOAP_ROLE_NONE() { - return localizer.localize(localizableINVALID_SOAP_ROLE_NONE()); + public static String HTTP_STATUS_CODE(Object arg0, Object arg1) { + return LOCALIZER.localize(localizableHTTP_STATUS_CODE(arg0, arg1)); } - public static Localizable localizableUNDEFINED_BINDING(Object arg0) { - return messageFactory.getMessage("undefined.binding", arg0); + public static Localizable localizableINVALID_SERVICE_NAME(Object arg0, Object arg1) { + return MESSAGE_FACTORY.getMessage("invalid.service.name", arg0, arg1); } /** - * Undefined binding: {0} + * {0} is not a valid service. Valid services are: {1} * */ - public static String UNDEFINED_BINDING(Object arg0) { - return localizer.localize(localizableUNDEFINED_BINDING(arg0)); + public static String INVALID_SERVICE_NAME(Object arg0, Object arg1) { + return LOCALIZER.localize(localizableINVALID_SERVICE_NAME(arg0, arg1)); } - public static Localizable localizableHTTP_NOT_FOUND(Object arg0) { - return messageFactory.getMessage("http.not.found", arg0); + public static Localizable localizableRUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) { + return MESSAGE_FACTORY.getMessage("runtime.wsdlparser.invalidWSDL", arg0, arg1, arg2, arg3); } /** - * HTTP Status-Code 404: Not Found - {0} + * Invalid WSDL {0}, expected {1} found {2} at (line{3}) * */ - public static String HTTP_NOT_FOUND(Object arg0) { - return localizer.localize(localizableHTTP_NOT_FOUND(arg0)); + public static String RUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) { + return LOCALIZER.localize(localizableRUNTIME_WSDLPARSER_INVALID_WSDL(arg0, arg1, arg2, arg3)); } - public static Localizable localizableINVALID_EPR_PORT_NAME(Object arg0, Object arg1) { - return messageFactory.getMessage("invalid.epr.port.name", arg0, arg1); + public static Localizable localizableNON_LOGICAL_HANDLER_SET(Object arg0) { + return MESSAGE_FACTORY.getMessage("non.logical.handler.set", arg0); } /** - * EndpointName specified in EPR {0} is not a WSDL port QName, valid Ports are {1} + * Cannot set {0} on binding. Handler must be a LogicalHandler. * */ - public static String INVALID_EPR_PORT_NAME(Object arg0, Object arg1) { - return localizer.localize(localizableINVALID_EPR_PORT_NAME(arg0, arg1)); + public static String NON_LOGICAL_HANDLER_SET(Object arg0) { + return LOCALIZER.localize(localizableNON_LOGICAL_HANDLER_SET(arg0)); } - public static Localizable localizableFAILED_TO_PARSE_WITH_MEX(Object arg0, Object arg1, Object arg2) { - return messageFactory.getMessage("failed.to.parseWithMEX", arg0, arg1, arg2); + public static Localizable localizableINVALID_PORT_NAME(Object arg0, Object arg1) { + return MESSAGE_FACTORY.getMessage("invalid.port.name", arg0, arg1); } /** - * Failed to access the WSDL at: {0}. It failed with: - * {1}. - * Retrying with MEX gave: - * {2} + * {0} is not a valid port. Valid ports are: {1} * */ - public static String FAILED_TO_PARSE_WITH_MEX(Object arg0, Object arg1, Object arg2) { - return localizer.localize(localizableFAILED_TO_PARSE_WITH_MEX(arg0, arg1, arg2)); + public static String INVALID_PORT_NAME(Object arg0, Object arg1) { + return LOCALIZER.localize(localizableINVALID_PORT_NAME(arg0, arg1)); } - public static Localizable localizableHTTP_STATUS_CODE(Object arg0, Object arg1) { - return messageFactory.getMessage("http.status.code", arg0, arg1); + public static Localizable localizableINVALID_SOAP_ACTION() { + return MESSAGE_FACTORY.getMessage("invalid.soap.action"); } /** - * The server sent HTTP status code {0}: {1} + * A valid SOAPAction should be set in the RequestContext when Addressing is enabled, Use BindingProvider.SOAPACTION_URI_PROPERTY to set it. * */ - public static String HTTP_STATUS_CODE(Object arg0, Object arg1) { - return localizer.localize(localizableHTTP_STATUS_CODE(arg0, arg1)); + public static String INVALID_SOAP_ACTION() { + return LOCALIZER.localize(localizableINVALID_SOAP_ACTION()); } public static Localizable localizableINVALID_ADDRESS(Object arg0) { - return messageFactory.getMessage("invalid.address", arg0); + return MESSAGE_FACTORY.getMessage("invalid.address", arg0); } /** @@ -180,175 +189,175 @@ * */ public static String INVALID_ADDRESS(Object arg0) { - return localizer.localize(localizableINVALID_ADDRESS(arg0)); + return LOCALIZER.localize(localizableINVALID_ADDRESS(arg0)); } - public static Localizable localizableUNDEFINED_PORT_TYPE(Object arg0) { - return messageFactory.getMessage("undefined.portType", arg0); + public static Localizable localizableFAILED_TO_PARSE(Object arg0, Object arg1) { + return MESSAGE_FACTORY.getMessage("failed.to.parse", arg0, arg1); } /** - * Undefined port type: {0} + * Failed to access the WSDL at: {0}. It failed with: + * {1}. * */ - public static String UNDEFINED_PORT_TYPE(Object arg0) { - return localizer.localize(localizableUNDEFINED_PORT_TYPE(arg0)); + public static String FAILED_TO_PARSE(Object arg0, Object arg1) { + return LOCALIZER.localize(localizableFAILED_TO_PARSE(arg0, arg1)); } - public static Localizable localizableWSDL_CONTAINS_NO_SERVICE(Object arg0) { - return messageFactory.getMessage("wsdl.contains.no.service", arg0); + public static Localizable localizableHTTP_NOT_FOUND(Object arg0) { + return MESSAGE_FACTORY.getMessage("http.not.found", arg0); } /** - * WSDL {0} contains no service definition. + * HTTP Status-Code 404: Not Found - {0} * */ - public static String WSDL_CONTAINS_NO_SERVICE(Object arg0) { - return localizer.localize(localizableWSDL_CONTAINS_NO_SERVICE(arg0)); + public static String HTTP_NOT_FOUND(Object arg0) { + return LOCALIZER.localize(localizableHTTP_NOT_FOUND(arg0)); } - public static Localizable localizableINVALID_SOAP_ACTION() { - return messageFactory.getMessage("invalid.soap.action"); + public static Localizable localizableUNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) { + return MESSAGE_FACTORY.getMessage("unsupported.operation", arg0, arg1, arg2); } /** - * A valid SOAPAction should be set in the RequestContext when Addressing is enabled, Use BindingProvider.SOAPACTION_URI_PROPERTY to set it. + * {0} not supported with {1}. Must be: {2} * */ - public static String INVALID_SOAP_ACTION() { - return localizer.localize(localizableINVALID_SOAP_ACTION()); + public static String UNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) { + return LOCALIZER.localize(localizableUNSUPPORTED_OPERATION(arg0, arg1, arg2)); } - public static Localizable localizableNON_LOGICAL_HANDLER_SET(Object arg0) { - return messageFactory.getMessage("non.logical.handler.set", arg0); + public static Localizable localizableWSDL_NOT_FOUND(Object arg0) { + return MESSAGE_FACTORY.getMessage("wsdl.not.found", arg0); } /** - * Cannot set {0} on binding. Handler must be a LogicalHandler. + * WSDL url {0} is not accessible. * */ - public static String NON_LOGICAL_HANDLER_SET(Object arg0) { - return localizer.localize(localizableNON_LOGICAL_HANDLER_SET(arg0)); + public static String WSDL_NOT_FOUND(Object arg0) { + return LOCALIZER.localize(localizableWSDL_NOT_FOUND(arg0)); } - public static Localizable localizableLOCAL_CLIENT_FAILED(Object arg0) { - return messageFactory.getMessage("local.client.failed", arg0); + public static Localizable localizableINVALID_SERVICE_NAME_NULL(Object arg0) { + return MESSAGE_FACTORY.getMessage("invalid.service.name.null", arg0); } /** - * local transport error: {0} + * {0} is not a valid service * */ - public static String LOCAL_CLIENT_FAILED(Object arg0) { - return localizer.localize(localizableLOCAL_CLIENT_FAILED(arg0)); + public static String INVALID_SERVICE_NAME_NULL(Object arg0) { + return LOCALIZER.localize(localizableINVALID_SERVICE_NAME_NULL(arg0)); } - public static Localizable localizableRUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) { - return messageFactory.getMessage("runtime.wsdlparser.invalidWSDL", arg0, arg1, arg2, arg3); + public static Localizable localizableHTTP_CLIENT_FAILED(Object arg0) { + return MESSAGE_FACTORY.getMessage("http.client.failed", arg0); } /** - * Invalid WSDL {0}, expected {1} found {2} at (line{3}) + * HTTP transport error: {0} * */ - public static String RUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) { - return localizer.localize(localizableRUNTIME_WSDLPARSER_INVALID_WSDL(arg0, arg1, arg2, arg3)); + public static String HTTP_CLIENT_FAILED(Object arg0) { + return LOCALIZER.localize(localizableHTTP_CLIENT_FAILED(arg0)); } - public static Localizable localizableWSDL_NOT_FOUND(Object arg0) { - return messageFactory.getMessage("wsdl.not.found", arg0); + public static Localizable localizableFAILED_TO_PARSE_EPR(Object arg0) { + return MESSAGE_FACTORY.getMessage("failed.to.parse.epr", arg0); } /** - * WSDL url {0} is not accessible. + * Failed to parse EPR: {0} * */ - public static String WSDL_NOT_FOUND(Object arg0) { - return localizer.localize(localizableWSDL_NOT_FOUND(arg0)); + public static String FAILED_TO_PARSE_EPR(Object arg0) { + return LOCALIZER.localize(localizableFAILED_TO_PARSE_EPR(arg0)); } - public static Localizable localizableHTTP_CLIENT_FAILED(Object arg0) { - return messageFactory.getMessage("http.client.failed", arg0); + public static Localizable localizableLOCAL_CLIENT_FAILED(Object arg0) { + return MESSAGE_FACTORY.getMessage("local.client.failed", arg0); } /** - * HTTP transport error: {0} + * local transport error: {0} * */ - public static String HTTP_CLIENT_FAILED(Object arg0) { - return localizer.localize(localizableHTTP_CLIENT_FAILED(arg0)); + public static String LOCAL_CLIENT_FAILED(Object arg0) { + return LOCALIZER.localize(localizableLOCAL_CLIENT_FAILED(arg0)); } - public static Localizable localizableINVALID_SERVICE_NAME_NULL(Object arg0) { - return messageFactory.getMessage("invalid.service.name.null", arg0); + public static Localizable localizableUNDEFINED_BINDING(Object arg0) { + return MESSAGE_FACTORY.getMessage("undefined.binding", arg0); } /** - * {0} is not a valid service + * Undefined binding: {0} * */ - public static String INVALID_SERVICE_NAME_NULL(Object arg0) { - return localizer.localize(localizableINVALID_SERVICE_NAME_NULL(arg0)); + public static String UNDEFINED_BINDING(Object arg0) { + return LOCALIZER.localize(localizableUNDEFINED_BINDING(arg0)); } - public static Localizable localizableINVALID_WSDL_URL(Object arg0) { - return messageFactory.getMessage("invalid.wsdl.url", arg0); + public static Localizable localizableINVALID_SERVICE_NO_WSDL(Object arg0) { + return MESSAGE_FACTORY.getMessage("invalid.service.no.wsdl", arg0); } /** - * Invalid WSDL URL: {0} + * No wsdl metadata for service: {0}, can't create proxy! Try creating Service by providing a WSDL URL * */ - public static String INVALID_WSDL_URL(Object arg0) { - return localizer.localize(localizableINVALID_WSDL_URL(arg0)); + public static String INVALID_SERVICE_NO_WSDL(Object arg0) { + return LOCALIZER.localize(localizableINVALID_SERVICE_NO_WSDL(arg0)); } - public static Localizable localizableINVALID_PORT_NAME(Object arg0, Object arg1) { - return messageFactory.getMessage("invalid.port.name", arg0, arg1); + public static Localizable localizableWSDL_CONTAINS_NO_SERVICE(Object arg0) { + return MESSAGE_FACTORY.getMessage("wsdl.contains.no.service", arg0); } /** - * {0} is not a valid port. Valid ports are: {1} + * WSDL {0} contains no service definition. * */ - public static String INVALID_PORT_NAME(Object arg0, Object arg1) { - return localizer.localize(localizableINVALID_PORT_NAME(arg0, arg1)); + public static String WSDL_CONTAINS_NO_SERVICE(Object arg0) { + return LOCALIZER.localize(localizableWSDL_CONTAINS_NO_SERVICE(arg0)); } - public static Localizable localizableINVALID_SERVICE_NAME(Object arg0, Object arg1) { - return messageFactory.getMessage("invalid.service.name", arg0, arg1); + public static Localizable localizableINVALID_BINDING_ID(Object arg0, Object arg1) { + return MESSAGE_FACTORY.getMessage("invalid.binding.id", arg0, arg1); } /** - * {0} is not a valid service. Valid services are: {1} + * Invalid binding id: {0}. Must be: {1} * */ - public static String INVALID_SERVICE_NAME(Object arg0, Object arg1) { - return localizer.localize(localizableINVALID_SERVICE_NAME(arg0, arg1)); + public static String INVALID_BINDING_ID(Object arg0, Object arg1) { + return LOCALIZER.localize(localizableINVALID_BINDING_ID(arg0, arg1)); } - public static Localizable localizableUNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) { - return messageFactory.getMessage("unsupported.operation", arg0, arg1, arg2); + public static Localizable localizableUNDEFINED_PORT_TYPE(Object arg0) { + return MESSAGE_FACTORY.getMessage("undefined.portType", arg0); } /** - * {0} not supported with {1}. Must be: {2} + * Undefined port type: {0} * */ - public static String UNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) { - return localizer.localize(localizableUNSUPPORTED_OPERATION(arg0, arg1, arg2)); + public static String UNDEFINED_PORT_TYPE(Object arg0) { + return LOCALIZER.localize(localizableUNDEFINED_PORT_TYPE(arg0)); } - public static Localizable localizableFAILED_TO_PARSE_EPR(Object arg0) { - return messageFactory.getMessage("failed.to.parse.epr", arg0); - } + private static class BundleSupplier + implements ResourceBundleSupplier + { + + + public ResourceBundle getResourceBundle(Locale locale) { + return ResourceBundle.getBundle(BUNDLE_NAME, locale); + } - /** - * Failed to parse EPR: {0} - * - */ - public static String FAILED_TO_PARSE_EPR(Object arg0) { - return localizer.localize(localizableFAILED_TO_PARSE_EPR(arg0)); } }