juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Remove deprecated code.
Date Tue, 13 Oct 2020 18:12:30 GMT
This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new cf6a152  Remove deprecated code.
cf6a152 is described below

commit cf6a152a7ef94db5b44963d2b04ca9bd0c394104
Author: JamesBognar <james.bognar@salesforce.com>
AuthorDate: Tue Oct 13 14:12:25 2020 -0400

    Remove deprecated code.
---
 .../juneau/utils/ClasspathResourceFinder.java      |  64 ------
 .../juneau/utils/ClasspathResourceFinderBasic.java |  70 -------
 .../utils/ClasspathResourceFinderRecursive.java    |  43 ----
 .../utils/ClasspathResourceFinderSimple.java       | 162 ---------------
 .../juneau/utils/ClasspathResourceManager.java     | 218 ---------------------
 .../juneau/rest/annotation/RestResource.java       |  13 --
 .../rest/annotation/RestResourceConfigApply.java   |   3 -
 7 files changed, 573 deletions(-)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinder.java
deleted file mode 100644
index 6be7ea6..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.
 The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file
except in compliance            *
-// * with the License.  You may obtain a copy of the License at                         
                                    *
-// *                                                                                    
                                    *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                        
                                    *
-// *                                                                                    
                                    *
-// * Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the        *
-// * specific language governing permissions and limitations under the License.         
                                    *
