8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com>
Co-authored-by: Amy Lu <amy.lu@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Miroslav Kos <miroslav.kos@oracle.com>
Co-authored-by: Huaming Li <huaming.li@oracle.com>
Co-authored-by: Sean Mullan <sean.mullan@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com>
Co-authored-by: Peter Levart <peter.levart@gmail.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Claes Redestad <claes.redestad@oracle.com>
Co-authored-by: Sergey Bylokhov <sergey.bylokhov@oracle.com>
Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com>
Co-authored-by: Volker Simonis <volker.simonis@gmail.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Stuart Marks <stuart.marks@oracle.com>
Co-authored-by: Semyon Sadetsky <semyon.sadetsky@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Co-authored-by: Valerie Peng <valerie.peng@oracle.com>
Co-authored-by: Vincent Ryan <vincent.x.ryan@oracle.com>
Co-authored-by: Weijun Wang <weijun.wang@oracle.com>
Co-authored-by: Yuri Nesterenko <yuri.nesterenko@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com>
Co-authored-by: Felix Yang <felix.yang@oracle.com>
Co-authored-by: Andrei Eremeev <andrei.eremeev@oracle.com>
Co-authored-by: Frank Yuan <frank.yuan@oracle.com>
Co-authored-by: Sergei Pikalev <sergei.pikalev@oracle.com>
Co-authored-by: Sibabrata Sahoo <sibabrata.sahoo@oracle.com>
Co-authored-by: Tiantian Du <tiantian.du@oracle.com>
Co-authored-by: Sha Jiang <sha.jiang@oracle.com>
Reviewed-by: alanb, mchung, naoto, rriggs, psandoz, plevart, mullan, ascarpino, vinnie, prr, sherman, dfuchs, mhaupt
2016-03-17 19:04:16 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2015, 2016, 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
|
|
|
|
* under the terms of the GNU General Public License version 2 only, as
|
|
|
|
* published by the Free Software Foundation. Oracle designates this
|
|
|
|
* particular file as subject to the "Classpath" exception as provided
|
|
|
|
* by Oracle in the LICENSE file that accompanied this code.
|
|
|
|
*
|
|
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
|
|
* accompanied this code).
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License version
|
|
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*
|
|
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
|
|
* questions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package java.util.spi;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.UncheckedIOException;
|
|
|
|
import java.lang.reflect.Module;
|
|
|
|
import java.security.AccessController;
|
|
|
|
import java.security.PrivilegedAction;
|
|
|
|
import java.util.Locale;
|
|
|
|
import java.util.ResourceBundle;
|
|
|
|
import sun.util.locale.provider.ResourceBundleProviderSupport;
|
|
|
|
import static sun.security.util.SecurityConstants.GET_CLASSLOADER_PERMISSION;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* {@code AbstractResourceBundleProvider} is an abstract class for helping
|
|
|
|
* implement the {@link ResourceBundleProvider} interface.
|
|
|
|
*
|
2016-06-03 12:26:45 -07:00
|
|
|
* <p>
|
|
|
|
* Resource bundles can be packaged in a named module separated from
|
|
|
|
* the <em>caller module</em> loading the resource bundle, i.e. the module
|
|
|
|
* calling {@link ResourceBundle#getBundle(String)}. For the caller module
|
|
|
|
* to load a resource bundle "{@code com.example.app.MyResources}"
|
|
|
|
* from another module and a service interface named
|
|
|
|
* "{@code com.example.app.MyResourcesProvider}",
|
|
|
|
* the <em>bundle provider module</em> can provide the implementation class
|
|
|
|
* as follows:
|
|
|
|
*
|
|
|
|
* <pre><code>
|
|
|
|
* import com.example.app.MyResourcesProvider;
|
|
|
|
* class MyResourcesProviderImpl extends AbstractResourceBundleProvider
|
|
|
|
* implements MyResourcesProvider
|
|
|
|
* {</code>
|
|
|
|
* {@code @Override
|
|
|
|
* public ResourceBundle getBundle(String baseName, Locale locale) {
|
|
|
|
* // this module only provides bundles in french
|
|
|
|
* if (locale.equals(Locale.FRENCH)) {
|
|
|
|
* return super.getBundle(baseName, locale);
|
|
|
|
* }
|
|
|
|
* return null;
|
|
|
|
* }
|
|
|
|
* }}</pre>
|
|
|
|
*
|
|
|
|
* @see <a href="../ResourceBundle.html#bundleprovider">
|
|
|
|
* Resource Bundles in Named Modules</a>
|
|
|
|
* @see <a href="../ResourceBundle.html#RBP_support">
|
|
|
|
* ResourceBundleProvider Service Providers</a>
|
|
|
|
*
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com>
Co-authored-by: Amy Lu <amy.lu@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Miroslav Kos <miroslav.kos@oracle.com>
Co-authored-by: Huaming Li <huaming.li@oracle.com>
Co-authored-by: Sean Mullan <sean.mullan@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com>
Co-authored-by: Peter Levart <peter.levart@gmail.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Claes Redestad <claes.redestad@oracle.com>
Co-authored-by: Sergey Bylokhov <sergey.bylokhov@oracle.com>
Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com>
Co-authored-by: Volker Simonis <volker.simonis@gmail.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Stuart Marks <stuart.marks@oracle.com>
Co-authored-by: Semyon Sadetsky <semyon.sadetsky@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Co-authored-by: Valerie Peng <valerie.peng@oracle.com>
Co-authored-by: Vincent Ryan <vincent.x.ryan@oracle.com>
Co-authored-by: Weijun Wang <weijun.wang@oracle.com>
Co-authored-by: Yuri Nesterenko <yuri.nesterenko@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com>
Co-authored-by: Felix Yang <felix.yang@oracle.com>
Co-authored-by: Andrei Eremeev <andrei.eremeev@oracle.com>
Co-authored-by: Frank Yuan <frank.yuan@oracle.com>
Co-authored-by: Sergei Pikalev <sergei.pikalev@oracle.com>
Co-authored-by: Sibabrata Sahoo <sibabrata.sahoo@oracle.com>
Co-authored-by: Tiantian Du <tiantian.du@oracle.com>
Co-authored-by: Sha Jiang <sha.jiang@oracle.com>
Reviewed-by: alanb, mchung, naoto, rriggs, psandoz, plevart, mullan, ascarpino, vinnie, prr, sherman, dfuchs, mhaupt
2016-03-17 19:04:16 +00:00
|
|
|
* @since 9
|
|
|
|
*/
|
|
|
|
public abstract class AbstractResourceBundleProvider implements ResourceBundleProvider {
|
|
|
|
private static final String FORMAT_CLASS = "java.class";
|
|
|
|
private static final String FORMAT_PROPERTIES = "java.properties";
|
|
|
|
|
|
|
|
private final String[] formats;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constructs an {@code AbstractResourceBundleProvider} with the
|
|
|
|
* "java.properties" format. This constructor is equivalent to
|
|
|
|
* {@code AbstractResourceBundleProvider("java.properties")}.
|
|
|
|
*/
|
|
|
|
protected AbstractResourceBundleProvider() {
|
|
|
|
this(FORMAT_PROPERTIES);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constructs an {@code AbstractResourceBundleProvider} with the specified
|
|
|
|
* {@code formats}. The {@link #getBundle(String, Locale)} method looks up
|
|
|
|
* resource bundles for the given {@code formats}. {@code formats} must
|
|
|
|
* be "java.class" or "java.properties".
|
|
|
|
*
|
|
|
|
* @param formats the formats to be used for loading resource bundles
|
|
|
|
* @throws NullPointerException if the given {@code formats} is null
|
|
|
|
* @throws IllegalArgumentException if the given {@code formats} is not
|
|
|
|
* "java.class" or "java.properties".
|
|
|
|
*/
|
|
|
|
protected AbstractResourceBundleProvider(String... formats) {
|
|
|
|
this.formats = formats.clone(); // defensive copy
|
|
|
|
if (this.formats.length == 0) {
|
|
|
|
throw new IllegalArgumentException("empty formats");
|
|
|
|
}
|
|
|
|
for (String f : this.formats) {
|
|
|
|
if (!FORMAT_CLASS.equals(f) && !FORMAT_PROPERTIES.equals(f)) {
|
|
|
|
throw new IllegalArgumentException(f);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the bundle name for the given {@code baseName} and {@code
|
|
|
|
* locale}. This method is called from the default implementation of the
|
|
|
|
* {@link #getBundle(String, Locale)} method.
|
|
|
|
*
|
|
|
|
* @implNote The default implementation of this method is the same as the
|
|
|
|
* implementation of
|
|
|
|
* {@link java.util.ResourceBundle.Control#toBundleName(String, Locale)}.
|
|
|
|
*
|
|
|
|
* @param baseName the base name of the resource bundle, a fully qualified
|
|
|
|
* class name
|
|
|
|
* @param locale the locale for which a resource bundle should be loaded
|
|
|
|
* @return the bundle name for the resource bundle
|
|
|
|
*/
|
|
|
|
protected String toBundleName(String baseName, Locale locale) {
|
|
|
|
return ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT)
|
|
|
|
.toBundleName(baseName, locale);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a {@code ResourceBundle} for the given {@code baseName} and
|
|
|
|
* {@code locale}. This method calls the
|
|
|
|
* {@link #toBundleName(String, Locale) toBundleName} method to get the
|
|
|
|
* bundle name for the {@code baseName} and {@code locale}. The formats
|
|
|
|
* specified by the constructor will be searched to find the resource
|
|
|
|
* bundle.
|
|
|
|
*
|
|
|
|
* @implNote
|
|
|
|
* The default implementation of this method will find the resource bundle
|
|
|
|
* local to the module of this provider.
|
|
|
|
*
|
|
|
|
* @param baseName the base bundle name of the resource bundle, a fully
|
|
|
|
* qualified class name.
|
|
|
|
* @param locale the locale for which the resource bundle should be instantiated
|
|
|
|
* @return {@code ResourceBundle} of the given {@code baseName} and {@code locale},
|
|
|
|
* or null if no resource bundle is found
|
|
|
|
* @throws NullPointerException if {@code baseName} or {@code locale} is null
|
|
|
|
* @throws UncheckedIOException if any IO exception occurred during resource
|
|
|
|
* bundle loading
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
public ResourceBundle getBundle(String baseName, Locale locale) {
|
|
|
|
Module module = this.getClass().getModule();
|
|
|
|
String bundleName = toBundleName(baseName, locale);
|
|
|
|
ResourceBundle bundle = null;
|
2016-06-03 12:26:45 -07:00
|
|
|
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com>
Co-authored-by: Amy Lu <amy.lu@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Miroslav Kos <miroslav.kos@oracle.com>
Co-authored-by: Huaming Li <huaming.li@oracle.com>
Co-authored-by: Sean Mullan <sean.mullan@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com>
Co-authored-by: Peter Levart <peter.levart@gmail.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Claes Redestad <claes.redestad@oracle.com>
Co-authored-by: Sergey Bylokhov <sergey.bylokhov@oracle.com>
Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com>
Co-authored-by: Volker Simonis <volker.simonis@gmail.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Stuart Marks <stuart.marks@oracle.com>
Co-authored-by: Semyon Sadetsky <semyon.sadetsky@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Co-authored-by: Valerie Peng <valerie.peng@oracle.com>
Co-authored-by: Vincent Ryan <vincent.x.ryan@oracle.com>
Co-authored-by: Weijun Wang <weijun.wang@oracle.com>
Co-authored-by: Yuri Nesterenko <yuri.nesterenko@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com>
Co-authored-by: Felix Yang <felix.yang@oracle.com>
Co-authored-by: Andrei Eremeev <andrei.eremeev@oracle.com>
Co-authored-by: Frank Yuan <frank.yuan@oracle.com>
Co-authored-by: Sergei Pikalev <sergei.pikalev@oracle.com>
Co-authored-by: Sibabrata Sahoo <sibabrata.sahoo@oracle.com>
Co-authored-by: Tiantian Du <tiantian.du@oracle.com>
Co-authored-by: Sha Jiang <sha.jiang@oracle.com>
Reviewed-by: alanb, mchung, naoto, rriggs, psandoz, plevart, mullan, ascarpino, vinnie, prr, sherman, dfuchs, mhaupt
2016-03-17 19:04:16 +00:00
|
|
|
for (String format : formats) {
|
|
|
|
try {
|
|
|
|
if (FORMAT_CLASS.equals(format)) {
|
|
|
|
PrivilegedAction<ResourceBundle> pa = () ->
|
|
|
|
ResourceBundleProviderSupport
|
|
|
|
.loadResourceBundle(module, bundleName);
|
|
|
|
bundle = AccessController.doPrivileged(pa, null, GET_CLASSLOADER_PERMISSION);
|
|
|
|
} else if (FORMAT_PROPERTIES.equals(format)) {
|
|
|
|
bundle = ResourceBundleProviderSupport
|
|
|
|
.loadPropertyResourceBundle(module, bundleName);
|
|
|
|
}
|
|
|
|
if (bundle != null) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} catch (IOException e) {
|
|
|
|
throw new UncheckedIOException(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return bundle;
|
|
|
|
}
|
|
|
|
}
|