[jboss-svn-commits] JBL Code SVN: r35874 - in labs/jbossrules/trunk: drools-guvnor/src/main/java/org/drools/guvnor/server and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 5 05:15:34 EDT 2010
Author: ge0ffrey
Date: 2010-11-05 05:15:32 -0400 (Fri, 05 Nov 2010)
New Revision: 35874
Added:
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItemPageResult.java
Removed:
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetPageList.java
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataResult.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
Log:
refactor rename into AssetPageList into AssetItemPageResult (it's not a List and it contains AssetItems (extending JCR Item) instead of simple Assets)
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataResult.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataResult.java 2010-11-05 08:29:00 UTC (rev 35873)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/TableDataResult.java 2010-11-05 09:15:32 UTC (rev 35874)
@@ -29,6 +29,6 @@
public TableDataRow[] data;
public long total = -1; //-1 means we won't show a total, as we just don't know...
public boolean hasNext;
- public long currentPosition; //the current cursor position in the result set
+ public long currentPosition; //the current cursor position in the result set // TODO this is not of the first row but apparently of the last row ?
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-11-05 08:29:00 UTC (rev 35873)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-11-05 09:15:32 UTC (rev 35874)
@@ -119,7 +119,7 @@
import org.drools.repository.AssetHistoryIterator;
import org.drools.repository.AssetItem;
import org.drools.repository.AssetItemIterator;
-import org.drools.repository.AssetPageList;
+import org.drools.repository.AssetItemPageResult;
import org.drools.repository.CategoryItem;
import org.drools.repository.PackageItem;
import org.drools.repository.PackageIterator;
@@ -505,17 +505,17 @@
RoleTypes.ANALYST_READ ) ) {
TableDisplayHandler handler = new TableDisplayHandler( tableConfig );
- return handler.loadRuleListTable( new AssetPageList() );
+ return handler.loadRuleListTable( new AssetItemPageResult() );
}
}
- AssetPageList list = repository.findAssetsByCategory( categoryPath,
+ AssetItemPageResult result = repository.findAssetsByCategory( categoryPath,
false,
skip,
numRows);
TableDisplayHandler handler = new TableDisplayHandler( tableConfig );
// log.debug("time for load: " + (System.currentTimeMillis() - time) );
- return handler.loadRuleListTable( list );
+ return handler.loadRuleListTable(result);
}
@@ -530,14 +530,14 @@
//TODO: May need to use a filter that acts on both package based and category based.
RepositoryFilter filter = new AssetItemFilter();
- AssetPageList list = repository.findAssetsByState( stateName,
+ AssetItemPageResult result = repository.findAssetsByState( stateName,
false,
skip,
numRows,
filter );
TableDisplayHandler handler = new TableDisplayHandler( tableConfig );
// log.debug("time for load: " + (System.currentTimeMillis() - time) );
- return handler.loadRuleListTable( list );
+ return handler.loadRuleListTable(result);
}
@WebRemote
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java 2010-11-05 08:29:00 UTC (rev 35873)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java 2010-11-05 09:15:32 UTC (rev 35874)
@@ -23,7 +23,7 @@
import org.drools.guvnor.client.rpc.DiscussionRecord;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
-import org.drools.repository.AssetPageList;
+import org.drools.repository.AssetItemPageResult;
import org.drools.core.util.StringUtils;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.security.Identity;
@@ -101,7 +101,7 @@
String cat = request.getParameter("name");
String status = request.getParameter("status");
checkCategoryPermission(cat);
- AssetPageList pg = getFileManager().getRepository().findAssetsByCategory(cat, false, 0, -1);
+ AssetItemPageResult pg = getFileManager().getRepository().findAssetsByCategory(cat, false, 0, -1);
Iterator<AssetItem> it = pg.assets.iterator();
List<AtomFeed.AtomEntry> entries = new ArrayList<AtomFeed.AtomEntry>();
buildEntries(request, entries, it, status);
Copied: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItemPageResult.java (from rev 35869, labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetPageList.java)
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItemPageResult.java (rev 0)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItemPageResult.java 2010-11-05 09:15:32 UTC (rev 35874)
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed 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.drools.repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jcr.RangeIterator;
+
+/**
+ * Used for holding a page of asset data.
+ *
+ * @author Michael Neale
+ */
+public class AssetItemPageResult {
+
+ public final List<AssetItem> assets;
+ public final boolean hasNext;
+ public long currentPosition;
+
+ public AssetItemPageResult(List<AssetItem> categories, RangeIterator it) {
+ this.assets = categories;
+ this.hasNext = it.hasNext();
+ this.currentPosition = it.getPosition();
+ }
+
+ public AssetItemPageResult() {
+ hasNext = false;
+ currentPosition = 0;
+ assets = new ArrayList<AssetItem>();
+ }
+
+}
Property changes on: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItemPageResult.java
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetPageList.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetPageList.java 2010-11-05 08:29:00 UTC (rev 35873)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetPageList.java 2010-11-05 09:15:32 UTC (rev 35874)
@@ -1,47 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed 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.drools.repository;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jcr.RangeIterator;
-
-/**
- * Used for holding a page of asset data.
- *
- * @author Michael Neale
- */
-public class AssetPageList {
-
- public final List<AssetItem> assets;
- public final boolean hasNext;
- public long currentPosition;
-
- public AssetPageList(List<AssetItem> categories, RangeIterator it) {
- this.assets = categories;
- this.hasNext = it.hasNext();
- this.currentPosition = it.getPosition();
- }
-
- public AssetPageList() {
- hasNext = false;
- currentPosition = 0;
- assets = new ArrayList<AssetItem>();
- }
-
-}
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2010-11-05 08:29:00 UTC (rev 35873)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2010-11-05 09:15:32 UTC (rev 35874)
@@ -873,7 +873,7 @@
* yourself... mahahahaha).
*
*/
- public AssetPageList findAssetsByCategory(String categoryTag,
+ public AssetItemPageResult findAssetsByCategory(String categoryTag,
boolean seekArchivedAsset,
int skip,
int numRowsToReturn) throws RulesRepositoryException {
@@ -893,7 +893,7 @@
* Pass in startRow of 0 to start at zero, numRowsToReturn can be set to -1 should you want it all.
* @param filter an AssetItem filter
*/
- public AssetPageList findAssetsByCategory(String categoryTag,
+ public AssetItemPageResult findAssetsByCategory(String categoryTag,
boolean seekArchivedAsset,
int skip,
int numRowsToReturn,
@@ -915,7 +915,7 @@
* Finds the AssetItem's linked to the requested state.
* Similar to finding by category.
*/
- public AssetPageList findAssetsByState(String stateName,
+ public AssetItemPageResult findAssetsByState(String stateName,
boolean seekArchivedAsset,
int skip,
int numRowsToReturn) throws RulesRepositoryException {
@@ -932,7 +932,7 @@
* @param filter an AssetItem filter
*
*/
- public AssetPageList findAssetsByState(String stateName,
+ public AssetItemPageResult findAssetsByState(String stateName,
boolean seekArchivedAsset,
int skip,
int numRowsToReturn,
@@ -949,7 +949,7 @@
}
}
- private AssetPageList loadLinkedAssets(boolean seekArchivedAsset,
+ private AssetItemPageResult loadLinkedAssets(boolean seekArchivedAsset,
int skip,
int numRowsToReturn,
Node n,
@@ -976,10 +976,10 @@
}
}
- return new AssetPageList(results, it);
+ return new AssetItemPageResult(results, it);
}
- public AssetPageList findAssetsByCategory(String categoryTag,
+ public AssetItemPageResult findAssetsByCategory(String categoryTag,
int skip,
int numRowsToReturn) throws RulesRepositoryException {
return this.findAssetsByCategory( categoryTag,
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2010-11-05 08:29:00 UTC (rev 35873)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java 2010-11-05 09:15:32 UTC (rev 35874)
@@ -310,37 +310,37 @@
a.addCategory("testPagedTag");
a.checkin("");
- AssetPageList list = getRepo().findAssetsByCategory("testPagedTag", 0, -1);
- assertTrue(list.currentPosition > 0);
- assertEquals(5, list.assets.size());
- assertEquals(false, list.hasNext);
+ AssetItemPageResult result = getRepo().findAssetsByCategory("testPagedTag", 0, -1);
+ assertTrue(result.currentPosition > 0);
+ assertEquals(5, result.assets.size());
+ assertEquals(false, result.hasNext);
- list = getRepo().findAssetsByCategory("testPagedTag", 0, 2);
- assertTrue(list.currentPosition > 0);
- assertEquals(true, list.hasNext);
- assertEquals(2, list.assets.size());
+ result = getRepo().findAssetsByCategory("testPagedTag", 0, 2);
+ assertTrue(result.currentPosition > 0);
+ assertEquals(true, result.hasNext);
+ assertEquals(2, result.assets.size());
- assertEquals("testPage1", ((AssetItem)list.assets.get(0)).getName());
- assertEquals("testPage2", ((AssetItem)list.assets.get(1)).getName());
+ assertEquals("testPage1", ((AssetItem) result.assets.get(0)).getName());
+ assertEquals("testPage2", ((AssetItem) result.assets.get(1)).getName());
- list = getRepo().findAssetsByCategory("testPagedTag", 2, 2);
- assertTrue(list.currentPosition > 0);
- assertEquals(true, list.hasNext);
- assertEquals(2, list.assets.size());
+ result = getRepo().findAssetsByCategory("testPagedTag", 2, 2);
+ assertTrue(result.currentPosition > 0);
+ assertEquals(true, result.hasNext);
+ assertEquals(2, result.assets.size());
- assertEquals("testPage3", ((AssetItem)list.assets.get(0)).getName());
- assertEquals("testPage4", ((AssetItem)list.assets.get(1)).getName());
+ assertEquals("testPage3", ((AssetItem) result.assets.get(0)).getName());
+ assertEquals("testPage4", ((AssetItem) result.assets.get(1)).getName());
- list = getRepo().findAssetsByCategory("testPagedTag", 2, 3);
- assertTrue(list.currentPosition > 0);
- assertEquals(false, list.hasNext);
- assertEquals(3, list.assets.size());
+ result = getRepo().findAssetsByCategory("testPagedTag", 2, 3);
+ assertTrue(result.currentPosition > 0);
+ assertEquals(false, result.hasNext);
+ assertEquals(3, result.assets.size());
- assertEquals("testPage3", ((AssetItem)list.assets.get(0)).getName());
- assertEquals("testPage4", ((AssetItem)list.assets.get(1)).getName());
- assertEquals("testPage5", ((AssetItem)list.assets.get(2)).getName());
+ assertEquals("testPage3", ((AssetItem) result.assets.get(0)).getName());
+ assertEquals("testPage4", ((AssetItem) result.assets.get(1)).getName());
+ assertEquals("testPage5", ((AssetItem) result.assets.get(2)).getName());
}
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2010-11-05 08:29:00 UTC (rev 35873)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RulesRepositoryTest.java 2010-11-05 09:15:32 UTC (rev 35874)
@@ -18,7 +18,6 @@
import java.io.ByteArrayInputStream;
import java.io.File;
-import java.io.IOException;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.Calendar;
@@ -27,20 +26,13 @@
import java.util.List;
import java.util.Map;
import java.util.Random;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import javax.jcr.LoginException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.jcr.Workspace;
-import org.apache.jackrabbit.core.TransientRepository;
import org.drools.repository.RulesRepository.DateQuery;
import org.drools.repository.migration.MigrateDroolsPackage;
@@ -107,7 +99,7 @@
asset.checkin( "" );
cat = repo.loadCategory( "testCatRename/testAnother" );
- AssetPageList as = repo.findAssetsByCategory( "testCatRename/testAnother",
+ AssetItemPageResult as = repo.findAssetsByCategory( "testCatRename/testAnother",
0,
-1 );
assertEquals( "fooBar",
@@ -176,12 +168,12 @@
asset1.checkin( "" );
asset2.checkin( "" );
- AssetPageList list = repo.findAssetsByState( "testFindByState",
+ AssetItemPageResult result = repo.findAssetsByState( "testFindByState",
true,
0,
-1 );
assertEquals( 2,
- list.assets.size() );
+ result.assets.size() );
}
@@ -608,7 +600,7 @@
repo.save();
- AssetPageList apl = repo.findAssetsByState( "Draft",
+ AssetItemPageResult apl = repo.findAssetsByState( "Draft",
false,
0,
-1,
@@ -655,7 +647,7 @@
assertEquals( 2,
items.size() );
- AssetPageList apl = repo.findAssetsByCategory( "/testFindAssetsByCategoryUsingFilterCat",
+ AssetItemPageResult apl = repo.findAssetsByCategory( "/testFindAssetsByCategoryUsingFilterCat",
false,
0,
-1,
More information about the jboss-svn-commits
mailing list