You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/11/11 22:12:09 UTC
[jspwiki] 06/08: remove warnings from search package
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 0a67306cf62607ab8de6bb4d3eaeeb4f2a466db9
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Nov 11 17:42:34 2018 +0100
remove warnings from search package
---
.../apache/wiki/search/LuceneSearchProvider.java | 22 ++++--------
.../java/org/apache/wiki/search/SearchManager.java | 41 +++++++---------------
.../org/apache/wiki/search/SearchProvider.java | 4 +--
3 files changed, 22 insertions(+), 45 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index 0969a51..5af7573 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -528,25 +528,19 @@ public class LuceneSearchProvider implements SearchProvider {
* @param page WikiPage to add to the update queue.
*/
@Override
- public void reindexPage( WikiPage page )
- {
- if( page != null )
- {
+ public void reindexPage( WikiPage page ) {
+ if( page != null ) {
String text;
// TODO: Think if this was better done in the thread itself?
- if( page instanceof Attachment )
- {
+ if( page instanceof Attachment ) {
text = getAttachmentContent( (Attachment) page );
- }
- else
- {
+ } else {
text = m_engine.getPureText( page );
}
- if( text != null )
- {
+ if( text != null ) {
// Add work item to m_updates queue.
Object[] pair = new Object[2];
pair[0] = page;
@@ -561,9 +555,7 @@ public class LuceneSearchProvider implements SearchProvider {
* {@inheritDoc}
*/
@Override
- public Collection findPages( String query, WikiContext wikiContext )
- throws ProviderException
- {
+ public Collection< SearchResult > findPages( String query, WikiContext wikiContext ) throws ProviderException {
return findPages( query, FLAG_CONTEXTS, wikiContext );
}
@@ -581,7 +573,7 @@ public class LuceneSearchProvider implements SearchProvider {
* @return A Collection of SearchResult instances
* @throws ProviderException if there is a problem with the backend
*/
- public Collection findPages( String query, int flags, WikiContext wikiContext )
+ public Collection< SearchResult > findPages( String query, int flags, WikiContext wikiContext )
throws ProviderException
{
IndexSearcher searcher = null;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java
index 6fcc313..05e6691 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchManager.java
@@ -133,13 +133,13 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
}
if (actionName.equals(AJAX_ACTION_SUGGESTIONS)) {
- List<String> callResults = new ArrayList<String>();
+ List<String> callResults = new ArrayList<>();
log.debug("Calling getSuggestions() START");
callResults = getSuggestions(itemId, maxResults);
log.debug("Calling getSuggestions() DONE. "+callResults.size());
result = AjaxUtil.toJson(callResults);
} else if (actionName.equals(AJAX_ACTION_PAGES)) {
- List<Map<String,Object>> callResults = new ArrayList<Map<String,Object>>();
+ List<Map<String,Object>> callResults = new ArrayList<>();
log.debug("Calling findPages() START");
WikiContext wikiContext = m_engine.createContext(req, WikiContext.VIEW);
if (wikiContext == null) {
@@ -167,7 +167,7 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
{
StopWatch sw = new StopWatch();
sw.start();
- List<String> list = new ArrayList<String>(maxLength);
+ List<String> list = new ArrayList<>(maxLength);
if( wikiName.length() > 0 )
{
@@ -217,12 +217,10 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
StopWatch sw = new StopWatch();
sw.start();
- List<Map<String,Object>> list = new ArrayList<Map<String,Object>>(maxLength);
+ List<Map<String,Object>> list = new ArrayList<>(maxLength);
- if( searchString.length() > 0 )
- {
- try
- {
+ if( searchString.length() > 0 ) {
+ try {
Collection< SearchResult > c;
if( m_searchProvider instanceof LuceneSearchProvider ) {
@@ -240,9 +238,7 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
hm.put( "score", sr.getScore() );
list.add( hm );
}
- }
- catch(Exception e)
- {
+ } catch(Exception e) {
log.info("AJAX search failed; ",e);
}
}
@@ -262,6 +258,7 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
* @param properties the properties used to initialize the wiki engine
* @throws FilterException if the search provider failed to initialize
*/
+ @Override
public void initialize(WikiEngine engine, Properties properties)
throws FilterException
{
@@ -283,8 +280,7 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
}
}
- private void loadSearchProvider(Properties properties)
- {
+ private void loadSearchProvider(Properties properties) {
//
// See if we're using Lucene, and if so, ensure that its
// index directory is up to date.
@@ -308,24 +304,12 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
return;
}
- String providerClassName = properties.getProperty( PROP_SEARCHPROVIDER,
- DEFAULT_SEARCHPROVIDER );
+ String providerClassName = properties.getProperty( PROP_SEARCHPROVIDER, DEFAULT_SEARCHPROVIDER );
- try
- {
+ try {
Class<?> providerClass = ClassUtil.findClass( "org.apache.wiki.search", providerClassName );
m_searchProvider = (SearchProvider)providerClass.newInstance();
- }
- catch( ClassNotFoundException e )
- {
- log.warn("Failed loading SearchProvider, will use BasicSearchProvider.", e);
- }
- catch( InstantiationException e )
- {
- log.warn("Failed loading SearchProvider, will use BasicSearchProvider.", e);
- }
- catch( IllegalAccessException e )
- {
+ } catch( ClassNotFoundException | InstantiationException | IllegalAccessException e ) {
log.warn("Failed loading SearchProvider, will use BasicSearchProvider.", e);
}
@@ -405,6 +389,7 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
*
* @param event {@inheritDoc}
*/
+ @Override
public void actionPerformed(WikiEvent event)
{
if( (event instanceof WikiPageEvent) && (event.getType() == WikiPageEvent.PAGE_DELETE_REQUEST) )
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchProvider.java
index 7fe4f29..c72c488 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchProvider.java
@@ -40,7 +40,7 @@ public interface SearchProvider extends WikiProvider
void pageRemoved(WikiPage page);
/**
- * Adds a WikiPage for indexing queue. This is called a queue, since
+ * Adds a WikiPage for indexing queue. This is called a queue, since
* this method is expected to return pretty quickly, and indexing to
* be done in a separate thread.
*
@@ -56,5 +56,5 @@ public interface SearchProvider extends WikiProvider
* @throws ProviderException if the search provider failed.
* @throws IOException if for some reason the query could not be executed.
*/
- Collection findPages(String query, WikiContext wikiContext) throws ProviderException, IOException;
+ Collection< SearchResult > findPages(String query, WikiContext wikiContext) throws ProviderException, IOException;
}