jdk-sandbox: comparison jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java

equal deleted inserted replaced

-:3c68ef249093
+:93a527059d8a
 * questions.
 */
 package com.sun.tools.internal.xjc;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.Set;
 import com.sun.codemodel.internal.CodeWriter;
 import com.sun.codemodel.internal.JPackage;
 import com.sun.codemodel.internal.JResourceFile;
 import com.sun.codemodel.internal.writer.FileCodeWriter;
 import com.sun.codemodel.internal.writer.PrologCodeWriter;
 import com.sun.tools.internal.xjc.api.SpecVersion;
 import com.sun.tools.internal.xjc.generator.bean.field.FieldRendererFactory;
 import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.reader.Util;
 import com.sun.xml.internal.bind.api.impl.NameConverter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.xml.catalog.CatalogFeatures;
-import javax.xml.catalog.CatalogFeatures.Feature;
-import javax.xml.catalog.CatalogManager;
 /**
 * Global options.
 *
 * <p>
 * {@link JPackage#addResourceFile(JResourceFile)}.
 */
 public File targetDir = new File(".");
 /**
-* Actually stores {@link CatalogResolver}, but the field
+* On JDK 8 an odler stores {@code CatalogResolver}, but the field
 * type is made to {@link EntityResolver} so that XJC can be
 * used even if resolver.jar is not available in the classpath.
 */
 public EntityResolver entityResolver = null;
 public String defaultPackage2 = null;
 /**
 * Input schema files as a list of {@link InputSource}s.
 */
-private final List<InputSource> grammars = new ArrayList<InputSource>();
+private final List<InputSource> grammars = new ArrayList<>();
-private final List<InputSource> bindFiles = new ArrayList<InputSource>();
+private final List<InputSource> bindFiles = new ArrayList<>();
 // Proxy setting.
 private String proxyHost = null;
 private String proxyPort = null;
 public String proxyAuth = null;
 /**
 * {@link Plugin}s that are enabled in this compilation.
 */
-public final List<Plugin> activePlugins = new ArrayList<Plugin>();
+public final List<Plugin> activePlugins = new ArrayList<>();
 /**
 * All discovered {@link Plugin}s.
 * This is lazily parsed, so that we can take '-cp' option into account.
 *
 private List<Plugin> allPlugins;
 /**
 * Set of URIs that plug-ins recognize as extension bindings.
 */
-public final Set<String> pluginURIs = new HashSet<String>();
+public final Set<String> pluginURIs = new HashSet<>();
 /**
 * This allocator has the final say on deciding the class name.
 */
 public ClassNameAllocator classNameAllocator;
 *
 * <p>
 * A plugins are enumerated when this method is called for the first time,
 * by taking {@link #classpaths} into account. That means
 * "-cp plugin.jar" has to come before you specify options to enable it.
+* @return
 */
 public List<Plugin> getAllPlugins() {
 if(allPlugins==null) {
 allPlugins = findServices(Plugin.class);
 }
 }
 public void setSchemaLanguage(Language _schemaLanguage) {
 this.schemaLanguage = _schemaLanguage;
 }
-/** Input schema files. */
+/** Input schema files.
+* @return  */
 public InputSource[] getGrammars() {
 return grammars.toArray(new InputSource[grammars.size()]);
 }
 /**
 * Adds a new input schema.
+* @param is
 */
 public void addGrammar( InputSource is ) {
 grammars.add(absolutize(is));
 }
 addGrammar(fileToInputSource(source));
 }
 /**
 * Recursively scan directories and add all XSD files in it.
+* @param dir
 */
 public void addGrammarRecursive( File dir ) {
 addRecursive(dir,".xsd",grammars);
 }
 logger.log(Level.FINE, "{0}, {1}", new Object[]{is.getSystemId(), e.getLocalizedMessage()});
 }
 return is;
 }
-/** Input external binding files. */
+/** Input external binding files.
+* @return  */
 public InputSource[] getBindFiles() {
 return bindFiles.toArray(new InputSource[bindFiles.size()]);
 }
 /**
 * Adds a new binding file.
+* @param is
 */
 public void addBindFile( InputSource is ) {
 bindFiles.add(absolutize(is));
 }
 /**
 * Adds a new binding file.
+* @param bindFile
 */
 public void addBindFile( File bindFile ) {
 bindFiles.add(fileToInputSource(bindFile));
 }
 /**
 * Recursively scan directories and add all ".xjb" files in it.
+* @param dir
 */
 public void addBindFileRecursive( File dir ) {
 addRecursive(dir,".xjb",bindFiles);
 }
