Wikitty-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
June 2010
- 4 participants
- 109 discussions
r105 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 07 Jun '10
by bpoussin＠users.nuiton.org 07 Jun '10
07 Jun '10
Author: bpoussin
Date: 2010-06-07 18:17:30 +0200 (Mon, 07 Jun 2010)
New Revision: 105
Url: http://nuiton.org/repositories/revision/wikitty/105
Log:
ajout d'une methode equals static qui verifie que tous les champs d'une extension sont egaux dans deux Wikitty differents
Modified:
trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java
Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java
===================================================================
--- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-06-07 14:20:02 UTC (rev 104)
+++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-06-07 16:17:30 UTC (rev 105)
@@ -134,6 +134,26 @@
return extensions;
}
+ /**
+ * Check equality on all field of this extension, and only those.
+ *)
+ static public boolean equals(Wikitty w1, Wikitty w2) {
+ boolean result = true;
+}*/
+ for (ObjectModelAttribute attr : clazz.getAttributes()) {
+ if (attr.isNavigable() && !attr.isStatic() &&
+ (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) {
+/*{ if (result) {
+ Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>);
+ Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>);
+ result = f1 == f2 || (f1 != null && f1.equals(f2));
+ }
+}*/
+ }
+ }
+/*{
+ return result;
+ }
} //<%=name%>
}*/
1
0
Author: echatellier
Date: 2010-06-07 16:20:02 +0200 (Mon, 07 Jun 2010)
New Revision: 104
Url: http://nuiton.org/repositories/revision/wikitty/104
Log:
Fix tests compilation
Modified:
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java
trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java
trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java
trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java
trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java
trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java
trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java
trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/AbstractTestHbase.java
trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java
trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java
trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java
trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java
trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java
trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java
trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java
trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -330,9 +330,10 @@
break;
}
}
-
+
}
- return new PagedResult<String>(firstIndex, endIndex, criteria.getRestriction().toString(), null, ids );
+
+ return new PagedResult<String>(firstIndex, endIndex, criteria.getRestriction().toString(), null, ids );
}
@Override
Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java
===================================================================
--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -128,7 +128,7 @@
Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST );
result.add( w );
}
- ws.store(result);
+ ws.store(null, result);
return result;
}
Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java
===================================================================
--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -35,7 +35,7 @@
protected WikittyImportExportService getImportExportService() {
if (ieService == null) {
- ieService = new WikittyImportExportService(ws);
+ ieService = new WikittyImportExportService(null, ws);
}
return ieService;
}
@@ -135,7 +135,7 @@
"7ca86742-5957-4659-b12f-4915cbef9193",
"77d7640c-573d-421c-a7e9-9b70bd025983"
};
- List<Wikitty> wikitties = ws.restore(Arrays.asList(ids));
+ List<Wikitty> wikitties = ws.restore(null, Arrays.asList(ids));
assertEquals(3, wikitties.size());
}
}
Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java
===================================================================
--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -63,7 +63,7 @@
FieldType fieldType = new FieldType(FieldType.TYPE.STRING, 1, 1);
extension.addField("field" + i, fieldType);
}
- wikittyService.storeExtension(extension);
+ wikittyService.storeExtension(null, extension);
Collection<Wikitty> wikitties = new ArrayList<Wikitty>(WIKITTY_SIZE);
for (int i = 0; i < WIKITTY_SIZE; i++) {
@@ -75,7 +75,7 @@
wikitties.add(wikitty);
}
long start = System.currentTimeMillis();
- wikittyService.store(wikitties);
+ wikittyService.store(null, wikitties);
long end = System.currentTimeMillis();
log.info("[Performance" + fieldSize + "] Write times : " + ((end - start) / 1000) + "s");
@@ -83,7 +83,7 @@
start = System.currentTimeMillis();
for (int i = 0; i < WIKITTY_SIZE; i++) {
int nextInt = random.nextInt(WIKITTY_SIZE);
- wikittyService.restore("Performance" + fieldSize + "id" + nextInt);
+ wikittyService.restore(null, "Performance" + fieldSize + "id" + nextInt);
}
end = System.currentTimeMillis();
log.info("[Performance" + fieldSize + "] Read times : " + ((end - start) / 1000) + "s");
Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java
===================================================================
--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -55,12 +55,12 @@
w.setField(ext.getName(), "age", "125");
wikitties.add( w );
- ws.store(wikitties);
+ ws.store(null, wikitties);
Criteria criteria = Search.query()
.eq("testExt.name", "Guillaume")
.criteria();
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
List<Wikitty> found = result.getAll();
assertEquals(1, found.size());
log.info( found.get(0).getFieldAsString(ext.getName(), "name") );
@@ -68,7 +68,7 @@
criteria = Search.query()
.eq("testExt.age", "125")
.criteria();
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
found = result.getAll();
assertEquals(1, found.size());
log.info( found.get(0).getFieldAsString(ext.getName(), "name") );
@@ -76,7 +76,7 @@
criteria = Search.query()
.gt("testExt.age", "10")
.criteria();
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
found = result.getAll();
assertEquals(2, found.size());
log.info( found.get(0).getFieldAsString(ext.getName(), "name") );
@@ -86,7 +86,7 @@
exemple.addExtension(ext);
exemple.setField(ext.getName(), "name", "Guillaume");
exemple.setField(ext.getName(), "age", "27");
- result = ws.findAllByCriteria( Search.query(exemple).criteria() );
+ result = ws.findAllByCriteria(null, Search.query(exemple).criteria() );
found = result.getAll();
assertEquals(1, found.size());
log.info( found.get(0).getFieldAsString(ext.getName(), "name") );
@@ -95,7 +95,7 @@
exemple.addExtension(ext);
exemple.setField(ext.getName(), "name", "Guillaume");
exemple.setField(ext.getName(), "age", "125");
- result = ws.findAllByCriteria( Search.query(exemple).criteria() );
+ result = ws.findAllByCriteria(null, Search.query(exemple).criteria() );
found = result.getAll();
assertEquals(0, found.size());
// log.info( found.get(0).getFieldAsString(ext.getName(), "name") );
Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java
===================================================================
--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -43,21 +43,21 @@
public void testStoreRestoreBasics() throws Exception {
Wikitty w = createBasicWikitty();
String id = w.getId();
- ws.store( w );
- w = ws.restore( id );
- assertTrue( w.hasExtension(EXTNAME) );
+ ws.store(null, w);
+ w = ws.restore(null, id);
+ assertTrue(w.hasExtension(EXTNAME));
for ( int i = 0; i < 3; i++ ) {
- assertTrue( w.hasField(EXTNAME, "fieldName" + i) );
+ assertTrue( w.hasField(EXTNAME, "fieldName" + i));
}
}
@Test
public void testExtensionMethod() throws Exception {
- ws.storeExtension(Arrays.asList(EXT_TEST));
- List<String> extIds = ws.getAllExtensionIds();
+ ws.storeExtension(null, Arrays.asList(EXT_TEST));
+ List<String> extIds = ws.getAllExtensionIds(null);
log.debug("extIds: " + extIds);
assertEquals(1, extIds.size());
- WikittyExtension ext = ws.restoreExtension(extIds.get(0));
+ WikittyExtension ext = ws.restoreExtension(null, extIds.get(0));
assertEquals(EXT_TEST.getName(), ext.getName());
assertEquals(EXT_TEST.getVersion(), ext.getVersion());
assertEquals(EXT_TEST, ext);
@@ -65,12 +65,12 @@
@Test
public void testExtensionRequires() throws Exception {
- ws.storeExtension(Arrays.asList(EXT_REQUIRED, EXT_REQUIRES));
- List<String> extIds = ws.getAllExtensionsRequires(EXTREQUIRED);
+ ws.storeExtension(null, Arrays.asList(EXT_REQUIRED, EXT_REQUIRES));
+ List<String> extIds = ws.getAllExtensionsRequires(null, EXTREQUIRED);
log.debug("extIds: " + extIds);
assertEquals(1, extIds.size());
- WikittyExtension ext = ws.restoreExtension(extIds.get(0));
+ WikittyExtension ext = ws.restoreExtension(null, extIds.get(0));
assertEquals(EXT_REQUIRES.getName(), ext.getName());
assertEquals(EXT_REQUIRES.getVersion(), ext.getVersion());
assertEquals(EXT_REQUIRES, ext);
@@ -101,9 +101,9 @@
wikitties.add( w );
ids.add( w.getId() );
}
- ws.store(wikitties);
+ ws.store(null, wikitties);
- wikitties = ws.restore(ids);
+ wikitties = ws.restore(null, ids);
int wIndex = 0;
for ( String wValue : wValues ) {
Wikitty w = wikitties.get(wIndex);
@@ -141,7 +141,7 @@
Wikitty w = null;
// should be ignored (?)
try {
- ws.store( w );
+ ws.store(null, w);
fail("store(null) Must throw an exception !");
} catch (Exception e) {
// OK !
@@ -149,8 +149,8 @@
w = new Wikitty();
String id = w.getId();
- ws.store( w );
- w = ws.restore(id);
+ ws.store(null, w);
+ w = ws.restore(null, id);
assertEquals( id, w.getId() );
}
@@ -163,12 +163,12 @@
"String other[0-n] unique not null"
));
- ws.storeExtension(Arrays.asList(ext));
+ ws.storeExtension(null, Arrays.asList(ext));
Wikitty w = new Wikitty();
w.addExtension(ext);
try {
- ws.store(w);
+ ws.store(null, w);
assertFalse("not null contraint don't work on String", true);
} catch (WikittyException eee) {
eee.printStackTrace();
@@ -177,7 +177,7 @@
w.setField("TestConstraint", "id", "toto");
try {
- ws.store(w);
+ ws.store(null, w);
assertFalse("not null contraint don't work in Collection", true);
} catch (WikittyException eee) {
eee.printStackTrace();
@@ -185,18 +185,18 @@
}
w.addToField("TestConstraint", "other", "titi");
- ws.store(w);
+ ws.store(null, w);
w.addToField("TestConstraint", "ext", "tata");
w.addToField("TestConstraint", "ext", "titi");
- ws.store(w);
+ ws.store(null, w);
- Wikitty w2 = ws.restore(w.getId());
+ Wikitty w2 = ws.restore(null, w.getId());
w2.addToField("TestConstraint", "ext", "tata"); // tata ne doit pas s'ajouter
w2.addToField("TestConstraint", "ext", "toto");
- ws.store(w2);
- Wikitty w3 = ws.restore(w.getId());
+ ws.store(null, w2);
+ Wikitty w3 = ws.restore(null, w.getId());
HashSet set = new HashSet(Arrays.asList("tata", "titi", "toto"));
assertEquals(set, w3.getFieldAsSet("TestConstraint", "ext", String.class));
@@ -228,7 +228,7 @@
Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST );
wikitties.add( w );
}
- ws.store(wikitties);
+ ws.store(null, wikitties);
// search test
Wikitty w = new Wikitty();
@@ -236,7 +236,7 @@
w.setField(EXT_TEST.getName(), "fieldName1", "003309");
Criteria criteria = Search.query(w).criteria()
.addSortDescending(EXT_TEST.getName() + ".fieldName0");
- PagedResult<Wikitty> resultFind = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> resultFind = ws.findAllByCriteria(null, criteria);
assertEquals(2, resultFind.size());
assertEquals(wikitties.subList(0, 2), resultFind.getAll());
@@ -268,7 +268,7 @@
Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST );
wikitties.add( w );
}
- ws.store(wikitties);
+ ws.store(null, wikitties);
// search test
Wikitty w = new Wikitty();
@@ -278,7 +278,7 @@
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS)
.addFacetField(EXT_TEST.getName()+".fieldName0")
.addFacetField(EXT_TEST.getName()+".fieldName1");
- PagedResult<Wikitty> resultFind = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> resultFind = ws.findAllByCriteria(null, criteria);
List<String> facetNames = new ArrayList<String>(resultFind.getFacetNames());
Collections.sort(facetNames);
@@ -321,7 +321,7 @@
for( Wikitty w : wikitties ) {
oldIdVersion.put(w.getId(), w.getVersion());
}
- UpdateResponse response = ws.store(wikitties);
+ UpdateResponse response = ws.store(null, wikitties);
for (Wikitty w : wikitties) {
response.update(w);
String v1 = w.getVersion();
@@ -336,7 +336,7 @@
w.addExtension(EXT_TEST);
w.setField(EXT_TEST.getName(), "fieldName0", "chaiseICI");
Criteria criteria = Search.query(w).criteria();
- Wikitty resultFind = ws.findByCriteria(criteria);
+ Wikitty resultFind = ws.findByCriteria(null, criteria);
Wikitty wikittySource = wikitties.get(1);
assertEquals(w.getFieldAsString(EXT_TEST.getName(), "fieldName0"),
@@ -357,17 +357,17 @@
// test to find deleted wikitty
// test if solr index is coherent with database
Criteria criteria1 = Search.query().eq("id", wikittySource.getId()).criteria();
- Wikitty searchedWikitty1 = ws.findByCriteria(criteria1);
+ Wikitty searchedWikitty1 = ws.findByCriteria(null, criteria1);
Assert.assertNotNull(searchedWikitty1);
- ws.delete(wikittySource.getId());
- Wikitty deletedObject = ws.restore(wikittySource.getId());
+ ws.delete(null, wikittySource.getId());
+ Wikitty deletedObject = ws.restore(null, wikittySource.getId());
assertNull(deletedObject);
// test to find deleted wikitty
// test if solr index is coherent with database
Criteria criteria2 = Search.query().eq("id", wikittySource.getId()).criteria();
- Wikitty searchedWikitty2 = ws.findByCriteria(criteria2);
+ Wikitty searchedWikitty2 = ws.findByCriteria(null, criteria2);
Assert.assertNull(searchedWikitty2);
}
@@ -381,22 +381,22 @@
// labelisation test
Wikitty w1 = wikitties.get(0);
- ws.addLabel(w1.getId(), "titi"+ts);
- ws.addLabel(w1.getId(), "toto"+ts);
+ ws.addLabel(null, w1.getId(), "titi"+ts);
+ ws.addLabel(null, w1.getId(), "toto"+ts);
Wikitty w2 = wikitties.get(1);
- ws.addLabel(w2.getId(), "tata"+ts);
- ws.addLabel(w2.getId(), "titi"+ts);
+ ws.addLabel(null, w2.getId(), "tata"+ts);
+ ws.addLabel(null, w2.getId(), "titi"+ts);
Wikitty w3 = wikitties.get(2);
- ws.addLabel(w3.getId(), "tutu"+ts);
- ws.addLabel(w3.getId(), "titi"+ts);
+ ws.addLabel(null, w3.getId(), "tutu"+ts);
+ ws.addLabel(null, w3.getId(), "titi"+ts);
- Wikitty wt = ws.findByLabel("toto"+ts );
+ Wikitty wt = ws.findByLabel(null, "toto"+ts );
assertEquals(w1, wt);
- Set<String> labels = ws.findAllAppliedLabels(w2.getId());
+ Set<String> labels = ws.findAllAppliedLabels(null, w2.getId());
assertEquals(new HashSet(Arrays.asList("tata"+ts, "titi"+ts)), labels);
}
@@ -425,7 +425,7 @@
// leaf.addChild( subLeaf.getWikittyId() );
}
}
- ws.store(wikittyNodes); // store treeNodes.
+ ws.store(null, wikittyNodes); // store treeNodes.
Wikitty table = wikitties.get(0);
Wikitty chaise = wikitties.get(1);
@@ -435,7 +435,7 @@
assign( table, root, "cat-1" );
assign( bureau, root, "cat-2/subcat-2-4" );
- Tree t = ws.restoreTree( root.getWikitty().getId() );
+ Tree t = ws.restoreTree(null, root.getWikitty().getId() );
t.getName().equals("MyCategoryRoot");
@@ -450,7 +450,7 @@
Criteria criteria = Search.query(node.getWikitty()).criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- List<Wikitty> wikitties = ws.findAllByCriteria(criteria).getAll();
+ List<Wikitty> wikitties = ws.findAllByCriteria(null, criteria).getAll();
for ( Wikitty child : wikitties ) {
if (!child.hasExtension(TreeNode.EXT_TREENODE)) {
continue;
@@ -464,6 +464,6 @@
fail( "Unable to find node " + nodeName + " inside " + currentNode.getName() );
}
currentNode.addChildren( wikitty.getId() );
- ws.store(currentNode.getWikitty());
+ ws.store(null, currentNode.getWikitty());
}
}
Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java
===================================================================
--- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -56,11 +56,11 @@
ext
);
String id = w.getId();
- wikittyService.store(w);
+ wikittyService.store(null, w);
((WikittyServiceInMemory)wikittyService).saveToPersistenceFile();
wikittyService = new WikittyServiceInMemory( tempPersistFile );
- w = wikittyService.restore(id);
+ w = wikittyService.restore(null, id);
assertTrue( w.hasField(extName, "fieldName0") );
assertEquals( 123, w.getFieldAsInt(extName, "fieldName0") );
assertTrue( w.hasField(extName, "fieldName1") );
Modified: trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/AbstractTestHbase.java
===================================================================
--- trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/AbstractTestHbase.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/AbstractTestHbase.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -30,7 +30,7 @@
@Before
public void deleteAll() throws Exception {
WikittyServiceHBase hbaseService = ((WikittyServiceHBase) ws);
- hbaseService.clear();
+ hbaseService.clear(null);
}
}
Modified: trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java
===================================================================
--- trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -34,6 +34,6 @@
@Before
public void deleteAll() throws Exception {
WikittyServiceHBase hbaseService = ((WikittyServiceHBase) ws);
- hbaseService.clear();
+ hbaseService.clear(null);
}
}
Modified: trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java
===================================================================
--- trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -34,6 +34,6 @@
@Before
public void deleteAll() throws Exception {
WikittyServiceJDBC service = ((WikittyServiceJDBC) ws);
- service.clear();
+ service.clear(null);
}
}
Modified: trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java
===================================================================
--- trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -39,6 +39,6 @@
@Before
public void deleteAll() throws Exception {
WikittyServiceJPA service = ((WikittyServiceJPA) ws);
- service.clear();
+ service.clear(null);
}
}
Modified: trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java
===================================================================
--- trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -61,7 +61,7 @@
// create wikitty service
service = new WikittyServiceMultiStorage(configuration);
- service.clear();
+ service.clear(null);
}
//@Test
@@ -70,9 +70,9 @@
WikittyExtension extension = new WikittyExtension("extension");
Wikitty wikitty = new Wikitty();
wikitty.addExtension(extension);
- service.store(wikitty);
+ service.store(null, wikitty);
- Wikitty restore = service.restore(wikitty.getId());
+ Wikitty restore = service.restore(null, wikitty.getId());
Assert.assertNotNull(restore);
}
Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java
===================================================================
--- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -684,8 +684,9 @@
}
int numFound = (int)resp.getResults().getNumFound();
+ // FIXME null security token
PagedResult<String> result = new PagedResult<String>(
- firstIndex, numFound, queryString, facets, ids);
+ null, firstIndex, numFound, queryString, facets, ids);
return result;
} catch (SolrServerException e) {
Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java
===================================================================
--- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -29,7 +29,7 @@
@Before
public void deleteAll() throws Exception {
WikittyServiceSolr hbaseService = ((WikittyServiceSolr) ws);
- hbaseService.clear();
+ hbaseService.clear(null);
}
}
Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java
===================================================================
--- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -120,7 +120,7 @@
Wikitty w = StorageTest.createWikitty( wValue, lonelyExtension.getName(), lonelyExtension );
result.add( w );
}
- ws.store(result);
+ ws.store(null, result);
return result.toArray( new Wikitty[]{} );
}
@@ -130,7 +130,7 @@
.eq("Test.name_s", "chaise")
.criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
List<Wikitty> list = result.getAll();
assertEquals(1, list.size());
@@ -147,7 +147,7 @@
.criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
List<Wikitty> list = result.getAll();
assertEquals(4, list.size());
@@ -157,7 +157,7 @@
.criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
list = result.getAll();
assertEquals(3, list.size());
}
@@ -172,7 +172,7 @@
.criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
List<Wikitty> list = result.getAll();
assertEquals( 2, list.size() );
}
@@ -180,17 +180,17 @@
@Test
public void testKeywordSearch() throws Exception {
Criteria criteria = Search.query().keyword("bureau").criteria();
- PagedResult<Wikitty> pagedResult = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> pagedResult = ws.findAllByCriteria(null, criteria);
List<Wikitty> result = pagedResult.getAll();
assertEquals(1, result.size());
criteria = Search.query().keyword("nothing").criteria();
- pagedResult = ws.findAllByCriteria(criteria);
+ pagedResult = ws.findAllByCriteria(null, criteria);
result = pagedResult.getAll();
assertEquals(0, result.size());
criteria = Search.query().keyword("*33*").criteria();
- pagedResult = ws.findAllByCriteria(criteria);
+ pagedResult = ws.findAllByCriteria(null, criteria);
result = pagedResult.getAll();
assertEquals(3, result.size());
@@ -198,7 +198,7 @@
.keyword("*33*")
.eq("Test.name", "bureau")
.criteria();
- pagedResult = ws.findAllByCriteria(criteria);
+ pagedResult = ws.findAllByCriteria(null, criteria);
result = pagedResult.getAll();
assertEquals(1, result.size());
}
@@ -208,7 +208,7 @@
Criteria criteria = Search.query().keyword("*").criteria();
criteria.addFacetField(Element.ELT_EXTENSION);
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
assertEquals(13, result.getAll().size());
List<FacetTopic> topics = result.getTopic(Element.ELT_EXTENSION);
@@ -232,14 +232,14 @@
.eq("Test.enabled", "true")
.criteria();
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
assertEquals(1, result.getNumFound());
criteria = Search.query()
.eq("Test.enabled", "false")
.criteria();
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
assertEquals(2, result.getNumFound());
}
@@ -249,14 +249,14 @@
query.not().eq("Test.name", "bureau");
Criteria criteria = query.criteria();
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
assertEquals(12, result.getNumFound());
query = Search.query().eq("Test.amount", "003300");
query.not().eq("Test.name", "bureau");
criteria = query.criteria();
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
assertEquals(1, result.getNumFound());
}
@@ -268,7 +268,7 @@
.criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
List<Wikitty> list = result.getAll();
assertEquals(1, list.size());
@@ -282,7 +282,7 @@
.criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
list = result.getAll();
assertEquals(12, list.size());
}
@@ -294,7 +294,7 @@
example.setField("Product", "price", 20);
Criteria criteria = Search.query(example).criteria();
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
assertEquals(3, result.getNumFound());
}
@@ -304,7 +304,7 @@
Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, "Product").criteria();
criteria.addFacetField("Product.value");
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
List<FacetTopic> topics = result.getTopic("Product.value");
for (FacetTopic topic : topics) {
String topicName = topic.getTopicName();
@@ -322,7 +322,7 @@
Criteria facet2 = Search.query().eq("Product.value", "2").criteria("2");
criteria.addFacetCriteria(facet2);
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
topics = result.getTopic("1");
FacetTopic topic = topics.get(0);
@@ -349,38 +349,38 @@
criteria.setFirstIndex(0);
criteria.setEndIndex(0);
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
assertEquals(13, result.getNumFound());
- ws.syncEngin();
+ ws.syncEngin(null);
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
assertTrue(13 <= result.getNumFound());
}
@Test
public void testLikeSearch() throws Exception {
Criteria criteria = Search.query().like("Category.name", "hArDwArE", Like.SearchAs.ToLowerCase).criteria();
- PagedResult<Wikitty> pagedResult = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> pagedResult = ws.findAllByCriteria(null, criteria);
List<Wikitty> result = pagedResult.getAll();
assertEquals(1, result.size());
criteria = Search.query().like("Category.name", "*wAre", Like.SearchAs.ToLowerCase).criteria();
- pagedResult = ws.findAllByCriteria(criteria);
+ pagedResult = ws.findAllByCriteria(null, criteria);
result = pagedResult.getAll();
assertEquals(1, result.size());
criteria = Search.query().like("Category.name", "Har*", Like.SearchAs.ToLowerCase).criteria();
- pagedResult = ws.findAllByCriteria(criteria);
+ pagedResult = ws.findAllByCriteria(null, criteria);
result = pagedResult.getAll();
assertEquals(1, result.size());
criteria = Search.query().like("Test.description", "help", Like.SearchAs.AsText).criteria();
- pagedResult = ws.findAllByCriteria(criteria);
+ pagedResult = ws.findAllByCriteria(null, criteria);
assertEquals(1, pagedResult.getNumFound());
criteria = Search.query().like("Test.description", "helped", Like.SearchAs.AsText).criteria();
- pagedResult = ws.findAllByCriteria(criteria);
+ pagedResult = ws.findAllByCriteria(null, criteria);
assertEquals(1, pagedResult.getNumFound());
}
@@ -392,7 +392,7 @@
.criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- PagedResult<Wikitty> result = ws.findAllByCriteria(criteria);
+ PagedResult<Wikitty> result = ws.findAllByCriteria(null, criteria);
List<Wikitty> list = result.getAll();
assertEquals(1, list.size());
@@ -404,7 +404,7 @@
.criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- result = ws.findAllByCriteria(criteria);
+ result = ws.findAllByCriteria(null, criteria);
list = result.getAll();
assertEquals(0, list.size());
}
Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java
===================================================================
--- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-06-07 14:07:40 UTC (rev 103)
+++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-06-07 14:20:02 UTC (rev 104)
@@ -68,7 +68,7 @@
extension = ExtensionFactory.create("test", "1")
.addField("name", TYPE.STRING)
.extension();
- ws.storeExtension(Arrays.asList(extension));
+ ws.storeExtension(null, Arrays.asList(extension));
}
/**
@@ -112,7 +112,7 @@
if(found == null) {
found = createNode(name, parent);
log.debug("[Storing] " + name + " with id " + found.getId());
- ws.store(found);
+ ws.store(null, found);
assertNotNull(findNode(name));
}
parent = found.getId();
@@ -128,12 +128,12 @@
leaf.setField("test", "name", value);
log.debug("[Storing] " + value + " with id " + leaf.getId());
- ws.store(leaf);
+ ws.store(null, leaf);
Wikitty node = findNode(nodeName);
assertNotNull(node);
node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leaf.getId());
- ws.store(node);
+ ws.store(null, node);
}
/**
@@ -141,7 +141,7 @@
*/
protected Wikitty findNode(String nodeName) {
Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_NAME, nodeName).criteria();
- Wikitty wikitty = ws.findByCriteria(criteria);
+ Wikitty wikitty = ws.findByCriteria(null, criteria);
return wikitty;
}
@@ -150,7 +150,7 @@
*/
protected Wikitty findValue(String value) {
Criteria criteria = Search.query().eq("test.name", value).criteria();
- Wikitty wikitty = ws.findByCriteria(criteria);
+ Wikitty wikitty = ws.findByCriteria(null, criteria);
return wikitty;
}
@@ -169,7 +169,7 @@
// Sum children node in node
String nodeId = node.getId();
- Map<TreeNode, Integer> children = ws.restoreChildren(nodeId, null);
+ Map<TreeNode, Integer> children = ws.restoreChildren(null, nodeId, null);
for (Integer count : children.values()) {
sum += count;
@@ -200,7 +200,7 @@
Wikitty root = findNode("root");
String rootId = root.getId();
- Tree tree = ws.restoreTree(rootId);
+ Tree tree = ws.restoreTree(null, rootId);
assertNotNull(tree);
}
@@ -224,7 +224,7 @@
Wikitty node1 = findNode("node1");
String node1Id = node1.getId();
- Map<TreeNode, Integer> children = ws.restoreChildren(node1Id, null);
+ Map<TreeNode, Integer> children = ws.restoreChildren(null, node1Id, null);
assertEquals(3, children.size());
}
@@ -234,7 +234,7 @@
String node1Id = node1.getId();
Criteria filter = Search.query().eq("test.name", "value 3").criteria();
- Map<TreeNode, Integer> children = ws.restoreChildren(node1Id, filter);
+ Map<TreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter);
assertEquals(3, children.size());
}
@@ -243,7 +243,7 @@
Wikitty node11 = findNode("node11");
String node11Id = node11.getId();
- Entry<TreeNode, Integer> count = ws.restoreNode(node11Id, null);
+ Entry<TreeNode, Integer> count = ws.restoreNode(null, node11Id, null);
assertEquals(3, count.getValue().intValue());
}
@@ -253,7 +253,7 @@
String node11Id = node11.getId();
Criteria filter = Search.query().eq("test.name", "value 3").criteria();
- Entry<TreeNode, Integer> count = ws.restoreNode(node11Id, filter);
+ Entry<TreeNode, Integer> count = ws.restoreNode(null, node11Id, filter);
assertEquals(1, count.getValue().intValue());
}
@@ -262,19 +262,19 @@
// Check that node 2 it has any child
Wikitty node2 = findNode("node2");
String node2Id = node2.getId();
- Map<TreeNode, Integer> children = ws.restoreChildren(node2Id, null);
+ Map<TreeNode, Integer> children = ws.restoreChildren(null, node2Id, null);
assertEquals(0, children.size());
// Create a new node, child of node 2
Wikitty nodeWikitty = createNode("node21", node2Id);
- ws.store(nodeWikitty);
+ ws.store(null, nodeWikitty);
// Retrieve it to check
Wikitty found = findNode("node21");
assertNotNull(found);
// Check that it was great added as node2 child
- children = ws.restoreChildren(node2Id, null);
+ children = ws.restoreChildren(null, node2Id, null);
assertEquals(1, children.size());
}
@@ -286,13 +286,13 @@
// Create a leaf
Wikitty leaf = StorageTest.createWikitty("name=totoTheLeaf", "test", extension);
- ws.store(leaf);
+ ws.store(null, leaf);
// Add it in the node2 (now: two values in it)
Wikitty node = findNode("node2");
assertNotNull(node);
node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leaf.getId());
- ws.store(node);
+ ws.store(null, node);
// now, there is one more value for the root node
int newSum = sum(root);
@@ -309,7 +309,7 @@
Wikitty node121 = findNode("node121");
int node121Init = sum(node121);
String node121Id = node121.getId();
- ws.delete(node121Id);
+ ws.delete(null, node121Id);
// node12 must have any child
Wikitty node12 = findNode("node12");
@@ -327,7 +327,7 @@
Wikitty node11 = findNode("node11");
String node11Id = node11.getId();
- ws.delete(Arrays.asList(node1Id, node11Id));
+ ws.delete(null, Arrays.asList(node1Id, node11Id));
// check that root node has weel one less children value
newRootChidlren = sum(root);
@@ -344,7 +344,7 @@
Wikitty node = findNode("node11");
List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, String.class);
node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leafs.get(0));
- ws.store(node);
+ ws.store(null, node);
// now, there is one more value for the root node
int newSum = sum(root);
@@ -360,7 +360,7 @@
// Remove a value
Wikitty value4 = findValue("value 4");
String value4Id = value4.getId();
- ws.delete(value4Id);
+ ws.delete(null, value4Id);
// now, there is one more value for the root node
int newSum = sum(root);
@@ -383,7 +383,7 @@
// Move node 1 in mode 2
node121.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT, node2);
- ws.store(node121);
+ ws.store(null, node121);
// now, there is less value node 121 for the node 1
int newSum1 = sum(node1);
@@ -400,22 +400,22 @@
createBranch("node3/node32");
Wikitty value = StorageTest.createWikitty("name=value", "test", extension);
- ws.store(value);
+ ws.store(null, value);
String valueId = value.getId();
Wikitty node31 = findNode("node31");
node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, valueId);
- ws.store(node31);
+ ws.store(null, node31);
Wikitty node32 = findNode("node32");
node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, valueId);
- ws.store(node32);
+ ws.store(null, node32);
Wikitty node3 = findNode("node3");
int sum = sum(node3);
assertEquals(2, sum);
- Entry<TreeNode, Integer> count = ws.restoreNode(node3.getId(), null);
+ Entry<TreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null);
assertEquals(1, count.getValue().intValue());
sum = sum(node31);
1
0
07 Jun '10
Author: bpoussin
Date: 2010-06-07 16:07:40 +0200 (Mon, 07 Jun 2010)
New Revision: 103
Url: http://nuiton.org/repositories/revision/wikitty/103
Log:
add constructor without securityToken. This constructor is used in Indexer that no need security context
Modified:
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-06-07 11:10:32 UTC (rev 102)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-06-07 14:07:40 UTC (rev 103)
@@ -53,9 +53,17 @@
/** securityToken of user that generate this PagedResult */
protected String securityToken;
- public PagedResult(String secuirtyToken, int firstIndice, int numFound, String queryString,
+ /**
+ * we don't initialize securityToken
+ *
+ * @param firstIndice
+ * @param numFound
+ * @param queryString
+ * @param facets
+ * @param results
+ */
+ public PagedResult(int firstIndice, int numFound, String queryString,
Map<String, List<FacetTopic>> facets, List<T> results) {
- this.securityToken = secuirtyToken;
this.firstIndice = firstIndice;
this.numFound = numFound;
this.queryString = queryString;
@@ -64,6 +72,35 @@
}
/**
+ * Create PagedResult and initialize securityToken
+ *
+ * @param secuirtyToken
+ * @param firstIndice
+ * @param numFound
+ * @param queryString
+ * @param facets
+ * @param results
+ */
+ public PagedResult(String securityToken, int firstIndice, int numFound, String queryString,
+ Map<String, List<FacetTopic>> facets, List<T> results) {
+ this.securityToken = securityToken;
+ this.firstIndice = firstIndice;
+ this.numFound = numFound;
+ this.queryString = queryString;
+ this.facets = facets;
+ this.results = Collections.unmodifiableList(results);
+ }
+
+ /**
+ * initialize/set securityToken
+ *
+ * @param securityToken
+ */
+ public void setSecurityToken(String securityToken) {
+ this.securityToken = securityToken;
+ }
+
+ /**
* Convert all result to the wanted type and return new PagedResult with
* this new result list. If some result don't have the right extension (clazz)
* this extension is automatically added if autoconvert is true. Else
1
0
r102 - in trunk/wikitty-api: . src/main/java/org/nuiton/wikitty src/main/java/org/nuiton/wikitty/importexport src/main/uml/wikitty-api
by bpoussin＠users.nuiton.org 07 Jun '10
by bpoussin＠users.nuiton.org 07 Jun '10
07 Jun '10
Author: bpoussin
Date: 2010-06-07 13:10:32 +0200 (Mon, 07 Jun 2010)
New Revision: 102
Url: http://nuiton.org/repositories/revision/wikitty/102
Log:
Preparation pour l'ajout de la security
- ajout des methodes login/logout
- ajout du token dans toutes les methodes
- ajout des extensions User, Group, Authorisation, SecurityToken
Added:
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java
trunk/wikitty-api/src/main/uml/wikitty-api/wikitty-security.zargo
Modified:
trunk/wikitty-api/pom.xml
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java
Modified: trunk/wikitty-api/pom.xml
===================================================================
--- trunk/wikitty-api/pom.xml 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/pom.xml 2010-06-07 11:10:32 UTC (rev 102)
@@ -214,8 +214,12 @@
<zargoResources>
<input>${maven.src.dir}/main/uml/wikitty-api</input>
</zargoResources>
+ <xmiResources>
+ <inputs><input>${maven.gen.dir}/xmi</input></inputs>
+ </xmiResources>
<includes>**/*.objectmodel</includes>
<templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates>
+ <fullPackagePath>org.nuiton.wikitty</fullPackagePath>
<defaultPackage>org.nuiton.wikitty</defaultPackage>
<extractedPackages>org.nuiton.wikitty</extractedPackages>
<generatedPackages>org.nuiton.wikitty</generatedPackages>
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -50,9 +50,12 @@
protected List<T> results;
/** facet asked or null if no facet */
protected Map<String, List<FacetTopic>> facets;
+ /** securityToken of user that generate this PagedResult */
+ protected String securityToken;
- public PagedResult(int firstIndice, int numFound, String queryString,
+ public PagedResult(String secuirtyToken, int firstIndice, int numFound, String queryString,
Map<String, List<FacetTopic>> facets, List<T> results) {
+ this.securityToken = secuirtyToken;
this.firstIndice = firstIndice;
this.numFound = numFound;
this.queryString = queryString;
@@ -98,7 +101,8 @@
Collection<WikittyExtension> wikittyExtension = w.getExtensions();
if (autoconvert || wikittyExtension.containsAll(wantedExtension)) {
- E e = WikittyUtil.newInstance(wikittyService, clazz, (Wikitty) t);
+ E e = WikittyUtil.newInstance(
+ securityToken, wikittyService, clazz, (Wikitty) t);
castedResult.add(e);
} else {
throw new WikittyException(String.format(
@@ -109,7 +113,7 @@
}
}
}
- PagedResult<E> result = new PagedResult<E>(
+ PagedResult<E> result = new PagedResult<E>(securityToken,
firstIndice, numFound, queryString, facets, castedResult);
return result;
}
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -41,6 +41,10 @@
/**
* Recursively add extension with requires ones (orderer).
+ * WikittyService used in this method must not have WikittyServiceSecurity
+ * in stack because we pass null as secuirtyToken to method. (TODO poussin
+ * 2010 verify this assertion, when we use Migration, we don't need
+ * Security)
*
* @param service service
* @param transaction current transaction to use
@@ -53,7 +57,9 @@
String requires = newExt.getRequires();
if (StringUtils.isNotEmpty(requires)) {
for (String require : requires.split(",")) {
- WikittyExtension newRequireExt = service.restoreExtensionLastVersion(transaction, require);
+ WikittyExtension newRequireExt =
+ service.restoreExtensionLastVersion(
+ null, transaction, require);
addExtension(service, transaction, wikitty, newRequireExt);
}
}
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -85,8 +85,10 @@
new HashMap<String, Future<String>>();
protected WikittyService ws;
+ protected String securityToken;
- public WikittyImportExportService(WikittyService ws) {
+ public WikittyImportExportService(String securityToken, WikittyService ws) {
+ this.securityToken = securityToken;
this.ws = ws;
}
@@ -96,7 +98,7 @@
public void syncImport(FORMAT format, String s) {
Reader reader = new StringReader(s);
- ImportTask task = new ImportTask(ws, format, reader);
+ ImportTask task = new ImportTask(securityToken, ws, format, reader);
task.run();
}
@@ -104,7 +106,7 @@
try {
URL url = new URL(uri);
Reader reader = new InputStreamReader(url.openStream());
- ImportTask task = new ImportTask(ws, format, reader);
+ ImportTask task = new ImportTask(securityToken, ws, format, reader);
task.run();
} catch (Exception eee) {
throw new WikittyException(eee);
@@ -115,7 +117,7 @@
try {
URL url = new URL(uri);
Reader reader = new InputStreamReader(url.openStream());
- ImportTask task = new ImportTask(ws, format, reader);
+ ImportTask task = new ImportTask(securityToken, ws, format, reader);
FutureTask<String> future = new FutureTask<String>(task, null);
importExportExecutor.submit(future);
@@ -167,7 +169,8 @@
File file = new File(EXPORT_DIRECTORY, jobId);
String url = EXPORT_URL + jobId;
Writer result = new FileWriter(file);
- ExportTask task = new ExportTask(ws, format, criteria, result);
+ ExportTask task = new ExportTask(
+ securityToken, ws, format, criteria, result);
FutureTask<String> future = new FutureTask<String>(task, url);
importExportExecutor.submit(future);
@@ -187,7 +190,8 @@
*/
public String syncExportAllByCriteria(FORMAT format, Criteria criteria) {
StringWriter result = new StringWriter();
- ExportTask task = new ExportTask(ws, format, criteria, result);
+ ExportTask task = new ExportTask(
+ securityToken, ws, format, criteria, result);
task.run();
return result.toString();
}
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -44,7 +44,26 @@
public class WikittyProxy {
protected WikittyService wikittyService;
-
+ protected String securityToken = null;
+
+ public String login(String login, String password) {
+ String result = wikittyService.login(login, password);
+ setSecurityToken(result);
+ return result;
+ }
+
+ public void logout() {
+ wikittyService.logout(securityToken);
+ }
+
+ public String getSecurityToken() {
+ return securityToken;
+ }
+
+ public void setSecurityToken(String securityToken) {
+ this.securityToken = securityToken;
+ }
+
public WikittyService getWikittyService() {
return wikittyService;
}
@@ -55,7 +74,7 @@
public <E extends BusinessEntity> E store(E e) {
Wikitty w = WikittyUtil.beanToWikitty(e);
- UpdateResponse resp = wikittyService.store(w);
+ UpdateResponse resp = wikittyService.store(securityToken, w);
resp.update(e);
return e;
}
@@ -76,7 +95,7 @@
}
// call the service with Wikitty
- UpdateResponse resp = wikittyService.store(wikitties);
+ UpdateResponse resp = wikittyService.store(securityToken, wikitties);
// update object
for (E e : objets) {
@@ -99,7 +118,7 @@
E result = null;
HashSet<String> extNames = null;
try {
- Wikitty wikitty = wikittyService.restore(id);
+ Wikitty wikitty = wikittyService.restore(securityToken, id);
if(wikitty == null) {
return null;
}
@@ -107,7 +126,8 @@
if (checkExtension) {
extNames = new HashSet<String>(wikitty.getExtensionNames());
}
- result = WikittyUtil.newInstance(wikittyService, clazz, wikitty);
+ result = WikittyUtil.newInstance(
+ securityToken, wikittyService, clazz, wikitty);
} catch (Exception eee) {
throw new WikittyException(eee);
}
@@ -153,7 +173,7 @@
public <E extends BusinessEntity> List<E> restore(
Class<E> clazz, List<String> id, boolean checkExtension) {
- List<Wikitty> wikitties = wikittyService.restore(id);
+ List<Wikitty> wikitties = wikittyService.restore(securityToken, id);
List<E> result = new ArrayList<E>();
for (Wikitty w : wikitties) {
HashSet<String> extNames = null;
@@ -161,7 +181,8 @@
extNames = new HashSet<String>(w.getExtensionNames());
}
- E dto = WikittyUtil.newInstance(wikittyService, clazz, w);
+ E dto = WikittyUtil.newInstance(
+ securityToken, wikittyService, clazz, w);
if (checkExtension) {
// WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl
BusinessEntityWikitty b = (BusinessEntityWikitty) dto;
@@ -185,11 +206,11 @@
}
public void delete(String id) {
- wikittyService.delete(id);
+ wikittyService.delete(securityToken, id);
}
public void delete(Collection<String> ids) {
- wikittyService.delete(ids);
+ wikittyService.delete(securityToken, ids);
}
public <E extends BusinessEntityWikitty> PagedResult<E> findAllByExample(E e,
@@ -199,18 +220,21 @@
.setFirstIndex(firstIndex).setEndIndex(endIndex)
.setFacetField(fieldFacet);
- PagedResult<Wikitty> pagedResult = wikittyService.findAllByCriteria(criteria);
+ PagedResult<Wikitty> pagedResult = wikittyService.findAllByCriteria(
+ securityToken, criteria);
// we can use autoconvert = true because search by example add automaticaly
// restriction on extension
- PagedResult<E> result = (PagedResult<E>)pagedResult.cast(wikittyService, e.getClass(), true);
+ PagedResult<E> result = (PagedResult<E>)pagedResult.cast(
+ wikittyService, e.getClass(), true);
return result;
}
public <E extends BusinessEntityWikitty> E findByExample(E e) {
Criteria criteria = Search.query(e.getWikitty()).criteria();
- Wikitty w = wikittyService.findByCriteria(criteria);
- E result = (E)WikittyUtil.newInstance(wikittyService, e.getClass(), w);
+ Wikitty w = wikittyService.findByCriteria(securityToken, criteria);
+ E result = (E)WikittyUtil.newInstance(
+ securityToken, wikittyService, e.getClass(), w);
return result;
}
@@ -273,7 +297,8 @@
}
}
- PagedResult<Wikitty> pagedResult = wikittyService.findAllByCriteria(serviceCriteria);
+ PagedResult<Wikitty> pagedResult = wikittyService.findAllByCriteria(
+ securityToken, serviceCriteria);
// we can cast with autoconvert true because we have add restriction
// on extension
@@ -292,43 +317,48 @@
criteria = search.criteria(criteria.getName());
- Wikitty w = wikittyService.findByCriteria(criteria);
- E result = WikittyUtil.newInstance(wikittyService, clazz, w);
+ Wikitty w = wikittyService.findByCriteria(securityToken, criteria);
+ E result = WikittyUtil.newInstance(
+ securityToken, wikittyService, clazz, w);
return result;
}
public void addLabel(String wikittyId, String label) {
- wikittyService.addLabel(wikittyId, label);
+ wikittyService.addLabel(securityToken, wikittyId, label);
}
public PagedResult<Wikitty> findAllByLabel(String label, int firstIndex, int endIndex) {
- PagedResult<Wikitty> result = wikittyService.findAllByLabel(
+ PagedResult<Wikitty> result = wikittyService.findAllByLabel(securityToken,
label, firstIndex, endIndex);
return result;
}
public Wikitty findByLabel(String label) {
- Wikitty result = wikittyService.findByLabel(label);
+ Wikitty result = wikittyService.findByLabel(securityToken, label);
return result;
}
public Set<String> findAllAppliedLabels(String wikittyId) {
- Set<String> result = wikittyService.findAllAppliedLabels(wikittyId);
+ Set<String> result = wikittyService.findAllAppliedLabels(
+ securityToken, wikittyId);
return result;
}
public Tree restoreTree(String wikittyId) {
- Tree result = wikittyService.restoreTree(wikittyId);
+ Tree result = wikittyService.restoreTree(securityToken, wikittyId);
return result;
}
- public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode(Class<E> clazz, String wikittyId, Criteria filter) {
+ public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode(
+ Class<E> clazz, String wikittyId, Criteria filter) {
Entry<E, Integer> result = restoreNode(clazz, wikittyId, filter, false);
return result;
}
- public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode(Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) {
- Map.Entry<TreeNode, Integer> node = wikittyService.restoreNode(wikittyId, filter);
+ public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode(
+ Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) {
+ Map.Entry<TreeNode, Integer> node = wikittyService.restoreNode(
+ securityToken, wikittyId, filter);
if(node == null) {
return null;
}
@@ -343,14 +373,17 @@
return result;
}
- public <E extends BusinessEntity> Map<E, Integer> restoreChildren(Class<E> clazz, String wikittyId, Criteria filter) {
+ public <E extends BusinessEntity> Map<E, Integer> restoreChildren(
+ Class<E> clazz, String wikittyId, Criteria filter) {
Map<E, Integer> result = restoreChildren(clazz, wikittyId, filter, false);
return result;
}
- public <E extends BusinessEntity> Map<E, Integer> restoreChildren(Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) {
+ public <E extends BusinessEntity> Map<E, Integer> restoreChildren(
+ Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) {
- Map<TreeNode, Integer> result = wikittyService.restoreChildren(wikittyId, filter);
+ Map<TreeNode, Integer> result = wikittyService.restoreChildren(
+ securityToken, wikittyId, filter);
if(result == null) {
return null;
}
@@ -367,11 +400,12 @@
E businessEntity = null;
HashSet<String> extNames = null;
try {
- Wikitty wikitty = wikittyService.restore(nodeId);
+ Wikitty wikitty = wikittyService.restore(securityToken, nodeId);
if(checkExtension) {
extNames = new HashSet<String>(wikitty.getExtensionNames());
}
- businessEntity = WikittyUtil.newInstance(wikittyService, clazz, wikitty);
+ businessEntity = WikittyUtil.newInstance(
+ securityToken, wikittyService, clazz, wikitty);
} catch (Exception eee) {
throw new WikittyException(eee);
}
@@ -379,10 +413,13 @@
boolean goodType = true;
if(checkExtension) {
// WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl
- BusinessEntityWikitty businessEntityImpl = (BusinessEntityWikitty) businessEntity;
- Collection<WikittyExtension> staticExtensions = businessEntityImpl.getStaticExtensions();
+ BusinessEntityWikitty businessEntityImpl =
+ (BusinessEntityWikitty) businessEntity;
+ Collection<WikittyExtension> staticExtensions =
+ businessEntityImpl.getStaticExtensions();
- for (Iterator<WikittyExtension> iterator = staticExtensions.iterator(); iterator.hasNext() && goodType;) {
+ for (Iterator<WikittyExtension> iterator =
+ staticExtensions.iterator(); iterator.hasNext() && goodType;) {
WikittyExtension ext = iterator.next();
if (!extNames.contains(ext.getName())) {
// extension wanted by BusinessEntity (clazz)
@@ -402,7 +439,8 @@
}
public Wikitty restoreVersion(String wikittyId, String version) {
- Wikitty result = wikittyService.restoreVersion(wikittyId, version);
+ Wikitty result = wikittyService.restoreVersion(
+ securityToken, wikittyId, version);
return result;
}
@@ -410,12 +448,13 @@
E result = null;
HashSet<String> extNames = null;
try {
- Wikitty wikitty = wikittyService.restore(wikittyId);
+ Wikitty wikitty = wikittyService.restore(securityToken, wikittyId);
if(wikitty == null) {
return false;
}
extNames = new HashSet<String>(wikitty.getExtensionNames());
- result = WikittyUtil.newInstance(wikittyService, clazz, wikitty);
+ result = WikittyUtil.newInstance(
+ securityToken, wikittyService, clazz, wikitty);
} catch (Exception eee) {
throw new WikittyException(eee);
}
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -67,8 +67,31 @@
* @see ServiceListenerType
*/
public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type);
-
+
/*
+ * security
+ */
+
+ /**
+ * Authenticate someone on WikittyService. securityToken returned must be
+ * used to call others methods
+ *
+ * @param login can be application specifique login, but best practice is
+ * to use email user
+ * @param password
+ * @return return token securityToken
+ */
+ public String login(String login, String password);
+
+ /**
+ * Unanthenticate someone by disabled securityToken
+ *
+ * @param securityToken security token previously returned by login. If
+ * securityToken is not valid, this method do nothing
+ */
+ public void logout(String securityToken);
+
+ /*
* Storage
*/
@@ -76,21 +99,21 @@
* Use with caution : It will delete ALL indexes from search engine !
* This operation should be disabled in production environment.
*/
- public void clear();
+ public void clear(String securityToken);
/**
* Manage Update and creation.
*
* @param wikitty contains an id all the time.
*/
- UpdateResponse store(Wikitty wikitty);
+ public UpdateResponse store(String securityToken, Wikitty wikitty);
/**
* Manage Update and creation.
*
* @param wikitties list of wikitty to be persisted
*/
- UpdateResponse store(Collection<Wikitty> wikitties);
+ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties);
/**
* Manage Update and creation.
@@ -99,7 +122,7 @@
* @param disableAutoVersionIncrement boolean to disable version increment
* on saved wikitty
*/
- UpdateResponse store(Collection<Wikitty> wikitties,
+ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties,
boolean disableAutoVersionIncrement);
@@ -112,34 +135,36 @@
* @param disableAutoVersionIncrement boolean to disable version increment
* on saved wikitty
*/
- UpdateResponse store(WikittyTransaction transaction,
+ public UpdateResponse store(String securityToken, WikittyTransaction transaction,
Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement);
/**
* Return all extension id (ex: "extName[version])")
* @return
*/
- List<String> getAllExtensionIds();
+ public List<String> getAllExtensionIds(String securityToken);
/**
- * Return all extension id (ex: "extName[version])") where extensionName is required.
+ * Return all extension id (ex: "extName[version])") where extensionName is
+ * required.
* @return
*/
- List<String> getAllExtensionsRequires(String extensionName);
+ public List<String> getAllExtensionsRequires(String securityToken, String extensionName);
/**
* Manage Update and creation.
*
* @param wikitty extension to be persisted
*/
- UpdateResponse storeExtension(WikittyExtension ext);
+ public UpdateResponse storeExtension(String securityToken, WikittyExtension ext);
/**
* Manage Update and creation.
*
* @param exts list of wikitty extension to be persisted
*/
- UpdateResponse storeExtension(Collection<WikittyExtension> exts);
+ public UpdateResponse storeExtension(String securityToken,
+ Collection<WikittyExtension> exts);
/**
* Manage Update and creation, action is done in transaction passed in
@@ -148,15 +173,15 @@
* @param transaction transaction used to do the action (must not be null)
* @param exts list of wikitty extension to be persisted
*/
- UpdateResponse storeExtension(WikittyTransaction transaction,
- Collection<WikittyExtension> exts);
+ public UpdateResponse storeExtension(String securityToken,
+ WikittyTransaction transaction, Collection<WikittyExtension> exts);
/**
*
* @param id
* @return the corresponding object, exception if no such object found.
*/
- public WikittyExtension restoreExtension(String id);
+ public WikittyExtension restoreExtension(String securityToken, String id);
/**
* action is done in transaction passed in argument
@@ -165,15 +190,16 @@
* @param id
* @return the corresponding object, exception if no such object found.
*/
- public WikittyExtension restoreExtension(WikittyTransaction transaction,
- String id);
+ public WikittyExtension restoreExtension(String securityToken,
+ WikittyTransaction transaction, String id);
/**
* Search extension with name in last version
* @param name
* @return the corresponding object, exception if no such object found.
*/
- public WikittyExtension restoreExtensionLastVersion(String name);
+ public WikittyExtension restoreExtensionLastVersion(
+ String securityToken, String name);
/**
*
@@ -181,7 +207,7 @@
* @return the corresponding object, or null if object doesn't exist or is
* deleted
*/
- Wikitty restore( String id );
+ public Wikitty restore(String securityToken, String id);
/**
*
@@ -190,26 +216,27 @@
* or deleted) this id is skip and result list have less elements than
* collection argument
*/
- List<Wikitty> restore( List<String> id );
+ public List<Wikitty> restore(String securityToken, List<String> id);
/**
* delete object if id exists
* @param id object's id to remove
*/
- void delete(String id);
+ public void delete(String securityToken, String id);
/**
* delete all object if id exists
* @param ids object's ids to remove
*/
- void delete(Collection<String> ids);
+ public void delete(String securityToken, Collection<String> ids);
/**
*
* @param criteria
* @return
*/
- public PagedResult<Wikitty> findAllByCriteria(Criteria criteria);
+ public PagedResult<Wikitty> findAllByCriteria(
+ String securityToken, Criteria criteria);
/**
*
@@ -217,7 +244,7 @@
* @param criteria
* @return
*/
- public PagedResult<Wikitty> findAllByCriteria(
+ public PagedResult<Wikitty> findAllByCriteria(String securityToken,
WikittyTransaction transaction, Criteria criteria);
/**
@@ -225,7 +252,7 @@
* @param criteria
* @return
*/
- public Wikitty findByCriteria(Criteria criteria);
+ public Wikitty findByCriteria(String securityToken, Criteria criteria);
/*
* Labelisation
@@ -236,28 +263,29 @@
* @param wikittyId id of wikitty object to add label
* @param label label to add
*/
- void addLabel(String wikittyId, String label);
+ public void addLabel(String securityToken, String wikittyId, String label);
/**
*
* @param label
* @return
*/
- PagedResult<Wikitty> findAllByLabel(String label, int firstIndex, int endIndex);
+ public PagedResult<Wikitty> findAllByLabel(String securityToken,
+ String label, int firstIndex, int endIndex);
/**
*
* @param addLabel
* @return
*/
- Wikitty findByLabel(String label);
+ public Wikitty findByLabel(String securityToken, String label);
/**
* retrieve all labels applied on a wikitty object
* @param wikittyId
* @return
*/
- Set<String> findAllAppliedLabels(String wikittyId);
+ public Set<String> findAllAppliedLabels(String securityToken, String wikittyId);
/*
@@ -272,7 +300,7 @@
* @param wikittyId
* @return
*/
- Tree restoreTree(String wikittyId);
+ public Tree restoreTree(String securityToken, String wikittyId);
/**
* Retrieve wikitty node with count. Wikitty reference by wikittyId MUST
@@ -280,7 +308,8 @@
* @param wikittyId
* @return
*/
- Map.Entry<TreeNode, Integer> restoreNode(String wikittyId, Criteria filter);
+ public Map.Entry<TreeNode, Integer> restoreNode(String securityToken,
+ String wikittyId, Criteria filter);
/**
* Retrieve all wikitties children with count (no recursively) of an other one
@@ -289,7 +318,8 @@
* @param wikittyId
* @return
*/
- Map<TreeNode, Integer> restoreChildren(String wikittyId, Criteria filter);
+ public Map<TreeNode, Integer> restoreChildren(String securityToken,
+ String wikittyId, Criteria filter);
/*
@@ -299,7 +329,8 @@
/**
*
*/
- Wikitty restoreVersion(String wikittyId, String version);
+ public Wikitty restoreVersion(String securityToken,
+ String wikittyId, String version);
/*
* admin
@@ -310,6 +341,6 @@
* reindex all wikitties.
* @return
*/
- UpdateResponse syncEngin();
+ public UpdateResponse syncEngin(String securityToken);
}
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -53,10 +53,8 @@
/** Cache. */
protected WikittyCache cache = null;
-
/** Delegated wikitty service implementation. */
protected WikittyService ws;
-
/**
* Default constructor.
*
@@ -73,9 +71,8 @@
* @param props properties (can be null)
*/
public WikittyServiceCached(WikittyService ws, Properties props) {
+ this.ws = ws;
cache = WikittyCache.getInstance();
- this.ws = ws;
-
registerWikittyServiceListener(props);
}
@@ -102,18 +99,8 @@
}
@Override
- public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) {
- ws.addWikittyServiceListener(listener, type);
- }
-
- @Override
- public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) {
- ws.removeWikittyServiceListener(listener, type);
- }
-
- @Override
- public void clear() {
- ws.clear();
+ public void clear(String securityToken) {
+ ws.clear(securityToken);
cache.clearWikitty();
}
@@ -124,9 +111,9 @@
* @param label
*/
@Override
- public void addLabel(String wikittyId, String label) {
- ws.addLabel(wikittyId, label);
- restore(wikittyId);
+ public void addLabel(String securityToken, String wikittyId, String label) {
+ ws.addLabel(securityToken, wikittyId, label);
+ restore(securityToken, wikittyId);
}
/**
@@ -134,8 +121,8 @@
* @param id
*/
@Override
- public void delete(String id) {
- ws.delete(id);
+ public void delete(String securityToken, String id) {
+ ws.delete(securityToken, id);
cache.removeWikitty(id);
}
@@ -144,8 +131,8 @@
* @param ids
*/
@Override
- public void delete(Collection<String> ids) {
- ws.delete(ids);
+ public void delete(String securityToken, Collection<String> ids) {
+ ws.delete(securityToken, ids);
cache.removeAllWikitty(ids);
}
@@ -156,10 +143,10 @@
* @return
*/
@Override
- public Set<String> findAllAppliedLabels(String wikittyId) {
+ public Set<String> findAllAppliedLabels(String securityToken, String wikittyId) {
// if we want to add cache for this method, we must clear cache when
// addLabel is called
- return ws.findAllAppliedLabels(wikittyId);
+ return ws.findAllAppliedLabels(securityToken, wikittyId);
}
/**
@@ -169,10 +156,11 @@
* @return
*/
@Override
- public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) {
+ public PagedResult<Wikitty> findAllByCriteria(
+ String securityToken, Criteria criteria) {
// if we want to add cache for this method, we must clear cache when
// addLabel, store, storeExtension are called
- return ws.findAllByCriteria(criteria);
+ return ws.findAllByCriteria(securityToken, criteria);
}
/**
@@ -182,10 +170,11 @@
* @return
*/
@Override
- public PagedResult<Wikitty> findAllByCriteria(WikittyTransaction transaction, Criteria criteria) {
+ public PagedResult<Wikitty> findAllByCriteria(String securityToken,
+ WikittyTransaction transaction, Criteria criteria) {
// if we want to add cache for this method, we must clear cache when
// addLabel, store, storeExtension are called
- return ws.findAllByCriteria(transaction, criteria);
+ return ws.findAllByCriteria(securityToken, transaction, criteria);
}
@@ -198,10 +187,11 @@
* @return
*/
@Override
- public PagedResult<Wikitty> findAllByLabel(String label, int firstIndex, int endIndex) {
+ public PagedResult<Wikitty> findAllByLabel(String securityToken,
+ String label, int firstIndex, int endIndex) {
// if we want to add cache for this method, we must clear cache when
// addLabel is called
- return ws.findAllByLabel(label, firstIndex, endIndex);
+ return ws.findAllByLabel(securityToken, label, firstIndex, endIndex);
}
/**
@@ -211,10 +201,10 @@
* @return
*/
@Override
- public Wikitty findByCriteria(Criteria criteria) {
+ public Wikitty findByCriteria(String securityToken, Criteria criteria) {
// if we want to add cache for this method, we must clear cache when
// addLabel, store, storeExtension are called
- return ws.findByCriteria(criteria);
+ return ws.findByCriteria(securityToken, criteria);
}
/**
@@ -224,10 +214,10 @@
* @return
*/
@Override
- public Wikitty findByLabel(String label) {
+ public Wikitty findByLabel(String securityToken, String label) {
// if we want to add cache for this method, we must clear cache when
// addLabel is called
- return ws.findByLabel(label);
+ return ws.findByLabel(securityToken, label);
}
/**
@@ -236,9 +226,9 @@
* @return
*/
@Override
- public List<String> getAllExtensionIds() {
+ public List<String> getAllExtensionIds(String securityToken) {
// TODO poussin 20100412: perhaps use cache for extension ?
- return ws.getAllExtensionIds();
+ return ws.getAllExtensionIds(securityToken);
}
/**
@@ -248,9 +238,10 @@
* @return
*/
@Override
- public List<String> getAllExtensionsRequires(String extensionName) {
+ public List<String> getAllExtensionsRequires(
+ String securityToken, String extensionName) {
// TODO poussin 20100412: perhaps use cache for extension ?
- return ws.getAllExtensionsRequires(extensionName);
+ return ws.getAllExtensionsRequires(securityToken, extensionName);
}
/**
@@ -260,10 +251,10 @@
* @return
*/
@Override
- public Wikitty restore(String id) {
+ public Wikitty restore(String securityToken, String id) {
Wikitty result = cache.getWikitty(id);
if (result == null) {
- result = ws.restore(id);
+ result = ws.restore(securityToken, id);
cache.putWikitty(result);
}
return result;
@@ -276,7 +267,7 @@
* @return
*/
@Override
- public List<Wikitty> restore(List<String> ids) {
+ public List<Wikitty> restore(String securityToken, List<String> ids) {
ArrayList<String> notInCache = new ArrayList<String>();
// linked to maintains the ordre
LinkedHashMap<String, Wikitty> fromCache =
@@ -290,7 +281,7 @@
}
// retrieve missing object
- List<Wikitty> missingInCache = ws.restore(notInCache);
+ List<Wikitty> missingInCache = ws.restore(securityToken, notInCache);
cache.putAllWikitty(missingInCache);
@@ -313,9 +304,10 @@
* @return
*/
@Override
- public Map<TreeNode, Integer> restoreChildren(String wikittyId, Criteria filter) {
+ public Map<TreeNode, Integer> restoreChildren(
+ String securityToken, String wikittyId, Criteria filter) {
// FIXME lookup in cache, and put in cache
- return ws.restoreChildren(wikittyId, filter);
+ return ws.restoreChildren(securityToken, wikittyId, filter);
}
/**
@@ -325,9 +317,9 @@
* @return
*/
@Override
- public WikittyExtension restoreExtension(String id) {
+ public WikittyExtension restoreExtension(String securityToken, String id) {
// TODO poussin 20100412: perhaps use cache for extension ?
- return ws.restoreExtension(id);
+ return ws.restoreExtension(securityToken, id);
}
/**
@@ -337,9 +329,10 @@
* @return
*/
@Override
- public WikittyExtension restoreExtensionLastVersion(String name) {
+ public WikittyExtension restoreExtensionLastVersion(
+ String securityToken, String name) {
// TODO poussin 20100412: perhaps use cache for extension ?
- return ws.restoreExtensionLastVersion(name);
+ return ws.restoreExtensionLastVersion(securityToken, name);
}
/**
@@ -350,9 +343,10 @@
* @return
*/
@Override
- public Entry<TreeNode, Integer> restoreNode(String wikittyId, Criteria filter) {
+ public Entry<TreeNode, Integer> restoreNode(
+ String securityToken, String wikittyId, Criteria filter) {
// FIXME lookup in cache, and put in cache
- return ws.restoreNode(wikittyId, filter);
+ return ws.restoreNode(securityToken, wikittyId, filter);
}
/**
@@ -362,9 +356,9 @@
* @return
*/
@Override
- public Tree restoreTree(String wikittyId) {
+ public Tree restoreTree(String securityToken, String wikittyId) {
// FIXME lookup in cache, and put in cache
- return ws.restoreTree(wikittyId);
+ return ws.restoreTree(securityToken, wikittyId);
}
/**
@@ -373,8 +367,8 @@
* @return
*/
@Override
- public UpdateResponse store(Wikitty wikitty) {
- UpdateResponse result = ws.store(wikitty);
+ public UpdateResponse store(String securityToken, Wikitty wikitty) {
+ UpdateResponse result = ws.store(securityToken, wikitty);
result.update(wikitty);
cache.putWikitty(wikitty);
@@ -389,8 +383,8 @@
* @return
*/
@Override
- public UpdateResponse store(Collection<Wikitty> wikitties) {
- UpdateResponse result = ws.store(wikitties);
+ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties) {
+ UpdateResponse result = ws.store(securityToken, wikitties);
for (Wikitty w : wikitties) {
result.update(w);
@@ -408,8 +402,9 @@
* @return
*/
@Override
- public UpdateResponse store(Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
- UpdateResponse result = ws.store(wikitties, disableAutoVersionIncrement);
+ public UpdateResponse store(String securityToken,
+ Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+ UpdateResponse result = ws.store(securityToken, wikitties, disableAutoVersionIncrement);
for (Wikitty w : wikitties) {
result.update(w);
@@ -427,11 +422,12 @@
* @return
*/
@Override
- public UpdateResponse store(WikittyTransaction transaction,
+ public UpdateResponse store(String securityToken, WikittyTransaction transaction,
Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
// FIXME poussin 2010 comment gerer le cache avec des transactions ????
- UpdateResponse result = ws.store(transaction, wikitties, disableAutoVersionIncrement);
+ UpdateResponse result = ws.store(securityToken, transaction,
+ wikitties, disableAutoVersionIncrement);
for (Wikitty w : wikitties) {
result.update(w);
@@ -449,9 +445,9 @@
* @return
*/
@Override
- public UpdateResponse storeExtension(WikittyExtension ext) {
+ public UpdateResponse storeExtension(String securityToken, WikittyExtension ext) {
// TODO poussin 20100412: perhaps use cache for extension ?
- return ws.storeExtension(ext);
+ return ws.storeExtension(securityToken, ext);
}
/**
@@ -461,33 +457,59 @@
* @return
*/
@Override
- public UpdateResponse storeExtension(Collection<WikittyExtension> exts) {
+ public UpdateResponse storeExtension(String securityToken, Collection<WikittyExtension> exts) {
// TODO poussin 20100412: perhaps use cache for extension ?
- return ws.storeExtension(exts);
+ return ws.storeExtension(securityToken, exts);
}
@Override
- public UpdateResponse storeExtension(WikittyTransaction transaction, Collection<WikittyExtension> exts) {
+ public UpdateResponse storeExtension(String securityToken,
+ WikittyTransaction transaction, Collection<WikittyExtension> exts) {
// FIXME poussin 2010 comment gerer le cache avec des transactions ????
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public WikittyExtension restoreExtension(WikittyTransaction transaction, String id) {
+ public WikittyExtension restoreExtension(String securityToken,
+ WikittyTransaction transaction, String id) {
// FIXME poussin 2010 comment gerer le cache avec des transactions ????
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Wikitty restoreVersion(String wikittyId, String version) {
+ public Wikitty restoreVersion(
+ String securityToken, String wikittyId, String version) {
// not put it in cache
- return ws.restoreVersion(wikittyId, version);
+ return ws.restoreVersion(securityToken, wikittyId, version);
}
+ //
+ // Just delegate method
+ //
+
@Override
- public UpdateResponse syncEngin() {
- return ws.syncEngin();
+ public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) {
+ ws.addWikittyServiceListener(listener, type);
}
+ @Override
+ public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) {
+ ws.removeWikittyServiceListener(listener, type);
+ }
+ @Override
+ public String login(String login, String password) {
+ return ws.login(login, password);
+ }
+
+ @Override
+ public void logout(String securityToken) {
+ ws.logout(securityToken);
+ }
+
+ @Override
+ public UpdateResponse syncEngin(String securityToken) {
+ return ws.syncEngin(securityToken);
+ }
+
}
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -105,7 +105,18 @@
}
@Override
- public UpdateResponse store(WikittyTransaction transaction,
+ public String login(String login, String password) {
+ log.warn("login asked, but there is no security service");
+ return null;
+ }
+
+ @Override
+ public void logout(String securityToken) {
+ log.warn("logout asked, but there is no security service");
+ }
+
+ @Override
+ public UpdateResponse store(String securityToken, WikittyTransaction transaction,
Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
// update/store extension if necessary
Set<WikittyExtension> allExtensions = new HashSet<WikittyExtension>();
@@ -133,14 +144,15 @@
* @param wikitty
*/
@Override
- public UpdateResponse store(Wikitty wikitty) {
+ public UpdateResponse store(String securityToken, Wikitty wikitty) {
if (wikitty != null) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
List<Wikitty> wikitties = Arrays.asList(wikitty);
- UpdateResponse result = store(transaction, wikitties, false);
+ UpdateResponse result = store(
+ securityToken, transaction, wikitties, false);
transaction.commit();
return result;
@@ -159,12 +171,13 @@
* @param wikitties
*/
@Override
- public UpdateResponse store(Collection<Wikitty> wikitties) {
+ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- UpdateResponse result = store(transaction, wikitties, false);
+ UpdateResponse result = store(
+ securityToken, transaction, wikitties, false);
transaction.commit();
return result;
@@ -180,12 +193,14 @@
* @param wikitties
*/
@Override
- public UpdateResponse store(Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+ public UpdateResponse store(String securityToken,
+ Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- UpdateResponse result = store(transaction, wikitties, disableAutoVersionIncrement);
+ UpdateResponse result = store(securityToken,
+ transaction, wikitties, disableAutoVersionIncrement);
transaction.commit();
return result;
@@ -196,7 +211,7 @@
}
@Override
- public List<String> getAllExtensionIds() {
+ public List<String> getAllExtensionIds(String securityToken) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
@@ -212,7 +227,8 @@
}
@Override
- public List<String> getAllExtensionsRequires(String extensionName) {
+ public List<String> getAllExtensionsRequires(
+ String securityToken, String extensionName) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
@@ -229,7 +245,8 @@
}
@Override
- public UpdateResponse storeExtension(WikittyTransaction transaction, Collection<WikittyExtension> exts) {
+ public UpdateResponse storeExtension(String securityToken,
+ WikittyTransaction transaction, Collection<WikittyExtension> exts) {
UpdateResponse result = getExtensionStorage().store(transaction, exts);
return result;
}
@@ -240,12 +257,14 @@
* @param exts
*/
@Override
- public UpdateResponse storeExtension(Collection<WikittyExtension> exts) {
+ public UpdateResponse storeExtension(String securityToken,
+ Collection<WikittyExtension> exts) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- UpdateResponse result = storeExtension(transaction, exts);
+ UpdateResponse result = storeExtension(
+ securityToken, transaction, exts);
transaction.commit();
return result;
@@ -256,12 +275,13 @@
}
@Override
- public UpdateResponse storeExtension(WikittyExtension ext) {
+ public UpdateResponse storeExtension(String securityToken, WikittyExtension ext) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- UpdateResponse result = storeExtension(transaction, Arrays.asList(ext));
+ UpdateResponse result = storeExtension(
+ securityToken, transaction, Arrays.asList(ext));
transaction.commit();
return result;
@@ -272,7 +292,8 @@
}
@Override
- public WikittyExtension restoreExtension(WikittyTransaction transaction, String id) {
+ public WikittyExtension restoreExtension(
+ String securityToken, WikittyTransaction transaction, String id) {
//split the id to ensure that version is normalized
String name = WikittyExtension.computeName(id);
String version = WikittyExtension.computeVersion(id);
@@ -288,12 +309,13 @@
* @return extension
*/
@Override
- public WikittyExtension restoreExtension(String id) {
+ public WikittyExtension restoreExtension(String securityToken, String id) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- WikittyExtension result = restoreExtension(transaction, id);
+ WikittyExtension result = restoreExtension(
+ securityToken, transaction, id);
transaction.commit();
return result;
@@ -304,7 +326,8 @@
}
- protected WikittyExtension restoreExtensionLastVersion(WikittyTransaction transaction, String name) {
+ protected WikittyExtension restoreExtensionLastVersion(String securityToken,
+ WikittyTransaction transaction, String name) {
String version = getExtensionStorage().getLastVersion(transaction, name);
if(version == null) {
return null;
@@ -315,12 +338,14 @@
}
@Override
- public WikittyExtension restoreExtensionLastVersion(String name) {
+ public WikittyExtension restoreExtensionLastVersion(
+ String securityToken, String name) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- WikittyExtension result = restoreExtensionLastVersion(transaction, name);
+ WikittyExtension result = restoreExtensionLastVersion(
+ securityToken, transaction, name);
transaction.commit();
return result;
@@ -330,7 +355,8 @@
}
}
- protected Wikitty restore(WikittyTransaction transaction, String id) {
+ protected Wikitty restore(String securityToken,
+ WikittyTransaction transaction, String id) {
if (!getWikittyStorage().exists(transaction, id)) {
// object doesn't exist, we return null
return null;
@@ -342,15 +368,16 @@
}
Wikitty result = getWikittyStorage().restore(transaction, id);
if(result != null) {
- result = upgradeData(transaction, result);
+ result = upgradeData(securityToken, transaction, result);
}
return result;
}
- protected List<Wikitty> restore(WikittyTransaction transaction, List<String> ids) {
+ protected List<Wikitty> restore(String securityToken,
+ WikittyTransaction transaction, List<String> ids) {
List<Wikitty> result = new ArrayList<Wikitty>();
for(String id : ids) {
- Wikitty w = restore(transaction, id);
+ Wikitty w = restore(securityToken, transaction, id);
if (w != null) {
result.add(w);
}
@@ -359,12 +386,12 @@
}
@Override
- public List<Wikitty> restore(List<String> ids) {
+ public List<Wikitty> restore(String securityToken, List<String> ids) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- List<Wikitty> result = restore(transaction, ids);
+ List<Wikitty> result = restore(securityToken, transaction, ids);
transaction.commit();
return result;
@@ -375,12 +402,12 @@
}
@Override
- public Wikitty restore(String id) {
+ public Wikitty restore(String securityToken, String id) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- Wikitty result = restore(transaction, id);
+ Wikitty result = restore(securityToken, transaction, id);
transaction.commit();
return result;
@@ -390,7 +417,8 @@
}
}
- protected Wikitty upgradeData(WikittyTransaction transaction, Wikitty wikitty) {
+ protected Wikitty upgradeData(String securityToken,
+ WikittyTransaction transaction, Wikitty wikitty) {
Wikitty result = wikitty;
Collection<WikittyExtension> extensions = wikitty.getExtensions();
@@ -401,7 +429,8 @@
WikittyExtension currentExtension = extension;
String currentExtensionVersion = currentExtension.getVersion();
- WikittyExtension lastExtension = restoreExtensionLastVersion(transaction, extensionName);
+ WikittyExtension lastExtension = restoreExtensionLastVersion(
+ securityToken, transaction, extensionName);
String lastExtensionVersion = lastExtension.getVersion();
log.debug("lastExtensionVersion=" + lastExtensionVersion);
@@ -416,14 +445,16 @@
// Get extension after the current version
String nextExtensionVersion = WikittyUtil.incrementMajorRevision(currentExtensionVersion);
String nextExtensionId = WikittyExtension.computeId(extensionName, nextExtensionVersion);
- WikittyExtension nextExtension = restoreExtension(transaction, nextExtensionId);
+ WikittyExtension nextExtension = restoreExtension(
+ securityToken, transaction, nextExtensionId);
log.debug("currentExtensionVersion=" + currentExtensionVersion);
log.debug("nextExtensionVersion=" + nextExtensionVersion);
// Test if extension is never use in this version
if(nextExtension != null) {
- result = migration.migrate(this, transaction, result, currentExtension, nextExtension);
+ result = migration.migrate(this, transaction, result,
+ currentExtension, nextExtension);
currentExtension = nextExtension;
}
@@ -435,7 +466,8 @@
return result;
}
- protected void delete(WikittyTransaction transaction, Collection<String> ids) throws WikittyException {
+ protected void delete(String securityToken, WikittyTransaction transaction,
+ Collection<String> ids) throws WikittyException {
// work only on valid id
Collection<Wikitty> storedWikitties = new ArrayList<Wikitty>();
List<String> idList = new LinkedList<String>(ids);
@@ -453,7 +485,8 @@
// Store node with have deleted node as parent
Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_PARENT, id).criteria();
- List<Wikitty> wikittyNodes = findAllByCriteria(transaction, criteria).getAll();
+ List<Wikitty> wikittyNodes = findAllByCriteria(
+ securityToken, transaction, criteria).getAll();
for (Wikitty wikittyNode : wikittyNodes) {
String wikittyNodeId = wikittyNode.getId();
if(!ids.contains(wikittyNodeId)) {
@@ -465,7 +498,8 @@
// Store node with have deleted child
criteria = Search.query().eq(TreeNode.FQ_FIELD_CHILDREN, id).criteria();
- wikittyNodes = findAllByCriteria(transaction, criteria).getAll();
+ wikittyNodes = findAllByCriteria(
+ securityToken, transaction, criteria).getAll();
for (Wikitty wikittyNode : wikittyNodes) {
String wikittyNodeId = wikittyNode.getId();
if(!ids.contains(wikittyNodeId)) {
@@ -479,17 +513,17 @@
getWikittyStorage().delete(transaction, ids);
getSearchEngin().delete(transaction, ids);
- store(transaction, storedWikitties, false);
+ store(securityToken, transaction, storedWikitties, false);
}
@Override
- public void delete(String id) {
+ public void delete(String securityToken, String id) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
List<String> ids = Arrays.asList(id);
- delete(transaction, ids);
+ delete(securityToken, transaction, ids);
transaction.commit();
} catch (Exception eee) {
@@ -499,12 +533,12 @@
}
@Override
- public void delete(Collection<String> ids){
+ public void delete(String securityToken, Collection<String> ids){
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- delete(transaction, ids);
+ delete(securityToken, transaction, ids);
transaction.commit();
} catch (Exception eee) {
@@ -518,7 +552,7 @@
* This operation should be disabled in production environment.
*/
@Override
- public void clear() {
+ public void clear(String securityToken) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
@@ -539,11 +573,13 @@
* return new PagedResult with Wikitty instance
*/
@Override
- public PagedResult<Wikitty> findAllByCriteria(WikittyTransaction transaction, Criteria criteria) {
+ public PagedResult<Wikitty> findAllByCriteria(String securityToken,
+ WikittyTransaction transaction, Criteria criteria) {
PagedResult<String> resultIds = getSearchEngin().findAllByCriteria(transaction, criteria);
List<String> ids = resultIds.getAll();
- List<Wikitty> wikitties = restore(transaction, ids);
+ List<Wikitty> wikitties = restore(securityToken, transaction, ids);
PagedResult<Wikitty> result = new PagedResult<Wikitty>(
+ securityToken,
resultIds.getFirstIndice(),
resultIds.getNumFound(),
resultIds.getQueryString(),
@@ -553,12 +589,14 @@
}
@Override
- public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) {
+ public PagedResult<Wikitty> findAllByCriteria(
+ String securityToken, Criteria criteria) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- PagedResult<Wikitty> result = findAllByCriteria(transaction, criteria);
+ PagedResult<Wikitty> result = findAllByCriteria(
+ securityToken, transaction, criteria);
transaction.commit();
return result;
@@ -568,9 +606,11 @@
}
}
- protected Wikitty findByCriteria(WikittyTransaction transaction, Criteria criteria) {
+ protected Wikitty findByCriteria(String securityToken,
+ WikittyTransaction transaction, Criteria criteria) {
criteria.setFirstIndex(0).setEndIndex(1);
- PagedResult<Wikitty> pages = findAllByCriteria(transaction, criteria);
+ PagedResult<Wikitty> pages = findAllByCriteria(
+ securityToken, transaction, criteria);
Wikitty result = null;
if (pages.size() > 0) {
@@ -581,12 +621,13 @@
}
@Override
- public Wikitty findByCriteria(Criteria criteria) {
+ public Wikitty findByCriteria(String securityToken, Criteria criteria) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- Wikitty result = findByCriteria(transaction, criteria);
+ Wikitty result = findByCriteria(
+ securityToken, transaction, criteria);
transaction.commit();
return result;
@@ -597,16 +638,16 @@
}
@Override
- public void addLabel(String wikittyId, String label) {
+ public void addLabel(String securityToken, String wikittyId, String label) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- Wikitty w = restore(transaction, wikittyId);
+ Wikitty w = restore(securityToken, transaction, wikittyId);
w.addExtension(LabelImpl.extensions);
LabelImpl l = new LabelImpl(w);
l.addLabels(label);
- store(transaction, Arrays.asList(w), false);
+ store(securityToken, transaction, Arrays.asList(w), false);
transaction.commit();
} catch (Exception eee) {
@@ -617,7 +658,8 @@
@Override
- public PagedResult<Wikitty> findAllByLabel(String label, int firstIndex, int endIndex) {
+ public PagedResult<Wikitty> findAllByLabel(String securityToken,
+ String label, int firstIndex, int endIndex) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
@@ -626,7 +668,8 @@
l.addLabels(label);
Criteria criteria = Search.query(l.getWikitty()).criteria()
.setFirstIndex(firstIndex).setEndIndex(endIndex);
- PagedResult<Wikitty> result = findAllByCriteria(transaction, criteria);
+ PagedResult<Wikitty> result = findAllByCriteria(
+ securityToken, transaction, criteria);
transaction.commit();
return result;
@@ -638,7 +681,7 @@
@Override
- public Wikitty findByLabel(String label) {
+ public Wikitty findByLabel(String securityToken, String label) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
@@ -646,7 +689,7 @@
LabelImpl l = new LabelImpl();
l.addLabels(label);
Criteria criteria = Search.query(l.getWikitty()).criteria();
- Wikitty result = findByCriteria(transaction, criteria);
+ Wikitty result = findByCriteria(securityToken, transaction, criteria);
transaction.commit();
return result;
@@ -658,12 +701,12 @@
@Override
- public Set<String> findAllAppliedLabels(String wikittyId) {
+ public Set<String> findAllAppliedLabels(String securityToken, String wikittyId) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- Wikitty w = restore(transaction, wikittyId);
+ Wikitty w = restore(securityToken, transaction, wikittyId);
LabelImpl l = new LabelImpl(w);
Set<String> result = l.getLabels();
@@ -676,8 +719,9 @@
}
- protected Tree restoreTree(WikittyTransaction transaction, String wikittyId) {
- Wikitty w = restore(transaction, wikittyId);
+ protected Tree restoreTree(String securityToken,
+ WikittyTransaction transaction, String wikittyId) {
+ Wikitty w = restore(securityToken, transaction, wikittyId);
if(w == null) {
return null;
}
@@ -696,21 +740,22 @@
Criteria criteria = Search.query(exempleNode.getWikitty()).criteria()
.setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS);
- PagedResult<Wikitty> childNodes = findAllByCriteria(transaction, criteria);
+ PagedResult<Wikitty> childNodes = findAllByCriteria(
+ securityToken, transaction, criteria);
for( Wikitty childNode : childNodes.getAll() ) {
- tree.addChild(restoreTree(transaction, childNode.getId()));
+ tree.addChild(restoreTree(securityToken, transaction, childNode.getId()));
}
return tree;
}
@Override
- public Tree restoreTree(String wikittyId) {
+ public Tree restoreTree(String securityToken, String wikittyId) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- Tree tree = restoreTree(transaction, wikittyId);
+ Tree tree = restoreTree(securityToken, transaction, wikittyId);
transaction.commit();
return tree;
@@ -721,12 +766,13 @@
}
@Override
- public Map.Entry<TreeNode, Integer> restoreNode(String wikittyId, Criteria filter) {
+ public Map.Entry<TreeNode, Integer> restoreNode(String securityToken,
+ String wikittyId, Criteria filter) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- Wikitty w = restore(transaction, wikittyId);
+ Wikitty w = restore(securityToken, transaction, wikittyId);
if(w == null) {
transaction.commit();
return null;
@@ -753,12 +799,13 @@
}
@Override
- public Map<TreeNode, Integer> restoreChildren(String wikittyId, Criteria filter) {
+ public Map<TreeNode, Integer> restoreChildren(String securityToken,
+ String wikittyId, Criteria filter) {
WikittyTransaction transaction = new WikittyTransaction();
try {
transaction.begin();
- Wikitty w = restore(transaction, wikittyId);
+ Wikitty w = restore(securityToken, transaction, wikittyId);
if(w == null) {
transaction.commit();
return null;
@@ -772,13 +819,14 @@
Map<TreeNode, Integer> result = new LinkedHashMap<TreeNode, Integer>();
- Map<String, Integer> search = getSearchEngin().findAllChildrenCount(transaction, w, filter);
+ Map<String, Integer> search = getSearchEngin().findAllChildrenCount(
+ transaction, w, filter);
Set<Entry<String, Integer>> children = search.entrySet();
for (Entry<String, Integer> child : children) {
Integer count = child.getValue();
String id = child.getKey();
- Wikitty wikitty = restore(transaction, id);
+ Wikitty wikitty = restore(securityToken, transaction, id);
TreeNode node = WikittyServiceImpl.toBean(new TreeNodeImpl(wikitty));
result.put(node, count);
@@ -793,12 +841,13 @@
}
@Override
- public Wikitty restoreVersion(String wikittyId, String version) {
+ public Wikitty restoreVersion(String securityToken,
+ String wikittyId, String version) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public UpdateResponse syncEngin() {
+ public UpdateResponse syncEngin(String securityToken) {
final WikittyTransaction transaction = new WikittyTransaction();
try {
final int numberForCommit = 1000;
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -162,201 +162,217 @@
}
}
- public void clear() {
- ws.clear();
+ @Override
+ public String login(String login, String password) {
+ return ws.login(login, password);
}
@Override
- public UpdateResponse store(Wikitty wikitty) {
- UpdateResponse updateResponse = ws.store(wikitty);
+ public void logout(String securityToken) {
+ ws.logout(securityToken);
+ }
+
+ public void clear(String securityToken) {
+ ws.clear(securityToken);
+ }
+
+ @Override
+ public UpdateResponse store(String securityToken, Wikitty wikitty) {
+ UpdateResponse updateResponse = ws.store(securityToken, wikitty);
// notify listeners
firePutWikitty(wikitty);
return updateResponse;
}
@Override
- public UpdateResponse store(Collection<Wikitty> wikitties) {
- UpdateResponse updateResponse = ws.store(wikitties);
+ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties) {
+ UpdateResponse updateResponse = ws.store(securityToken, wikitties);
// notify listeners
firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()]));
return updateResponse;
}
@Override
- public UpdateResponse store(Collection<Wikitty> wikitties,
+ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties,
boolean disableAutoVersionIncrement) {
- UpdateResponse updateResponse = ws.store(wikitties, disableAutoVersionIncrement);
+ UpdateResponse updateResponse = ws.store(
+ securityToken, wikitties, disableAutoVersionIncrement);
// notify listeners
firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()]));
return updateResponse;
}
@Override
- public UpdateResponse store(WikittyTransaction transaction,
+ public UpdateResponse store(String securityToken, WikittyTransaction transaction,
Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
- UpdateResponse updateResponse = ws.store(transaction, wikitties,
- disableAutoVersionIncrement);
+ UpdateResponse updateResponse = ws.store(securityToken, transaction,
+ wikitties, disableAutoVersionIncrement);
// notify listeners
firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()]));
return updateResponse;
}
@Override
- public List<String> getAllExtensionIds() {
+ public List<String> getAllExtensionIds(String securityToken) {
// no notification
- return ws.getAllExtensionIds();
+ return ws.getAllExtensionIds(securityToken);
}
@Override
- public List<String> getAllExtensionsRequires(String extensionName) {
+ public List<String> getAllExtensionsRequires(
+ String securityToken, String extensionName) {
// no notification
- return ws.getAllExtensionsRequires(extensionName);
+ return ws.getAllExtensionsRequires(securityToken, extensionName);
}
@Override
- public UpdateResponse storeExtension(WikittyExtension ext) {
- UpdateResponse updateResponse = ws.storeExtension(ext);
+ public UpdateResponse storeExtension(String securityToken, WikittyExtension ext) {
+ UpdateResponse updateResponse = ws.storeExtension(securityToken, ext);
// notify listeners
firePutExtension(ext);
return updateResponse;
}
@Override
- public UpdateResponse storeExtension(Collection<WikittyExtension> exts) {
- UpdateResponse updateResponse = ws.storeExtension(exts);
+ public UpdateResponse storeExtension(
+ String securityToken, Collection<WikittyExtension> exts) {
+ UpdateResponse updateResponse = ws.storeExtension(securityToken, exts);
// notify listeners
firePutExtension(exts.toArray(new WikittyExtension[exts.size()]));
return updateResponse;
}
@Override
- public UpdateResponse storeExtension(WikittyTransaction transaction,
- Collection<WikittyExtension> exts) {
- UpdateResponse updateResponse = ws.storeExtension(transaction, exts);
+ public UpdateResponse storeExtension(String securityToken,
+ WikittyTransaction transaction, Collection<WikittyExtension> exts) {
+ UpdateResponse updateResponse = ws.storeExtension(
+ securityToken, transaction, exts);
// no notification called by #storeExtension(Collection<WikittyExtension>)
return updateResponse;
}
@Override
- public WikittyExtension restoreExtension(String id) {
+ public WikittyExtension restoreExtension(String securityToken, String id) {
// no notification
- return ws.restoreExtension(id);
+ return ws.restoreExtension(securityToken, id);
}
@Override
- public WikittyExtension restoreExtension(WikittyTransaction transaction,
- String id) {
+ public WikittyExtension restoreExtension(String securityToken,
+ WikittyTransaction transaction, String id) {
// no notification
- return ws.restoreExtension(transaction, id);
+ return ws.restoreExtension(securityToken, transaction, id);
}
@Override
- public WikittyExtension restoreExtensionLastVersion(String name) {
+ public WikittyExtension restoreExtensionLastVersion(
+ String securityToken, String name) {
// no notification
- return ws.restoreExtensionLastVersion(name);
+ return ws.restoreExtensionLastVersion(securityToken, name);
}
@Override
- public Wikitty restore(String id) {
+ public Wikitty restore(String securityToken, String id) {
// no notification
- return ws.restore(id);
+ return ws.restore(securityToken, id);
}
@Override
- public List<Wikitty> restore(List<String> id) {
+ public List<Wikitty> restore(String securityToken, List<String> id) {
// no notification
- return ws.restore(id);
+ return ws.restore(securityToken, id);
}
@Override
- public void delete(String id) {
- ws.delete(id);
+ public void delete(String securityToken, String id) {
+ ws.delete(securityToken, id);
// notify listeners
fireRemoveWikitty(id);
}
@Override
- public void delete(Collection<String> ids) {
- ws.delete(ids);
+ public void delete(String securityToken, Collection<String> ids) {
+ ws.delete(securityToken, ids);
// notify listeners
fireRemoveWikitty(ids.toArray(new String[ids.size()]));
}
@Override
- public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) {
+ public PagedResult<Wikitty> findAllByCriteria(String securityToken, Criteria criteria) {
// no notification
- return ws.findAllByCriteria(criteria);
+ return ws.findAllByCriteria(securityToken, criteria);
}
@Override
- public PagedResult<Wikitty> findAllByCriteria(
+ public PagedResult<Wikitty> findAllByCriteria(String securityToken,
WikittyTransaction transaction, Criteria criteria) {
// no notification
- return ws.findAllByCriteria(transaction, criteria);
+ return ws.findAllByCriteria(securityToken, transaction, criteria);
}
@Override
- public Wikitty findByCriteria(Criteria criteria) {
+ public Wikitty findByCriteria(String securityToken, Criteria criteria) {
// no notification
- return ws.findByCriteria(criteria);
+ return ws.findByCriteria(securityToken, criteria);
}
@Override
- public void addLabel(String wikittyId, String label) {
+ public void addLabel(String securityToken, String wikittyId, String label) {
// no notification
// TODO EC20100607 fixme : need notification ?
- ws.addLabel(wikittyId, label);
+ ws.addLabel(securityToken, wikittyId, label);
}
@Override
- public PagedResult<Wikitty> findAllByLabel(String label, int firstIndex,
- int endIndex) {
+ public PagedResult<Wikitty> findAllByLabel(String securityToken,
+ String label, int firstIndex, int endIndex) {
// no notification
- return ws.findAllByLabel(label, firstIndex, endIndex);
+ return ws.findAllByLabel(securityToken, label, firstIndex, endIndex);
}
@Override
- public Wikitty findByLabel(String label) {
+ public Wikitty findByLabel(String securityToken, String label) {
// no notification
- return ws.findByLabel(label);
+ return ws.findByLabel(securityToken, label);
}
@Override
- public Set<String> findAllAppliedLabels(String wikittyId) {
+ public Set<String> findAllAppliedLabels(String securityToken, String wikittyId) {
// no notification
- return ws.findAllAppliedLabels(wikittyId);
+ return ws.findAllAppliedLabels(securityToken, wikittyId);
}
@Override
- public Tree restoreTree(String wikittyId) {
+ public Tree restoreTree(String securityToken, String wikittyId) {
// no notification
- return ws.restoreTree(wikittyId);
+ return ws.restoreTree(securityToken, wikittyId);
}
@Override
- public Entry<TreeNode, Integer> restoreNode(String wikittyId,
+ public Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId,
Criteria filter) {
// no notification
- return ws.restoreNode(wikittyId, filter);
+ return ws.restoreNode(securityToken, wikittyId, filter);
}
@Override
- public Map<TreeNode, Integer> restoreChildren(String wikittyId,
- Criteria filter) {
+ public Map<TreeNode, Integer> restoreChildren(String securityToken,
+ String wikittyId, Criteria filter) {
// no notification
- return ws.restoreChildren(wikittyId, filter);
+ return ws.restoreChildren(securityToken, wikittyId, filter);
}
@Override
- public Wikitty restoreVersion(String wikittyId, String version) {
+ public Wikitty restoreVersion(
+ String securityToken, String wikittyId, String version) {
// no notification
- return ws.restoreVersion(wikittyId, version);
+ return ws.restoreVersion(securityToken, wikittyId, version);
}
@Override
- public UpdateResponse syncEngin() {
+ public UpdateResponse syncEngin(String securityToken) {
// no notification
- return ws.syncEngin();
+ return ws.syncEngin(securityToken);
}
/**
Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java (rev 0)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -0,0 +1,223 @@
+/* *##%
+ * Copyright (c) 2010 poussin. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *##%*/
+
+package org.nuiton.wikitty;
+
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ *
+ * @author poussin
+ * @version $Revision$
+ *
+ * Last update: $Date$
+ * by : $Author$
+ */
+public class WikittyServiceSecurity implements WikittyService {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ static private Log log = LogFactory.getLog(WikittyServiceSecurity.class);
+
+ protected WikittyService ws;
+
+ public WikittyServiceSecurity(WikittyService ws) {
+ this.ws = ws;
+ }
+
+ @Override
+ public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) {
+ ws.addWikittyServiceListener(listener, type);
+ }
+
+ @Override
+ public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) {
+ ws.addWikittyServiceListener(listener, type);
+ }
+
+ @Override
+ public String login(String login, String password) {
+ String token = WikittyUtil.genSecurityToken();
+ Wikitty wToken = new Wikitty(token);
+ // force add extension to wikitty
+ SecurityToken securityToken = new SecurityTokenImpl(wToken);
+ // on passe null comme toke, car on est dans le service de secu
+ // normalement il ne devrait pas y en avoir d'autre
+ ws.store(null, wToken);
+ return token;
+ }
+
+ @Override
+ public void logout(String securityToken) {
+ // on passe null comme toke, car on est dans le service de secu
+ // normalement il ne devrait pas y en avoir d'autre
+ ws.delete(null, securityToken);
+ }
+
+ @Override
+ public void clear(String securityToken) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ // seul les AppAdmin on le droit a cette method
+ }
+
+ @Override
+ public UpdateResponse store(String securityToken, Wikitty wikitty) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public List<String> getAllExtensionIds(String securityToken) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public List<String> getAllExtensionsRequires(String securityToken, String extensionName) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public UpdateResponse storeExtension(String securityToken, WikittyExtension ext) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public UpdateResponse storeExtension(String securityToken, Collection<WikittyExtension> exts) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public UpdateResponse storeExtension(String securityToken, WikittyTransaction transaction, Collection<WikittyExtension> exts) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public WikittyExtension restoreExtension(String securityToken, String id) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public WikittyExtension restoreExtension(String securityToken, WikittyTransaction transaction, String id) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public WikittyExtension restoreExtensionLastVersion(String securityToken, String name) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Wikitty restore(String securityToken, String id) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public List<Wikitty> restore(String securityToken, List<String> id) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void delete(String securityToken, String id) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void delete(String securityToken, Collection<String> ids) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public PagedResult<Wikitty> findAllByCriteria(String securityToken, Criteria criteria) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public PagedResult<Wikitty> findAllByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Wikitty findByCriteria(String securityToken, Criteria criteria) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void addLabel(String securityToken, String wikittyId, String label) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public PagedResult<Wikitty> findAllByLabel(String securityToken, String label, int firstIndex, int endIndex) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Wikitty findByLabel(String securityToken, String label) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Set<String> findAllAppliedLabels(String securityToken, String wikittyId) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Tree restoreTree(String securityToken, String wikittyId) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Map<TreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Wikitty restoreVersion(String securityToken, String wikittyId, String version) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public UpdateResponse syncEngin(String securityToken) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+}
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -622,7 +622,7 @@
* @param w wikitty object to use internaly for in new instance
* @return new instance
*/
- static public <E extends BusinessEntity> E newInstance(
+ static public <E extends BusinessEntity> E newInstance(String securityToken,
WikittyService wikittyService, Class<E> clazz, Wikitty w) {
try {
Class<?> clazzInstanciable = clazz;
@@ -655,7 +655,7 @@
result = (E) cons.newInstance(parms);
BusinessEntityWikitty bean = (BusinessEntityWikitty) result;
- checkExtensionVersion(wikittyService, w, bean);
+ checkExtensionVersion(securityToken, wikittyService, w, bean);
bean.setWikitty(w);
} catch (NoSuchMethodException noerror) {
@@ -683,7 +683,8 @@
* @param entity
* @return
*/
- static public Wikitty checkExtensionVersion(WikittyService wikittyService,
+ static public Wikitty checkExtensionVersion(
+ String securityToken, WikittyService wikittyService,
Wikitty wikitty, BusinessEntityWikitty entity) {
Wikitty result = wikitty;
@@ -700,7 +701,7 @@
String oldVersion = oldExt.getVersion();
if (WikittyUtil.versionGreaterThan(newVersion, oldVersion)) {
- wikittyService.storeExtension(Arrays.asList(ext));
+ wikittyService.storeExtension(securityToken, Arrays.asList(ext));
upgradeData = true;
}
}
@@ -708,7 +709,7 @@
if (upgradeData) {
String wikittyId = wikitty.getId();
- result = wikittyService.restore(wikittyId);
+ result = wikittyService.restore(securityToken, wikittyId);
}
return result;
@@ -881,6 +882,18 @@
}
}
+ /**
+ * SecurityToken is used like wikitty id and must begin with UUID_
+ *
+ * @return SecurityToken that can be used like wikitty id
+ */
+ static public String genSecurityToken() {
+ String result = "_" + Math.abs(Math.random());
+ result.replace(".", ""); // on supprime le '.' dans le nombre aleatoire
+ result = genUID() + result;
+ return result;
+ }
+
// private static BASE64Encoder enc = new BASE64Encoder();
public static String genUID() {
return UUID.randomUUID().toString();
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -22,9 +22,12 @@
protected FORMAT format;
protected Criteria criteria;
protected Writer writer;
+ protected String securityToken;
- public ExportTask(WikittyService ws, FORMAT format, Criteria criteria, Writer writer) {
+ public ExportTask(String securityToken,
+ WikittyService ws, FORMAT format, Criteria criteria, Writer writer) {
super();
+ this.securityToken = securityToken;
this.ws = ws;
this.transaction = new WikittyTransaction();
this.format = format;
@@ -41,14 +44,15 @@
// used for CSV export
criteria.addFacetField(Element.ELT_EXTENSION);
- PagedResult<Wikitty> pageResult = ws.findAllByCriteria(transaction, criteria);
+ PagedResult<Wikitty> pageResult = ws.findAllByCriteria(
+ securityToken, transaction, criteria);
long time = 0;
if (log.isInfoEnabled()) {
time = System.currentTimeMillis();
log.info("Export started");
}
ImportExportMethod exporter = format.ieporter();
- exporter.exportWriter(writer, ws, pageResult);
+ exporter.exportWriter(securityToken, writer, ws, pageResult);
if (log.isInfoEnabled()) {
time = System.currentTimeMillis() - time;
log.info("Export in (ms)" + time);
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -63,7 +63,8 @@
protected Pattern queryPattern = Pattern.compile("^((\\w+)\\.(\\w+))=(\"(.+)\"|([^\"]+))$");
@Override
- public void importReader(Reader reader, WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception {
+ public void importReader(String securityToken, Reader reader,
+ WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception {
// get index of wikitty.id field
int wikittyIdIndex = -1;
@@ -113,10 +114,10 @@
if (StringUtils.isNotEmpty(value)) {
// extension must exists on wikitty to set a field value
- addMissingExtension(ws, currentWikitty, extName);
+ addMissingExtension(securityToken, ws, currentWikitty, extName);
// convert link values (if necessary)
- value = convertLinkValues(ws, value);
+ value = convertLinkValues(securityToken, ws, value);
// add value to correct field
FieldType fieldType = currentWikitty.getFieldType(extName + "." + fieldName);
@@ -144,17 +145,18 @@
/**
* Recusively add missing extension of not exist and required extension too.
*/
- protected void addMissingExtension(WikittyService ws, Wikitty currentWikitty, String extName) {
+ protected void addMissingExtension(String securityToken, WikittyService ws, Wikitty currentWikitty, String extName) {
// extension must exists on wikitty to set a field value
if (!currentWikitty.hasExtension(extName)) {
- WikittyExtension extension = ws.restoreExtensionLastVersion(extName);
+ WikittyExtension extension = ws.restoreExtensionLastVersion(
+ securityToken, extName);
String requires = extension.getRequires();
if (StringUtils.isNotEmpty(requires)) {
// add required extensions BEFORE current
for (String require : requires.split(",")) {
String localRequire = require.trim();
- addMissingExtension(ws, currentWikitty, localRequire);
+ addMissingExtension(securityToken, ws, currentWikitty, localRequire);
}
}
@@ -168,7 +170,8 @@
* @param value
* @return
*/
- protected String convertLinkValues(WikittyService ws, String value) {
+ protected String convertLinkValues(
+ String securityToken, WikittyService ws, String value) {
String originalValue = value;
String resultValue = "";
@@ -189,7 +192,7 @@
fValue = m.group(6);
}
Criteria criteria = Search.query().eq(fqField, fValue).criteria();
- Wikitty wikitty = ws.findByCriteria(criteria);
+ Wikitty wikitty = ws.findByCriteria(securityToken, criteria);
if (wikitty == null) {
correctQueries = false;
}
@@ -219,7 +222,8 @@
}
@Override
- public void exportWriter(Writer writer, WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception {
+ public void exportWriter(String securityToken, Writer writer,
+ WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception {
CSVWriter csvWriter = new CSVWriter(writer);
@@ -229,7 +233,8 @@
for (FacetTopic topic : pagedResult.getTopic(Element.ELT_EXTENSION)) {
String extName = topic.getTopicName();
- WikittyExtension extension = ws.restoreExtensionLastVersion(extName);
+ WikittyExtension extension = ws.restoreExtensionLastVersion(
+ securityToken, extName);
String ext = WikittyExtension.computeName(extName);
for (String fieldName : extension.getFieldNames()) {
extensionHeader.add(ext + "." + fieldName);
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -44,7 +44,8 @@
*
* @throws Exception
*/
- public void importReader(Reader reader, WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception;
+ public void importReader(String securityToken, Reader reader,
+ WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception;
/**
* Export data to writer.
@@ -55,5 +56,6 @@
*
* @throws Exception
*/
- public void exportWriter(Writer writer, WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception;
+ public void exportWriter(String securityToken, Writer writer,
+ WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception;
}
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -54,7 +54,8 @@
static private Log log = LogFactory.getLog(ImportExportXML.class);
@Override
- public void importReader(Reader reader, WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception {
+ public void importReader(String securityToken, Reader reader,
+ WikittyService ws, WikittyBatchUpdate batchUpdate) throws Exception {
XmlPullParserFactory factory = XmlPullParserFactory.newInstance(
System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null);
factory.setNamespaceAware(true);
@@ -130,7 +131,8 @@
}
@Override
- public void exportWriter(Writer result, WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception {
+ public void exportWriter(String securityToken, Writer result,
+ WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception {
// keep extension already done
Set<String> extDone = new HashSet<String>();
result.write("<wikengo>\n");
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -18,9 +18,12 @@
protected FORMAT format;
protected Reader reader;
protected ImportExportMethod importerExporter;
+ protected String securityToken;
- public ImportTask(WikittyService ws, FORMAT format, Reader reader) {
+ public ImportTask(String securityToken,
+ WikittyService ws, FORMAT format, Reader reader) {
super();
+ this.securityToken = securityToken;
this.ws = ws;
this.format = format;
this.reader = reader;
@@ -31,7 +34,8 @@
public void run() {
try {
transaction.begin();
- WikittyBatchUpdate batchUpdate = new WikittyBatchUpdate(ws, transaction);
+ WikittyBatchUpdate batchUpdate = new WikittyBatchUpdate(
+ securityToken, ws, transaction);
long time = 0;
if (log.isInfoEnabled()) {
@@ -39,7 +43,7 @@
log.info("Import in (ms)" + time);
}
ImportExportMethod importer = format.ieporter();
- importer.importReader(reader, ws, batchUpdate);
+ importer.importReader(securityToken, reader, ws, batchUpdate);
if (log.isInfoEnabled()) {
time = System.currentTimeMillis() - time;
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java 2010-06-07 10:44:00 UTC (rev 101)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java 2010-06-07 11:10:32 UTC (rev 102)
@@ -22,9 +22,12 @@
protected List<Wikitty> wikitties = new LinkedList<Wikitty>();
protected WikittyService ws;
protected WikittyTransaction transaction;
+ protected String securityToken;
- public WikittyBatchUpdate(WikittyService ws, WikittyTransaction transaction) {
+ public WikittyBatchUpdate(String securityToken,
+ WikittyService ws, WikittyTransaction transaction) {
super();
+ this.securityToken = securityToken;
this.ws = ws;
this.transaction = transaction;
}
@@ -48,14 +51,14 @@
public WikittyExtension getExtension(String id) {
WikittyExtension result = exts.get(id);
if (result == null) {
- result = ws.restoreExtension(transaction, id);
+ result = ws.restoreExtension(securityToken, transaction, id);
}
return result;
}
public void flush() {
- ws.storeExtension(transaction, exts.values());
- ws.store(transaction, wikitties, true);
+ ws.storeExtension(securityToken, transaction, exts.values());
+ ws.store(securityToken, transaction, wikitties, true);
exts.clear();
wikitties.clear();
currentAdded = 0;
Added: trunk/wikitty-api/src/main/uml/wikitty-api/wikitty-security.zargo
===================================================================
(Binary files differ)
Property changes on: trunk/wikitty-api/src/main/uml/wikitty-api/wikitty-security.zargo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
1
0
Author: bpoussin
Date: 2010-06-07 12:44:00 +0200 (Mon, 07 Jun 2010)
New Revision: 101
Url: http://nuiton.org/repositories/revision/wikitty/101
Log:
ajout d'un document Spec pour decrire toutes les subtilites wikitty
Added:
trunk/src/site/rst/Spec.rst
Added: trunk/src/site/rst/Spec.rst
===================================================================
--- trunk/src/site/rst/Spec.rst (rev 0)
+++ trunk/src/site/rst/Spec.rst 2010-06-07 10:44:00 UTC (rev 101)
@@ -0,0 +1,14 @@
+Ce document est fait pour contenir toutes les normalisations autour de Wikitty
+
+Identifiant
+===========
+Les identifiants sont de la forme UUID[_<specifique extension>]. Donc tous les
+identifiants commence par un UUID et peu etre séparé d'une extension
+specifique pour certain besoin par un '_' (underscore)
+
+Droits
+======
+Si l'on veut que tout le monde puisse lire un objet, il faut laisser vide la
+liste des readers (vide ou null). Si l'on souhaitent indiquer que personne
+ne peut lire l'objet il faut mettre le owner en tant que reader. Car de
+toute façon l'owner aura toujours le droit en lecture
1
0
r100 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 07 Jun '10
by echatellier＠users.nuiton.org 07 Jun '10
07 Jun '10
Author: echatellier
Date: 2010-06-07 11:59:54 +0200 (Mon, 07 Jun 2010)
New Revision: 100
Url: http://nuiton.org/repositories/revision/wikitty/100
Log:
Add missing notification on wikitty service notifier
Modified:
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-07 09:48:49 UTC (rev 99)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-07 09:59:54 UTC (rev 100)
@@ -51,8 +51,10 @@
*/
static public final String WIKITTY_CACHE_LISTENEVENTS_OPTION = "wikitty.service.cache.listenevents";
+ /** Cache. */
protected WikittyCache cache = null;
+ /** Delegated wikitty service implementation. */
protected WikittyService ws;
/**
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-07 09:48:49 UTC (rev 99)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-07 09:59:54 UTC (rev 100)
@@ -194,143 +194,177 @@
@Override
public UpdateResponse store(WikittyTransaction transaction,
Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
- return ws.store(transaction, wikitties,
+ UpdateResponse updateResponse = ws.store(transaction, wikitties,
disableAutoVersionIncrement);
+ // notify listeners
+ firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()]));
+ return updateResponse;
}
@Override
public List<String> getAllExtensionIds() {
+ // no notification
return ws.getAllExtensionIds();
}
@Override
public List<String> getAllExtensionsRequires(String extensionName) {
+ // no notification
return ws.getAllExtensionsRequires(extensionName);
}
@Override
public UpdateResponse storeExtension(WikittyExtension ext) {
- return ws.storeExtension(ext);
+ UpdateResponse updateResponse = ws.storeExtension(ext);
+ // notify listeners
+ firePutExtension(ext);
+ return updateResponse;
}
@Override
public UpdateResponse storeExtension(Collection<WikittyExtension> exts) {
- return ws.storeExtension(exts);
+ UpdateResponse updateResponse = ws.storeExtension(exts);
+ // notify listeners
+ firePutExtension(exts.toArray(new WikittyExtension[exts.size()]));
+ return updateResponse;
}
@Override
public UpdateResponse storeExtension(WikittyTransaction transaction,
Collection<WikittyExtension> exts) {
- return ws.storeExtension(transaction, exts);
+ UpdateResponse updateResponse = ws.storeExtension(transaction, exts);
+ // no notification called by #storeExtension(Collection<WikittyExtension>)
+ return updateResponse;
}
@Override
public WikittyExtension restoreExtension(String id) {
+ // no notification
return ws.restoreExtension(id);
}
@Override
public WikittyExtension restoreExtension(WikittyTransaction transaction,
String id) {
+ // no notification
return ws.restoreExtension(transaction, id);
}
@Override
public WikittyExtension restoreExtensionLastVersion(String name) {
+ // no notification
return ws.restoreExtensionLastVersion(name);
}
@Override
public Wikitty restore(String id) {
+ // no notification
return ws.restore(id);
}
@Override
public List<Wikitty> restore(List<String> id) {
+ // no notification
return ws.restore(id);
}
@Override
public void delete(String id) {
ws.delete(id);
+ // notify listeners
+ fireRemoveWikitty(id);
}
@Override
public void delete(Collection<String> ids) {
ws.delete(ids);
+ // notify listeners
+ fireRemoveWikitty(ids.toArray(new String[ids.size()]));
}
@Override
public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) {
+ // no notification
return ws.findAllByCriteria(criteria);
}
@Override
public PagedResult<Wikitty> findAllByCriteria(
WikittyTransaction transaction, Criteria criteria) {
+ // no notification
return ws.findAllByCriteria(transaction, criteria);
}
@Override
public Wikitty findByCriteria(Criteria criteria) {
+ // no notification
return ws.findByCriteria(criteria);
}
@Override
public void addLabel(String wikittyId, String label) {
+ // no notification
+ // TODO EC20100607 fixme : need notification ?
ws.addLabel(wikittyId, label);
}
@Override
public PagedResult<Wikitty> findAllByLabel(String label, int firstIndex,
int endIndex) {
+ // no notification
return ws.findAllByLabel(label, firstIndex, endIndex);
}
@Override
public Wikitty findByLabel(String label) {
+ // no notification
return ws.findByLabel(label);
}
@Override
public Set<String> findAllAppliedLabels(String wikittyId) {
+ // no notification
return ws.findAllAppliedLabels(wikittyId);
}
@Override
public Tree restoreTree(String wikittyId) {
+ // no notification
return ws.restoreTree(wikittyId);
}
@Override
public Entry<TreeNode, Integer> restoreNode(String wikittyId,
Criteria filter) {
+ // no notification
return ws.restoreNode(wikittyId, filter);
}
@Override
public Map<TreeNode, Integer> restoreChildren(String wikittyId,
Criteria filter) {
+ // no notification
return ws.restoreChildren(wikittyId, filter);
}
@Override
public Wikitty restoreVersion(String wikittyId, String version) {
+ // no notification
return ws.restoreVersion(wikittyId, version);
}
@Override
public UpdateResponse syncEngin() {
+ // no notification
return ws.syncEngin();
}
-
+
/**
* Build event to fire and call {@link #firePutWikitty(WikittyServiceEvent)}.
*
* @param ws data
*/
- protected void firePutWikitty(Wikitty ... ws) {
-
+ protected void firePutWikitty(Wikitty... ws) {
WikittyServiceEvent event = new WikittyServiceEvent(ws);
Set<String> ids = new HashSet<String>();
Map<String, Set<String>> idsExtension = new HashMap<String, Set<String>>();
@@ -358,8 +392,7 @@
*
* @param wikittyIds wikitty ids
*/
- protected void fireRemoveWikitty(String ... wikittyIds) {
-
+ protected void fireRemoveWikitty(String... wikittyIds) {
WikittyServiceEvent event = new WikittyServiceEvent(ws);
Set<String> ids = new HashSet<String>();
@@ -376,12 +409,44 @@
* Build event to fire and call {@link #fireClearWikitty(WikittyServiceEvent)}.
*/
protected void fireClearWikitty() {
-
WikittyServiceEvent event = new WikittyServiceEvent(ws);
fireClearWikitty(event);
}
-
+
/**
+ * Build event to fire and call {@link #firePutExtension(WikittyServiceEvent)}.
+ *
+ * @param ws data
+ */
+ protected void firePutExtension(WikittyExtension... exts) {
+ if (log.isWarnEnabled()) {
+ log.warn("Not implemented firePutExtension !!!");
+ }
+ }
+
+ /**
+ * Build event to fire and call {@link #fireRemoveExtension(WikittyServiceEvent)}.
+ *
+ * @param ws data
+ */
+ protected void fireRemoveExtension(WikittyExtension... exts) {
+ if (log.isWarnEnabled()) {
+ log.warn("Not implemented fireRemoveExtension !!!");
+ }
+ }
+
+ /**
+ * Build event to fire and call {@link #fireClearExtension(WikittyServiceEvent)}.
+ *
+ * @param ws data
+ */
+ protected void fireClearExtension() {
+ if (log.isWarnEnabled()) {
+ log.warn("Not implemented fireClearExtension !!!");
+ }
+ }
+
+ /**
* Fire event to all registred listener.
*
* Take care about {@link WikittyServiceEvent#isRemote()} for fire.
1
0
Author: echatellier
Date: 2010-06-07 11:48:49 +0200 (Mon, 07 Jun 2010)
New Revision: 99
Url: http://nuiton.org/repositories/revision/wikitty/99
Log:
Add todo about wikittyexeption
Added:
trunk/src/site/rst/todo.rst
Modified:
trunk/src/site/site.xml
Added: trunk/src/site/rst/todo.rst
===================================================================
--- trunk/src/site/rst/todo.rst (rev 0)
+++ trunk/src/site/rst/todo.rst 2010-06-07 09:48:49 UTC (rev 99)
@@ -0,0 +1,7 @@
+TODO
+====
+
+Code
+----
+
+- Voir pour changer la WikittyExtension en non-RuntimeException
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2010-06-04 16:23:28 UTC (rev 98)
+++ trunk/src/site/site.xml 2010-06-07 09:48:49 UTC (rev 99)
@@ -13,6 +13,7 @@
<item name="Accueil" href="index.html"/>
<item name="Migration" href="migration.html"/>
<item name="GWT problem" href="gwt.html"/>
+ <item name="TODO" href="todo.html"/>
</menu>
<menu ref="reports"/>
1
0
04 Jun '10
Author: echatellier
Date: 2010-06-04 18:23:28 +0200 (Fri, 04 Jun 2010)
New Revision: 98
Url: http://nuiton.org/repositories/revision/wikitty/98
Log:
Fix javadoc
Modified:
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-04 16:02:09 UTC (rev 97)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-04 16:23:28 UTC (rev 98)
@@ -356,7 +356,7 @@
/**
* Build event to fire and call {@link #fireRemoveWikitty(WikittyServiceEvent)}.
*
- * @param ws ids
+ * @param wikittyIds wikitty ids
*/
protected void fireRemoveWikitty(String ... wikittyIds) {
@@ -374,8 +374,6 @@
/**
* Build event to fire and call {@link #fireClearWikitty(WikittyServiceEvent)}.
- *
- * @param ws ids
*/
protected void fireClearWikitty() {
@@ -388,7 +386,7 @@
*
* Take care about {@link WikittyServiceEvent#isRemote()} for fire.
*
- * @param event
+ * @param event event to fire
*/
protected void firePutWikitty(WikittyServiceEvent event) {
for (WikittyServiceListener l : allWikittyServiceListeners) {
@@ -411,7 +409,7 @@
*
* Take care about {@link WikittyServiceEvent#isRemote()} for fire.
*
- * @param event
+ * @param event event to fire
*/
protected void fireRemoveWikitty(WikittyServiceEvent event) {
for (WikittyServiceListener l : allWikittyServiceListeners) {
@@ -434,7 +432,7 @@
*
* Take care about {@link WikittyServiceEvent#isRemote()} for fire.
*
- * @param event
+ * @param event event to fire
*/
protected void fireClearWikitty(WikittyServiceEvent event) {
for (WikittyServiceListener l : allWikittyServiceListeners) {
1
0
04 Jun '10
Author: echatellier
Date: 2010-06-04 18:02:09 +0200 (Fri, 04 Jun 2010)
New Revision: 97
Url: http://nuiton.org/repositories/revision/wikitty/97
Log:
Erreur de copi?\195?\169/coll?\195?\169
Modified:
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-04 13:46:55 UTC (rev 96)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-04 16:02:09 UTC (rev 97)
@@ -41,7 +41,7 @@
public class WikittyServiceCached implements WikittyService {
/** to use log facility, just put in your code: log.info(\"...\"); */
- static private Log log = LogFactory.getLog(WikittyServiceNotifier.class);
+ static private Log log = LogFactory.getLog(WikittyServiceCached.class);
/**
* Utiliser pour mettre à jour le cache en ecoutant les evenements
1
0
04 Jun '10
Author: echatellier
Date: 2010-06-04 15:46:55 +0200 (Fri, 04 Jun 2010)
New Revision: 96
Url: http://nuiton.org/repositories/revision/wikitty/96
Log:
Add an options for cache to listener for modification on service (default to not listen)
Modified:
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-04 12:40:33 UTC (rev 95)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-06-04 13:46:55 UTC (rev 96)
@@ -23,8 +23,12 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Properties;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Override some method of WikittyService to use cache
*
@@ -36,19 +40,65 @@
*/
public class WikittyServiceCached implements WikittyService {
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ static private Log log = LogFactory.getLog(WikittyServiceNotifier.class);
+
+ /**
+ * Utiliser pour mettre à jour le cache en ecoutant les evenements
+ * sur le service.
+ *
+ * Le service {@link #ws} doit supporter l'enregistrement de listener.
+ */
+ static public final String WIKITTY_CACHE_LISTENEVENTS_OPTION = "wikitty.service.cache.listenevents";
+
protected WikittyCache cache = null;
protected WikittyService ws;
-
+
+ /**
+ * Default constructor.
+ *
+ * @param ws delegate service
+ */
public WikittyServiceCached(WikittyService ws) {
+ this(ws, null);
+ }
+
+ /**
+ * Constructor with configuration.
+ *
+ * @param ws delegate service
+ * @param props properties (can be null)
+ */
+ public WikittyServiceCached(WikittyService ws, Properties props) {
cache = WikittyCache.getInstance();
this.ws = ws;
-
- // add service listener for synchronisation
- // listener des remote event
- addWikittyServiceListener(cache, ServiceListenerType.REMOTE);
+
+ registerWikittyServiceListener(props);
}
+
+ /**
+ * Add cache as service listener if configuration request it.
+ *
+ * @param props properties (can be null)
+ */
+ protected void registerWikittyServiceListener(Properties props) {
+ if (props != null) {
+ // add notifier as listener
+ String listenEvents = props.getProperty(WIKITTY_CACHE_LISTENEVENTS_OPTION, "false");
+ if ("true".equalsIgnoreCase(listenEvents)) {
+ // add service listener for synchronisation
+ // listener des remote event
+ addWikittyServiceListener(cache, ServiceListenerType.REMOTE);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Listen remote event on service");
+ }
+ }
+ }
+ }
+
@Override
public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) {
ws.addWikittyServiceListener(listener, type);
Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-04 12:40:33 UTC (rev 95)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-04 13:46:55 UTC (rev 96)
@@ -75,10 +75,10 @@
/** Wikitty service listener (all event). */
protected ListenerSet<WikittyServiceListener> allWikittyServiceListeners;
-
+
/** Wikitty service listener (only for local event). */
protected ListenerSet<WikittyServiceListener> localWikittyServiceListeners;
-
+
/** Wikitty service listener (only for remote event). */
protected ListenerSet<WikittyServiceListener> remoteWikittyServiceListeners;
1
0