removed javadocs, which doesnt add anything
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0f64bd7e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0f64bd7e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0f64bd7e Branch: refs/heads/master Commit: 0f64bd7e238786e2ac950a0e371c170ce3287398 Parents: 3bf930d Author: Hayri Cicek <ha...@kodnito.com> Authored: Thu Dec 27 10:30:55 2018 +0100 Committer: Hayri Cicek <ha...@kodnito.com> Committed: Thu Dec 27 10:30:55 2018 +0100 ---------------------------------------------------------------------- .../openejb/loader/BasicURLClassPath.java | 20 -- .../org/apache/openejb/loader/ClassPath.java | 14 -- .../apache/openejb/loader/ContextClassPath.java | 12 -- .../org/apache/openejb/loader/FileUtils.java | 48 ----- .../java/org/apache/openejb/loader/Files.java | 141 ------------- .../main/java/org/apache/openejb/loader/IO.java | 198 ------------------- .../org/apache/openejb/loader/JarLocation.java | 19 -- .../java/org/apache/openejb/loader/Options.java | 26 --- .../apache/openejb/loader/SystemInstance.java | 32 --- .../java/org/apache/openejb/loader/Zips.java | 23 --- .../provisining/ProvisioningResolver.java | 21 -- .../openejb/observer/ObserverManager.java | 12 -- .../openejb/observer/event/ObserverAdded.java | 10 - .../openejb/observer/event/ObserverRemoved.java | 10 - 14 files changed, 586 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java index caba783..eed9457 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/BasicURLClassPath.java @@ -28,11 +28,6 @@ import java.util.Locale; public abstract class BasicURLClassPath implements ClassPath { - /** - * Returns the context ClassLoader for this Thread or null - * - * @return ClassLoader ClassLoader - */ public static ClassLoader getContextClassLoader() { return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { @Override @@ -45,14 +40,6 @@ public abstract class BasicURLClassPath implements ClassPath { private Field ucpField; private boolean ucpFieldErrorLogged; - /** - * Add Jar to the URLClassPath - * - * Throws Exception if fails any - * @param jar URL - * @param loader URLClassLoader - * @throws Exception - */ protected void addJarToPath(final URL jar, final URLClassLoader loader) throws Exception { final Object cp = getURLClassPath(loader); if (cp == null && CustomizableURLClassLoader.class.isInstance(loader)) { @@ -81,13 +68,6 @@ public abstract class BasicURLClassPath implements ClassPath { }); } - /** - * Adds Jars to the URLClassPath - * - * @param dir File - * @param loader URLClassLoader - * @throws Exception - */ protected synchronized void addJarsToPath(final File dir, final URLClassLoader loader) throws Exception { if (dir == null || !dir.exists()) { return; http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/ClassPath.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ClassPath.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ClassPath.java index 4a12085..6cdb335 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ClassPath.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ClassPath.java @@ -23,21 +23,7 @@ public interface ClassPath { ClassLoader getClassLoader(); - /** - * Add Jars to the URL ClassPath - * Throws Exception if it fails - * - * @param dir File - * @throws Exception - */ void addJarsToPath(File dir) throws Exception; - /** - * Add Jar to the URL ClassPath - * Throws Exception if it fails - * - * @param dir URL - * @throws Exception - */ void addJarToPath(URL dir) throws Exception; } http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/ContextClassPath.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ContextClassPath.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ContextClassPath.java index af0bfef..71c4aa2 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/ContextClassPath.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/ContextClassPath.java @@ -31,12 +31,6 @@ public class ContextClassPath extends BasicURLClassPath { return getContextClassLoader(); } - /** - * Add Jars to URLClassPath - * - * @param dir File - * @throws Exception - */ @Override public void addJarsToPath(final File dir) throws Exception { final ClassLoader contextClassLoader = getContextClassLoader(); @@ -46,12 +40,6 @@ public class ContextClassPath extends BasicURLClassPath { } } - /** - * Add Jar to URLClassPath - * - * @param jar URL - * @throws Exception - */ @Override public void addJarToPath(final URL jar) throws Exception { final ClassLoader contextClassLoader = getContextClassLoader(); http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/FileUtils.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/FileUtils.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/FileUtils.java index c182b8e..7030146 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/FileUtils.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/FileUtils.java @@ -58,14 +58,6 @@ public class FileUtils { } } - /** - * Returns the cannonical pathname - * - * - * @param path String - * @return File - * @throws IOException if an I/O error occurs - */ public File getDirectory(final String path) throws IOException { return getDirectory(path, false); } @@ -79,14 +71,6 @@ public class FileUtils { return this.getDirectory().equals(that.getDirectory()); } - /** - * Returns canonical form of the specified path - * - * @param path String - * @param create boolean - * @return File - * @throws IOException if an I/O error occurs - */ public File getDirectory(final String path, final boolean create) throws IOException { File dir = new File(home, path); dir = dir.getCanonicalFile(); @@ -115,25 +99,10 @@ public class FileUtils { this.home = dir; } - /** - * Returns File at specified path String - * - * @param path String - * @return File - * @throws IOException - */ public File getFile(final String path) throws IOException { return getFile(path, true); } - /** - * Returns File at specified path String - * - * @param path String - * @param validate boolean - * @return File - * @throws IOException if and I/O error occurs - */ public File getFile(final String path, final boolean validate) throws IOException { File file = new File(path); @@ -150,15 +119,6 @@ public class FileUtils { return file; } - /** - * Creates Temp Directory - * - * Throws IOException if directory doesn't exists and if it fails to create directories - * - * @param pathPrefix path prefix - * @return File File - * @throws IOException - */ public static File createTempDirectory(final String pathPrefix) throws IOException { for (int maxAttempts = 100; maxAttempts > 0; --maxAttempts) { @@ -172,14 +132,6 @@ public class FileUtils { throw new IOException("Cannot create temporary directory at: " + pathPrefix); } - /** - * Creates Temp Directory - * - * Throws IOException if directory doesn't exists and if it fails to create directories - * - * @return File File - * @throws IOException - */ public static File createTempDirectory() throws IOException { final String prefix = System.getProperty("java.io.tmpdir", File.separator + "tmp") + File.separator + "openejb"; return createTempDirectory(prefix); http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java index 6b247ec..ff3f32d 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Files.java @@ -46,12 +46,6 @@ public class Files { private static final Map<String, MessageDigest> DIGESTS = new HashMap<>(); private static final boolean IS_WINDOWS = System.getProperty("os.name", "unknown").toLowerCase(Locale.ENGLISH).startsWith("win"); - /** - * Returns the absolute path of the File Object - * - * @param parts String... - * @return File - */ public static File path(final String... parts) { File dir = null; for (final String part : parts) { @@ -65,13 +59,6 @@ public class Files { return null != dir ? dir.getAbsoluteFile() : dir; } - /** - * Returns the absolute path of the File Object - * - * @param dir File - * @param parts String... - * @return File - */ public static File path(final File dir, final String... parts) { File base = dir; int idx = 0; @@ -90,35 +77,14 @@ public class Files { return base.getAbsoluteFile(); } - /** - * Returns a List of pathnames for File Objects - * - * @param dir File - * @param regex String - * @return List of Files - */ public static List<File> collect(final File dir, final String regex) { return collect(dir, Pattern.compile(regex)); } - /** - * Returns a List of pathnames for File Objects - * - * @param dir File - * @param pattern Pattern - * @return List of Files - */ public static List<File> collect(final File dir, final Pattern pattern) { return collect(dir, new PatternFileFilter(pattern)); } - /** - * Returns a List of pathnames for File Objects - * - * @param dir File - * @param filter FileFilter - * @return List of Files - */ public static List<File> collect(final File dir, final FileFilter filter) { final List<File> accepted = new ArrayList<>(); if (filter.accept(dir)) { @@ -135,14 +101,6 @@ public class Files { return accepted; } - /** - * Method to check if the file or direcotory exists - * - * @param file File - * @param s String - * @return File - * @Throws FileRuntimeException on failure at any point - */ public static File exists(final File file, final String s) { if (!file.exists()) { throw new FileDoesNotExistException(s + " does not exist: " + file.getAbsolutePath()); @@ -150,13 +108,6 @@ public class Files { return file; } - /** - * Method to check if the file or direcotory exists - * - * @param file File - * @return File - * @Throws FileRuntimeException on failure at any point - */ public static File exists(final File file) { if (!file.exists()) { throw new FileDoesNotExistException("Does not exist: " + file.getAbsolutePath()); @@ -164,13 +115,6 @@ public class Files { return file; } - /** - * Method to check if it is a directory - * - * @param file File - * @return File - * @Throws FileRuntimeException on failure at any point - */ public static File dir(final File file) { if (!file.isDirectory()) { throw new FileRuntimeException("Not a directory: " + file.getAbsolutePath()); @@ -179,14 +123,6 @@ public class Files { return file; } - /** - * Method to create a file - * - * @param file File - * @return File - * @throws IOException if an I/O error occurs - * @Throws FileRuntimeException on failure at any point - */ public static File touch(final File file) throws IOException { if (!file.createNewFile()) { throw new FileRuntimeException("Cannot create file: " + file.getAbsolutePath()); @@ -194,13 +130,6 @@ public class Files { return file; } - /** - * Method to check if the specified File Object is a File - * - * @param file File - * @return File - * @Throws FileRuntimeException on failure at any point - */ public static File file(final File file) { exists(file); if (!file.isFile()) { @@ -209,13 +138,6 @@ public class Files { return file; } - /** - * Method to check if File Object is hidden - * - * @param file File - * @return File - * @Throws FileRuntimeException on failure at any point - */ public static File notHidden(final File file) { exists(file); if (file.isHidden()) { @@ -224,13 +146,6 @@ public class Files { return file; } - /** - * Method to check if File Object is writeable - * - * @param file File - * @return File - * @Throws FileRuntimeException on failure at any point - */ public static File writable(final File file) { if (!file.canWrite()) { throw new FileRuntimeException("Not writable: " + file.getAbsolutePath()); @@ -238,13 +153,6 @@ public class Files { return file; } - /** - * Method to check if File Object is readable - * - * @param file File - * @return File - * @Throws FileRuntimeException on failure at any point - */ public static File readable(final File file) { if (!file.canRead()) { throw new FileRuntimeException("Not readable: " + file.getAbsolutePath()); @@ -252,23 +160,10 @@ public class Files { return file; } - /** - * File Object is readble - * - * @param file File - * @return File - */ public static File readableFile(final File file) { return readable(file(file)); } - /** - * Create directory by the specified path - * - * @param file File - * @return File - * @Throws FileRuntimeException if it fails to create directory - */ public static File mkdir(final File file) { if (file.exists()) { return file; @@ -289,23 +184,10 @@ public class Files { } } - /** - * Create directory by the specified parent pathname and child pathname - * - * @param file file - * @param name String - * @return File - */ public static File mkdir(final File file, final String name) { return mkdir(new File(file, name)); } - /** - * Method to create tmp directory - * - * @return File - * @Throws IOException if an I/O error occurs - */ public static File tmpdir() { try { File file; @@ -340,24 +222,11 @@ public class Files { } } - /** - * Create parent pathname by the specified pathname - * - * @param file File - * @return File - */ public static File mkparent(final File file) { mkdirs(file.getParentFile()); return file; } - /** - * Create directories by the specified pathname - * - * @param file File - * @return File - * @Throws FileRuntimeException on failure at any point - */ public static File mkdirs(final File file) { if (!file.exists()) { @@ -393,21 +262,11 @@ public class Files { } } - /** - * Delete File Object when exit - * - * @param file File - */ public static void deleteOnExit(final File file) { DELETE.add(file.getAbsolutePath()); flagForDeleteOnExit(file); } - /** - * Delete File Objects when exit - * - * @param file File - */ public static void flagForDeleteOnExit(final File file) { if (file.exists()) { if (file.isDirectory()) { http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java index f7b9b15..157aaa5 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java @@ -68,13 +68,6 @@ public class IO { MAX_TIMEOUT = timeout; } - /** - * Method for reading files as String - * - * @param uri URI - * @return String - * @throws IOException if an I/O error occurs - */ public static String readFileAsString(final URI uri) throws IOException { final StringBuilder builder = new StringBuilder(""); for (final Proxy proxy : ProxySelector.getDefault().select(uri)) { @@ -102,60 +95,22 @@ public class IO { return builder.toString(); } - /** - * Method for reading Properties - * - * @param resource URL - * @return Properties - * @throws IOException if an I/O error occurs - */ public static Properties readProperties(final URL resource) throws IOException { return readProperties(resource, new Properties()); } - /** - * Reading Properties - * - * @param resource URL - * @param properties Properties - * @return Properties - * @throws IOException if and I/O error occurs - */ public static Properties readProperties(final URL resource, final Properties properties) throws IOException { return readProperties(read(resource), properties); } - /** - * Read properties of the specified pathname - * - * @param resource File - * @return Properties - * @throws IOException if an I/O error occurs - */ public static Properties readProperties(final File resource) throws IOException { return readProperties(resource, new Properties()); } - /** - * Read properties of the specified pathname - * - * @param resource File - * @param properties Properties - * @return Properties - * @throws IOException if an I/O error occurs - */ public static Properties readProperties(final File resource, final Properties properties) throws IOException { return readProperties(read(resource), properties); } - /** - * Reads and closes the input stream - * - * @param in InputStream - * @param properties Properties - * @return Properties - * @throws IOException - */ public static Properties readProperties(final InputStream in, final Properties properties) throws IOException { if (in == null) { throw new NullPointerException("InputStream is null"); @@ -171,13 +126,6 @@ public class IO { return properties; } - /** - * Method for reading the String of the specified pathname - * - * @param url URL - * @return String - * @throws IOException if an I/O error occurs - */ public static String readString(final URL url) throws IOException { final InputStream in = url.openStream(); try { @@ -188,13 +136,6 @@ public class IO { } } - /** - * Method for reading the String of the specified pathname - * - * @param file File - * @return String - * @throws IOException if an I/O error occurs - */ public static String readString(final File file) throws IOException { final FileReader in = new FileReader(file); try { @@ -205,50 +146,22 @@ public class IO { } } - /** - * Method to read the entire File into a String - * - * @param file File - * @return String - * @throws IOException if an I/O error occurs - */ public static String slurp(final File file) throws IOException { try (final InputStream is = read(file)) { return slurp(is); } } - /** - * Method to read the entire specified pathname into a String - * - * @param url URL - * @return String - * @throws IOException if an I/O error occurs - */ public static String slurp(final URL url) throws IOException { return slurp(url.openStream()); } - /** - * Method to read the entire InputStream into a String - * - * @param in InputStream - * @return String - * @throws IOException if an I/O error occurs - */ public static String slurp(final InputStream in) throws IOException { final ByteArrayOutputStream out = new ByteArrayOutputStream(); copy(in, out); return new String(out.toByteArray()); } - /** - * Method to write the specified String to File - * - * @param file File - * @param string String - * @throws IOException if an I/O error occurs - */ public static void writeString(final File file, final String string) throws IOException { final FileWriter out = new FileWriter(file); try { @@ -264,13 +177,6 @@ public class IO { } } - /** - * Method to copy File object - * - * @param from File - * @param to File - * @throws IOException if an I/O error occurs - */ public static void copy(final File from, final File to) throws IOException { if (!from.isDirectory()) { final FileOutputStream fos = new FileOutputStream(to); @@ -284,13 +190,6 @@ public class IO { } } - /** - * Method to copy directory - * - * @param srcDir File - * @param destDir File - * @throws IOException if an I/O error occurs - */ public static void copyDirectory(final File srcDir, final File destDir) throws IOException { if (srcDir == null) { throw new NullPointerException("Source must not be null"); @@ -352,13 +251,6 @@ public class IO { } } - /** - * Method to copy File to OutputStream - * - * @param from File - * @param to OutputStream - * @throws IOException if an I/O error occurs - */ public static void copy(final File from, final OutputStream to) throws IOException { final InputStream read = read(from); try { @@ -368,13 +260,6 @@ public class IO { } } - /** - * Method to copy from specified pathname to OutputStream - * - * @param from URL - * @param to OutputStream - * @throws IOException if an I/O error occurs - */ public static void copy(final URL from, final OutputStream to) throws IOException { final InputStream read = read(from); try { @@ -384,13 +269,6 @@ public class IO { } } - /** - * Method to copy from InputStream to File - * - * @param from InputStream - * @param to File - * @throws IOException if an I/O error occurs - */ public static void copy(final InputStream from, final File to) throws IOException { final OutputStream write = write(to); try { @@ -400,14 +278,6 @@ public class IO { } } - /** - * Method to copy InputStream to File and append - * - * @param from InputStream - * @param to File - * @param append boolean - * @throws IOException if an I/O error occurs - */ public static void copy(final InputStream from, final File to, final boolean append) throws IOException { final OutputStream write = write(to, append); try { @@ -434,25 +304,11 @@ public class IO { copy(new ByteArrayInputStream(from), to); } - /** - * Method for writing specified File as ZIP file format - * - * @param file File - * @return ZipOutputStream ZipOutputStream - * @throws IOException if an I/O error occurs - */ public static ZipOutputStream zip(final File file) throws IOException { final OutputStream write = write(file); return new ZipOutputStream(write); } - /** - * Method to unzip ZIP file - * - * @param file File - * @return ZipInputStream - * @throws IOException if an I/O error occurs - */ public static ZipInputStream unzip(final File file) throws IOException { final InputStream read = read(file); return new ZipInputStream(read); @@ -476,12 +332,6 @@ public class IO { } } - /** - * Delete file - * - * @param file File - * @return boolean if file successfully deleted - */ public static boolean delete(final File file) { if (file == null) { return false; @@ -494,81 +344,33 @@ public class IO { return true; } - /** - * Write data to the specified File destination - * - * @param destination File - * @return OutputStream - * @throws FileNotFoundException if the file is not found - */ public static OutputStream write(final File destination) throws FileNotFoundException { final OutputStream out = new FileOutputStream(destination); return new BufferedOutputStream(out, 32768); } - /** - * Write data to the specified File destination and append - * - * @param destination File - * @param append boolean - * @return OutputStream - * @throws FileNotFoundException if the file is not found - */ public static OutputStream write(final File destination, final boolean append) throws FileNotFoundException { final OutputStream out = new FileOutputStream(destination, append); return new BufferedOutputStream(out, 32768); } - /** - * Read data from the specified File source - * - * @param source File - * @return InputStream - * @throws FileNotFoundException if the file is not found - */ public static InputStream read(final File source) throws FileNotFoundException { final InputStream in = new FileInputStream(source); return new BufferedInputStream(in, 32768); } - /** - * Read the next byte from the specified String to input stream - * - * @param content String - * @return InputStream - */ public static InputStream read(final String content) { return read(content.getBytes()); } - /** - * Read the next byte from the specified String to input stream using encoding - * - * @param content String - * @param encoding String - * @return InputStream - * @throws UnsupportedEncodingException - */ public static InputStream read(final String content, final String encoding) throws UnsupportedEncodingException { return read(content.getBytes(encoding)); } - /** - * Read the data from byte array - * - * @param content byte[] - * @return InputStream - */ public static InputStream read(final byte[] content) { return new ByteArrayInputStream(content); } - /** - * Open connection to the specified URL and return InputStream for reading from the connection - * @param url URL - * @return InputStream - * @throws IOException - */ public static InputStream read(final URL url) throws IOException { return url.openStream(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/JarLocation.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/JarLocation.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/JarLocation.java index dba00e8..1963cd3 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/JarLocation.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/JarLocation.java @@ -30,23 +30,10 @@ public class JarLocation { return jarLocation(JarLocation.class); } - /** - * Return jar from the specified resource name - * - * @param resourceName String - * @return File - */ public static File jarFromResource(final String resourceName) { return jarFromResource(Thread.currentThread().getContextClassLoader(), resourceName); } - /** - * Return jar from the specified resource name - * - * @param loader ClassLoader - * @param resourceName String - * @return File - */ public static File jarFromResource(final ClassLoader loader, final String resourceName) { try { URL url = loader.getResource(resourceName); @@ -81,12 +68,6 @@ public class JarLocation { } } - /** - * Return jar location - * - * @param clazz Class - * @return File - */ public static File jarLocation(final Class clazz) { try { final String classFileName = clazz.getName().replace(".", "/") + ".class"; http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java index 2c7e4f7..200855e 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Options.java @@ -94,23 +94,10 @@ public class Options { return parent.getLogger(); } - /** - * Method to check if properties contains the specified String property - * - * @param property String - * @return boolean - */ public boolean has(final String property) { return properties.containsKey(property) || parent.has(property); } - /** - * Return property by the specified String property - * - * @param property String - * @param defaultValue String - * @return String - */ public String get(final String property, final String defaultValue) { final String value = properties.getProperty(property); @@ -355,23 +342,10 @@ public class Options { return possibleValues(enumType); } - /** - * Check possible values of enum and return concatenated string - * - * @param enumType - * @return - */ protected static String possibleValues(final Class<? extends Enum> enumType) { return join(", ", lowercase(enumType.getEnumConstants())); } - /** - * Concatenates the given elements with the delimiter and returns string - * - * @param delimiter String - * @param collection Object... - * @return String - */ public static String join(final String delimiter, final Object... collection) { final StringBuilder sb = new StringBuilder(); for (final Object obj : collection) { http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java index 609119a..6084943 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java @@ -134,22 +134,10 @@ public final class SystemInstance { return observerManager.fireEvent(event); } - /** - * Add the specified Object to Observer - * - * @param observer Object - * @return boolean - */ public boolean addObserver(final Object observer) { return observerManager.addObserver(observer); } - /** - * Remove the specified Object from Observer - * - * @param observer Object - * @return boolean - */ public boolean removeObserver(final Object observer) { return observerManager.removeObserver(observer); } @@ -167,24 +155,10 @@ public final class SystemInstance { return internalProperties; } - /** - * Return the property by the specified String key - * - * @param key String - * @return String - */ public String getProperty(final String key) { return internalProperties.getProperty(key); } - /** - * Return the property by the specified String key - * if the key is not found the default value will be returned - * - * @param key String - * @param defaultValue String - * @return String - */ public String getProperty(final String key, final String defaultValue) { return internalProperties.getProperty(key, defaultValue); } @@ -340,12 +314,6 @@ public final class SystemInstance { addSystemProperties(file); } - /** - * Returns the conf by the specified pathname - * - * @param subPath String - * @return File - */ public File getConf(final String subPath) { File conf = null; http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/Zips.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Zips.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Zips.java index 3893549..e1aa249 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/Zips.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/Zips.java @@ -27,25 +27,10 @@ import java.util.zip.ZipInputStream; */ public class Zips { - /** - * Unzip the specified ZIP file to the specified destination - * - * @param zipFile File - * @param destination File - * @throws IOException - */ public static void unzip(final File zipFile, final File destination) throws IOException { unzip(zipFile, destination, false); } - /** - * Unzip the specified ZIP file to the specified destination - * - * @param zipFile File - * @param destination File - * @param noparent boolean - * @throws IOException - */ public static void unzip(final File zipFile, final File destination, final boolean noparent) throws IOException { Files.dir(destination); @@ -62,14 +47,6 @@ public class Zips { } } - /** - * Method to unzip ZIP files - * - * @param read InputStream - * @param destination File - * @param noparent boolean - * @throws IOException - */ public static void unzip(final InputStream read, final File destination, final boolean noparent) throws IOException { try { // Open the ZIP file http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java index 20dfc8a..0d881fc 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/ProvisioningResolver.java @@ -74,32 +74,16 @@ public class ProvisioningResolver { } } - /** - * Add ArchiveResolver to resolvers - * - * @param resolver ArchiveResolver - */ public void addResolver(final ArchiveResolver resolver) { if (resolvers.put(resolver.prefix(), resolver) != null) { Logger.getLogger(ProvisioningResolver.class.getName()).warning("Overriding resolver " + resolver.prefix() + " with " + resolver); } } - /** - * Remove resolver - * - * @param resolver ArchiveResolver - */ public void removeResolver(final ArchiveResolver resolver) { resolvers.remove(resolver.prefix()); } - /** - * Real path location of the specified location - * - * @param rawLocation String - * @return - */ public Set<String> realLocation(final String rawLocation) { // if direct file path then use it final File file = new File(rawLocation); @@ -192,11 +176,6 @@ public class ProvisioningResolver { return System.getProperty(OPENEJB_DEPLOYER_CACHE_FOLDER, TEMP_DIR); } - /** - * Cache the specified String pathname - * @param path String - * @return File - */ public static File cacheFile(final String path) { final String cache = cache(); if (new File(cache).isAbsolute()) { http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java b/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java index 22be6c6..ac87398 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java @@ -55,12 +55,6 @@ public class ObserverManager { private final Set<Observer> observers = new LinkedHashSet<>(); private final Map<Class, Invocation> methods = new ConcurrentHashMap<>(); - /** - * Add the provided object to be observable - * - * @param observer Object - * @return boolean - */ public boolean addObserver(final Object observer) { if (observer == null) { throw new IllegalArgumentException("observer cannot be null"); @@ -80,12 +74,6 @@ public class ObserverManager { } } - /** - * Remove the observable object so this object doesn't have any observers - * - * @param observer Object - * @return boolean - */ public boolean removeObserver(final Object observer) { if (observer == null) { throw new IllegalArgumentException("listener cannot be null"); http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverAdded.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverAdded.java b/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverAdded.java index 0848ab5..87dbd74 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverAdded.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverAdded.java @@ -26,20 +26,10 @@ public class ObserverAdded { private final Object observer; - /** - * Add the provided object to be observable - * - * @param observer - */ public ObserverAdded(final Object observer) { this.observer = observer; } - /** - * Return the observable object - * - * @return - */ public Object getObserver() { return observer; } http://git-wip-us.apache.org/repos/asf/tomee/blob/0f64bd7e/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverRemoved.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverRemoved.java b/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverRemoved.java index 2c07bf2..f33efa3 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverRemoved.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/observer/event/ObserverRemoved.java @@ -26,20 +26,10 @@ public class ObserverRemoved { private final Object observer; - /** - * Remove the observable object so this object doesn't have any observers - * - * @param observer - */ public ObserverRemoved(final Object observer) { this.observer = observer; } - /** - * Return the observable object - * - * @return - */ public Object getObserver() { return observer; }
