targetClass) {
/**
* Convert a value object to a collection objects, use for converting the
* iterable/array/iterator/enumeration objects to collection objects.
- *
- * if the value object not belong to above then regard the value object as the first item of
+ *
+ * If the value object not belong to above then regard the value object as the first item of
* collection and convert it.
*
* @param the target class of item of the collection
@@ -218,10 +223,13 @@ public static T convert(Object value, Class targetClass) {
* @param targetItemClass the target class of item of the collection
* @param collectionFactory the constructor of collection
* @param hints the converter hints use for intervening converters
+ * @param supportsSingleton whether to be converted as single element collection if the given
+ * value is not iterable/array/iterator/enumeration.
* @return A collection of items converted according to the target type
*/
public static > C convert(Object value, Class targetItemClass,
- IntFunction collectionFactory, Map hints) {
+ IntFunction collectionFactory, Map hints, boolean supportsSingleton) {
+ shouldNotNull(targetItemClass, "The target item class of the conversion can't be null");
Iterable it = null;
int size = 10;
if (value instanceof Iterable) {
@@ -242,8 +250,11 @@ public static > C convert(Object value, Class targ
Object[] array = wrapArray(value);
size = array.length;
it = convert(iterableOf(wrapArray(array)), targetItemClass, hints);
- } else {
+ } else if (supportsSingleton) {
it = convert(iterableOf(value), targetItemClass, hints);
+ } else {
+ throw new ConversionException(
+ "The given value can't be converted, the target item class of the conversion must be iterable/array/iterator/enumeration");
}
}
final C collection = collectionFactory.apply(size);
@@ -269,13 +280,14 @@ public static T convert(Object value, Class targetClass, Map sourceClass = value.getClass();
if (targetClass.isAssignableFrom(sourceClass)) {
return (T) value;
}
Converter converter = resolveConverter(sourceClass, targetClass);
if (converter != null) {
- LOGGER.finer(() -> String.format("Resolve converter %", converter));
+ LOGGER.finer(() -> String.format("Resolve converter %s", converter));
return converter.apply((S) value, hints);
} else {
Converter stringConverter = resolveConverter(String.class, targetClass);
@@ -331,6 +343,7 @@ public static T convert(Object value, TypeLiteral typeLiteral, Map T[] convert(Object[] value, Class targetItemClass,
IntFunction arrayFactory, Map hints) {
+ shouldNotNull(targetItemClass, "The target item class of the conversion can't be null");
if (value == null) {
return arrayFactory.apply(0);
}
@@ -359,6 +372,7 @@ public static > C convert(Object[] value,
if (value == null) {
return null;
}
+ shouldNotNull(targetItemClass, "The target item class of the conversion can't be null");
C collection = collectionFactory.apply(value.length);
for (T t : convert(iterableOf(value), targetItemClass, hints)) {
collection.add(t);
@@ -376,6 +390,7 @@ public static > C convert(Object[] value,
* @return the converted object
*/
public static T[] convertArray(Object value, Class targetClass, Map hints) {
+ shouldNotNull(targetClass, "The target class can't null");
if (value == null) {
return (T[]) Array.newInstance(targetClass, 0);
} else if (value.getClass().isArray()) {
@@ -412,6 +427,7 @@ public static T[] convertArray(Object value, Class targetClass, Map Map convertMap(Object value, Class keyClass, Class valueClass,
Map hints) {
+ shouldNoneNull(keyClass, valueClass);
if (value == null) {
return null;
} else if (value instanceof Map) {
@@ -552,9 +568,9 @@ static Object convertType(Object value, Type targetType, Map hints) {
"Cannot convert for type " + typeClass + "<" + Arrays.toString(argClasses) + "[]>");
}
} else if (List.class.isAssignableFrom(typeClass) && argClasses.length == 1) {
- result = convert(value, argClasses[0], ArrayList::new, hints);
+ result = convert(value, argClasses[0], ArrayList::new, hints, false);
} else if (Set.class.isAssignableFrom(typeClass) && argClasses.length == 1) {
- result = convert(value, argClasses[0], HashSet::new, hints);
+ result = convert(value, argClasses[0], HashSet::new, hints, false);
} else if (Optional.class.isAssignableFrom(typeClass) && argClasses.length == 1) {
result = Optional.ofNullable(convert(value, argClasses[0], hints));
} else if (Supplier.class.isAssignableFrom(typeClass) && argClasses.length == 1) {
diff --git a/corant-shared/src/main/java/org/corant/shared/resource/Resource.java b/corant-shared/src/main/java/org/corant/shared/resource/Resource.java
index 3564e301a..008f2bbf5 100644
--- a/corant-shared/src/main/java/org/corant/shared/resource/Resource.java
+++ b/corant-shared/src/main/java/org/corant/shared/resource/Resource.java
@@ -22,7 +22,7 @@
import java.nio.channels.ReadableByteChannel;
import java.util.Map;
import java.util.logging.Level;
-import org.corant.shared.util.Resources;
+import java.util.logging.Logger;
import org.corant.shared.util.Streams;
/**
@@ -38,6 +38,8 @@
*/
public interface Resource {
+ Logger logger = Logger.getLogger(Resource.class.getName());
+
String META_CONTENT_TYPE = "Content-Type";
String META_CONTENT_LENGTH = "Content-Length";
String META_LAST_MODIFIED = "Last-Modified";
@@ -54,7 +56,7 @@ default boolean exists() {
/**
* Return a byte array for the content of this resource, please evaluate the size of the resource
* when using it to avoid OOM.
- *
+ *
* NOTE: the stream will be closed after reading.
*
* @throws IOException If I/O errors occur
@@ -92,7 +94,7 @@ default Map getMetadata() {
* Returns metadata information for this resource's corresponding name with the given name and
* type.
*
- * @param
+ * @param the metadata value type class
* @param name the metadata key
* @param type the metadata value type, may involve type conversion
*/
@@ -142,7 +144,7 @@ default InputStream tryOpenInputStream() {
try {
return openInputStream();
} catch (IOException e) {
- Resources.logger.log(Level.WARNING, e,
+ logger.log(Level.WARNING, e,
() -> String.format("Can't not open stream from %s.", getLocation()));
}
return null;
diff --git a/corant-shared/src/main/java/org/corant/shared/resource/WritableResource.java b/corant-shared/src/main/java/org/corant/shared/resource/WritableResource.java
index 868f5dbee..58dea4a76 100644
--- a/corant-shared/src/main/java/org/corant/shared/resource/WritableResource.java
+++ b/corant-shared/src/main/java/org/corant/shared/resource/WritableResource.java
@@ -19,7 +19,6 @@
import java.nio.channels.WritableByteChannel;
import java.nio.file.OpenOption;
import java.util.logging.Level;
-import org.corant.shared.util.Resources;
/**
* corant-shared
@@ -39,7 +38,7 @@ default OutputStream tryOpenOutputStream() {
try {
return openOutputStream();
} catch (IOException e) {
- Resources.logger.log(Level.WARNING, e,
+ logger.log(Level.WARNING, e,
() -> String.format("Can't not open stream from %s.", getLocation()));
}
return null;
diff --git a/corant-shared/src/main/java/org/corant/shared/util/Conversions.java b/corant-shared/src/main/java/org/corant/shared/util/Conversions.java
index ee8009346..d1e2684f6 100644
--- a/corant-shared/src/main/java/org/corant/shared/util/Conversions.java
+++ b/corant-shared/src/main/java/org/corant/shared/util/Conversions.java
@@ -101,7 +101,7 @@ public static BigDecimal toBigDecimal(Object obj) {
/**
* Convert an object to BigDecimal object, supports String to BigDecimal Number to BigDecimal,
* return the given alternative object if the converted object is null else return the converted
- * obejct. Support converting String or Numeric type to BigDecimal type.
+ * object. Support converting String or Numeric type to BigDecimal type.
*
* @param obj the object that to be converted
* @param altVal the alternative object if converted object is null
@@ -116,7 +116,7 @@ public static BigDecimal toBigDecimal(Object obj, BigDecimal altVal) {
/**
* Convert an object to rounding BigDecimal object with scale, support converting String or
* Numeric type to BigDecimal type. Return the given alternative object if the converted object is
- * null else return the converted obejct.
+ * null else return the converted object.
*
* @param obj the object that to be converted
* @param altVal the alternative object if converted object is null
@@ -225,7 +225,7 @@ public static Byte toByte(Object obj) {
/**
* Convert an object to Byte object, support converting String (normal or Hex) or Numeric type to
* Byte type, Float or Double type object may involve rounding or truncation. Return the given
- * alternative object if the converted object is null else return the converted obejct.
+ * alternative object if the converted object is null else return the converted object.
*
* @param obj the object that to be converted
* @param altVal the alternative object if converted object is null
@@ -269,7 +269,7 @@ public static Class toClass(Object obj) {
*/
public static > C toCollection(Object obj, Class itemClass,
IntFunction collectionFactory) {
- return Conversion.convert(obj, itemClass, collectionFactory, null);
+ return Conversion.convert(obj, itemClass, collectionFactory, null, true);
}
/**
@@ -377,12 +377,9 @@ public static List toList(Object obj, Class clazz) {
public static List toList(Object obj, Class clazz, Map hints) {
if (obj == null) {
return null;
- } else if (obj instanceof Collection) {
- return Conversion.convert((Collection) obj, ArrayList::new, clazz, hints);
- } else if (obj.getClass().isArray()) {
- return Conversion.convert(wrapArray(obj), ArrayList::new, clazz, hints);
+ } else {
+ return Conversion.convert(obj, clazz, ArrayList::new, hints, false);
}
- return Conversion.convert(obj, clazz, ArrayList::new, hints);// FIXME weird
}
public static List toList(Object obj, Function convert) {
@@ -592,12 +589,9 @@ public static Set toSet(Object obj, Class clazz) {
public static Set toSet(Object obj, Class clazz, Map hints) {
if (obj == null) {
return null;
- } else if (obj instanceof Collection) {
- return Conversion.convert((Collection) obj, HashSet::new, clazz, hints);
- } else if (obj.getClass().isArray()) {
- return Conversion.convert(wrapArray(obj), HashSet::new, clazz, hints);
+ } else {
+ return Conversion.convert(obj, clazz, HashSet::new, hints, false);
}
- return Conversion.convert(obj, clazz, HashSet::new, hints);// FIXME weird
}
public static Set toSet(Object obj, Function convert) {
diff --git a/corant-shared/src/main/java/org/corant/shared/util/Maps.java b/corant-shared/src/main/java/org/corant/shared/util/Maps.java
index aeefce5be..edae3fc06 100644
--- a/corant-shared/src/main/java/org/corant/shared/util/Maps.java
+++ b/corant-shared/src/main/java/org/corant/shared/util/Maps.java
@@ -150,10 +150,6 @@ public static List extractMapKeyPathValues(Object object, Object[] keyPat
/**
* @see #flatMap(Map, String, int)
- *
- * @param map
- * @param maxDepth
- * @return flatMap
*/
public static Map flatMap(Map map, int maxDepth) {
Map flatMap = new HashMap<>();
@@ -210,7 +206,7 @@ public static Map flatMap(Map map, int maxDepth) {
* }
*
*
- * @param map the map to be flatten
+ * @param map the map to be flattened
* @param splitor the string key splitor, use to splite key levels.
* @param maxDepth Maximum leveling depth
* @return a map, where the key consists of the key of the given map and the given delimiter
@@ -236,8 +232,8 @@ public static Map flatMap(Map map, String splitor, in
/**
* @see #flatMap(Map, String, int)
*
- * @param map the map to be flatten
- * @param splitor the string key splitor, use to splite key levels.
+ * @param map the map to be flattened
+ * @param splitor the string key splitor, use to split key levels.
* @param maxDepth Maximum leveling depth
* @return a map, where the key consists of the key of the original map and the given delimiter
*/
@@ -368,22 +364,16 @@ public static > C getMapCollection(final Map ma
* @param hints the lastConverter hints use for intervening converters
* @return the mapped expected collection value
*
- * @see Conversion#convert(Object, Class, IntFunction, Map)
- * @see Conversion#convert(Collection, IntFunction, Class, Map)
- * @see Conversion#convert(Object[], IntFunction, Class, Map)
+ * @see Conversion#convert(Object, Class, IntFunction, Map, boolean)
*/
public static > C getMapCollection(final Map map,
final Object key, final IntFunction collectionFactory, final Class elementClazz,
final Map hints) {
Object obj = map == null ? null : map.get(key);
- if (obj instanceof Collection) {
- return Conversion.convert((Collection) obj, collectionFactory, elementClazz, hints);
- } else if (obj instanceof Object[] || obj != null && obj.getClass().isArray()) {
- return Conversion.convert(wrapArray(obj), collectionFactory, elementClazz, hints);
- } else if (obj != null) {
- return Conversion.convert(obj, elementClazz, collectionFactory, hints);
- } else {
+ if (obj == null) {
return null;
+ } else {
+ return Conversion.convert(obj, elementClazz, collectionFactory, hints, false);
}
}
@@ -408,47 +398,7 @@ public static > C getMapCollection(final Map ma
public static > C getMapCollection(final Map map,
final Object key, final IntFunction collectionFactory,
final Function converter) {
- Object obj = map == null ? null : map.get(key);
- if (obj instanceof Collection) {
- Collection vals = (Collection) obj;
- C results = collectionFactory.apply(vals.size());
- for (Object val : vals) {
- results.add(converter.apply(val));
- }
- return results;
- } else if (obj instanceof Object[] || obj != null && obj.getClass().isArray()) {
- Object[] vals = wrapArray(obj);
- C results = collectionFactory.apply(vals.length);
- for (Object val : vals) {
- results.add(converter.apply(val));
- }
- return results;
- } else if (obj instanceof Iterable) {
- Iterable vals = (Iterable) obj;
- C results = collectionFactory.apply(10);
- for (Object val : vals) {
- results.add(converter.apply(val));
- }
- return results;
- } else if (obj instanceof Iterator) {
- Iterator vals = (Iterator) obj;
- C results = collectionFactory.apply(10);
- while (vals.hasNext()) {
- results.add(converter.apply(vals.next()));
- }
- return results;
- } else if (obj instanceof Enumeration) {
- Enumeration vals = (Enumeration) obj;
- C results = collectionFactory.apply(10);
- while (vals.hasMoreElements()) {
- results.add(converter.apply(vals.nextElement()));
- }
- return results;
- } else if (obj == null) {
- return null;
- } else {
- throw new NotSupportedException();
- }
+ return convertCollection(map == null ? null : map.get(key), collectionFactory, converter);
}
/**
@@ -759,13 +709,13 @@ public static List getMapList(final Map map, final Object key,
* @param the expected returned element type
* @param map the map to use
* @param key the key to lookup
- * @param singleElementconverter the converter function that extract value to expected list
+ * @param singleElementConverter the converter function that extract value to expected list
* element.
* @return the expected list
*/
public static List getMapList(final Map map, final Object key,
- final Function singleElementconverter) {
- return getMapObjectList(map, key, v -> toList(v, singleElementconverter));
+ final Function singleElementConverter) {
+ return getMapObjectList(map, key, v -> toList(v, singleElementConverter));
}
/**
@@ -1162,6 +1112,86 @@ public static Map newLinkedHashMap(Map ma
return map != null ? new LinkedHashMap<>(map) : new LinkedHashMap<>();
}
+ /**
+ *
+ * Remove and return converted the collection value mapped to the given key in the given Map or
+ * {@code null} if the given map is {@code null} or the map contains no mapping for the key or the
+ * mapped value is {@code null}.
+ *
+ *
+ * Note: The returned collection is reconstructed
+ *
+ * @param the target class of item of the collection
+ * @param the target collection class
+ * @param map the map to use
+ * @param key the key to lookup
+ * @param collectionFactory the constructor of collection
+ * @param elementClazz the element class
+ * @return the mapped expected collection value
+ */
+ public static > C popMapCollection(final Map map,
+ final Object key, final IntFunction collectionFactory, final Class elementClazz) {
+ Object obj = map == null ? null : map.remove(key);
+ if (obj == null) {
+ return null;
+ } else {
+ return Conversion.convert(obj, elementClazz, collectionFactory, null, false);
+ }
+ }
+
+ /**
+ *
+ * Remove and return converted the collection value mapped to the given key in the given Map or
+ * {@code null} if the given map is {@code null} or the map contains no mapping for the key or the
+ * mapped value is {@code null}.
+ *
+ *
+ * Note: The returned collection is reconstructed
+ *
+ * @param the target class of item of the collection
+ * @param the target collection class
+ * @param map the map to use
+ * @param key the key to lookup
+ * @param collectionFactory the constructor of collection
+ * @param converter the single element converter
+ * @return the mapped expected collection value
+ */
+ public static > C popMapCollection(final Map map,
+ final Object key, final IntFunction collectionFactory,
+ final Function converter) {
+ return convertCollection(map == null ? null : map.remove(key), collectionFactory, converter);
+ }
+
+ /**
+ * Remove and return converted the value corresponding to the given key in the given map, and the
+ * intermediate process may involve type conversion.
+ *
+ * @param the expected value type
+ * @param map the map to use
+ * @param key the key to lookup
+ * @param clazz the expected value class
+ * @return the mapped object
+ */
+ public static T popMapObject(final Map map, final Object key, final Class clazz) {
+ return popMapObject(map, key, clazz, null);
+ }
+
+ /**
+ * Remove and return converted the value corresponding to the given key in the given map, and the
+ * intermediate process may involve type conversion.
+ *
+ * @param the expected value type
+ * @param map the map to use
+ * @param key the key to lookup
+ * @param clazz the expected value class
+ * @param hints the conversion hints
+ * @return the mapped object
+ */
+ public static T popMapObject(final Map map, final Object key, final Class clazz,
+ final Map hints) {
+ return toObject(map == null ? null : map.remove(key), shouldNotNull(clazz), hints);
+ }
+
public static Properties propertiesOf(String... strings) {
Properties result = new Properties();
result.putAll(mapOf((Object[]) strings));
@@ -1231,6 +1261,50 @@ public static Map union(Map... maps) {
return union;
}
+ static > C convertCollection(Object obj,
+ final IntFunction collectionFactory, final Function converter) {
+ if (obj == null) {
+ return null;
+ } else if (obj instanceof Collection) {
+ Collection vals = (Collection) obj;
+ C results = collectionFactory.apply(vals.size());
+ for (Object val : vals) {
+ results.add(converter.apply(val));
+ }
+ return results;
+ } else if (obj instanceof Object[] || obj.getClass().isArray()) {
+ Object[] vals = wrapArray(obj);
+ C results = collectionFactory.apply(vals.length);
+ for (Object val : vals) {
+ results.add(converter.apply(val));
+ }
+ return results;
+ } else if (obj instanceof Iterable) {
+ Iterable vals = (Iterable) obj;
+ C results = collectionFactory.apply(10);
+ for (Object val : vals) {
+ results.add(converter.apply(val));
+ }
+ return results;
+ } else if (obj instanceof Iterator) {
+ Iterator vals = (Iterator) obj;
+ C results = collectionFactory.apply(10);
+ while (vals.hasNext()) {
+ results.add(converter.apply(vals.next()));
+ }
+ return results;
+ } else if (obj instanceof Enumeration) {
+ Enumeration vals = (Enumeration) obj;
+ C results = collectionFactory.apply(10);
+ while (vals.hasMoreElements()) {
+ results.add(converter.apply(vals.nextElement()));
+ }
+ return results;
+ } else {
+ throw new NotSupportedException();
+ }
+ }
+
@SuppressWarnings({"unchecked", "rawtypes"})
static void doFlatMap(Map resultMap, FlatMapKey key, Object val,
int maxDepth) {
diff --git a/corant-shared/src/main/java/org/corant/shared/util/Resources.java b/corant-shared/src/main/java/org/corant/shared/util/Resources.java
index fcca0dbbf..6750a3111 100644
--- a/corant-shared/src/main/java/org/corant/shared/util/Resources.java
+++ b/corant-shared/src/main/java/org/corant/shared/util/Resources.java
@@ -42,7 +42,7 @@
*/
public class Resources {
- public static final Logger logger = Logger.getLogger(Resources.class.getName());
+ static final Logger logger = Logger.getLogger(Resources.class.getName());
/**
* Get URL resources from specified URL path, support Glob / Regex Pattern.
@@ -60,7 +60,7 @@ public class Resources {
*
* @param the resource type
* @param path the resource path
- * @throws IOException
+ * @throws IOException if an I/O error occurs
* @see PathMatcher#decidePathMatcher(String, boolean, boolean)
*/
public static Stream from(String path) throws IOException {
@@ -80,9 +80,9 @@ public static Stream from(String path) throws IOExcep
/**
* Use specified class loader to scan all class path resources.
*
- * @param classLoader
- * @return
- * @throws IOException fromClassPath
+ * @param classLoader class loader for loading resources
+ * @return A class path resource stream
+ * @throws IOException if an I/O error occurs
*/
public static Stream fromClassPath(ClassLoader classLoader)
throws IOException {
@@ -100,15 +100,17 @@ public static Stream fromClassPath(ClassLoader classLoader)
* 1.if path is "javax/sql/" then will scan all resources that under the javax.sql class path.
* 2.if path is "java/sql/Driver.class" then will scan single resource javax.sql.Driver.
* 3.if path is "META-INF/maven/" then will scan all resources under the META-INF/maven.
- * 4.if path is blank ({@code Strings.isBlank}) then will scan all class path in the system.
+ * 4.if path is blank ({@code
+ * Strings.isBlank
+ * }) then will scan all class path in the system.
* 5.if path is "javax/sql/*Driver.class" then will scan javax.sql class path and filter class name
* end with Driver.class.
*
*
- * @param classLoader
- * @param classPath
- * @return
- * @throws IOException fromClassPath
+ * @param classLoader class loader for loading resources
+ * @param classPath the resource class path or expression, supports glob-pattern/regex
+ * @return A class path resource stream
+ * @throws IOException if an I/O error occurs
*/
public static Stream fromClassPath(ClassLoader classLoader, String classPath)
throws IOException {
@@ -118,9 +120,9 @@ public static Stream fromClassPath(ClassLoader classLoader, S
/**
* Use default class loader to scan the specified path resources.
*
- * @param classPath
- * @return
- * @throws IOException fromClassPath
+ * @param classPath the resource class path or expression, supports glob-pattern/regex
+ * @return A class path resource stream
+ * @throws IOException if an I/O error occurs
*/
public static Stream fromClassPath(String classPath) throws IOException {
return ClassPathResourceLoader.DFLT_INST.load(classPath).stream();
@@ -129,9 +131,8 @@ public static Stream fromClassPath(String classPath) throws I
/**
* Use file create file system resource.
*
- * @param file
- * @return
- * @throws IOException fromFileSystem
+ * @param file used to build FileSystemResource
+ * @return A file system resource
*/
public static FileSystemResource fromFileSystem(File file) {
return new FileSystemResource(shouldNotNull(file));
@@ -140,9 +141,9 @@ public static FileSystemResource fromFileSystem(File file) {
/**
* Use Path to find file system resource.
*
- * @param path
- * @return
- * @throws IOException fromFileSystem
+ * @param path used to build FileSystemResource
+ * @return A file system resource
+ * @throws IOException if an I/O error occurs
*/
public static FileSystemResource fromFileSystem(Path path) throws IOException {
return new FileSystemResource(path);
@@ -151,10 +152,11 @@ public static FileSystemResource fromFileSystem(Path path) throws IOException {
/**
* Use path string to find file system resource. Support glob/regex expression
*
+ * @param path the resource path or expression, supports glob-pattern/regex
+ * @return A file system resource stream
+ * @throws IOException if an I/O error occurs
+ *
* @see PathMatcher#decidePathMatcher(String, boolean, boolean)
- * @param path
- * @return
- * @throws IOException fromFileSystem
*/
public static Stream fromFileSystem(String path) throws IOException {
return FileSystemResourceLoader.DFLT_INST.load(path).stream();
@@ -163,10 +165,10 @@ public static Stream fromFileSystem(String path) throws IOEx
/**
* Use input stream to build input stream resource.
*
- * @param inputStream
- * @param location
- * @return
- * @throws IOException fromInputStream
+ * @param inputStream used to build InputStreamResource
+ * @param location used to denote the origin of a given input stream
+ * @return an input stream resource
+ * @throws IOException if an I/O error occurs
*/
public static InputStreamResource fromInputStream(InputStream inputStream, String location)
throws IOException {
@@ -176,9 +178,9 @@ public static InputStreamResource fromInputStream(InputStream inputStream, Strin
/**
* Get the resources of a relative path through a class and path
*
- * @param relative
- * @param path
- * @return fromRelativeClass
+ * @param relative the relative class use to search the resource
+ * @param path resource class path
+ * @return a URLResource
*/
public static URLResource fromRelativeClass(Class relative, String path) {
return ClassPathResourceLoader.relative(relative, path);
@@ -187,9 +189,9 @@ public static URLResource fromRelativeClass(Class relative, String path) {
/**
* Use specified URL string to find resource.
*
- * @param url
- * @return
- * @throws IOException fromUrl
+ * @param url used to build URLResource
+ * @return a URLResource
+ * @throws IOException if an I/O error occurs
*/
public static URLResource fromUrl(String url) throws IOException {
return new URLResource(SourceType.URL.resolve(url));
@@ -198,9 +200,9 @@ public static URLResource fromUrl(String url) throws IOException {
/**
* Use specified URL to find resource.
*
- * @param url
- * @return
- * @throws IOException fromUrl
+ * @param url used to build URLResource
+ * @return a URLResource
+ * @throws IOException if an I/O error occurs
*/
public static URLResource fromUrl(URL url) throws IOException {
return new URLResource(url);
@@ -209,10 +211,10 @@ public static URLResource fromUrl(URL url) throws IOException {
/**
* Use specified http URL and proxy to find resource.
*
- * @param url
- * @param proxy
- * @return
- * @throws IOException fromUrl
+ * @param url used to build URLResource
+ * @param proxy the Proxy through which this connection will be made
+ * @return an input stream resource
+ * @throws IOException if an I/O error occurs
*/
public static InputStreamResource fromUrl(URL url, Proxy proxy) throws IOException {
return fromInputStream(url.openConnection(proxy).getInputStream(), url.toExternalForm());
@@ -222,9 +224,6 @@ public static InputStreamResource fromUrl(URL url, Proxy proxy) throws IOExcepti
* Not throw IO exception, just warning
*
* @see #from
- *
- * @param path
- * @return tryFrom
*/
public static Stream tryFrom(final String path) {
try {
@@ -240,8 +239,6 @@ public static Stream tryFrom(final String path) {
* Not throw IO exception, just warning
*
* @see #fromClassPath(ClassLoader)
- * @param classLoader
- * @return tryFromClassPath
*/
public static Stream tryFromClassPath(ClassLoader classLoader) {
try {
@@ -257,9 +254,6 @@ public static Stream tryFromClassPath(ClassLoader classLoader
* Not throw IO exception, just warning
*
* @see #fromClassPath(ClassLoader, String)
- * @param classLoader
- * @param classPath
- * @return tryFromClassPath
*/
public static Stream tryFromClassPath(ClassLoader classLoader,
String classPath) {
@@ -276,8 +270,6 @@ public static Stream tryFromClassPath(ClassLoader classLoader
* Not throw IO exception, just warning
*
* @see #fromClassPath(String)
- * @param classPath
- * @return tryFromClassPath
*/
public static Stream tryFromClassPath(String classPath) {
try {
@@ -293,8 +285,6 @@ public static Stream tryFromClassPath(String classPath) {
* Not throw IO exception, just warning
*
* @see #fromFileSystem(Path)
- * @param path
- * @return tryFromFileSystem
*/
public static FileSystemResource tryFromFileSystem(Path path) {
try {
@@ -310,8 +300,6 @@ public static FileSystemResource tryFromFileSystem(Path path) {
* Not throw IO exception, just warning
*
* @see #fromFileSystem(String)
- * @param path
- * @return tryFromFileSystem
*/
public static Stream tryFromFileSystem(String path) {
try {
@@ -327,9 +315,6 @@ public static Stream tryFromFileSystem(String path) {
* Not throw IO exception, just warning
*
* @see #fromInputStream(InputStream, String)
- * @param inputStream
- * @param location
- * @return tryFromInputStream
*/
public static InputStreamResource tryFromInputStream(InputStream inputStream, String location) {
try {
@@ -344,8 +329,6 @@ public static InputStreamResource tryFromInputStream(InputStream inputStream, St
* Not throw IO exception, just warning
*
* @see #fromUrl(String)
- * @param url
- * @return tryFromUrl
*/
public static URLResource tryFromUrl(String url) {
try {
@@ -360,8 +343,6 @@ public static URLResource tryFromUrl(String url) {
* Not throw IO exception, just warning
*
* @see #fromUrl(URL)
- * @param url
- * @return tryFromUrl
*/
public static URLResource tryFromUrl(URL url) {
try {
@@ -376,9 +357,6 @@ public static URLResource tryFromUrl(URL url) {
* Not throw IO exception, just warning
*
* @see #fromUrl(URL, Proxy)
- * @param url
- * @param proxy
- * @return tryFromUrl
*/
public static InputStreamResource tryFromUrl(URL url, Proxy proxy) {
try {