-// ***************************************************************************************************************************
-package org.apache.juneau.utils;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Interface for finding classpath resources.
- *
- * <p>
- * Essentially a wrapper around {@link Class#getResourceAsStream(String)}, but with support
for looking up resources
- * with localized names (e.g. <js>"myfile_ja_JP.txt"</js>).
- *
- * <p>
- * The following predefined implementations are provided:
- * <ul>
- * 	<li>{@link ClasspathResourceFinderSimple} - Simple searching of classpath.
- * 	<li>{@link ClasspathResourceFinderBasic} - Same as above, but looks in local JVM
working directory if resource
- * 		can't be found on classpath.
- * 	<li>{@link ClasspathResourceFinderRecursive} - Same as above, except if the resource
can't be found on the
- * 		classpath relative to the base class, recursively searches up the parent class hierarchy.
- * </ul>
- *
- * @deprecated Use {@link org.apache.juneau.cp.ResourceFinder}.
- */
-@Deprecated
-public interface ClasspathResourceFinder {
-
-	/**
-	 * Represents "no" classpath resource finder.
-	 */
-	public static final class Null implements ClasspathResourceFinder {
-		@Override
-		public InputStream findResource(Class<?> baseClass, String name, Locale locale) throws
IOException {
-			throw new NoSuchMethodError();
-		}
-	}
-
-	/**
-	 * Returns the contents of the resource with the specified name.
-	 *
-	 * @param baseClass
-	 * 	The class to use to retrieve the resource.
-	 * @param name The resource name.
-	 * 	See {@link Class#getResource(String)} for format.
-	 * @param locale
-	 * 	The locale of the resource to retrieve.
-	 * 	<br>If <jk>null</jk>, won't look for localized file names.
-	 * @return The resolved resource contents, or <jk>null</jk> if the resource
was not found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	InputStream findResource(Class<?> baseClass, String name, Locale locale) throws IOException;
-}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderBasic.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderBasic.java
deleted file mode 100644
index d5027c0..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderBasic.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.
 The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file
except in compliance            *
-// * with the License.  You may obtain a copy of the License at                         
                                    *
-// *                                                                                    
                                    *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                        
                                    *
-// *                                                                                    
                                    *
-// * Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the        *
-// * specific language governing permissions and limitations under the License.         
                                    *
-// ***************************************************************************************************************************
-package org.apache.juneau.utils;
-
-import java.io.*;
-import java.util.*;
-
-import org.apache.juneau.cp.*;
-
-/**
- * Utility class for finding resources for a class.
- *
- * <p>
- * Same as {@link ClasspathResourceFinderSimple}, but first searches the working directory
for the file before
- * looking in the classpath.
- * <br>Path traversals outside the working directory are not allowed for security reasons.
- *
- * @deprecated Use {@link SimpleResourceFinder}.
- */
-@Deprecated
-public class ClasspathResourceFinderBasic extends ClasspathResourceFinderSimple {
-
-	/**
-	 * Reusable instance.
-	 */
-	public static final ClasspathResourceFinderBasic INSTANCE = new ClasspathResourceFinderBasic();
-
-	@Override /* ClasspathResourceFinder */
-	public InputStream findResource(Class<?> baseClass, String name, Locale locale) throws
IOException {
-		InputStream is = findFileSystemResource(name, locale);
-		if (is != null)
-			return is;
-		return findClasspathResource(baseClass, name, locale);
-	}
-
-	/**
-	 * Workhorse method for retrieving a resource from the file system.
-	 *
-	 * <p>
-	 * This method can be overridden by subclasses to provide customized handling of resource
retrieval from file systems.
-	 *
-	 * @param name The resource name.
-	 * @param locale
-	 * 	The resource locale.
-	 * 	<br>Can be <jk>null</jk>.
-	 * @return The resource stream, or <jk>null</jk> if it couldn't be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	protected InputStream findFileSystemResource(String name, Locale locale) throws IOException
{
-		if (name.indexOf("..") == -1) {
-			for (String n2 : getCandidateFileNames(name, locale)) {
-				File f = new File(n2);
-				if (f.exists() && f.canRead() && ! f.isAbsolute()) {
-					return new FileInputStream(f);
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderRecursive.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderRecursive.java
deleted file mode 100644
index d4f4f73..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderRecursive.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.
 The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file
except in compliance            *
-// * with the License.  You may obtain a copy of the License at                         
                                    *
-// *                                                                                    
                                    *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                        
                                    *
-// *                                                                                    
                                    *
-// * Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the        *
-// * specific language governing permissions and limitations under the License.         
                                    *
-// ***************************************************************************************************************************
-package org.apache.juneau.utils;
-
-import java.io.*;
-import java.util.*;
-
-import org.apache.juneau.cp.*;
-
-/**
- * Same as {@link ClasspathResourceFinderBasic} but searches for resources up the parent
class hierarchy chain.
- *
- * @deprecated Use {@link BasicResourceFinder}.
- */
-@Deprecated
-public class ClasspathResourceFinderRecursive extends ClasspathResourceFinderBasic {
-
-	/**
-	 * Reusable instance.
-	 */
-	public static final ClasspathResourceFinderRecursive INSTANCE = new ClasspathResourceFinderRecursive();
-
-	@Override /* ResourceFinder2 */
-	public InputStream findResource(Class<?> baseClass, String name, Locale locale) throws
IOException {
-		while (baseClass != null) {
-			InputStream is = findClasspathResource(baseClass, name, locale);
-			if (is != null)
-				return is;
-			baseClass = baseClass.getSuperclass();
-		}
-		return findFileSystemResource(name, locale);
-	}
-}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderSimple.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderSimple.java
deleted file mode 100644
index b028adf..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceFinderSimple.java
+++ /dev/null
@@ -1,162 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.
 The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file
except in compliance            *
-// * with the License.  You may obtain a copy of the License at                         
                                    *
-// *                                                                                    
                                    *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                        
                                    *
-// *                                                                                    
                                    *
-// * Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the        *
-// * specific language governing permissions and limitations under the License.         
                                    *
-// ***************************************************************************************************************************
-package org.apache.juneau.utils;
-
-import static org.apache.juneau.internal.FileUtils.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.ResourceBundle.*;
-
-import org.apache.juneau.cp.*;
-
-/**
- * Utility class for finding resources for a class.
- *
- * <p>
- * Same as {@link Class#getResourceAsStream(String)} except looks for resources with localized
file names.
- *
- * <p>
- * If the <c>locale</c> is specified, then we look for resources whose name matches
that locale.
- * For example, if looking for the resource <js>"MyResource.txt"</js> for the
Japanese locale, we will look for
- * files in the following order:
- * <ol>
- * 	<li><js>"MyResource_ja_JP.txt"</js>
- * 	<li><js>"MyResource_ja.txt"</js>
- * 	<li><js>"MyResource.txt"</js>
- * </ol>
- *
- * @deprecated Use {@link SimpleResourceFinder}.
- */
-@Deprecated
-public class ClasspathResourceFinderSimple implements ClasspathResourceFinder {
-
-	/**
-	 * Reusable instance.
-	 */
-	public static final ClasspathResourceFinderSimple INSTANCE = new ClasspathResourceFinderSimple();
-
-	private static final ResourceBundle.Control RB_CONTROL = ResourceBundle.Control.getControl(Control.FORMAT_DEFAULT);
-	private static final List<Locale> ROOT_LOCALE = Arrays.asList(Locale.ROOT);
-
-
-	@Override /* ClasspathResourceFinder */
-	public InputStream findResource(Class<?> baseClass, String name, Locale locale) throws
IOException {
-		return findClasspathResource(baseClass, name, locale);
-	}
-
-	/**
-	 * Workhorse method for retrieving a resource from the classpath.
-	 *
-	 * <p>
-	 * This method can be overridden by subclasses to provide customized handling of resource
retrieval from the classpath.
-	 *
-	 * @param baseClass The base class providing the classloader.
-	 * @param name The resource name.
-	 * @param locale
-	 * 	The resource locale.
-	 * 	<br>If <jk>null</jk>, won't look for localized file names.
-	 * @return The resource stream, or <jk>null</jk> if it couldn't be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	protected InputStream findClasspathResource(Class<?> baseClass, String name, Locale
locale) throws IOException {
-
-		if (locale == null)
-			return getResourceAsStream(baseClass, name);
-
-		for (String n : getCandidateFileNames(name, locale)) {
-			InputStream is = getResourceAsStream(baseClass, n);
-			if (is != null)
-				return is;
-		}
-		return null;
-	}
-
-	private InputStream getResourceAsStream(Class<?> baseClass, String name) {
-		return baseClass.getResourceAsStream(name);
-	}
-
-	/**
-	 * Returns the candidate file names for the specified file name in the specified locale.
-	 *
-	 * <p>
-	 * For example, if looking for the <js>"MyResource.txt"</js> file in the Japanese
locale, the iterator will return
-	 * names in the following order:
-	 * <ol>
-	 * 	<li><js>"MyResource_ja_JP.txt"</js>
-	 * 	<li><js>"MyResource_ja.txt"</js>
-	 * 	<li><js>"MyResource.txt"</js>
-	 * </ol>
-	 *
-	 * <p>
-	 * If the locale is <jk>null</jk>, then it will only return <js>"MyResource.txt"</js>.
-	 *
-	 * @param fileName The name of the file to get candidate file names on.
-	 * @param l
-	 * 	The locale.
-	 * 	<br>If <jk>null</jk>, won't look for localized file names.
-	 * @return An iterator of file names to look at.
-	 */
-	protected static Iterable<String> getCandidateFileNames(final String fileName, final
Locale l) {
-		return new Iterable<String>() {
-			@Override
-			public Iterator<String> iterator() {
-				return new Iterator<String>() {
-					final Iterator<Locale> locales = getCandidateLocales(l).iterator();
-					String baseName, ext;
-
-					@Override
-					public boolean hasNext() {
-						return locales.hasNext();
-					}
-
-					@Override
-					public String next() {
-						Locale l2 = locales.next();
-						if (l2.toString().isEmpty())
-							return fileName;
-						if (baseName == null)
-							baseName = getBaseName(fileName);
-						if (ext == null)
-							ext = getExtension(fileName);
-						return baseName + "_" + l2.toString() + (ext.isEmpty() ? "" : ('.' + ext));
-					}
-					@Override
-					public void remove() {
-						throw new UnsupportedOperationException();
-					}
-				};
-			}
-		};
-	}
-
-	/**
-	 * Returns the candidate locales for the specified locale.
-	 *
-	 * <p>
-	 * For example, if <c>locale</c> is <js>"ja_JP"</js>, then this
method will return:
-	 * <ol>
-	 * 	<li><js>"ja_JP"</js>
-	 * 	<li><js>"ja"</js>
-	 * 	<li><js>""</js>
-	 * </ol>
-	 *
-	 * @param locale The locale to get the list of candidate locales for.
-	 * @return The list of candidate locales.
-	 */
-	static final List<Locale> getCandidateLocales(Locale locale) {
-		if (locale == null)
-			return ROOT_LOCALE;
-		return RB_CONTROL.getCandidateLocales("", locale);
-	}
-}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceManager.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceManager.java
deleted file mode 100644
index 0b6f654..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceManager.java
+++ /dev/null
@@ -1,218 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements.  See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership.
 The ASF licenses this file        *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file
except in compliance            *
-// * with the License.  You may obtain a copy of the License at                         
                                    *
-// *                                                                                    
                                    *
-// *  http://www.apache.org/licenses/LICENSE-2.0                                        
                                    *
-// *                                                                                    
                                    *
-// * Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an  *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the        *
-// * specific language governing permissions and limitations under the License.         
                                    *
-// ***************************************************************************************************************************
-package org.apache.juneau.utils;
-
-import static org.apache.juneau.internal.ObjectUtils.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import org.apache.juneau.internal.*;
-
-/**
- * Class for retrieving and caching resource files from the classpath.
- *
- * @deprecated Use {@link org.apache.juneau.cp.ResourceManager}.
- */
-@Deprecated
-public final class ClasspathResourceManager {
-
-	// Maps resource names+locales to found resources.
-	private final ConcurrentHashMap<ResourceKey,byte[]> byteCache;
-	private final ConcurrentHashMap<ResourceKey,String> stringCache;
-
-	private final Class<?> baseClass;
-	private final ClasspathResourceFinder resourceFinder;
-	private final boolean useCache;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param baseClass The default class to use for retrieving resources from the classpath.
-	 * @param resourceFinder The resource finder implementation.
-	 * @param useCache If <jk>true</jk>, retrieved resources are stored in an in-memory
cache for fast lookup.
-	 */
-	public ClasspathResourceManager(Class<?> baseClass, ClasspathResourceFinder resourceFinder,
boolean useCache) {
-		this.baseClass = baseClass;
-		this.resourceFinder = resourceFinder;
-		this.useCache = useCache;
-		if (useCache) {
-			this.byteCache = new ConcurrentHashMap<>();
-			this.stringCache = new ConcurrentHashMap<>();
-		} else {
-			this.byteCache = null;
-			this.stringCache = null;
-		}
-	}
-
-	/**
-	 * Constructor.
-	 *
-	 * <p>
-	 * Uses default {@link ClasspathResourceFinderBasic} for finding resources.
-	 *
-	 * @param baseClass The default class to use for retrieving resources from the classpath.
-	 */
-	public ClasspathResourceManager(Class<?> baseClass) {
-		this(baseClass, new ClasspathResourceFinderBasic(), false);
-	}
-
-	/**
-	 * Finds the resource with the given name.
-	 *
-	 * @param name Name of the desired resource.
-	 * @return An input stream to the object, or <jk>null</jk> if the resource could
not be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	public InputStream getStream(String name) throws IOException {
-		return getStream(name, null);
-	}
-
-	/**
-	 * Finds the resource with the given name for the specified locale and returns it as an
input stream.
-	 *
-	 * @param name Name of the desired resource.
-	 * @param locale The locale.  Can be <jk>null</jk>.
-	 * @return An input stream to the object, or <jk>null</jk> if the resource could
not be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	public InputStream getStream(String name, Locale locale) throws IOException {
-		return getStream(baseClass, name, locale);
-	}
-
-	/**
-	 * Finds the resource with the given name for the specified locale and returns it as an
input stream.
-	 *
-	 * @param baseClass
-	 * 	Overrides the default class to use for retrieving the classpath resource.
-	 * 	<br>If <jk>null</jk>, uses the base class passed in through the constructor
of this class.
-	 * @param name Name of the desired resource.
-	 * @param locale The locale.  Can be <jk>null</jk>.
-	 * @return An input stream to the object, or <jk>null</jk> if the resource could
not be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	public InputStream getStream(Class<?> baseClass, String name, Locale locale) throws
IOException {
-
-		if (baseClass == null)
-			baseClass = this.baseClass;
-
-		if (! useCache)
-			return resourceFinder.findResource(baseClass, name, locale);
-
-		ResourceKey key = new ResourceKey(name, locale);
-
-		byte[] r = byteCache.get(key);
-		if (r == null) {
-			try (InputStream is = resourceFinder.findResource(baseClass, name, locale)) {
-				if (is != null)
-					byteCache.putIfAbsent(key, IOUtils.readBytes(is, 1024));
-			}
-		}
-
-		r = byteCache.get(key);
-		return r == null ? null : new ByteArrayInputStream(r);
-	}
-
-	/**
-	 * Finds the resource with the given name and converts it to a simple string.
-	 *
-	 * @param name Name of the desired resource.
-	 * @return The resource converted to a string, or <jk>null</jk> if the resource
could not be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	public String getString(String name) throws IOException {
-		return getString(baseClass, name, null);
-	}
-
-	/**
-	 * Finds the resource with the given name and converts it to a simple string.
-	 *
-	 * @param baseClass
-	 * 	Overrides the default class to use for retrieving the classpath resource.
-	 * 	<br>If <jk>null</jk>, uses the base class passed in through the constructor
of this class.
-	 * @param name Name of the desired resource.
-	 * @return The resource converted to a string, or <jk>null</jk> if the resource
could not be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	public String getString(Class<?> baseClass, String name) throws IOException {
-		return getString(baseClass, name, null);
-	}
-
-	/**
-	 * Finds the resource with the given name and converts it to a simple string.
-	 *
-	 * @param name Name of the desired resource.
-	 * @param locale The locale.  Can be <jk>null</jk>.
-	 * @return The resource converted to a string, or <jk>null</jk> if the resource
could not be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	public String getString(String name, Locale locale) throws IOException {
-		return getString(baseClass, name, locale);
-	}
-
-	/**
-	 * Finds the resource with the given name and converts it to a simple string.
-	 *
-	 * @param baseClass
-	 * 	Overrides the default class to use for retrieving the classpath resource.
-	 * 	<br>If <jk>null</jk>, uses the base class passed in through the constructor
of this class.
-	 * @param name Name of the desired resource.
-	 * @param locale The locale.  Can be <jk>null</jk>.
-	 * @return The resource converted to a string, or <jk>null</jk> if the resource
could not be found.
-	 * @throws IOException Thrown by underlying stream.
-	 */
-	public String getString(Class<?> baseClass, String name, Locale locale) throws IOException
{
-
-		if (baseClass == null)
-			baseClass = this.baseClass;
-
-		if (! useCache) {
-			try (InputStream is = resourceFinder.findResource(baseClass, name, locale)) {
-				return IOUtils.read(is, IOUtils.UTF8);
-			}
-		}
-
-		ResourceKey key = new ResourceKey(name, locale);
-
-		String r = stringCache.get(key);
-		if (r == null) {
-			try (InputStream is = resourceFinder.findResource(baseClass, name, locale)) {
-				if (is != null)
-					stringCache.putIfAbsent(key, IOUtils.read(is, IOUtils.UTF8));
-			}
-		}
-
-		return stringCache.get(key);
-	}
-
-	private class ResourceKey {
-		final String name;
-		final Locale locale;
-
-		ResourceKey(String name, Locale locale) {
-			this.name = name;
-			this.locale = locale;
-		}
-
-		@Override
-		public int hashCode() {
-			return name.hashCode() + (locale == null ? 0 : locale.hashCode());
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			return (o instanceof ResourceKey) && eq(this, (ResourceKey)o, (x,y)->eq(x.name,
y.name) && eq(x.locale, y.locale));
-		}
-	}
-}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
index c4a560c..fad124c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
@@ -25,7 +25,6 @@ import org.apache.juneau.httppart.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.rest.*;
 import org.apache.juneau.serializer.*;
-import org.apache.juneau.utils.*;
 
 /**
  * Used to denote that a class is a REST resource and to associate metadata on it.
@@ -236,18 +235,6 @@ public @interface RestResource {
 	Class<?>[] children() default {};
 
 	/**
-	 * Classpath resource finder.
-	 *
-	 * <p>
-	 * Used to retrieve localized files from the classpath.
-	 *
-	 * <ul class='seealso'>
-	 * 	<li class='jf'>{@link RestContext#REST_classpathResourceFinder}
-	 * </ul>
-	 */
-	Class<? extends ClasspathResourceFinder> classpathResourceFinder() default ClasspathResourceFinder.Null.class;
-
-	/**
 	 * Client version header.
 	 *
 	 * <p>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResourceConfigApply.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResourceConfigApply.java
index fea325e..c0b0386 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResourceConfigApply.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResourceConfigApply.java
@@ -186,9 +186,6 @@ public class RestResourceConfigApply extends ConfigApply<RestResource>
{
 		if (! a.useClasspathResourceCaching().isEmpty())
 			psb.set(REST_useClasspathResourceCaching, bool(a.useClasspathResourceCaching()));
 
-		if (a.classpathResourceFinder() != ClasspathResourceFinder.Null.class)
-			psb.set(REST_classpathResourceFinder, a.classpathResourceFinder());
-
 		if (! a.path().isEmpty())
 			psb.set(REST_path, trimLeadingSlash(string(a.path())));
 


Mime
View raw message