From 0541bad7dccadad601d74e04a3b1a5147604cc52 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Fri, 19 Apr 2013 20:29:21 +0000 Subject: [PATCH] Make the Lucene/Solr-provided forbidden api signature files use the new syntax in the forbidden-apis ANT task and provide a useful message git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1470024 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/tools/forbiddenApis/executors.txt | 4 ++-- lucene/tools/forbiddenApis/servlet-api.txt | 12 ++++++------ lucene/tools/forbiddenApis/tests.txt | 11 ++++------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/lucene/tools/forbiddenApis/executors.txt b/lucene/tools/forbiddenApis/executors.txt index cb5b248595d..a502959bdaf 100644 --- a/lucene/tools/forbiddenApis/executors.txt +++ b/lucene/tools/forbiddenApis/executors.txt @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# These methods spawn threads with vague names. Use a custom thread factory and name -# threads so that you can tell (by its name) which executor it is associated with. # see Solr's DefaultSolrThreadFactory # see Lucene's NamedThreadFactory +@defaultMessage spawns threads with vague names; use a custom thread factory and name threads so that you can tell (by its name) which executor it is associated with + java.util.concurrent.Executors#newFixedThreadPool(int) java.util.concurrent.Executors#newSingleThreadExecutor() java.util.concurrent.Executors#newCachedThreadPool() diff --git a/lucene/tools/forbiddenApis/servlet-api.txt b/lucene/tools/forbiddenApis/servlet-api.txt index 4034408da00..36715f11624 100644 --- a/lucene/tools/forbiddenApis/servlet-api.txt +++ b/lucene/tools/forbiddenApis/servlet-api.txt @@ -13,17 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -# These methods from the Servlet API should not be used, because they are -# either broken and slow in some environments (e.g., Jetty's UTF-8 readers), -# or the parsing of request parameters is not using the correct encoding -# without extra configuration in the servlet container: -javax.servlet.ServletRequest#getReader() +@defaultMessage Servlet API method is parsing request parameters without using the correct encoding if no extra configuration is given in the servlet container + javax.servlet.ServletRequest#getParameter(java.lang.String) javax.servlet.ServletRequest#getParameterMap() javax.servlet.ServletRequest#getParameterNames() javax.servlet.ServletRequest#getParameterValues(java.lang.String) -javax.servlet.ServletResponse#getWriter() +@defaultMessage Servlet API method is broken and slow in some environments (e.g., Jetty's UTF-8 readers) + +javax.servlet.ServletRequest#getReader() +javax.servlet.ServletResponse#getWriter() javax.servlet.ServletInputStream#readLine(byte[],int,int) javax.servlet.ServletOutputStream#print(boolean) javax.servlet.ServletOutputStream#print(char) diff --git a/lucene/tools/forbiddenApis/tests.txt b/lucene/tools/forbiddenApis/tests.txt index a99ac676b44..506dc7530cf 100644 --- a/lucene/tools/forbiddenApis/tests.txt +++ b/lucene/tools/forbiddenApis/tests.txt @@ -13,13 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# All classes should derive from LuceneTestCase -junit.framework.TestCase +junit.framework.TestCase @ All classes should derive from LuceneTestCase -# Use RandomizedRunner's random instead -java.util.Random#() +java.util.Random#() @ Use RandomizedRunner's random instead -# Don't depend on wall clock times # TODO: fix tests that do this! -#java.lang.System#currentTimeMillis() -#java.lang.System#nanoTime() +#java.lang.System#currentTimeMillis() @ Don't depend on wall clock times +#java.lang.System#nanoTime() @ Don't depend on wall clock times