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/10/28 23:52:21 UTC
[jspwiki] branch master updated (6a23999 -> e738e1a)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from 6a23999 2.11.0-M1-git-05
new 0b2b5ed WikiEngine#findPages( String query, WikiContext wikiContext ) is removed, use WikiEngine#getSearchManager()#findPages( String query, WikiContext wikiContext ) instead (backwards incompatible change)
new 9ffcca2 use generic
new a808eb4 remove unused SuppressWarning
new ab9872f use generics
new aa72f52 more generics
new e738e1a update changelog for 2.11.0-M1-git-05
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog | 2 ++
.../src/main/java/org/apache/wiki/WikiEngine.java | 25 ----------------------
.../java/org/apache/wiki/content/PageRenamer.java | 1 -
.../wiki/htmltowiki/PersistentMapDecorator.java | 17 ++++++---------
.../main/java/org/apache/wiki/plugin/Search.java | 3 +--
.../apache/wiki/plugin/UndefinedPagesPlugin.java | 2 +-
.../apache/wiki/search/BasicSearchProvider.java | 10 ++++-----
.../java/org/apache/wiki/search/SearchManager.java | 14 ++++++------
.../org/apache/wiki/search/SearchManagerTest.java | 8 +++----
9 files changed, 25 insertions(+), 57 deletions(-)
[jspwiki] 05/06: more generics
Posted by ju...@apache.org.
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 aa72f521b918690068e1eb6617beea824553d33d
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Oct 29 00:51:39 2018 +0100
more generics
---
.../apache/wiki/htmltowiki/PersistentMapDecorator.java | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
index f99b645..62c7fa1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
@@ -32,14 +32,14 @@ public class PersistentMapDecorator extends Properties
{
private static final long serialVersionUID = 0L;
- private Map m_delegate;
+ private Map< Object, Object > m_delegate;
/**
* Creates a new decorator for a given map.
*
* @param delegate The map to create a decorator for.
*/
- public PersistentMapDecorator( Map delegate )
+ public PersistentMapDecorator( Map< Object, Object > delegate )
{
m_delegate = delegate;
}
@@ -74,9 +74,8 @@ public class PersistentMapDecorator extends Properties
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
- public Set entrySet()
+ public Set< Map.Entry< Object, Object > > entrySet()
{
return m_delegate.entrySet();
}
@@ -120,9 +119,8 @@ public class PersistentMapDecorator extends Properties
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
- public Set keySet()
+ public Set< Object > keySet()
{
return m_delegate.keySet();
}
@@ -130,7 +128,6 @@ public class PersistentMapDecorator extends Properties
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
public Object put( Object arg0, Object arg1 )
{
@@ -140,9 +137,8 @@ public class PersistentMapDecorator extends Properties
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
- public void putAll( Map arg0 )
+ public void putAll( Map< ?, ? > arg0 )
{
m_delegate.putAll( arg0 );
}
@@ -177,9 +173,8 @@ public class PersistentMapDecorator extends Properties
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
@Override
- public Collection values()
+ public Collection< Object > values()
{
return m_delegate.values();
}
[jspwiki] 04/06: use generics
Posted by ju...@apache.org.
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 ab9872f9654519f958450f82f5f7a444422a9fed
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Oct 29 00:51:18 2018 +0100
use generics
---
.../main/java/org/apache/wiki/search/BasicSearchProvider.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
index 1dd2970..0d95d7f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/BasicSearchProvider.java
@@ -149,12 +149,12 @@ public class BasicSearchProvider implements SearchProvider
return "";
}
- private Collection findPages( QueryItem[] query, WikiContext wikiContext )
+ private Collection< SearchResult > findPages( QueryItem[] query, WikiContext wikiContext )
{
- TreeSet<SearchResult> res = new TreeSet<SearchResult>( new SearchResultComparator() );
+ TreeSet<SearchResult> res = new TreeSet<>( new SearchResultComparator() );
SearchMatcher matcher = new SearchMatcher( m_engine, query );
- Collection allPages = null;
+ Collection< WikiPage > allPages = null;
try {
allPages = m_engine.getPageManager().getAllPages();
} catch( ProviderException pe ) {
@@ -164,7 +164,7 @@ public class BasicSearchProvider implements SearchProvider
AuthorizationManager mgr = m_engine.getAuthorizationManager();
- Iterator it = allPages.iterator();
+ Iterator< WikiPage > it = allPages.iterator();
while( it.hasNext() ) {
try {
WikiPage page = (WikiPage) it.next();
@@ -195,7 +195,7 @@ public class BasicSearchProvider implements SearchProvider
/**
* {@inheritDoc}
*/
- public Collection findPages(String query, WikiContext wikiContext) {
+ public Collection< SearchResult > findPages(String query, WikiContext wikiContext) {
return findPages(parseQuery(query), wikiContext);
}
[jspwiki] 02/06: use generic
Posted by ju...@apache.org.
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 9ffcca25900443f534267fa57c27516045eb8203
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Oct 29 00:50:22 2018 +0100
use generic
---
.../src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
index f9f5cdd..b94fa24 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
@@ -45,7 +45,7 @@ public class UndefinedPagesPlugin
throws PluginException
{
ReferenceManager refmgr = context.getEngine().getReferenceManager();
- Collection links = refmgr.findUncreated();
+ Collection< String > links = refmgr.findUncreated();
super.initialize( context, params );
[jspwiki] 06/06: update changelog for 2.11.0-M1-git-05
Posted by ju...@apache.org.
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 e738e1accd0866ec17d5917d3a355ed1583dcf2f
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Oct 29 00:52:04 2018 +0100
update changelog for 2.11.0-M1-git-05
---
ChangeLog | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index e20a438..60adfa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
- PropertiesUtils moved to the util package
- ReferenceManager#findReferrers returns Set< String > instead of Collection< String >
- AttachmentManager#listAttachments returns a List<Attachment> instead of a Collection
+ - WikiEngine#findPages( String query, WikiContext wikiContext ) is removed, use
+ WikiEngine#getSearchManager()#findPages( String query, WikiContext wikiContext ) instead
2018-10-26 Juan Pablo Santos (juanpablo AT apache DOT org)
[jspwiki] 01/06: WikiEngine#findPages( String query,
WikiContext wikiContext ) is removed,
use WikiEngine#getSearchManager()#findPages( String query,
WikiContext wikiContext ) instead (backwards incompatible change)
Posted by ju...@apache.org.
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 0b2b5ed0a97240fef9a6cd313aad500363f93008
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Oct 29 00:49:54 2018 +0100
WikiEngine#findPages( String query, WikiContext wikiContext ) is removed, use WikiEngine#getSearchManager()#findPages( String query, WikiContext wikiContext ) instead (backwards incompatible change)
---
.../src/main/java/org/apache/wiki/WikiEngine.java | 25 ----------------------
.../main/java/org/apache/wiki/plugin/Search.java | 3 +--
.../java/org/apache/wiki/search/SearchManager.java | 14 ++++++------
.../org/apache/wiki/search/SearchManagerTest.java | 8 +++----
4 files changed, 11 insertions(+), 39 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 4c19788..8f76517 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -1833,31 +1833,6 @@ public class WikiEngine
}
/**
- * Parses an incoming search request, then
- * does a search.
- * <P>
- * The query is dependent on the actual chosen search provider - each one of them has
- * a language of its own.
- *
- * @param query The query string
- * @param wikiContext the context within which to run the search
- * @return A Collection of SearchResult objects.
- * @throws ProviderException If the searching failed
- * @throws IOException If the searching failed
- */
-
- //
- // FIXME: Should also have attributes attached.
- //
- public Collection findPages( String query, WikiContext wikiContext )
- throws ProviderException, IOException
- {
- Collection results = m_searchManager.findPages( query, wikiContext );
-
- return results;
- }
-
- /**
* Finds the corresponding WikiPage object based on the page name. It always finds
* the latest version of a page.
*
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Search.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Search.java
index 1186819..c8ffb3b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Search.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Search.java
@@ -114,8 +114,7 @@ public class Search implements WikiPlugin
{
log.debug("Searching for string "+query);
- @SuppressWarnings("unchecked")
- Collection<SearchResult> list = context.getEngine().findPages( query, context );
+ Collection<SearchResult> list = context.getEngine().getSearchManager().findPages( query, context );
return list;
}
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 a638907..6fcc313 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
@@ -223,7 +223,7 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
{
try
{
- Collection c;
+ Collection< SearchResult > c;
if( m_searchProvider instanceof LuceneSearchProvider ) {
c = ((LuceneSearchProvider)m_searchProvider).findPages( searchString, 0, wikiContext );
@@ -232,10 +232,10 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
}
int count = 0;
- for( Iterator i = c.iterator(); i.hasNext() && count < maxLength; count++ )
+ for( Iterator< SearchResult > i = c.iterator(); i.hasNext() && count < maxLength; count++ )
{
- SearchResult sr = (SearchResult)i.next();
- HashMap<String,Object> hm = new HashMap<String,Object>();
+ SearchResult sr = i.next();
+ HashMap<String,Object> hm = new HashMap<>();
hm.put( "page", sr.getPage().getName() );
hm.put( "score", sr.getScore() );
list.add( hm );
@@ -357,13 +357,11 @@ public class SearchManager extends BasicPageFilter implements InternalModule, Wi
* @throws ProviderException If the provider fails and a search cannot be completed.
* @throws IOException If something else goes wrong.
*/
- public Collection findPages( String query, WikiContext wikiContext )
+ public Collection< SearchResult > findPages( String query, WikiContext wikiContext )
throws ProviderException, IOException
{
if( query == null ) query = "";
- Collection c = m_searchProvider.findPages( query, wikiContext );
-
- return c;
+ return m_searchProvider.findPages( query, wikiContext );
}
/**
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
index aa31eb7..bb4e995 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
@@ -70,8 +70,8 @@ public class SearchManagerTest {
/**
* Should cover for both index and initial delay
*/
- Collection waitForIndex( String text, String testName ) throws Exception {
- Collection res = null;
+ Collection< SearchResult > waitForIndex( String text, String testName ) throws Exception {
+ Collection< SearchResult > res = null;
for( long l = 0; l < SLEEP_COUNT; l++ ) {
if( res == null || res.isEmpty() ) {
Thread.sleep( SLEEP_TIME );
@@ -147,7 +147,7 @@ public class SearchManagerTest {
m_engine.saveText( ctx, "The Babylon Project was a dream given form. Its goal: to prevent another war by creating a place where humans and aliens could work out their differences peacefully." );
Thread.yield();
- Collection res = waitForIndex( "Babylon" , "testSimpleSearch3" ); // wait until 2nd m_engine.saveText() takes effect
+ Collection< SearchResult > res = waitForIndex( "Babylon" , "testSimpleSearch3" ); // wait until 2nd m_engine.saveText() takes effect
res = m_mgr.findPages( "mankind", ctx ); // check for text present in 1st m_engine.saveText() but not in 2nd
@@ -174,7 +174,7 @@ public class SearchManagerTest {
m_engine.saveText( ctx, txt );
Thread.yield();
- Collection res = waitForIndex( "mankind" , "testSimpleSearch4" );
+ Collection< SearchResult > res = waitForIndex( "mankind" , "testSimpleSearch4" );
Assertions.assertNotNull( res, "found results" );
Assertions.assertEquals( 1, res.size(), "result not found" );
[jspwiki] 03/06: remove unused SuppressWarning
Posted by ju...@apache.org.
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 a808eb4c323317e94ca7fa1908b4017cd7e3cbe1
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Oct 29 00:50:53 2018 +0100
remove unused SuppressWarning
---
jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java b/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
index ad91697..04539c1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/content/PageRenamer.java
@@ -174,7 +174,6 @@ public class PageRenamer
//
engine.getSearchManager().reindexPage(toPage);
- @SuppressWarnings( "unchecked" )
Collection<Attachment> attachmentsNewName = engine.getAttachmentManager().listAttachments( toPage );
for (Attachment att:attachmentsNewName)
{