You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by sf...@apache.org on 2011/04/20 17:57:08 UTC
svn commit: r1095442 [2/2] - in /chemistry/opencmis/trunk:
chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/ap...
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java Wed Apr 20 15:57:06 2011
@@ -572,10 +572,10 @@ public class RepositoryServiceTest exten
public static final String COMPLEX_TYPE = "ComplexType";
public static final String TOPLEVEL_TYPE = "DocumentTopLevel";
- public static final String LEVEL1_TYPE = "DocumentLevel1";;
+ public static final String LEVEL1_TYPE = "DocumentLevel1";
public static final String LEVEL2_TYPE = "DocumentLevel2";
- public static List<TypeDefinition> singletonTypes = buildTypesList();
+ public static final List<TypeDefinition> singletonTypes = buildTypesList();
public List<TypeDefinition> createTypesList() {
return singletonTypes;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java Wed Apr 20 15:57:06 2011
@@ -370,7 +370,6 @@ public class TypeValidationTest extends
TypeManager tm = buildInheritedTypes();
TypeDefinition superType = tm.getTypeById(DOC_TYPE_SUPER).getTypeDefinition();
TypeDefinition subType = tm.getTypeById(DOC_TYPE_SUB).getTypeDefinition();
- ;
List<PropertyData<?>> properties = createPropertiesWithNameAndTypeId(DOC_TYPE_SUB);
properties.add(FACTORY.createPropertyStringData(STRING_PROP_TYPE_SUB,
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/UnitTestTypeSystemCreator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/UnitTestTypeSystemCreator.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/UnitTestTypeSystemCreator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/UnitTestTypeSystemCreator.java Wed Apr 20 15:57:06 2011
@@ -46,10 +46,10 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.inmemory.types.PropertyCreationHelper;
public class UnitTestTypeSystemCreator implements TypeCreator {
- public static List<TypeDefinition> singletonTypes = buildTypesList();
+ public static final List<TypeDefinition> singletonTypes = buildTypesList();
public static final String COMPLEX_TYPE = "ComplexType";
public static final String TOPLEVEL_TYPE = "DocumentTopLevel";
- public static final String LEVEL1_TYPE = "DocumentLevel1";;
+ public static final String LEVEL1_TYPE = "DocumentLevel1";
public static final String LEVEL2_TYPE = "DocumentLevel2";
public static final String VERSION_DOCUMENT_TYPE_ID = "MyVersionedType";
public static final String VERSION_PROPERTY_ID = "StringProp";
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersionTestTypeSystemCreator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersionTestTypeSystemCreator.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersionTestTypeSystemCreator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersionTestTypeSystemCreator.java Wed Apr 20 15:57:06 2011
@@ -30,9 +30,9 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.inmemory.types.PropertyCreationHelper;
public class VersionTestTypeSystemCreator implements TypeCreator {
- public static String VERSION_TEST_DOCUMENT_TYPE_ID = "MyVersionedType";
- public static String PROPERTY_ID = "StringProp";
- public static List<TypeDefinition> singletonTypes = buildTypesList();
+ public static final String VERSION_TEST_DOCUMENT_TYPE_ID = "MyVersionedType";
+ public static final String PROPERTY_ID = "StringProp";
+ public static final List<TypeDefinition> singletonTypes = buildTypesList();
/**
* in the public interface of this class we return the singleton containing
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java Wed Apr 20 15:57:06 2011
@@ -666,8 +666,8 @@ public class VersioningTest extends Abst
}
public static class VersionTestTypeSystemCreator implements TypeCreator {
- public static String VERSION_TEST_DOCUMENT_TYPE_ID = "MyVersionedType";
- public static String PROPERTY_ID = "StringProp";
+ public static final String VERSION_TEST_DOCUMENT_TYPE_ID = "MyVersionedType";
+ public static final String PROPERTY_ID = "StringProp";
public List<TypeDefinition> createTypesList() {
// always add CMIS default types
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/AbstractQueryTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/AbstractQueryTest.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/AbstractQueryTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/AbstractQueryTest.java Wed Apr 20 15:57:06 2011
@@ -61,14 +61,11 @@ public abstract class AbstractQueryTest
protected static final String AUTHOR_PROP = "Author";
protected static final String ISBN_PROP = "ISBN";
protected static final String PUB_DATE_PROP = "PublishingDate";
-
- protected void setUp(QueryObject qo, PredicateWalkerBase pw) throws Exception {
- queryObj = qo;
- predicateWalker = pw;
- queryUtil = new QueryUtil();
- }
- protected void tearDown() throws Exception {
+ protected void setUp(QueryObject qo, PredicateWalkerBase pw) {
+ queryObj = qo;
+ predicateWalker = pw;
+ queryUtil = new QueryUtil();
}
protected CmisQueryWalker traverseStatement(String statement) throws UnsupportedEncodingException, IOException, RecognitionException {
@@ -110,23 +107,23 @@ public abstract class AbstractQueryTest
Map<String, PropertyDefinition<?>> propertyDefinitions = new HashMap<String, PropertyDefinition<?>>();
PropertyBooleanDefinition prop1 = PropertyCreationHelper.createBooleanDefinition(BOOL_PROP,
- "Sample Boolean Property");
+ "Sample Boolean Property");
((PropertyBooleanDefinitionImpl) prop1).setIsRequired(true);
propertyDefinitions.put(prop1.getId(), prop1);
PropertyStringDefinition prop2 = PropertyCreationHelper.createStringDefinition(STRING_PROP,
- "Sample String Property");
+ "Sample String Property");
propertyDefinitions.put(prop2.getId(), prop2);
PropertyIntegerDefinitionImpl prop3 = PropertyCreationHelper.createIntegerDefinition(INT_PROP,
- "Sample Integer Property");
+ "Sample Integer Property");
propertyDefinitions.put(prop2.getId(), prop2);
cmisType.setPropertyDefinitions(propertyDefinitions);
typeDefs.add(cmisType);
myType = cmisType;
-
+
// add another type definition with exactly the same properties
cmisType = new InMemoryDocumentTypeDefinition(MY_DOC_TYPE_COPY,
"Document Type Duplicated", InMemoryDocumentTypeDefinition.getRootDocumentType());
@@ -149,11 +146,11 @@ public abstract class AbstractQueryTest
propertyDefinitions.put(prop2.getId(), prop2);
prop3 = PropertyCreationHelper.createIntegerDefinition(ISBN_PROP,
- "ISBN of Book");
+ "ISBN of Book");
propertyDefinitions.put(prop3.getId(), prop3);
PropertyDateTimeDefinitionImpl prop4 = PropertyCreationHelper.createDateTimeDefinition(PUB_DATE_PROP,
- "Publishing Date of Book");
+ "Publishing Date of Book");
propertyDefinitions.put(prop4.getId(), prop4);
cmisType.setPropertyDefinitions(propertyDefinitions);
@@ -164,5 +161,4 @@ public abstract class AbstractQueryTest
return typeDefs;
}
-
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/ProcessQueryTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/ProcessQueryTest.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/ProcessQueryTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/ProcessQueryTest.java Wed Apr 20 15:57:06 2011
@@ -354,11 +354,6 @@ public class ProcessQueryTest extends Ab
super.setUp(qo, queryProcessor);
}
- @After
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
@Test
public void testStartStopProcessing() {
String statement = "SELECT BookType.Title, BookType.Author FROM BookType WHERE ISBN = 100";
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryConditionProcessor.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryConditionProcessor.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryConditionProcessor.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryConditionProcessor.java Wed Apr 20 15:57:06 2011
@@ -60,8 +60,8 @@ public interface QueryConditionProcessor
void onEqAny(Tree node, Tree literalNode, Tree colNode);
// Null comparisons:
- public void onIsNull(Tree nullNode, Tree colNode);
- public void onIsNotNull(Tree notNullNode, Tree colNode);
+ void onIsNull(Tree nullNode, Tree colNode);
+ void onIsNotNull(Tree notNullNode, Tree colNode);
// String matching:
void onIsLike(Tree node, Tree colNode, Tree stringNode);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java Wed Apr 20 15:57:06 2011
@@ -56,11 +56,6 @@ public class QueryParseTest extends Abst
super.setUp(new QueryObject(null), null);
}
- @After
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
@Test
public void simpleFailTest() {
String statement = "SELECT * TO MyType ORDER BY abc.def ASC";
@@ -78,9 +73,11 @@ public class QueryParseTest extends Abst
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<CmisSelector> selects = queryObj.getSelectReferences();
assertTrue(1 == selects.size());
assertTrue(selects.get(0) instanceof FunctionReference);
+
FunctionReference funcRef = ((FunctionReference)selects.get(0));
assertTrue(FunctionReference.CmisQlFunction.SCORE == funcRef.getFunction());
}
@@ -90,6 +87,7 @@ public class QueryParseTest extends Abst
String statement = "SELECT abc FROM cmis:document";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<CmisSelector> selects = queryObj.getSelectReferences();
assertTrue(1 == selects.size());
// nothing should be in where references
@@ -98,7 +96,6 @@ public class QueryParseTest extends Abst
ColumnReference colRef = ((ColumnReference)selects.get(0));
assertTrue(selects.get(0) instanceof ColumnReference);
assertEquals("abc", colRef.getPropertyQueryName());
-
}
@Test
@@ -106,15 +103,16 @@ public class QueryParseTest extends Abst
String statement = "SELECT t1.abc FROM cmis:document";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<CmisSelector> selects = queryObj.getSelectReferences();
assertTrue(1 == selects.size());
// nothing should be in where references
assertTrue(0 == queryObj.getWhereReferences().size());
assertTrue(selects.get(0) instanceof ColumnReference);
+
ColumnReference colRef = ((ColumnReference)selects.get(0));
assertEquals("t1", colRef.getTypeQueryName());
assertEquals("abc", colRef.getPropertyQueryName());
-
}
@Test
@@ -122,16 +120,16 @@ public class QueryParseTest extends Abst
String statement = "SELECT * FROM cmis:document";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<CmisSelector> selects = queryObj.getSelectReferences();
assertTrue(1 == selects.size());
// nothing should be in where references
assertTrue(0 == queryObj.getWhereReferences().size());
+
ColumnReference colRef = ((ColumnReference)selects.get(0));
assertTrue(selects.get(0) instanceof ColumnReference);
assertEquals(null, colRef.getTypeQueryName());
assertEquals("*", colRef.getPropertyQueryName());
-
-
}
@Test
@@ -139,15 +137,16 @@ public class QueryParseTest extends Abst
String statement = "SELECT t1.* FROM cmis:document";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<CmisSelector> selects = queryObj.getSelectReferences();
assertTrue(1 == selects.size());
// nothing should be in where references
assertTrue(0 == queryObj.getWhereReferences().size());
assertTrue(selects.get(0) instanceof ColumnReference);
+
ColumnReference colRef = ((ColumnReference)selects.get(0));
assertEquals("t1", colRef.getTypeQueryName());
assertEquals("*", colRef.getPropertyQueryName());
-
}
@Test
@@ -155,15 +154,16 @@ public class QueryParseTest extends Abst
String statement = "SELECT t2.aaa myalias FROM cmis:document";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<CmisSelector> selects = queryObj.getSelectReferences();
assertTrue(1 == selects.size());
// nothing should be in where references
assertTrue(0 == queryObj.getWhereReferences().size());
assertTrue(selects.get(0) instanceof ColumnReference);
+
ColumnReference colRef = ((ColumnReference)selects.get(0));
assertEquals("t2", colRef.getTypeQueryName());
assertEquals("aaa", colRef.getPropertyQueryName());
-
}
@Test
@@ -176,7 +176,6 @@ public class QueryParseTest extends Abst
} catch (Exception e) {
assertTrue(e instanceof CmisInvalidArgumentException);
}
-
}
@Test
@@ -185,8 +184,10 @@ public class QueryParseTest extends Abst
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
Map<String,String> types = queryObj.getTypes();
assertTrue(1 == types.size());
+
String key = types.keySet().iterator().next();
assertEquals("MyAlias", key);
assertEquals("MyType", types.get(key));
@@ -197,12 +198,13 @@ public class QueryParseTest extends Abst
String statement = "SELECT * FROM MyType";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
Map<String,String> types = queryObj.getTypes();
assertTrue(1 == types.size());
+
String key = types.keySet().iterator().next();
assertEquals("MyType", key);
assertEquals("MyType", types.get(key));
-
}
@Test
@@ -210,8 +212,10 @@ public class QueryParseTest extends Abst
String statement = "SELECT t2.aaa FROM MyType abc123";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
Map<String,String> types = queryObj.getTypes();
assertTrue(1 == types.size());
+
String key = types.keySet().iterator().next();
assertEquals("abc123", key);
assertEquals("MyType", types.get(key));
@@ -222,8 +226,10 @@ public class QueryParseTest extends Abst
String statement = "SELECT X.aaa FROM MyType AS X WHERE 10 = ANY X.aaa ";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
Map<String,String> types = queryObj.getTypes();
assertTrue(1 == types.size());
+
String key = types.keySet().iterator().next();
assertEquals("X", key);
assertEquals("MyType", types.get(key));
@@ -235,9 +241,11 @@ public class QueryParseTest extends Abst
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<CmisSelector> whereRefs = queryObj.getWhereReferences();
Map<Integer, CmisSelector> colRefs = queryObj.getColumnReferences();
assertTrue(1 == whereRefs.size());
+
CmisSelector value = whereRefs.iterator().next();
assertTrue(value instanceof ColumnReference);
assertEquals("MyProp1", ((ColumnReference)value).getPropertyQueryName());
@@ -287,10 +295,13 @@ public class QueryParseTest extends Abst
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<SortSpec> orderBys = queryObj.getOrderBys();
assertTrue(1 == orderBys.size());
+
SortSpec sp = orderBys.get(0);
assertTrue(sp.isAscending());
+
CmisSelector sortSpec = sp.getSelector();
assert(sortSpec instanceof ColumnReference);
assertEquals("abc", ((ColumnReference)sortSpec).getTypeQueryName());
@@ -302,10 +313,13 @@ public class QueryParseTest extends Abst
String statement = "SELECT * FROM MyType ORDER BY def DESC";
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
List<SortSpec> orderBys = queryObj.getOrderBys();
assertTrue(1 == orderBys.size());
+
SortSpec sp = orderBys.get(0);
assertFalse(sp.isAscending());
+
CmisSelector sortSpec = sp.getSelector();
assert(sortSpec instanceof ColumnReference);
assertNull(((ColumnReference)sortSpec).getTypeQueryName());
@@ -338,7 +352,6 @@ public class QueryParseTest extends Abst
printTree(whereTree);
LOG.info("Evaluate WHERE subtree: ...");
evalWhereTree(whereTree);
-
} catch (Exception e) {
fail("Cannot parse query: " + statement + " (" + e + ")");
}
@@ -353,123 +366,123 @@ public class QueryParseTest extends Abst
@Test
public void whereTestEq() {
- String statement = "SELECT p1 FROM MyType WHERE p1='abc'";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1='abc'";
+ checkTreeWhere(statement);
}
@Test
public void whereTestNotEq() {
- String statement = "SELECT p1 FROM MyType WHERE p1 <> 123";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 <> 123";
+ checkTreeWhere(statement);
}
@Test
public void whereTestLT() {
- String statement = "SELECT p1 FROM MyType WHERE p1 < 123";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 < 123";
+ checkTreeWhere(statement);
}
@Test
public void whereTestGT() {
- String statement = "SELECT p1 FROM MyType WHERE p1 > 123";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 > 123";
+ checkTreeWhere(statement);
}
@Test
public void whereTestLTEQ() {
- String statement = "SELECT p1 FROM MyType WHERE p1 <= 123";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 <= 123";
+ checkTreeWhere(statement);
}
@Test
public void whereTestGTEQ() {
- String statement = "SELECT p1 FROM MyType WHERE p1 >= 123";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 >= 123";
+ checkTreeWhere(statement);
}
@Test
public void whereTestAnd() {
- String statement = "SELECT p1 FROM MyType WHERE p1=1 AND p2=2";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1=1 AND p2=2";
+ checkTreeWhere(statement);
}
@Test
public void whereTestOr() {
- String statement = "SELECT p1 FROM MyType WHERE p1='abc' OR p2=123";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1='abc' OR p2=123";
+ checkTreeWhere(statement);
}
@Test
public void whereTestNot() {
- String statement = "SELECT p1 FROM MyType WHERE NOT p1 = 123";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE NOT p1 = 123";
+ checkTreeWhere(statement);
}
@Test
public void whereTestInFolder() {
- String statement = "SELECT p1 FROM MyType WHERE IN_FOLDER('myfolder')";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE IN_FOLDER('myfolder')";
+ checkTreeWhere(statement);
}
@Test
public void whereTestInTree() {
- String statement = "SELECT p1 FROM MyType WHERE IN_TREE('myfolder')";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE IN_TREE('myfolder')";
+ checkTreeWhere(statement);
}
@Test
public void whereTestAny() {
- String statement = "SELECT p1 FROM MyType WHERE 'Smith' = ANY Authors ";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE 'Smith' = ANY Authors ";
+ checkTreeWhere(statement);
}
@Test
public void whereTestAnyIn() {
- String statement = "SELECT p1 FROM MyType WHERE ANY Colors IN ('Red', 'Green', 'Blue')";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE ANY Colors IN ('Red', 'Green', 'Blue')";
+ checkTreeWhere(statement);
}
@Test
public void whereTestLike() {
- String statement = "SELECT p1 FROM MyType WHERE p1 LIKE 'abc*' ";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 LIKE 'abc*' ";
+ checkTreeWhere(statement);
}
@Test
public void whereTestNotLike() {
- String statement = "SELECT p1 FROM MyType WHERE p1 NOT LIKE 'abc*'";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 NOT LIKE 'abc*'";
+ checkTreeWhere(statement);
}
@Test
public void whereTestNull() {
- String statement = "SELECT p1 FROM MyType WHERE p1 IS NULL";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 IS NULL";
+ checkTreeWhere(statement);
}
@Test
public void whereTestNotNull() {
- String statement = "SELECT p1 FROM MyType WHERE p1 IS NOT NULL";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE p1 IS NOT NULL";
+ checkTreeWhere(statement);
}
@Test
public void whereTestContains() {
- String statement = "SELECT p1 FROM MyType WHERE CONTAINS('Beethoven')";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE CONTAINS('Beethoven')";
+ checkTreeWhere(statement);
}
@Test
public void whereTestScore() {
- String statement = "SELECT p1 FROM MyType WHERE SCORE() = 100";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE SCORE() = 100";
+ checkTreeWhere(statement);
}
@Test
public void whereTestParentheses() {
- String statement = "SELECT p1 FROM MyType WHERE (p1 IS NULL OR SCORE()=100) AND (p2=123 OR p3=456)";
- checkTreeWhere(statement);
+ String statement = "SELECT p1 FROM MyType WHERE (p1 IS NULL OR SCORE()=100) AND (p2=123 OR p3=456)";
+ checkTreeWhere(statement);
}
@Test
@@ -478,6 +491,7 @@ public class QueryParseTest extends Abst
CmisQueryWalker walker = traverseStatementAndCatchExc(statement);
assertNotNull(walker);
+
QueryObject from = queryObj;
Map<String,String> types = from.getTypes();
assertTrue(2 == types.size());
@@ -584,8 +598,8 @@ public class QueryParseTest extends Abst
case CmisQlStrictLexer.ORDER_BY:
return "#ORDER_BY";
- case CmisQlStrictLexer.WHERE:;
- case CmisQlStrictLexer.LT:
+ case CmisQlStrictLexer.WHERE:
+ case CmisQlStrictLexer.LT:
case CmisQlStrictLexer.STAR:
case CmisQlStrictLexer.BOOL_LIT:
case CmisQlStrictLexer.INNER:
@@ -644,7 +658,7 @@ public class QueryParseTest extends Abst
private void evaluateWhereNode(Tree node) {
LOG.info("evaluating node: " + node.toString());
switch (node.getType()) {
- case CmisQlStrictLexer.WHERE:;
+ case CmisQlStrictLexer.WHERE:
break; // ignore
case CmisQlStrictLexer.COL:
evalColumn(node);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrPrivateWorkingCopy.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrPrivateWorkingCopy.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrPrivateWorkingCopy.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrPrivateWorkingCopy.java Wed Apr 20 15:57:06 2011
@@ -36,7 +36,7 @@ public class JcrPrivateWorkingCopy exten
/**
* Name of a private working copy
*/
- public static String PWC_NAME = "pwc";
+ public static final String PWC_NAME = "pwc";
public JcrPrivateWorkingCopy(Node node, JcrTypeManager typeManager, PathManager pathManager,
JcrNodeFactory nodeFactory) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslatorTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslatorTest.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslatorTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslatorTest.java Wed Apr 20 15:57:06 2011
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
public class QueryTranslatorTest {
private String jcrTypeCondition;
- QueryTranslator queryTranslator = new QueryTranslator(new JcrTypeManager()) {
+ final QueryTranslator queryTranslator = new QueryTranslator(new JcrTypeManager()) {
@Override
protected String jcrPathFromId(String id) {
assertNotNull(id);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/XPathBuilderTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/XPathBuilderTest.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/XPathBuilderTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/XPathBuilderTest.java Wed Apr 20 15:57:06 2011
@@ -220,7 +220,7 @@ public class XPathBuilderTest {
return Arrays.asList(elements);
}
- private static XPathBuilder execute(String statement) throws RecognitionException, IOException {
+ private static XPathBuilder execute(String statement) {
QueryUtil queryUtil = new QueryUtil();
QueryObject queryObject = new QueryObject(new JcrTypeManager());
ParseTreeWalker<XPathBuilder> parseTreeWalker = new ParseTreeWalker<XPathBuilder>(new EvaluatorXPath());
@@ -228,8 +228,7 @@ public class XPathBuilderTest {
return parseTreeWalker.getResult();
}
- private static void check(String query, String result, List<String> folderPredicates, Boolean evaluation)
- throws IOException, RecognitionException {
+ private static void check(String query, String result, List<String> folderPredicates, Boolean evaluation) {
XPathBuilder queryBuilder = execute(query);
if (result == null) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeManager.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeManager.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeManager.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeManager.java Wed Apr 20 15:57:06 2011
@@ -33,7 +33,7 @@ public interface TypeManager {
* id of the type definition
* @return type definition for this id
*/
- public abstract TypeDefinitionContainer getTypeById(String typeId);
+ TypeDefinitionContainer getTypeById(String typeId);
/**
* return a type definition from the type query name or null if not found
@@ -42,14 +42,14 @@ public interface TypeManager {
* query name of the type definition
* @return type definition for this query name
*/
- public abstract TypeDefinition getTypeByQueryName(String typeQueryName);
+ TypeDefinition getTypeByQueryName(String typeQueryName);
/**
* return a list of all types known in this repository
*
* @return
*/
- public abstract Collection<TypeDefinitionContainer> getTypeDefinitionList();
+ Collection<TypeDefinitionContainer> getTypeDefinitionList();
/**
* return a list of the root types as defined in the CMIS spec (for
@@ -57,7 +57,7 @@ public interface TypeManager {
*
* @return
*/
- public abstract List<TypeDefinitionContainer> getRootTypes();
+ List<TypeDefinitionContainer> getRootTypes();
/**
* retrieve the property id from a type for a given property query name
@@ -69,6 +69,6 @@ public interface TypeManager {
* @return
* property id of property or null if not found
*/
- public abstract String getPropertyIdForQueryName(TypeDefinition typeDefinition, String propQueryName);
+ String getPropertyIdForQueryName(TypeDefinition typeDefinition, String propQueryName);
}
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java Wed Apr 20 15:57:06 2011
@@ -175,7 +175,7 @@ public class TypeValidator {
super.validate(propDef, property);
- BigInteger propVal = ((PropertyInteger) property).getFirstValue();
+ BigInteger propVal = property.getFirstValue();
BigInteger minVal = ((PropertyIntegerDefinition) propDef).getMinValue();
BigInteger maxVal = ((PropertyIntegerDefinition) propDef).getMaxValue();
@@ -197,7 +197,7 @@ public class TypeValidator {
super.validate(propDef, property);
- BigDecimal propVal = ((PropertyDecimal) property).getFirstValue();
+ BigDecimal propVal = property.getFirstValue();
BigDecimal minVal = ((PropertyDecimalDefinition) propDef).getMinValue();
BigDecimal maxVal = ((PropertyDecimalDefinition) propDef).getMaxValue();
@@ -221,8 +221,8 @@ public class TypeValidator {
long maxLen = ((PropertyStringDefinition) propDef).getMaxLength() == null ? -1
: ((PropertyStringDefinition) propDef).getMaxLength().longValue();
- long len = ((PropertyData<String>) property).getFirstValue() == null ? -1
- : ((PropertyData<String>) property).getFirstValue().length();
+ long len = property.getFirstValue() == null ? -1
+ : property.getFirstValue().length();
// check max length
if (maxLen >= 0 && len >= 0 && maxLen < len) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/FunctionReference.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/FunctionReference.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/FunctionReference.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/FunctionReference.java Wed Apr 20 15:57:06 2011
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.se
public class FunctionReference extends CmisSelector {
- public enum CmisQlFunction { SCORE, };
+ public enum CmisQlFunction { SCORE, }
private final CmisQlFunction function;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java Wed Apr 20 15:57:06 2011
@@ -48,36 +48,36 @@ public class QueryObject {
// http://www.antlr.org/pipermail/antlr-interest/2008-April/027600.html
// select part
protected TypeManager typeMgr;
- protected List<CmisSelector> selectReferences = new ArrayList<CmisSelector>();
- protected List<CmisSelector> whereReferences = new ArrayList<CmisSelector>();
- protected List<CmisSelector> joinReferences = new ArrayList<CmisSelector>();
+ protected final List<CmisSelector> selectReferences = new ArrayList<CmisSelector>();
+ protected final List<CmisSelector> whereReferences = new ArrayList<CmisSelector>();
+ protected final List<CmisSelector> joinReferences = new ArrayList<CmisSelector>();
// --> Join not implemented yet
- protected Map<String, CmisSelector> colOrFuncAlias = new HashMap<String, CmisSelector>();
+ protected final Map<String, CmisSelector> colOrFuncAlias = new HashMap<String, CmisSelector>();
// from part
/** map from alias name to type query name */
- protected Map<String, String> froms = new LinkedHashMap<String, String>();
+ protected final Map<String, String> froms = new LinkedHashMap<String, String>();
/** main from alias name */
protected String from = null;
- protected List<JoinSpec> joinSpecs = new LinkedList<JoinSpec>();
+ protected final List<JoinSpec> joinSpecs = new LinkedList<JoinSpec>();
// where part
- protected Map<Integer, CmisSelector> columnReferences = new HashMap<Integer, CmisSelector>();
+ protected final Map<Integer, CmisSelector> columnReferences = new HashMap<Integer, CmisSelector>();
// order by part
- protected List<SortSpec> sortSpecs = new ArrayList<SortSpec>();
+ protected final List<SortSpec> sortSpecs = new ArrayList<SortSpec>();
private String errorMessage;
public static class JoinSpec {
/** INNER / LEFT / RIGHT */
- public String kind;
+ public final String kind;
/** Alias or full table type */
- public String alias;
+ public final String alias;
public ColumnReference onLeft;
@@ -101,8 +101,8 @@ public class QueryObject {
}
public class SortSpec {
- public boolean ascending;
- public Integer colRefKey; // key in columnReferencesMap point to column
+ public final boolean ascending;
+ public final Integer colRefKey; // key in columnReferencesMap point to column
// descriptions
public SortSpec(Integer key, boolean ascending) {
@@ -117,7 +117,7 @@ public class QueryObject {
public boolean isAscending() {
return ascending;
}
- };
+ }
public QueryObject() {
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java Wed Apr 20 15:57:06 2011
@@ -43,7 +43,7 @@ public class QueryUtil {
private CmisQueryWalker walker;
// convenience method because everybody needs this piece of code
- public static CmisQueryWalker getWalker(String statement) throws UnsupportedEncodingException, IOException, RecognitionException {
+ public static CmisQueryWalker getWalker(String statement) throws RecognitionException {
CharStream input = new ANTLRStringStream(statement);
TokenSource lexer = new CmisQlStrictLexer(input);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureData.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureData.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureData.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureData.java Wed Apr 20 15:57:06 2011
@@ -35,9 +35,8 @@ public enum FixtureData {
"org.apache.chemistry.opencmis.fit.runtime.document2.name",
"document2.txt"),
PROPERTY_NAME_STRING_MULTI_VALUED("org.apache.chemistry.opencmis.fit.runtime.multi.valued.property.name", null);
- ;
- private final String key;
+ private final String key;
private String value;
FixtureData(String key, String value) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/PropertyCheckEnum.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/PropertyCheckEnum.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/PropertyCheckEnum.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/PropertyCheckEnum.java Wed Apr 20 15:57:06 2011
@@ -19,5 +19,5 @@
package org.apache.chemistry.opencmis.tck.impl;
public enum PropertyCheckEnum {
- NO_VALUE_CHECK, MUST_NOT_BE_SET, MUST_BE_SET, STRING_SHOULD_NOT_BE_EMPTY, STRING_MUST_NOT_BE_EMPTY;
+ NO_VALUE_CHECK, MUST_NOT_BE_SET, MUST_BE_SET, STRING_SHOULD_NOT_BE_EMPTY, STRING_MUST_NOT_BE_EMPTY
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java Wed Apr 20 15:57:06 2011
@@ -29,7 +29,7 @@ public class MultiThreadedObjectGenerato
public static enum Action {
CreateDocument, CreateTree, CreateFolders
- };
+ }
static class ObjectGeneratorRunner implements Runnable {
private final Action fAction;
@@ -55,7 +55,7 @@ public class MultiThreadedObjectGenerato
}
public String[] doCreateDocument() {
- String ids[] = fObjGen.createDocuments(fRootFolderId, fCount);
+ String[] ids = fObjGen.createDocuments(fRootFolderId, fCount);
return ids;
}
@@ -196,7 +196,7 @@ public class MultiThreadedObjectGenerato
public static void runMultiThreaded(ObjectGeneratorRunner[] runner) {
int threadCount = runner.length;
- Thread threads[] = new Thread[threadCount];
+ Thread[] threads = new Thread[threadCount];
for (int i = 0; i < threadCount; i++) {
Thread thread = new Thread(runner[i], "ObjectGeneratorThread-" + i);
threads[i] = thread;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java Wed Apr 20 15:57:06 2011
@@ -297,7 +297,7 @@ public class ObjectGenerator {
public String[] createDocuments(String folderId, int count) {
- String result[];
+ String[] result;
fTimeLoggerCreateDoc.reset();
for (int i = 0; i < count; i++) {
@@ -317,7 +317,7 @@ public class ObjectGenerator {
public String[] createFolders(String folderId, int count) {
- String result[];
+ String[] result;
fTimeLoggerCreateFolder.reset();
for (int i = 0; i < count; i++) {
@@ -592,7 +592,7 @@ public class ObjectGenerator {
if (entry.getValue().getFirstValue() instanceof GregorianCalendar) {
for (Object obj : entry.getValue().getValues()) {
GregorianCalendar cal = (GregorianCalendar) obj;
- valueStr.append(df.format(cal.getTime()) + ", ");
+ valueStr.append(df.format(cal.getTime())).append(", ");
}
valueStr.append("]");
} else {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java Wed Apr 20 15:57:06 2011
@@ -35,7 +35,7 @@ public class TimeLogger {
private static class TimeRecord {
public long fStart;
public long fStop;
- };
+ }
private final String fAction;
private LinkedList<TimeRecord> fTimeRecs = new LinkedList<TimeRecord>();
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/CreateDialog.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/CreateDialog.java?rev=1095442&r1=1095441&r2=1095442&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/CreateDialog.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/swing/CreateDialog.java Wed Apr 20 15:57:06 2011
@@ -102,7 +102,7 @@ public abstract class CreateDialog exten
return result;
}
- public static interface ObjectTypeItem {
+ public interface ObjectTypeItem {
ObjectType getObjectType();
}
}