diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java index baced24..e78d929 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java @@ -831,8 +831,9 @@ public void handle( } static class CubeHandler extends HandlerImpl { - - public void handle(Element row, Context context, + public void handle( + Element row, + Context context, List list) throws OlapException { diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java index 5f0a033..90d25c9 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java @@ -254,7 +254,7 @@ public static Future getFuture( final String request) { return executor.submit( - new Callable() { + new Callable() { public byte[] call() throws Exception { return proxy.get(url, request); } diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java b/src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java index 721a0fe..95cddfb 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java @@ -101,7 +101,8 @@ static DOMParser getParser( parser.setFeature(VALIDATION_FEATURE_ID, doingValidation); if (schemaLocationPropertyValue != null) { - parser.setProperty(SCHEMA_LOCATION, + parser.setProperty( + SCHEMA_LOCATION, schemaLocationPropertyValue.replace('\\', '/')); } diff --git a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java index aa2a79c..53ac248 100644 --- a/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java +++ b/src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java @@ -128,16 +128,23 @@ public void storeCookies(URLConnection conn) { while (st.hasMoreTokens()) { String token = st.nextToken(); - cookie.put(token.substring(0, + cookie.put( + token.substring( + 0, token.indexOf(NAME_VALUE_SEPARATOR)).toLowerCase(), token.substring( - token.indexOf(NAME_VALUE_SEPARATOR) + 1, - token.length())); + token.indexOf(NAME_VALUE_SEPARATOR) + 1, + token.length())); - if (this.debug == true) { - System.out.println("Saving cookie : " + token.substring(0, - token.indexOf(NAME_VALUE_SEPARATOR)).toLowerCase() + "=" - + token.substring( + if (this.debug) { + System.out.println( + "Saving cookie : " + + token.substring( + 0, + token.indexOf( + NAME_VALUE_SEPARATOR)).toLowerCase() + + "=" + + token.substring( token.indexOf(NAME_VALUE_SEPARATOR) + 1, token.length())); } diff --git a/src/org/olap4j/transform/DrillReplaceTransform.java b/src/org/olap4j/transform/DrillReplaceTransform.java index 289cd39..90fb492 100644 --- a/src/org/olap4j/transform/DrillReplaceTransform.java +++ b/src/org/olap4j/transform/DrillReplaceTransform.java @@ -68,8 +68,8 @@ public DrillReplaceTransform( // Position positionToDrill = // TransformUtil.getPositionFromCellSet(axis, positionOrdinalInAxis, // cellSet); - memberToDrill = TransformUtil.getMemberFromCellSet(axis, - positionOrdinalInAxis, memberOrdinalInPosition, cellSet); + memberToDrill = TransformUtil.getMemberFromCellSet( + axis, positionOrdinalInAxis, memberOrdinalInPosition, cellSet); // pathToMember = getPathToMember(positionToDrill, // memberOrdinalInPosition); } diff --git a/src/org/olap4j/transform/MdxHelper.java b/src/org/olap4j/transform/MdxHelper.java index 0b9d8e5..d610590 100644 --- a/src/org/olap4j/transform/MdxHelper.java +++ b/src/org/olap4j/transform/MdxHelper.java @@ -34,8 +34,10 @@ public static MemberNode makeMemberNode(Member m) { return new MemberNode(null, m); } - private static CallNode _makePropCallNode(ParseTreeNode node, - String funcName) { + private static CallNode _makePropCallNode( + ParseTreeNode node, + String funcName) + { List callArgs = new ArrayList(); callArgs.add(node); return new CallNode(null, funcName, Syntax.Property, callArgs); diff --git a/src/org/olap4j/transform/RollUpLevelTransform.java b/src/org/olap4j/transform/RollUpLevelTransform.java index f753a24..9194c49 100644 --- a/src/org/olap4j/transform/RollUpLevelTransform.java +++ b/src/org/olap4j/transform/RollUpLevelTransform.java @@ -66,8 +66,8 @@ public RollUpLevelTransform( // Position positionToDrill = // TransformUtil.getPositionFromCellSet(axis, positionOrdinalInAxis, // cellSet); - memberToDrill = TransformUtil.getMemberFromCellSet(axis, - positionOrdinalInAxis, memberOrdinalInPosition, cellSet); + memberToDrill = TransformUtil.getMemberFromCellSet( + axis, positionOrdinalInAxis, memberOrdinalInPosition, cellSet); // pathToMember = getPathToMember(positionToDrill, // memberOrdinalInPosition); } diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java index 4a39b8e..ddd07f3 100644 --- a/testsrc/org/olap4j/ConnectionTest.java +++ b/testsrc/org/olap4j/ConnectionTest.java @@ -960,7 +960,8 @@ public void testCell() throws Exception { assertEquals(5, cell.getOrdinal()); assertEquals(Arrays.asList(1, 2), cell.getCoordinateList()); - assertEquals("#,###.00", + assertEquals( + "#,###.00", cell.getPropertyValue(Property.StandardCellProperty.FORMAT_STRING)); assertFalse(cell.isEmpty()); assertFalse(cell.isError()); @@ -1655,10 +1656,12 @@ public void testMetadata() throws Exception { assertNotNull(member); Member member2 = cube.lookupMember("Product", "All Products", "Food"); assertEquals(member, member2); - assertEquals("[Product].[All Products].[Food]", + assertEquals( + "[Product].[All Products].[Food]", member.getUniqueName()); assertEquals("Food", member.getName()); - assertEquals("[Product].[Product Family]", + assertEquals( + "[Product].[Product Family]", member.getLevel().getUniqueName()); assertEquals(Member.Type.REGULAR, member.getMemberType()); @@ -1693,7 +1696,8 @@ public void testMetadata() throws Exception { // All member final Member allProductsMember = member.getParentMember(); - assertEquals("[Product].[All Products]", + assertEquals( + "[Product].[All Products]", allProductsMember.getUniqueName()); assertEquals("(All)", allProductsMember.getLevel().getName()); assertEquals("[Product].[(All)]", allProductsMember.getLevel().getUniqueName()); diff --git a/testsrc/org/olap4j/MetadataTest.java b/testsrc/org/olap4j/MetadataTest.java index a418701..cd5322b 100644 --- a/testsrc/org/olap4j/MetadataTest.java +++ b/testsrc/org/olap4j/MetadataTest.java @@ -436,7 +436,9 @@ public void testDatabaseMetaDataGetMembers() throws SQLException { catalogName, "FoodMart", "Sales", null, null, null, "[Time].[1997].[Q2].[4]", null), MEMBERS_COLUMN_NAMES); - assertEquals(TestContext.fold("CATALOG_NAME=" + catalogName + ", SCHEMA_NAME=FoodMart, CUBE_NAME=Sales, DIMENSION_UNIQUE_NAME=[Time], HIERARCHY_UNIQUE_NAME=[Time], LEVEL_UNIQUE_NAME=[Time].[Month], LEVEL_NUMBER=2, MEMBER_ORDINAL=6, MEMBER_NAME=4, MEMBER_UNIQUE_NAME=[Time].[1997].[Q2].[4], MEMBER_TYPE=1, MEMBER_GUID=null, MEMBER_CAPTION=4, CHILDREN_CARDINALITY=0, PARENT_LEVEL=1, PARENT_UNIQUE_NAME=[Time].[1997].[Q2], PARENT_COUNT=1, TREE_OP=null, DEPTH=2\n"), + assertEquals( + TestContext.fold( + "CATALOG_NAME=" + catalogName + ", SCHEMA_NAME=FoodMart, CUBE_NAME=Sales, DIMENSION_UNIQUE_NAME=[Time], HIERARCHY_UNIQUE_NAME=[Time], LEVEL_UNIQUE_NAME=[Time].[Month], LEVEL_NUMBER=2, MEMBER_ORDINAL=6, MEMBER_NAME=4, MEMBER_UNIQUE_NAME=[Time].[1997].[Q2].[4], MEMBER_TYPE=1, MEMBER_GUID=null, MEMBER_CAPTION=4, CHILDREN_CARDINALITY=0, PARENT_LEVEL=1, PARENT_UNIQUE_NAME=[Time].[1997].[Q2], PARENT_COUNT=1, TREE_OP=null, DEPTH=2\n"), s); // with treeop diff --git a/testsrc/org/olap4j/OlapTest.java b/testsrc/org/olap4j/OlapTest.java index f4c2a0d..9adc61d 100644 --- a/testsrc/org/olap4j/OlapTest.java +++ b/testsrc/org/olap4j/OlapTest.java @@ -308,15 +308,17 @@ public void testSelectionModes() { QueryDimension productDimension = query.getDimension("Product"); Member drinkMember = cube.lookupMember("Product", "Drink"); Selection drinkSelection = - productDimension.createSelection(drinkMember, - Selection.Operator.CHILDREN); + productDimension.createSelection( + drinkMember, + Selection.Operator.CHILDREN); productDimension.getSelections().add(drinkSelection); QueryDimension measuresDimension = query.getDimension("Measures"); Member storeSalesMember = cube.lookupMember("Measures", "Store Sales"); Selection storeSalesSelection = - measuresDimension.createSelection(storeSalesMember, - Selection.Operator.MEMBER); + measuresDimension.createSelection( + storeSalesMember, + Selection.Operator.MEMBER); measuresDimension.getSelections().add(storeSalesSelection); query.getAxes().get(Axis.ROWS).getDimensions() @@ -339,8 +341,9 @@ public void testSelectionModes() { productDimension.getSelections().clear(); drinkSelection = - productDimension.createSelection(drinkMember, - Selection.Operator.ANCESTORS); + productDimension.createSelection( + drinkMember, + Selection.Operator.ANCESTORS); productDimension.getSelections().add(drinkSelection); query.validate(); @@ -358,8 +361,9 @@ public void testSelectionModes() { productDimension.getSelections().clear(); drinkSelection = - productDimension.createSelection(drinkMember, - Selection.Operator.DESCENDANTS); + productDimension.createSelection( + drinkMember, + Selection.Operator.DESCENDANTS); productDimension.getSelections().add(drinkSelection); query.validate(); @@ -377,8 +381,9 @@ public void testSelectionModes() { productDimension.getSelections().clear(); drinkSelection = - productDimension.createSelection(drinkMember, - Selection.Operator.INCLUDE_CHILDREN); + productDimension.createSelection( + drinkMember, + Selection.Operator.INCLUDE_CHILDREN); productDimension.getSelections().add(drinkSelection); query.validate(); @@ -396,8 +401,9 @@ public void testSelectionModes() { productDimension.getSelections().clear(); drinkSelection = - productDimension.createSelection(drinkMember, - Selection.Operator.SIBLINGS); + productDimension.createSelection( + drinkMember, + Selection.Operator.SIBLINGS); productDimension.getSelections().add(drinkSelection); query.validate(); @@ -429,29 +435,33 @@ public void testMultipleDimensionSelections() { QueryDimension productDimension = query.getDimension("Product"); Member drinkMember = cube.lookupMember("Product", "Drink"); Selection drinkSelection = - productDimension.createSelection(drinkMember, - Selection.Operator.CHILDREN); + productDimension.createSelection( + drinkMember, + Selection.Operator.CHILDREN); productDimension.getSelections().add(drinkSelection); QueryDimension storeDimension = query.getDimension("Store"); Member usaMember = cube.lookupMember("Store", "USA"); Selection usaSelection = - storeDimension.createSelection(usaMember, - Selection.Operator.INCLUDE_CHILDREN); + storeDimension.createSelection( + usaMember, + Selection.Operator.INCLUDE_CHILDREN); storeDimension.getSelections().add(usaSelection); QueryDimension timeDimension = query.getDimension("Time"); Member year1997Member = cube.lookupMember("Time", "1997"); Selection year1997Selection = - timeDimension.createSelection(year1997Member, - Selection.Operator.CHILDREN); + timeDimension.createSelection( + year1997Member, + Selection.Operator.CHILDREN); timeDimension.getSelections().add(year1997Selection); QueryDimension measuresDimension = query.getDimension("Measures"); Member storeSalesMember = cube.lookupMember("Measures", "Store Sales"); Selection storeSalesSelection = - measuresDimension.createSelection(storeSalesMember, - Selection.Operator.MEMBER); + measuresDimension.createSelection( + storeSalesMember, + Selection.Operator.MEMBER); measuresDimension.getSelections().add(storeSalesSelection); query.getAxes().get(Axis.ROWS).getDimensions() @@ -493,16 +503,18 @@ public void testSwapAxes() { QueryDimension productDimension = query.getDimension("Product"); Member drinkMember = cube.lookupMember("Product", "Drink"); Selection drinkSelection = - productDimension.createSelection(drinkMember, - Selection.Operator.CHILDREN); + productDimension.createSelection( + drinkMember, + Selection.Operator.CHILDREN); productDimension.getSelections().add(drinkSelection); QueryDimension measuresDimension = query.getDimension("Measures"); Member storeSalesMember = cube.lookupMember("Measures", "Store Sales"); Selection storeSalesSelection = - measuresDimension.createSelection(storeSalesMember, - Selection.Operator.MEMBER); + measuresDimension.createSelection( + storeSalesMember, + Selection.Operator.MEMBER); measuresDimension.getSelections().add(storeSalesSelection); query.getAxes().get(Axis.ROWS).getDimensions() diff --git a/testsrc/org/olap4j/impl/ConnectStringParserTest.java b/testsrc/org/olap4j/impl/ConnectStringParserTest.java index 553cd35..bcd61cd 100644 --- a/testsrc/org/olap4j/impl/ConnectStringParserTest.java +++ b/testsrc/org/olap4j/impl/ConnectStringParserTest.java @@ -252,8 +252,9 @@ public void testBufReplace() { checkReplace("cacab", "cab", "bb", "cabb"); // Seek string does not exist. - checkReplace("the quick brown fox", "coyote", "wolf", - "the quick brown fox"); + checkReplace( + "the quick brown fox", "coyote", "wolf", + "the quick brown fox"); // Empty buffer. checkReplace("", "coyote", "wolf", ""); diff --git a/testsrc/org/olap4j/test/ParserTest.java b/testsrc/org/olap4j/test/ParserTest.java index c763acc..9db6252 100644 --- a/testsrc/org/olap4j/test/ParserTest.java +++ b/testsrc/org/olap4j/test/ParserTest.java @@ -119,8 +119,9 @@ private void checkAxis( List axes = selectNode.getAxisList(); assertEquals("Number of axes must be 1", 1, axes.size()); - assertEquals("Axis index name must be correct", - expectedName, axes.get(0).getAxis().name()); + assertEquals( + "Axis index name must be correct", + expectedName, axes.get(0).getAxis().name()); } public void testNegativeCases() throws Exception { @@ -185,13 +186,15 @@ public void testScannerPunc() { "[measures].[$foo] ON COLUMNS\n" + "FROM sales")); + // todo: parser off by one assertParseQueryFails( - "select [measures].$^f^oo on columns from sales", // todo: parser off by one - "Unexpected character '\\$'"); + "select [measures].$^f^oo on columns from sales", + "Unexpected character '\\$'"); // ']' unexcpected - assertParseQueryFails("select { Customers]^.^Children } on columns from [Sales]", - "Unexpected character ']'"); + assertParseQueryFails( + "select { Customers]^.^Children } on columns from [Sales]", + "Unexpected character ']'"); } public void testUnparse() { @@ -510,51 +513,63 @@ public void testCellProperties() { } public void testIsEmpty() { - assertParseExpr("[Measures].[Unit Sales] IS EMPTY", + assertParseExpr( + "[Measures].[Unit Sales] IS EMPTY", "([Measures].[Unit Sales] IS EMPTY)"); - assertParseExpr("[Measures].[Unit Sales] IS EMPTY AND 1 IS NULL", + assertParseExpr( + "[Measures].[Unit Sales] IS EMPTY AND 1 IS NULL", "(([Measures].[Unit Sales] IS EMPTY) AND (1.0 IS NULL))"); // FIXME: "NULL" should associate as "IS NULL" rather than "NULL + 56.0" - assertParseExpr("- x * 5 is empty is empty is null + 56", + assertParseExpr( + "- x * 5 is empty is empty is null + 56", "(((((- x) * 5.0) IS EMPTY) IS EMPTY) IS (NULL + 56.0))"); } public void testIs() { - assertParseExpr("[Measures].[Unit Sales] IS [Measures].[Unit Sales] AND [Measures].[Unit Sales] IS NULL", + assertParseExpr( + "[Measures].[Unit Sales] IS [Measures].[Unit Sales] AND [Measures].[Unit Sales] IS NULL", "(([Measures].[Unit Sales] IS [Measures].[Unit Sales]) AND ([Measures].[Unit Sales] IS NULL))"); } public void testIsNull() { - assertParseExpr("[Measures].[Unit Sales] IS NULL", + assertParseExpr( + "[Measures].[Unit Sales] IS NULL", "([Measures].[Unit Sales] IS NULL)"); - assertParseExpr("[Measures].[Unit Sales] IS NULL AND 1 <> 2", + assertParseExpr( + "[Measures].[Unit Sales] IS NULL AND 1 <> 2", "(([Measures].[Unit Sales] IS NULL) AND (1.0 <> 2.0))"); - assertParseExpr("x is null or y is null and z = 5", + assertParseExpr( + "x is null or y is null and z = 5", "((x IS NULL) OR ((y IS NULL) AND (z = 5.0)))"); - assertParseExpr("(x is null) + 56 > 6", + assertParseExpr( + "(x is null) + 56 > 6", "((((x IS NULL)) + 56.0) > 6.0)"); // FIXME: Should be // "(((((x IS NULL) AND (a = b)) OR ((c = (d + 5.0))) IS NULL) + 5.0)"); - assertParseExpr("x is null and a = b or c = d + 5 is null + 5", + assertParseExpr( + "x is null and a = b or c = d + 5 is null + 5", "(((x IS NULL) AND (a = b)) OR ((c = (d + 5.0)) IS (NULL + 5.0)))"); } public void testNull() { - assertParseExpr("Filter({[Measures].[Foo]}, Iif(1 = 2, NULL, 'X'))", + assertParseExpr( + "Filter({[Measures].[Foo]}, Iif(1 = 2, NULL, 'X'))", "Filter({[Measures].[Foo]}, Iif((1.0 = 2.0), NULL, \"X\"))"); } public void testCast() { - assertParseExpr("Cast([Measures].[Unit Sales] AS Numeric)", + assertParseExpr( + "Cast([Measures].[Unit Sales] AS Numeric)", "CAST([Measures].[Unit Sales] AS Numeric)"); - assertParseExpr("Cast(1 + 2 AS String)", + assertParseExpr( + "Cast(1 + 2 AS String)", "CAST((1.0 + 2.0) AS String)"); } @@ -682,7 +697,8 @@ public void testNumbers() { assertParseExpr("+45", "45.0"); // space bad - assertParseExprFails("4 ^5^", + assertParseExprFails( + "4 ^5^", "Syntax error at \\[1:35\\], token '5\\.0'"); assertParseExpr("3.14", "3.14");