-public final List<URL> classpaths = new ArrayList<URL>();
+public final List<URL> classpaths = new ArrayList<>();
 /**
 * Gets a classLoader that can load classes specified via the
 * -classpath option.
+* @param parent
+* @return
 */
 public ClassLoader getUserClassLoader( ClassLoader parent ) {
 if (classpaths.isEmpty())
 return parent;
 return new URLClassLoader(
 /**
 * Parses an option {@code args[i]} and return
 * the number of tokens consumed.
 *
+* @param args
+* @param i
 * @return
 *      0 if the argument is not understood. Returning 0
 *      will let the caller report an error.
 * @exception BadCommandLineException
 *      If the callee wants to provide a custom message for an error.
 if(!file.exists()) {
 throw new BadCommandLineException(
 Messages.format(Messages.NO_SUCH_FILE,file));
 }
-try {
+try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"))) {
-BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
 parseProxy(in.readLine());
-in.close();
 } catch (IOException e) {
 throw new BadCommandLineException(
 Messages.format(Messages.FAILED_TO_PARSE,file,e.getMessage()),e);
 }
 if (args[i].equals("-port")) {
 proxyPort = requireArgument("-port",args,++i);
 return 2;
 }
 if( args[i].equals("-catalog") ) {
-// use javax.xml.catalog to resolve external entities.
+// use Sun's "XML Entity and URI Resolvers" by Norman Walsh
+// to resolve external entities.
+// https://xerces.apache.org/xml-commons/components/resolver/resolver-article.html
 File catalogFile = new File(requireArgument("-catalog",args,++i));
 try {
 addCatalog(catalogFile);
 } catch (IOException e) {
 }
 return 2;
 }
 if( args[i].equals("-Xtest-class-name-allocator") ) {
 classNameAllocator = new ClassNameAllocator() {
+@Override
 public String assignClassName(String packageName, String className) {
 System.out.printf("assignClassName(%s,%s)\n",packageName,className);
 return className+"_Type";
 }
 };
 }
 }
 /**
 * Obtains an operand and reports an error if it's not there.
+* @param optionName
+* @param args
+* @param i
+* @return
+* @throws com.sun.tools.internal.xjc.BadCommandLineException
 */
 public String requireArgument(String optionName, String[] args, int i) throws BadCommandLineException {
 if (i == args.length || args[i].startsWith("-")) {
 throw new BadCommandLineException(
 Messages.format(Messages.MISSING_OPERAND,optionName));
 target.add(absolutize(fileToInputSource(fsrc)));
 }
 }
 }
-/**
-* Adds a new catalog file.
-*/
-public void addCatalog(File catalogFile) throws IOException {
-URI newUrl = catalogFile.toURI();
-if (!catalogUrls.contains(newUrl)) {
-catalogUrls.add(newUrl);
-}
-try {
-entityResolver = CatalogManager.catalogResolver(catalogFeatures,
-catalogUrls.stream().toArray(URI[]::new));
-} catch (Exception ex) {
-entityResolver = null;
-}
-}
 // Since javax.xml.catalog is unmodifiable we need to track catalog
 // URLs added and create new catalog each time addCatalog is called
 private final ArrayList<URI> catalogUrls = new ArrayList<>();
-// Cache CatalogFeatures instance for future usages.
+/**
-// Resolve feature is set to "continue" value for backward compatibility.
+* Adds a new catalog file.Use created or existed resolver to parse new catalog file.
-private static CatalogFeatures catalogFeatures = CatalogFeatures.builder()
+* @param catalogFile
-.with(Feature.RESOLVE, "continue")
+* @throws java.io.IOException
-.build();
+*/
+public void addCatalog(File catalogFile) throws IOException {
+URI newUri = catalogFile.toURI();
+if (!catalogUrls.contains(newUri)) {
+catalogUrls.add(newUri);
+}
+entityResolver = CatalogUtil.getCatalog(entityResolver, catalogFile, catalogUrls);
+}
 /**
 * Parses arguments and fill fields of this object.
 *
+* @param args
 * @exception BadCommandLineException
 *      thrown when there's a problem in the command-line arguments
 */
 public void parseArguments( String[] args ) throws BadCommandLineException {
 Messages.format(Messages.PLUGIN_LOAD_FAILURE,pluginLoadFailure));
 }
 /**
 * Finds the {@code META-INF/sun-jaxb.episode} file to add as a binding customization.
+* @param jar
+* @throws com.sun.tools.internal.xjc.BadCommandLineException
 */
 public void scanEpisodeFile(File jar) throws BadCommandLineException {
 try {
 URLClassLoader ucl = new URLClassLoader(new URL[]{jar.toURL()});
 Enumeration<URL> resources = ucl.findResources("META-INF/sun-jaxb.episode");
 }
 /**
 * Guesses the schema language.
+* @return
 */
 public Language guessSchemaLanguage() {
 // otherwise, use the file extension.
 // not a good solution, but very easy.
 return Language.XMLSCHEMA;
 }
 /**
 * Creates a configured CodeWriter that produces files into the specified directory.
+* @return
+* @throws java.io.IOException
 */
 public CodeWriter createCodeWriter() throws IOException {
 return createCodeWriter(new FileCodeWriter( targetDir, readOnly, encoding ));
 }
 /**
 * Creates a configured CodeWriter that produces files into the specified directory.
+* @param core
+* @return
 */
 public CodeWriter createCodeWriter( CodeWriter core ) {
 if(noFileHeader)
 return core;
 return new PrologCodeWriter( core,getPrologComment() );
 }
 /**
-* Gets the string suitable to be used as the prolog comment baked into artifacts.
+* Gets the string suitable to be used as the prolog comment baked into artifacts.This is the string like "This file was generated by the JAXB RI on YYYY/mm/dd..."
-* This is the string like "This file was generated by the JAXB RI on YYYY/mm/dd..."
+* @return
 */
 public String getPrologComment() {
 // generate format syntax: <date> 'at' <time>
 String format =
 Messages.format(Messages.DATE_FORMAT)
 /**
 * Looks for all "META-INF/services/[className]" files and
 * create one instance for each class name found inside this file.
 */
 private <T> List<T> findServices( Class<T> clazz) {
-final List<T> result = new ArrayList<T>();
+final List<T> result = new ArrayList<>();
 final boolean debug = getDebugPropertyValue();
 try {
 // TCCL allows user plugins to be loaded even if xjc is in jdk
 // We have to use our SecureLoader to obtain it because we are trying to avoid SecurityException
 final ClassLoader tccl = SecureLoader.getContextClassLoader();

changeset 43852	93a527059d8a
parent 43127	33b8f6646c21
child 45678	65fdff10664d